diff options
| author | rillig <rillig@pkgsrc.org> | 2022-07-08 18:06:19 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-07-08 18:06:19 +0000 |
| commit | e6b357c0f922fcf6f9deb7eff6603d7c14dd8a3c (patch) | |
| tree | 0aeb385ad87dcbaf5cac5fef7885113430124b85 /pkgtools/createbuildlink | |
| parent | e319002f4eca1554def536a06502e0b78cad8769 (diff) | |
| download | pkgsrc-e6b357c0f922fcf6f9deb7eff6603d7c14dd8a3c.tar.gz | |
pkgtools/createbuildlink: fix location of BUILDLINK_DEPMETHOD
Reported by Mayuresh in
https://mail-index.netbsd.org/pkgsrc-users/2022/07/08/msg035799.html.
Bump version.
Diffstat (limited to 'pkgtools/createbuildlink')
| -rw-r--r-- | pkgtools/createbuildlink/Makefile | 14 | ||||
| -rwxr-xr-x | pkgtools/createbuildlink/files/createbuildlink | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index cf643eb2df1..70e7ab55135 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2020/05/16 06:28:52 rillig Exp $ +# $NetBSD: Makefile,v 1.57 2022/07/08 18:06:19 rillig Exp $ -PKGNAME= createbuildlink-3.18 +PKGNAME= createbuildlink-3.19 CATEGORIES= pkgtools sysutils MAINTAINER= pkgsrc-users@NetBSD.org @@ -8,14 +8,14 @@ COMMENT= Shell script to help creating buildlink3.mk files LICENSE= original-bsd WRKSRC= ${WRKDIR} -USE_LANGUAGES= # empty +USE_LANGUAGES= # none NO_BUILD= yes -SCRIPT= ${PKGNAME:C/-.*$//} +SCRIPT= createbuildlink SCRIPTS= ${SCRIPT} substplistbasedirs REPLACE_SH+= ${SCRIPTS} -INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 +AUTO_MKDIRS= yes SUBST_CLASSES+= vars SUBST_STAGE.vars= pre-configure @@ -27,8 +27,8 @@ do-extract: do-install: .for scr in ${SCRIPTS} - ${INSTALL_SCRIPT} ${WRKSRC:Q}/${scr:Q} ${DESTDIR}${PREFIX}/bin/${scr:Q} + ${INSTALL_SCRIPT} ${WRKSRC}/${scr} ${DESTDIR}${PREFIX}/bin/ .endfor - ${INSTALL_MAN} ${FILESDIR:Q}/${SCRIPT:Q}.8 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man8 + ${INSTALL_MAN} ${FILESDIR}/${SCRIPT}.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index b3d0d8d7dd0..ddfe65c5e6e 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.39 2020/05/16 06:28:52 rillig Exp $ +# $NetBSD: createbuildlink,v 1.40 2022/07/08 18:06:19 rillig Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -32,7 +32,7 @@ # Create an initial buildlink3.mk from a package's Makefile and PLIST # -REV=`echo '$Revision: 1.39 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.40 $' | sed 's/\\$//g'` tmpdir=/tmp spacesintab=8 makefile=Makefile @@ -108,11 +108,6 @@ sed -f $sedrules <<EOF # XXX After this file has been verified as correct, the comment lines # XXX beginning with "XXX" should be removed. Please do not commit # XXX unverified buildlink3.mk files. -# XXX -# XXX Packages that only install static libraries or headers should -# XXX include the following line: -# XXX -# XXX BUILDLINK_DEPMETHOD.$PKGNOVER?= build EOF @@ -130,6 +125,12 @@ BUILDLINK_TREE+= $PKGNOVER .if !defined(${PKGUPPER}_BUILDLINK3_MK) ${PKGUPPER}_BUILDLINK3_MK:= +# XXX +# XXX Packages that only install static libraries or headers should +# XXX include the following line: +# XXX +# XXX BUILDLINK_DEPMETHOD.$PKGNOVER?= build + EOF if [ -n "$GO_PACKAGE" ] |