diff options
| author | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
| commit | cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 (patch) | |
| tree | dfd45506cac9c8adb60a55d809ab0dbc4d5a750e /time | |
| parent | afe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff) | |
| download | pkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz | |
all: replace SUBST_SED with the simpler SUBST_VARS
pkglint -Wall -r --only "substitution command" -F
With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.
Diffstat (limited to 'time')
| -rw-r--r-- | time/cardboard-schedule/Makefile | 6 | ||||
| -rw-r--r-- | time/kronolith/Makefile | 4 | ||||
| -rw-r--r-- | time/leapsunpack/Makefile | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 7f46d8207a2..d16198ee6d0 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2017/08/01 17:40:17 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2019/05/23 19:23:18 rillig Exp $ # DISTNAME= cs113ins @@ -49,8 +49,8 @@ INSTALLATION_DIRS= bin lib/cardboard-schedule SUBST_CLASSES+= cs SUBST_STAGE.cs= do-configure SUBST_FILES.cs= csched.sh -SUBST_SED.cs+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.cs+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_VARS.cs= PREFIX +SUBST_VARS.cs+= LOCALBASE SUBST_SED.cs+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' post-extract: diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile index a34a136afbf..0867e3e2943 100644 --- a/time/kronolith/Makefile +++ b/time/kronolith/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2017/08/16 20:21:16 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/05/23 19:23:18 rillig Exp $ DISTNAME= kronolith-h3-${KRONOLITHVER} PKGNAME= kronolith-${KRONOLITHVER} @@ -50,7 +50,7 @@ USE_PKGINSTALL= YES SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= kronolith.conf.dist -SUBST_SED.files= -e "s|@KRONOLITHDIR@|${KRONOLITHDIR}|g" +SUBST_VARS.files= KRONOLITHDIR SUBST_MESSAGE.files= Fixing configuration files. PKG_USERS_VARS+= APACHE_USER diff --git a/time/leapsunpack/Makefile b/time/leapsunpack/Makefile index 66a1ee5546a..a1e4f262e72 100644 --- a/time/leapsunpack/Makefile +++ b/time/leapsunpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/08/16 20:45:46 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:18 rillig Exp $ # DISTNAME= leapsunpack-0.05 @@ -18,7 +18,7 @@ LDFLAGS.SunOS+= -lsocket -lnsl SUBST_CLASSES+= files SUBST_STAGE.files= do-configure SUBST_FILES.files= leapsinstall.sh -SUBST_SED.files= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" +SUBST_VARS.files= PKG_SYSCONFDIR SUBST_MESSAGE.files= Fixing configuration files. INSTALLATION_DIRS= bin share/doc/${PKGBASE} |