diff options
| author | rh <rh@pkgsrc.org> | 2003-04-29 01:36:08 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2003-04-29 01:36:08 +0000 |
| commit | 2ff0c5692eb9582a0f865f52b36b3b30c2425ae8 (patch) | |
| tree | b8113c03dfb50d246440f7857270e78e623abea4 /pkgtools | |
| parent | c5c505aca9cea257a5e18a27196f3f0b883ccf53 (diff) | |
| download | pkgsrc-2ff0c5692eb9582a0f865f52b36b3b30c2425ae8.tar.gz | |
Update createbuildlink to 2.6. Changes include:
- use of ${MAKE} instead of 'make' in the script so this works on
non-NetBSD systems as well
- s/NetBSD/pkgsrc/ in the manual page
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 7 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 8 | ||||
| -rw-r--r-- | pkgtools/createbuildlink/files/createbuildlink.8 | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index c476726d422..c709b662c10 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2003/04/04 22:13:15 rh Exp $ +# $NetBSD: Makefile,v 1.16 2003/04/29 01:36:08 rh Exp $ # -DISTNAME= createbuildlink-2.5 +DISTNAME= createbuildlink-2.6 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing @@ -20,7 +20,8 @@ SCRIPT= ${DISTNAME:C/-.*$//} do-configure: .for scr in ${SCRIPT} - ${SED} -e 's/@PKGVERSION@/${PKGVERSION}/' \ + ${SED} -e 's/@PKGVERSION@/${PKGVERSION}/' \ + -e 's/@MAKE@/${MAKE}/' \ < ${FILESDIR}/${scr} > ${WRKSRC}/${scr} .endfor diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index 2c11d8423db..c71e1ab5fd0 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.12 2003/04/04 22:13:16 rh Exp $ +# $NetBSD: createbuildlink,v 1.13 2003/04/29 01:36:08 rh Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,7 +39,7 @@ # Create an initial buildlink2.mk from a package's Makefile and PLIST # -REV=`echo '$Revision: 1.12 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.13 $' | sed 's/\\$//g'` tmpdir=/tmp makefile=Makefile sedrules=$tmpdir/sedrules.buildlink.$$ @@ -88,12 +88,12 @@ commons=`grep '^.include.*Makefile.common\"' $makefile | \ ## package specific variables ## CURDIR=`pwd | sed 's|^.*/\([^/]*/[^/]*\)$|\1|'` -PKGNAME=`make show-var VARNAME=PKGNAME` +PKGNAME=`@MAKE@ show-var VARNAME=PKGNAME` PKGVER=`echo $PKGNAME | sed -e 's/^.*-//'` PKGNOVER=`echo $PKGNAME | sed -e 's/-[^-]*$//'` PKGUPPER=`echo $PKGNOVER | tr '[:lower:]' '[:upper:]' | tr - _` PREFIX=X11PREFIX -USE_X11BASE=`make show-var VARNAME=USE_X11BASE` +USE_X11BASE=`@MAKE@ show-var VARNAME=USE_X11BASE` if [ -z "$USE_X11BASE" ]; then if ! grep -q "^USE_X11BASE" $makefile $commons ; then PREFIX=LOCALBASE diff --git a/pkgtools/createbuildlink/files/createbuildlink.8 b/pkgtools/createbuildlink/files/createbuildlink.8 index e674fb40a76..3fbd2322e33 100644 --- a/pkgtools/createbuildlink/files/createbuildlink.8 +++ b/pkgtools/createbuildlink/files/createbuildlink.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: createbuildlink.8,v 1.4 2002/10/16 08:50:50 rh Exp $ +.\" $NetBSD: createbuildlink.8,v 1.5 2003/04/29 01:36:08 rh Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,12 +34,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 16, 2002 +.Dd April 29, 2003 .Dt CREATEBUILDLINK 8 .Os .Sh NAME .Nm createbuildlink -.Nd automatic NetBSD buildlink2.mk generator +.Nd automatic pkgsrc buildlink2.mk generator .Sh SYNOPSIS .Nm .Op Fl j |