pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

yaggo: Generate command line parser using getopt_long



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Thu Apr 6 07:37:13 2017 -0500
Changeset:	0439524da132fb33ed4a09262237c779210ad489

Modified Files:
	Makefile
	jellyfish2/Makefile
	jellyfish2/distinfo
	jellyfish2/patches/patch-include_jellyfish_file__header.hpp
Added Files:
	yaggo/DESCR
	yaggo/Makefile
	yaggo/PLIST
	yaggo/distinfo
	yaggo/patches/patch-Makefile

Log Message:
yaggo: Generate command line parser using getopt_long

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0439524da132fb33ed4a09262237c779210ad489

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 +
 jellyfish2/Makefile                                | 43 +++++-----------------
 jellyfish2/distinfo                                |  8 ++--
 .../patch-include_jellyfish_file__header.hpp       |  2 +
 yaggo/DESCR                                        |  1 +
 yaggo/Makefile                                     | 30 +++++++++++++++
 yaggo/PLIST                                        |  4 ++
 yaggo/distinfo                                     |  7 ++++
 yaggo/patches/patch-Makefile                       | 28 ++++++++++++++
 9 files changed, 88 insertions(+), 36 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index a0826cd52f..f937daa363 100644
--- a/Makefile
+++ b/Makefile
@@ -4516,6 +4516,7 @@ SUBDIR+=	xxdiff
 SUBDIR+=	xxhash
 SUBDIR+=	yabar
 SUBDIR+=	yafray
+SUBDIR+=	yaggo
 SUBDIR+=	yakuake
 SUBDIR+=	yateclient
 SUBDIR+=	yauap
diff --git a/jellyfish2/Makefile b/jellyfish2/Makefile
index a88d8d97b7..3c62cb99a6 100644
--- a/jellyfish2/Makefile
+++ b/jellyfish2/Makefile
@@ -4,56 +4,33 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-###########################################################
-# Unconverted and partially converted FreeBSD port syntax:
-
-## Created by: Jason Bacon <bacon4000%gmail.com@localhost>
-## $FreeBSD$
-#USE_LDCONFIG=	yes
-#post-stage:
-#	${MV} ${DESTDIR}${PREFIX}/lib/pkgconfig/* \
-#		${DESTDIR}${PREFIX}/libdata/pkgconfig
-#.include <bsd.port.mk>
-
 DISTNAME=	jellyfish-${PORTVERSION}
 CATEGORIES=	biology
-MASTER_SITES=	ftp://ftp.genome.umd.edu/pub/jellyfish/
-
+MASTER_SITES=	${MASTER_SITE_GITHUB:=gmarcais/}
 MAINTAINER=	dsiercks%uwm.edu@localhost
 HOMEPAGE=	http://www.genome.umd.edu/jellyfish.html
+DISTNAME=	jellyfish-v${PORTVERSION}
+
 COMMENT=	Fast, memory-efficient counting of k-mers in DNA
-# Check this
 LICENSE=	gnu-gpl-v3
 
-# FIXME: Only for amd64
-# Test and change if necessary.
-# MAKE_JOBS_SAFE=	no
-
+USE_TOOLS=	autoreconf autoconf automake
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
-CFLAGS=		-fopenmp 
+CFLAGS=		-fopenmp
 
 CXXFLAGS+=	-std=c++0x
 
-FFLAGS=		-fopenmp 
-
-PORTVERSION=	2.2.0
-DATADIR=	${PREFIX}/share/jellyfish
-DOCSDIR=	${PREFIX}/share/doc/jellyfish
-
-# Sets OPSYS, OS_VERSION, MACHINE_ARCH, etc..
-# .include "../../mk/bsd.prefs.mk"
+WRKSRC=		${WRKDIR}/Jellyfish-${PORTVERSION}
 
-# Keep this if there are user-selectable options.
-# .include "options.mk"
-
-# Specify which directories to create before install.
-# You should only need this if using your own install target.
+PORTVERSION=	2.2.6
 INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man1 share/doc share/examples
 
-# Linux doesn't have zlib in the base, so just in case...
+pre-configure:
+	cd ${WRKSRC} && autoreconf -if
+
 # .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/jellyfish2/distinfo b/jellyfish2/distinfo
index f44555ffbc..96a454918e 100644
--- a/jellyfish2/distinfo
+++ b/jellyfish2/distinfo
@@ -1,5 +1,7 @@
 $NetBSD$
 
-SHA1 (jellyfish-2.2.0.tar.gz) = 9ac4817aed0c61a1819b913193b0e312fa4fa9bd
-RMD160 (jellyfish-2.2.0.tar.gz) = 01e5847c72bf1bf92989b1158988605b1155aec4
-Size (jellyfish-2.2.0.tar.gz) = 1085913 bytes
+SHA1 (jellyfish-v2.2.6.tar.gz) = 8654c50c56b506da24dd4a44fcbdc94c953e88da
+RMD160 (jellyfish-v2.2.6.tar.gz) = 238cbcf4340e5777e7a58e33e92979f07e069e0d
+SHA512 (jellyfish-v2.2.6.tar.gz) = 7d61d823feaaab05fbb43eaca22823a988bd05da318431e74092b42c7e33ce39f387ac15db30906341f084223b7c2726e199592555aea4b21a5b517e8d0c08f9
+Size (jellyfish-v2.2.6.tar.gz) = 660858 bytes
+SHA1 (patch-include_jellyfish_file__header.hpp) = 6876cf0e62b6c87118effe752d559e19b6c89cb5
diff --git a/jellyfish2/patches/patch-include_jellyfish_file__header.hpp b/jellyfish2/patches/patch-include_jellyfish_file__header.hpp
index 9dca7710a2..b424b1f0e0 100644
--- a/jellyfish2/patches/patch-include_jellyfish_file__header.hpp
+++ b/jellyfish2/patches/patch-include_jellyfish_file__header.hpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Some GCC installations appear to be missing certain to_string() morphs
+
 --- include/jellyfish/file_header.hpp.orig	2013-12-13 19:04:16 UTC
 +++ include/jellyfish/file_header.hpp
 @@ -21,6 +21,8 @@
diff --git a/yaggo/DESCR b/yaggo/DESCR
new file mode 100644
index 0000000000..8523ee42ee
--- /dev/null
+++ b/yaggo/DESCR
@@ -0,0 +1 @@
+Generate command line parser using getopt_long.
diff --git a/yaggo/Makefile b/yaggo/Makefile
new file mode 100644
index 0000000000..64dea1bd7b
--- /dev/null
+++ b/yaggo/Makefile
@@ -0,0 +1,30 @@
+# $NetBSD$
+#
+###########################################################
+#                  Generated by fbsd2pkg                  #
+#              Thu Apr  6 07:04:14 CDT 2017               #
+###########################################################
+
+DISTNAME=	yaggo-${PORTVERSION}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=gmarcais/}
+GITHUB_PROJECT=	yaggo
+GITHUB_TAG=	v${PORTVERSION}
+
+MAINTAINER=	bacon4000%gmail.com@localhost
+HOMEPAGE=	https://github.com/gmarcais/yaggo
+COMMENT=	Generate command line parser using getopt_long
+LICENSE=	gnu-gpl-v3
+
+SUBST_CLASSES+=		ruby
+SUBST_STAGE.ruby=	post-patch
+SUBST_SED.ruby=		-e 's|\#\! /usr/bin/env ruby|\#\!${RUBY}|g'
+SUBST_FILES.ruby=	${WRKSRC}/bin/create_yaggo_one_file
+
+REPLACE_RUBY=	bin/yaggo
+
+PORTVERSION=	1.5.9
+
+.include "../../lang/ruby/buildlink3.mk"
+.include "../../lang/ruby/replace.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/yaggo/PLIST b/yaggo/PLIST
new file mode 100644
index 0000000000..31a2624695
--- /dev/null
+++ b/yaggo/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD$
+bin/yaggo
+man/man1/yaggo.1
+share/doc/yaggo/README.md
diff --git a/yaggo/distinfo b/yaggo/distinfo
new file mode 100644
index 0000000000..2dfcd72143
--- /dev/null
+++ b/yaggo/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (yaggo-1.5.9.tar.gz) = 8d110b6db87343e171db6a15e94d1f20be66b98c
+RMD160 (yaggo-1.5.9.tar.gz) = 2204397541727dd8de2926008671346e5db71803
+SHA512 (yaggo-1.5.9.tar.gz) = d1a12d761821315ed583e53c46c6c78a513adaf5a789604b2c8df3275a563a6657dd8f45aa3066562e1d6738db22bce1c7b968d0fadc7a7750aae1635c06c63b
+Size (yaggo-1.5.9.tar.gz) = 42480 bytes
+SHA1 (patch-Makefile) = 4f2a788929e49e49793a7e21cf5619ab0a0c43c3
diff --git a/yaggo/patches/patch-Makefile b/yaggo/patches/patch-Makefile
new file mode 100644
index 0000000000..94c1e0ece1
--- /dev/null
+++ b/yaggo/patches/patch-Makefile
@@ -0,0 +1,28 @@
+$NetBSD$
+
+# Support staged installs
+
+--- Makefile.orig	2015-10-14 16:25:43.000000000 +0000
++++ Makefile
+@@ -1,12 +1,14 @@
+-prefix ?= /usr/local
++PREFIX ?= /usr/local
++DESTDIR ?= 
++MANPREFIX ?= $(PREFIX)
+ 
+ all: bin/create_yaggo_one_file
+ 	ruby bin/create_yaggo_one_file ./yaggo
+ 
+ install: all
+-	mkdir -p $(prefix)/bin
+-	mkdir -p $(prefix)/share/doc/yaggo
+-	mkdir -p $(prefix)/share/man/man1
+-	cp ./yaggo $(prefix)/bin
+-	cp ./README.md $(prefix)/share/doc/yaggo
+-	./yaggo -m $(prefix)/share/man/man1/yaggo.1
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
++	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/yaggo
++	mkdir -p $(DESTDIR)$(MANPREFIX)/man/man1
++	cp ./yaggo $(DESTDIR)$(PREFIX)/bin
++	cp ./README.md $(DESTDIR)$(PREFIX)/share/doc/yaggo
++	./yaggo -m $(DESTDIR)$(MANPREFIX)/man/man1/yaggo.1


Home | Main Index | Thread Index | Old Index