summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorjlam <jlam>2006-06-15 22:13:58 +0000
committerjlam <jlam>2006-06-15 22:13:58 +0000
commit68d07341458b9ec7c184121d18ffa201d07aa5b4 (patch)
treeef60c02e04e192f211125066525adacc49b9b24c /sysutils
parent5c1c52dbd1b497bfa9b8e065b6c08c6eaa9b8df0 (diff)
downloadpkgsrc-68d07341458b9ec7c184121d18ffa201d07aa5b4.tar.gz
Pluralize INSTALL_TEMPLATE and DEINSTALL_TEMPLATE variable names as per
the pkglint warning: As {INSTALL,DEINSTALL}_TEMPLATE is modified using "+=", its name should indicate plural. This does make the variables a bit more suggestive of the fact that they hold lists of values.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/desktop-file-utils/desktopdb.mk6
-rw-r--r--sysutils/webmin/wbm.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/sysutils/desktop-file-utils/desktopdb.mk b/sysutils/desktop-file-utils/desktopdb.mk
index 0e72ae949c2..603a8b72c1f 100644
--- a/sysutils/desktop-file-utils/desktopdb.mk
+++ b/sysutils/desktop-file-utils/desktopdb.mk
@@ -1,4 +1,4 @@
-# $NetBSD: desktopdb.mk,v 1.4 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: desktopdb.mk,v 1.5 2006/06/15 22:13:59 jlam Exp $
#
# This Makefile fragment is intended to be included by packages that install
# desktop entries. It takes care of registering them in the global database.
@@ -9,8 +9,8 @@ DESKTOP_FILE_UTILS_MIMEDB_MK= # defined
.include "../../mk/bsd.prefs.mk"
-INSTALL_TEMPLATE+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
-DEINSTALL_TEMPLATE+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
+INSTALL_TEMPLATES+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
+DEINSTALL_TEMPLATES+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl
FILES_SUBST+= APPLICATIONS_PATH="${BUILDLINK_PREFIX.desktop-file-utils}/share/applications"
FILES_SUBST+= UPDATE_DESKTOPDB="${BUILDLINK_PREFIX.desktop-file-utils}/bin/update-desktop-database"
diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk
index 87414ef7e15..3d23ca814aa 100644
--- a/sysutils/webmin/wbm.mk
+++ b/sysutils/webmin/wbm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: wbm.mk,v 1.4 2006/05/19 17:14:53 jlam Exp $
+# $NetBSD: wbm.mk,v 1.5 2006/06/15 22:13:59 jlam Exp $
#
# Makefile fragment for Webmin modules
@@ -32,7 +32,7 @@ FILES_SUBST+= WBMNAME=${WBMNAME:Q}
FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q}
FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
-DEINSTALL_TEMPLATE+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl
+DEINSTALL_TEMPLATES+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl
# WBMNAME is the name of the module directory
WBMNAME?= ${DISTNAME}