diff options
| author | zuntum <zuntum> | 2001-10-31 18:45:42 +0000 |
|---|---|---|
| committer | zuntum <zuntum> | 2001-10-31 18:45:42 +0000 |
| commit | 38a691dc11503075cf52d750a967486a830b898c (patch) | |
| tree | 8f70214047e7eb2220eee12d58428c9750942ddf | |
| parent | 645e6073d0225d7aee96b8fa37c198e9b97d060a (diff) | |
| download | pkgsrc-38a691dc11503075cf52d750a967486a830b898c.tar.gz | |
o store pkgdir files (PLIST, DESCR and other) in . by default,
no need to use pkg/ for that purpose
o use ${PREFIX} instead of ${LOCALBASE} in do-install
Bump version to 1.16
OK'd by hubertf
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 6 | ||||
| -rwxr-xr-x | pkgtools/url2pkg/files/url2pkg | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 731e4a825c5..21932a0ac85 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:43 agc Exp $ +# $NetBSD: Makefile,v 1.16 2001/10/31 18:45:42 zuntum Exp $ # -DISTNAME= url2pkg-1.15 +DISTNAME= url2pkg-1.16 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing @@ -17,7 +17,7 @@ NO_PATCH= yes EXTRACT_CMD= ${ECHO} do-install: - ${INSTALL_SCRIPT} ${FILESDIR}/${DISTNAME:C/-.*$//} ${LOCALBASE}/bin/${DISTNAME:C/-.*$//} + ${INSTALL_SCRIPT} ${FILESDIR}/${DISTNAME:C/-.*$//} ${PREFIX}/bin/${DISTNAME:C/-.*$//} ${INSTALL_MAN} ${FILESDIR}/${DISTNAME:C/-.*$//}.8 ${PREFIX}/man/man8 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg index 3f4b5caf394..f4cc41a6dc7 100755 --- a/pkgtools/url2pkg/files/url2pkg +++ b/pkgtools/url2pkg/files/url2pkg @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: url2pkg,v 1.16 2001/02/18 05:21:07 hubertf Exp $ +# $NetBSD: url2pkg,v 1.17 2001/10/31 18:45:43 zuntum Exp $ # # url2pkg # (c) 1999 Hubert Feyrer @@ -79,8 +79,7 @@ if [ ! -f w*/.extract_done ]; then echo '.include "../../mk/bsd.pkg.mk"' ) >Makefile - mkdir pkg - echo '@comment $'NetBSD'$' >pkg/PLIST + echo '@comment $'NetBSD'$' > PLIST ${editor} +5 Makefile @@ -134,10 +133,10 @@ echo "" echo "Contents of "`echo w*`"/${wrksrc}:" ls -la w*/$wrksrc -if [ ! -f pkg/DESCR ]; then - touch pkg/DESCR +if [ ! -f DESCR ]; then + touch DESCR fi echo "" -echo "Don't forget to fill in the COMMENT variable and pkg/DESCR when you're done." +echo "Don't forget to fill in the COMMENT variable and DESCR when you're done." echo "" echo "Good luck! (See pkgsrc/Packages.txt for some more help :-)" |