CVS commit: pkgsrc/pkgtools/createbuildlink

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Jul  8 18:06:19 UTC 2022

Modified Files:
        pkgsrc/pkgtools/createbuildlink: Makefile
        pkgsrc/pkgtools/createbuildlink/files: createbuildlink

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/pkgtools/createbuildlink/Makefile
cvs rdiff -u -r1.39 -r1.40 \
    pkgsrc/pkgtools/createbuildlink/files/createbuildlink

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

Modified files:

Index: pkgsrc/pkgtools/createbuildlink/Makefile
diff -u pkgsrc/pkgtools/createbuildlink/Makefile:1.56 pkgsrc/pkgtools/createbuildlink/Makefile:1.57
--- pkgsrc/pkgtools/createbuildlink/Makefile:1.56       Sat May 16 06:28:52 2020
+++ pkgsrc/pkgtools/createbuildlink/Makefile    Fri Jul  8 18:06:19 2022
@@ -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@localhost
@@ -8,14 +8,14 @@ COMMENT=      Shell script to help creating b
 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"

Index: pkgsrc/pkgtools/createbuildlink/files/createbuildlink
diff -u pkgsrc/pkgtools/createbuildlink/files/createbuildlink:1.39 pkgsrc/pkgtools/createbuildlink/files/createbuildlink:1.40
--- pkgsrc/pkgtools/createbuildlink/files/createbuildlink:1.39  Sat May 16 06:28:52 2020
+++ pkgsrc/pkgtools/createbuildlink/files/createbuildlink       Fri Jul  8 18:06:19 2022
@@ -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" ]