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 /databases | |
| 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 'databases')
| -rw-r--r-- | databases/phpmyadmin/Makefile | 6 | ||||
| -rw-r--r-- | databases/unixodbc/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index d8f9ab509f7..dfdd970abb4 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.156 2018/12/13 08:22:42 tm Exp $ +# $NetBSD: Makefile,v 1.157 2019/05/23 19:22:57 rillig Exp $ DISTNAME= phpMyAdmin-4.8.4-all-languages PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl} @@ -75,8 +75,8 @@ NO_BUILD= yes SUBST_CLASSES+= paths SUBST_FILES.paths+= ${WRKDIR}/phpmyadmin.conf SUBST_FILES.paths+= ${WRKSRC}/libraries/vendor_config.php -SUBST_SED.paths+= -e "s|@PMDIR@|${PMDIR}|g" -SUBST_SED.paths+= -e "s|@PMVARDIR@|${PMVARDIR}|g" +SUBST_VARS.paths= PMDIR +SUBST_VARS.paths+= PMVARDIR SUBST_SED.paths+= -e "s|@PMCONFDIR@|${PMCONFDIR}/|g" SUBST_STAGE.paths= post-configure diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index 4317df0dbb3..914c4ae8e97 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2018/08/14 13:04:24 adam Exp $ +# $NetBSD: Makefile,v 1.41 2019/05/23 19:22:57 rillig Exp $ DISTNAME= unixODBC-2.3.7 PKGNAME= ${DISTNAME:S/ODBC/odbc/} @@ -54,8 +54,8 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/ODBCDataSources SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= ${WRKDIR}/odbc.ini -SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_SED.paths+= -e 's,@UNIXODBC_DRIVERS_DIR@,${UNIXODBC_DRIVERS_DIR},g' +SUBST_VARS.paths= PREFIX +SUBST_VARS.paths+= UNIXODBC_DRIVERS_DIR SUBST_CLASSES+= mutex SUBST_STAGE.mutex= pre-configure |