pkgsrc-WIP-changes archive

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

Bump to version 0.2. Many bug fixes and greatly improved handling of Python packages.



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <jwbacon%tds.net@localhost>
Pushed By:	outpaddling
Date:		Sat Jan 16 10:37:25 2016 -0600
Changeset:	8e8c9f9306ce3369c0dc9df9fd2d8d3016638548

Modified Files:
	fbsd2pkg/Makefile
	fbsd2pkg/distinfo
Removed Files:
	fbsd2pkg/patches/patch-fbsd2pkg
	fbsd2pkg/patches/patch-fbsd2pkg.awk

Log Message:
Bump to version 0.2.  Many bug fixes and greatly improved handling of
Python packages.

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

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

diffstat:
 fbsd2pkg/Makefile                   |  8 ++++----
 fbsd2pkg/distinfo                   |  9 ++++-----
 fbsd2pkg/patches/patch-fbsd2pkg     | 29 ---------------------------
 fbsd2pkg/patches/patch-fbsd2pkg.awk | 40 -------------------------------------
 4 files changed, 8 insertions(+), 78 deletions(-)

diffs:
diff --git a/fbsd2pkg/Makefile b/fbsd2pkg/Makefile
index c337927..35ff057 100644
--- a/fbsd2pkg/Makefile
+++ b/fbsd2pkg/Makefile
@@ -3,12 +3,12 @@
 # Don't bother committing this.  I'm adding new features almost every
 # time I convert a port.
 
-DISTNAME=	fbsd2pkg-0.1
+DISTNAME=	fbsd2pkg-0.2
 CATEGORIES=	pkgtools
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	jwbacon%tds.net@localhost
+MAINTAINER=	bacon4000%gmail.com@localhost
 HOMEPAGE=	http://acadix.biz/Ports/distfiles/
 COMMENT=	Convert a FreeBSD port framework to a pkgsrc package
 LICENSE=	2-clause-bsd
@@ -23,8 +23,8 @@ SUBST_FILES.prefix=	${WRKSRC}/fbsd2pkg
 SUBST_SED.prefix=	\
 	's|fbsd2pkg.awk|${PREFIX}/libexec/fbsd2pkg/fbsd2pkg.awk|g'
 
-DEPENDS+=	createbuildlink-[0-9]*:../../pkgtools/createbuildlink \
-		pkglint-[0-9]*:../../pkgtools/pkglint
+DEPENDS+=	createbuildlink:../../pkgtools/createbuildlink \
+		pkglint:../../pkgtools/pkglint
 
 do-install:
 	${MKDIR} ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/libexec/fbsd2pkg
diff --git a/fbsd2pkg/distinfo b/fbsd2pkg/distinfo
index 51ae9a7..1175b74 100644
--- a/fbsd2pkg/distinfo
+++ b/fbsd2pkg/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-SHA1 (fbsd2pkg-0.1.tar.xz) = 450f237ac0f546452090e936881e048ba93e915a
-RMD160 (fbsd2pkg-0.1.tar.xz) = c50b4e5addd5a02923b480e3826aa50e70e51350
-Size (fbsd2pkg-0.1.tar.xz) = 4444 bytes
-SHA1 (patch-fbsd2pkg) = cff89804ec822ca3c4f141564efebbbb0aefe1d9
-SHA1 (patch-fbsd2pkg.awk) = be0b22e5e753f4e5e2c677db90957efffbe1bc86
+SHA1 (fbsd2pkg-0.2.tar.xz) = 44c8c5cd7b81448354f780f4c6dea064eb45e450
+RMD160 (fbsd2pkg-0.2.tar.xz) = a1336311bc88b035190a664aaec9fb0e686349f3
+SHA512 (fbsd2pkg-0.2.tar.xz) = 12d457c7a436ab3b686139d5dfb380f3f760a678e5decb558ef7f087cc929e020bb18b60bcc72a4c7f242dbf466723d0a2c93eac7d813177a88ee35add1bccd5
+Size (fbsd2pkg-0.2.tar.xz) = 4504 bytes
diff --git a/fbsd2pkg/patches/patch-fbsd2pkg b/fbsd2pkg/patches/patch-fbsd2pkg
deleted file mode 100644
index 63928e9..0000000
--- a/fbsd2pkg/patches/patch-fbsd2pkg
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-On NetBSD, existing test on bmake may not be necessary 
-or even harmfull :-)
-
---- fbsd2pkg.orig	2015-10-07 23:58:48.000000000 +0900
-+++ fbsd2pkg	2015-10-08 00:04:02.000000000 +0900
-@@ -40,10 +40,6 @@ if [ $# != 2 ]; then
-     usage
- fi
- 
--if ! which bmake; then
--    printf "Error: bmake not found in PATH.\n"
--    exit 1
--fi
- 
- port_path=$1
- maintainer=$2
-@@ -56,6 +52,10 @@ fi
- if [ `uname` = NetBSD ]; then
-     make=make
- else
-+    if ! which bmake; then
-+	printf "Error: bmake not found in PATH.\n"
-+    exit 1
-+    fi
-     make=bmake
- fi
- 
diff --git a/fbsd2pkg/patches/patch-fbsd2pkg.awk b/fbsd2pkg/patches/patch-fbsd2pkg.awk
deleted file mode 100644
index 2458027..0000000
--- a/fbsd2pkg/patches/patch-fbsd2pkg.awk
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
-awk: warning: escape sequence `\$' treated as plain `$'
- source line number 56 source file /usr/pkg/libexec/fbsd2pkg/fbsd2pkg.awk
- context is
-                    master_sites = >>>  "\$ <<< 
-awk: warning: escape sequence `\$' treated as plain `$'
- source line number 212 source file /usr/pkg/libexec/fbsd2pkg/fbsd2pkg.awk
-awk: warning: escape sequence `\$' treated as plain `$'
- source line number 220 source file /usr/pkg/libexec/fbsd2pkg/fbsd2pkg.awk
-
---- fbsd2pkg.awk.orig	2015-09-29 09:52:32.000000000 +0900
-+++ fbsd2pkg.awk	2015-10-08 00:13:51.000000000 +0900
-@@ -53,7 +53,7 @@ BEGIN {
- 	else if ( master_sites ~ "^SF" )
- 	    sf_master_sites = master_sites;
- 	else if ( master_sites == "CHEESESHOP" )
--	    master_sites = "\${CHEESESHOP}";
-+	    master_sites = "\\${CHEESESHOP}";
- 	else
- 	    gsub("\\${PORTNAME}", portname, master_sites);
-     }
-@@ -209,7 +209,7 @@ BEGIN {
-     else if ( $1 ~ "^PKGNAMEPREFIX" )
-     {
- 	pkgnameprefix=$2;
--	gsub("\\${PYTHON_PKGNAMEPREFIX}", "\${PYPKGPREFIX}-", pkgnameprefix);
-+	gsub("\\${PYTHON_PKGNAMEPREFIX}", "\\${PYPKGPREFIX}-", pkgnameprefix);
-     }
-     else if ( $1 ~ "^PKGNAMESUFFIX" )
- 	pkgnamesuffix=$2;
-@@ -217,7 +217,7 @@ BEGIN {
-     {
- 	# Convert what we can in FreeBSD ports code that's left commented out
- 	gsub("STAGEDIR", "DESTDIR", $0);
--	gsub("\\${PYTHON_PKGNAMEPREFIX}", "\${PYPKGPREFIX}-", $0);
-+	gsub("\\${PYTHON_PKGNAMEPREFIX}", "\\${PYPKGPREFIX}-", $0);
- 	gsub("\\${PORTSDIR}", "../..", $0);
- 	
- 	if ( ($0 ~ "COPYTREE") && (use_tools !~ "pax") )


Home | Main Index | Thread Index | Old Index