Sat May 16 06:24:15 2020 UTC ()
pkgtools/createbuildlink: use SUBST instead of ad-hoc sed

This allows to show the actual changes by setting SUBST_SHOW_DIFF=yes,
and with SUBST_NOOP_OK=no it also demonstrates that no substitutions are
needed for substplistbasedirs.

Another thing this demonstrates is this wrong patch:

-echo >>$sedrules "s|@@PKGVERSION@@|@PKGVERSION@|g"
+echo >>$sedrules "s|@3.17@|3.17|g"


(rillig)
diff -r1.54 -r1.55 pkgsrc/pkgtools/createbuildlink/Makefile
cvs diff -r1.54 -r1.55 pkgsrc/pkgtools/createbuildlink/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/createbuildlink/Makefile 2015/12/29 21:21:20 1.54
+++ pkgsrc/pkgtools/createbuildlink/Makefile 2020/05/16 06:24:15 1.55
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.54 2015/12/29 21:21:20 wiz Exp $ 1# $NetBSD: Makefile,v 1.55 2020/05/16 06:24:15 rillig Exp $
2 2
3PKGNAME= createbuildlink-3.17 3PKGNAME= createbuildlink-3.17
4CATEGORIES= pkgtools sysutils 4CATEGORIES= pkgtools sysutils
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7COMMENT= Shell script to help creating buildlink3.mk files 7COMMENT= Shell script to help creating buildlink3.mk files
8LICENSE= original-bsd 8LICENSE= original-bsd
9 9
10WRKSRC= ${WRKDIR} 10WRKSRC= ${WRKDIR}
11USE_LANGUAGES= # empty 11USE_LANGUAGES= # empty
12NO_BUILD= yes 12NO_BUILD= yes
13 13
14SCRIPT= ${PKGNAME:C/-.*$//} 14SCRIPT= ${PKGNAME:C/-.*$//}
15SCRIPTS= ${SCRIPT} substplistbasedirs 15SCRIPTS= ${SCRIPT} substplistbasedirs
16REPLACE_SH+= ${SCRIPTS} 16REPLACE_SH+= ${SCRIPTS}
17 17
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
19 19
 20SUBST_CLASSES+= vars
 21SUBST_STAGE.vars= pre-configure
 22SUBST_FILES.vars= ${SCRIPT}
 23SUBST_VARS.vars= PKGVERSION MAKE
 24
20do-extract: 25do-extract:
21.for scr in ${SCRIPTS} 26 cd ${FILESDIR} && ${CP} ${SCRIPTS} ${WRKSRC}
22 ${SED} -e 's|@PKGVERSION@|${PKGVERSION}|' \ 
23 -e 's|@MAKE@|${MAKE}|' \ 
24 < ${FILESDIR:Q}/${scr:Q} > ${WRKSRC:Q}/${scr:Q} 
25.endfor 
26 27
27do-install: 28do-install:
28.for scr in ${SCRIPTS} 29.for scr in ${SCRIPTS}
29 ${INSTALL_SCRIPT} ${WRKSRC:Q}/${scr:Q} ${DESTDIR}${PREFIX}/bin/${scr:Q} 30 ${INSTALL_SCRIPT} ${WRKSRC:Q}/${scr:Q} ${DESTDIR}${PREFIX}/bin/${scr:Q}
30.endfor 31.endfor
31 ${INSTALL_MAN} ${FILESDIR:Q}/${SCRIPT:Q}.8 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man8 32 ${INSTALL_MAN} ${FILESDIR:Q}/${SCRIPT:Q}.8 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man8
32 33
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"