Sun Oct 6 12:55:30 2019 UTC ()
pkgtools/url2pkg: update to 19.3.3

Changes since 19.3.2:

* Replaced the Perl implementation with the Python implementation.

* Improved detection of WRKSRC: only directories are candidates, regular
  files are ignored.

* R packages are handled by R2pkg instead of url2pkg.


(rillig)
diff -r1.105 -r1.106 pkgsrc/pkgtools/url2pkg/Makefile
diff -r1.7 -r1.8 pkgsrc/pkgtools/url2pkg/PLIST
cvs diff -r1.105 -r1.106 pkgsrc/pkgtools/url2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/url2pkg/Makefile 2019/10/05 22:02:32 1.105
+++ pkgsrc/pkgtools/url2pkg/Makefile 2019/10/06 12:55:30 1.106
@@ -1,48 +1,46 @@ @@ -1,48 +1,46 @@
1# $NetBSD: Makefile,v 1.105 2019/10/05 22:02:32 rillig Exp $ 1# $NetBSD: Makefile,v 1.106 2019/10/06 12:55:30 rillig Exp $
2 2
3PKGNAME= url2pkg-19.3.2 3PKGNAME= url2pkg-19.3.3
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6MAINTAINER= rillig@NetBSD.org 6MAINTAINER= rillig@NetBSD.org
7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/creating.html 7HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/creating.html
8COMMENT= Tool to automate initial steps in building a package 8COMMENT= Tool to automate initial steps in building a package
9LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
10 10
11WRKSRC= ${WRKDIR} 11WRKSRC= ${WRKDIR}
12NO_CHECKSUM= yes 12NO_CHECKSUM= yes
13NO_BUILD= yes 13NO_BUILD= yes
14USE_LANGUAGES= # none 14USE_LANGUAGES= # none
15USE_TOOLS+= perl:run 15USE_TOOLS+= perl:run
16AUTO_MKDIRS= yes 16AUTO_MKDIRS= yes
17 17
18TEST_DEPENDS+= ${PYPKGPREFIX}-test>=0:../../devel/py-test 18TEST_DEPENDS+= ${PYPKGPREFIX}-test>=0:../../devel/py-test
19 19
20do-extract: 20do-extract:
21 ${RUN} cd ${FILESDIR} && cp *.* ${WRKSRC}/ 21 ${RUN} cd ${FILESDIR} && cp *.* ${WRKSRC}/
22 22
23do-test: 23do-test:
24 ${RUN} cd ${WRKSRC} && env PKGSRCDIR=${PKGSRCDIR} perl -I. url2pkg.t 
25 ${RUN} cd ${WRKSRC} && env PKGSRCDIR=${PKGSRCDIR} MAKE=${MAKE:Q} \ 24 ${RUN} cd ${WRKSRC} && env PKGSRCDIR=${PKGSRCDIR} MAKE=${MAKE:Q} \
26 ${PREFIX}/bin/pytest-${PYVERSSUFFIX} 25 ${PREFIX}/bin/pytest-${PYVERSSUFFIX}
27 26
28.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
29 28
30SUBST_CLASSES+= up 29SUBST_CLASSES+= up
31SUBST_STAGE.up= do-configure 30SUBST_STAGE.up= do-configure
32SUBST_MESSAGE.up= Replacing variable placeholders 31SUBST_MESSAGE.up= Replacing variable placeholders
33SUBST_FILES.up= url2pkg.pl MakeMaker.pm url2pkg.py 32SUBST_FILES.up= MakeMaker.pm url2pkg.py
34SUBST_VARS.up= MAKE PERL5 PKGSRCDIR PYTHONBIN 33SUBST_VARS.up= MAKE PERL5 PKGSRCDIR PYTHONBIN
35SUBST_SED.up= -e 's,@LIBDIR@,${PREFIX}/lib/url2pkg,g' 34SUBST_SED.up= -e 's,@LIBDIR@,${PREFIX}/lib/url2pkg,g'
36 35
37do-install: 36do-install:
38 ${INSTALL_SCRIPT} ${WRKSRC}/url2pkg.pl ${DESTDIR}${PREFIX}/bin/url2pkg 37 ${INSTALL_SCRIPT} ${WRKSRC}/url2pkg.py ${DESTDIR}${PREFIX}/bin/url2pkg
39 ${INSTALL_SCRIPT} ${WRKSRC}/url2pkg.py ${DESTDIR}${PREFIX}/bin/url2pkg-py 
40 ${INSTALL_MAN} ${FILESDIR}/url2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 38 ${INSTALL_MAN} ${FILESDIR}/url2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
41 ${INSTALL_DATA} ${WRKSRC}/Build.pm ${DESTDIR}${PREFIX}/lib/url2pkg/Module/ 39 ${INSTALL_DATA} ${WRKSRC}/Build.pm ${DESTDIR}${PREFIX}/lib/url2pkg/Module/
42 ${INSTALL_DATA} ${WRKSRC}/MakeMaker.pm ${DESTDIR}${PREFIX}/lib/url2pkg/ExtUtils/ 40 ${INSTALL_DATA} ${WRKSRC}/MakeMaker.pm ${DESTDIR}${PREFIX}/lib/url2pkg/ExtUtils/
43 ${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/ 41 ${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/
44 ${INSTALL_DATA} /dev/null ${DESTDIR}${PREFIX}/lib/url2pkg/distutils/__init__.py 42 ${INSTALL_DATA} /dev/null ${DESTDIR}${PREFIX}/lib/url2pkg/distutils/__init__.py
45 ${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/distutils/core.py 43 ${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/distutils/core.py
46 44
47.include "../../lang/python/application.mk" 45.include "../../lang/python/application.mk"
48.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/url2pkg/PLIST (expand / switch to unified diff)

--- pkgsrc/pkgtools/url2pkg/PLIST 2019/10/05 22:02:32 1.7
+++ pkgsrc/pkgtools/url2pkg/PLIST 2019/10/06 12:55:30 1.8
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1@comment $NetBSD: PLIST,v 1.7 2019/10/05 22:02:32 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.8 2019/10/06 12:55:30 rillig Exp $
2bin/url2pkg 2bin/url2pkg
3bin/url2pkg-py 
4lib/url2pkg/ExtUtils/MakeMaker.pm 3lib/url2pkg/ExtUtils/MakeMaker.pm
5lib/url2pkg/Module/Build.pm 4lib/url2pkg/Module/Build.pm
6lib/url2pkg/distutils/__init__.py 5lib/url2pkg/distutils/__init__.py
7lib/url2pkg/distutils/core.py 6lib/url2pkg/distutils/core.py
8lib/url2pkg/setuptools.py 7lib/url2pkg/setuptools.py
9man/man8/url2pkg.8 8man/man8/url2pkg.8