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.

24 files changed, 84 insertions, 84 deletions

diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk
index 5fb9f1bb1d4..3d23e1a1cb1 100644
--- a/databases/shared-mime-info/mimedb.mk
+++ b/databases/shared-mime-info/mimedb.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mimedb.mk,v 1.4 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: mimedb.mk,v 1.5 2006/06/15 22:13:58 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # mime customization files.  It takes care of registering them in the global
@@ -10,8 +10,8 @@ SHARED_MIME_INFO_MIMEDB_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
-DEINSTALL_TEMPLATE+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+INSTALL_TEMPLATES+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+DEINSTALL_TEMPLATES+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
 
 FILES_SUBST+=		MIMEDB_PATH="${BUILDLINK_PREFIX.shared-mime-info}/share/mime"
 FILES_SUBST+=		UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mime-database"
diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
index e504f5fcf29..64c3e47e1c5 100644
--- a/devel/GConf2/schemas.mk
+++ b/devel/GConf2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.14 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: schemas.mk,v 1.15 2006/06/15 22:13:58 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GConf2 schema files.  It takes care of registering them in the GConf2
@@ -47,8 +47,8 @@ FILES_SUBST+=		GCONF2_CONFIG_SOURCE=${GCONF2_CONFIG_SOURCE:Q}
 FILES_SUBST+=		GCONF2_ENTRIES=${GCONF2_ENTRIES:Q}
 FILES_SUBST+=		GCONF2_SCHEMAS=${GCONF2_SCHEMAS:Q}
 FILES_SUBST+=		GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR:Q}
-INSTALL_TEMPLATE+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
-DEINSTALL_TEMPLATE+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
+INSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
+DEINSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
 .endif
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/gconf$$/ { next; }
diff --git a/graphics/hicolor-icon-theme/Makefile b/graphics/hicolor-icon-theme/Makefile
index 52c870e3a0c..34099d49c8b 100644
--- a/graphics/hicolor-icon-theme/Makefile
+++ b/graphics/hicolor-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/15 22:13:58 jlam Exp $
 #
 
 DISTNAME=	hicolor-icon-theme-0.9
@@ -20,8 +20,8 @@ USE_TOOLS+=	gmake
 
 FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${BUILDLINK_PREFIX.gtk2}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${PREFIX}/share/icons/hicolor"
-INSTALL_TEMPLATE+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
-DEINSTALL_TEMPLATE+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
+INSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
+DEINSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
 PRINT_PLIST_AWK+=	/^share\/icons\/hicolor\/icon-theme.cache$$/ { next; }
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index cd91bd3e950..831682016b3 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/06/15 22:13:58 jlam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 HICOLOR_ICON_THEME_BUILDLINK3_MK:=	${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
@@ -29,8 +29,8 @@ PRINT_PLIST_AWK+=	/^@dirrm ${d:S/\//\\\//g}$$/ \
 .include  "../../x11/gtk2/buildlink3.mk"
 FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${BUILDLINK_PREFIX.gtk2}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${BUILDLINK_PREFIX.hicolor-icon-theme}/share/icons/hicolor"
-INSTALL_TEMPLATE+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
-DEINSTALL_TEMPLATE+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
+INSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
+DEINSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
 PRINT_PLIST_AWK+=	/^share\/icons\/hicolor\/icon-theme.cache$$/ { next; }
 
 BUILDLINK_TARGETS+=	guic-buildlink-fake
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 9945b7ef159..411cf9b2976 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2006/06/09 08:38:53 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2006/06/15 22:13:59 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
 PERL5_OPTIONS?=		# empty
 .  if !empty(PERL5_OPTIONS:Mthreads)
-INSTALL_TEMPLATE+=	${.CURDIR}/../../lang/perl5/files/install_threads.tmpl
+INSTALL_TEMPLATES+=	${.CURDIR}/../../lang/perl5/files/install_threads.tmpl
 .  endif
 
 .  if ${PKG_INSTALLATION_TYPE} == "overwrite"
diff --git a/lang/perl5/packlist.mk b/lang/perl5/packlist.mk
index 9c62fe0d258..afa1d4b6f5f 100644
--- a/lang/perl5/packlist.mk
+++ b/lang/perl5/packlist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: packlist.mk,v 1.7 2006/06/09 08:50:24 rillig Exp $
+# $NetBSD: packlist.mk,v 1.8 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # create packlist files.  This file is automatically included by
@@ -30,8 +30,8 @@ _PERL5_PACKLIST=	${PERL5_PACKLIST:S/^/${PERL5_PACKLIST_DIR}\//}
 ### INSTALL/DEINSTALL scripts to manage symlinks
 ###
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../lang/perl5/files/install.tmpl
-DEINSTALL_TEMPLATE+=	${.CURDIR}/../../lang/perl5/files/deinstall.tmpl
+INSTALL_TEMPLATES+=	${.CURDIR}/../../lang/perl5/files/install.tmpl
+DEINSTALL_TEMPLATES+=	${.CURDIR}/../../lang/perl5/files/deinstall.tmpl
 FILES_SUBST+=		PERL5_COMMENT=
 FILES_SUBST+=		PERL5_PACKLIST=${_PERL5_PACKLIST:Q}
 
diff --git a/lang/scsl-jre15/Makefile b/lang/scsl-jre15/Makefile
index e2967f668b4..b7e9cfd9664 100644
--- a/lang/scsl-jre15/Makefile
+++ b/lang/scsl-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/05/15 19:44:07 tv Exp $
+# $NetBSD: Makefile,v 1.2 2006/06/15 22:13:59 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -28,9 +28,9 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATE+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATE+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATE+=	${PKGDIR}/DEINSTALL.tmpl
+HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
+INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
+DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
 FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
 FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 
@@ -52,7 +52,7 @@ do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${HEADER_TEMPLATE}
+	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index c1cbc827ba9..2a8dc7d030c 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/05/28 02:24:49 tv Exp $
+# $NetBSD: Makefile,v 1.33 2006/06/15 22:13:59 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -28,9 +28,9 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATE+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATE+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATE+=	${PKGDIR}/DEINSTALL.tmpl
+HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
+INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
+DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
 FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
 FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 
@@ -52,7 +52,7 @@ do-configure:
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f $$file $$file.default;				\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${HEADER_TEMPLATE}
+	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index b692d3d7df4..541d27e6800 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/06/14 14:31:35 tv Exp $
+# $NetBSD: Makefile,v 1.44 2006/06/15 22:13:59 jlam Exp $
 
 DISTNAME=	mailman-2.1.8
 CATEGORIES=	mail www
@@ -58,8 +58,8 @@ CONF_FILES+=		${EXECDIR}/Mailman/mm_cfg.py.dist ${EXECDIR}/Mailman/mm_cfg.py
 
 RCD_SCRIPTS=		mailman
 
-INSTALL_TEMPLATE+=	${FILESDIR}/INSTALL
-DEINSTALL_TEMPLATE+=	${FILESDIR}/DEINSTALL
+INSTALL_TEMPLATES+=	${FILESDIR}/INSTALL
+DEINSTALL_TEMPLATES+=	${FILESDIR}/DEINSTALL
 
 PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
 PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
diff --git a/mk/alternatives.mk b/mk/alternatives.mk
index aa1866ed359..e3217357570 100644
--- a/mk/alternatives.mk
+++ b/mk/alternatives.mk
@@ -1,4 +1,4 @@
-# $NetBSD: alternatives.mk,v 1.6 2006/03/14 01:14:35 jlam Exp $
+# $NetBSD: alternatives.mk,v 1.7 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment handles the alternatives system, registering a
 # package in the database.
@@ -49,8 +49,8 @@ EVAL_PREFIX+=			PREFIX.pkg_alternatives=pkg_alternatives
 PREFIX.alternatives_DEFAULT=	${LOCALBASE}
 PKG_ALTERNATIVES=		${PREFIX.pkg_alternatives}/sbin/pkg_alternatives
 
-INSTALL_TEMPLATE+=	${WRKDIR}/.altinstall
-DEINSTALL_TEMPLATE+=	${WRKDIR}/.altdeinstall
+INSTALL_TEMPLATES+=	${WRKDIR}/.altinstall
+DEINSTALL_TEMPLATES+=	${WRKDIR}/.altdeinstall
 
 .endif
 
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 766b045e6f6..973a022e570 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.10 2006/06/09 16:41:09 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.11 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -29,29 +29,29 @@ PKG_DB_TMPDIR?=		${WRKDIR}/.pkgdb
 
 # These are the template scripts for the INSTALL/DEINSTALL scripts.
 # Packages may do additional work in the INSTALL/DEINSTALL scripts by
-# overriding the variables DEINSTALL_TEMPLATE and INSTALL_TEMPLATE to
+# overriding the variables DEINSTALL_TEMPLATES and INSTALL_TEMPLATES to
 # point to additional script fragments.  These bits are included after
 # the main install/deinstall script fragments.
 #
 _HEADER_TMPL?=		${.CURDIR}/../../mk/pkginstall/header
-HEADER_TEMPLATE?=	# empty
+HEADER_TEMPLATES?=	# empty
 .if exists(${PKGDIR}/HEADER) && \
-    empty(HEADER_TEMPLATE:M${PKGDIR}/HEADER)
-HEADER_TEMPLATE+=	${PKGDIR}/HEADER
+    empty(HEADER_TEMPLATES:M${PKGDIR}/HEADER)
+HEADER_TEMPLATES+=	${PKGDIR}/HEADER
 .endif
 _DEINSTALL_PRE_TMPL?=	${.CURDIR}/../../mk/pkginstall/deinstall-pre
-DEINSTALL_TEMPLATE?=	# empty
+DEINSTALL_TEMPLATES?=	# empty
 .if exists(${PKGDIR}/DEINSTALL) && \
-    empty(DEINSTALL_TEMPLATE:M${PKGDIR}/DEINSTALL)
-DEINSTALL_TEMPLATE+=	${PKGDIR}/DEINSTALL
+    empty(DEINSTALL_TEMPLATES:M${PKGDIR}/DEINSTALL)
+DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL
 .endif
 _DEINSTALL_TMPL?=	${.CURDIR}/../../mk/pkginstall/deinstall
 _INSTALL_UNPACK_TMPL?=	# empty
 _INSTALL_TMPL?=		${.CURDIR}/../../mk/pkginstall/install
-INSTALL_TEMPLATE?=	# empty
+INSTALL_TEMPLATES?=	# empty
 .if exists(${PKGDIR}/INSTALL) && \
-    empty(INSTALL_TEMPLATE:M${PKGDIR}/INSTALL)
-INSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
+    empty(INSTALL_TEMPLATES:M${PKGDIR}/INSTALL)
+INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL
 .endif
 _INSTALL_POST_TMPL?=	${.CURDIR}/../../mk/pkginstall/install-post
 _INSTALL_DATA_TMPL?=	# empty
@@ -64,15 +64,15 @@ _FOOTER_TMPL?=		${.CURDIR}/../../mk/pkginstall/footer
 # _DEINSTALL_TEMPLATES_DFLT and _INSTALL_TEMPLATES_DFLT are the list of
 #	template files minus any user-supplied templates.
 #
-_DEINSTALL_TEMPLATES=	${_HEADER_TMPL} ${HEADER_TEMPLATE}		\
+_DEINSTALL_TEMPLATES=	${_HEADER_TMPL} ${HEADER_TEMPLATES}		\
 			${_DEINSTALL_PRE_TMPL}				\
-			${DEINSTALL_TEMPLATE}				\
+			${DEINSTALL_TEMPLATES}				\
 			${_DEINSTALL_TMPL}				\
 			${_FOOTER_TMPL}
-_INSTALL_TEMPLATES=	${_HEADER_TMPL} ${HEADER_TEMPLATE}		\
+_INSTALL_TEMPLATES=	${_HEADER_TMPL} ${HEADER_TEMPLATES}		\
 			${_INSTALL_UNPACK_TMPL}				\
 			${_INSTALL_TMPL}				\
-			${INSTALL_TEMPLATE}				\
+			${INSTALL_TEMPLATES}				\
 			${_INSTALL_POST_TMPL}				\
 			${_FOOTER_TMPL}					\
 			${_INSTALL_DATA_TMPL}				\
diff --git a/multimedia/gstreamer0.8/plugins.mk b/multimedia/gstreamer0.8/plugins.mk
index 8add471426d..29e1d20d1c6 100644
--- a/multimedia/gstreamer0.8/plugins.mk
+++ b/multimedia/gstreamer0.8/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
+# $NetBSD: plugins.mk,v 1.4 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GStreamer modules.  It takes care of rebuilding the corresponding databases
@@ -15,8 +15,8 @@ GST0.8_REGISTER=	${BUILDLINK_PREFIX.gstreamer0.8}/bin/gst-register-0.8
 FILES_SUBST+=		GST0.8_DBDIR=${GST0.8_DBDIR:Q}
 FILES_SUBST+=		GST0.8_COMPPREP=${GST0.8_COMPPREP:Q}
 FILES_SUBST+=		GST0.8_REGISTER=${GST0.8_REGISTER:Q}
-INSTALL_TEMPLATE+=	../../multimedia/gstreamer0.8/files/plugins.tmpl
-DEINSTALL_TEMPLATE+=	../../multimedia/gstreamer0.8/files/plugins.tmpl
+INSTALL_TEMPLATES+=	../../multimedia/gstreamer0.8/files/plugins.tmpl
+DEINSTALL_TEMPLATES+=	../../multimedia/gstreamer0.8/files/plugins.tmpl
 
 PRINT_PLIST_AWK+=	/^libdata\/gstreamer-0.8/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm libdata\/gstreamer-0.8/ { next; }
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index cc1df24af54..095bd051db8 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.5 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: map.mk,v 1.6 2006/06/15 22:13:59 jlam Exp $
 # This Makefile fragment is intended to be included by packages that
 # install font maps used by dvipdfmx.  It takes care of adding and
 # removing font map entires in dvipdfmx.cfg.
@@ -20,8 +20,8 @@ DEPENDS+=		dvipdfmx>=0.0.0.20050627:../../print/dvipdfmx
 
 FILES_SUBST+=		DVIPDFMX_FONTMAPS=${DVIPDFMX_FONTMAPS:Q}
 FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
-INSTALL_TEMPLATE+=	../../print/dvipdfmx/files/map.tmpl
-DEINSTALL_TEMPLATE+=	../../print/dvipdfmx/files/map.tmpl
+INSTALL_TEMPLATES+=	../../print/dvipdfmx/files/map.tmpl
+DEINSTALL_TEMPLATES+=	../../print/dvipdfmx/files/map.tmpl
 
 PRINT_PLIST_AWK+=	/^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}\/dvidpfm\/config\/dvipdfmx.cfg$$/ \
 			{ next; }
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 5f81c28aa01..83894bd4316 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/15 20:40:16 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/06/15 22:13:59 jlam Exp $
 
 .include "Makefile.common"
 
@@ -36,8 +36,8 @@ DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
 
-DEINSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/DEINSTALL
-INSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
+DEINSTALL_TEMPLATES+=	${.CURDIR}/../../print/foomatic-filters-cups/DEINSTALL
+INSTALL_TEMPLATES+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
 
 EGDIR=		${PREFIX}/share/examples/foomatic
 CONFDIR=	${PKG_SYSCONFDIR}/foomatic
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index f51120442e4..497471678e2 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.15 2006/04/21 16:07:35 minskim Exp $
+# $NetBSD: module.mk,v 1.16 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It takes care of rebuilding the ls-R database
@@ -26,8 +26,8 @@ FILES_SUBST+=		MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
 FILES_SUBST+=		TEXMFDIRS=${TEXMFDIRS:Q}
 FILES_SUBST+=		UPDMAP_SYS="${LOCALBASE}/bin/updmap-sys"
 FILES_SUBST+=		TEX_FONTMAPS=${TEX_FONTMAPS:Q}
-INSTALL_TEMPLATE+=	../../print/teTeX/files/texmf.tmpl
-DEINSTALL_TEMPLATE+=	../../print/teTeX/files/texmf.tmpl
+INSTALL_TEMPLATES+=	../../print/teTeX/files/texmf.tmpl
+DEINSTALL_TEMPLATES+=	../../print/teTeX/files/texmf.tmpl
 
 PRINT_PLIST_AWK+=	/^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \
 			{ next; }
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}
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
index 9bff7873dbf..7662c26616b 100644
--- a/textproc/scrollkeeper/omf.mk
+++ b/textproc/scrollkeeper/omf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.11 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: omf.mk,v 1.12 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # OMF files.  It takes care of registering them in scrollkeeper's global
@@ -22,8 +22,8 @@ SCROLLKEEPER_DATADIR=	${BUILDLINK_PREFIX.scrollkeeper}/libdata/scrollkeeper
 SCROLLKEEPER_REBUILDDB=	${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-rebuilddb
 SCROLLKEEPER_UPDATEDB=	${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-update
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
-DEINSTALL_TEMPLATE+=	${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
+INSTALL_TEMPLATES+=	${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
+DEINSTALL_TEMPLATES+=	${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
 
 FILES_SUBST+=		SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
 FILES_SUBST+=		SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index f6b72cb8ca6..b6931067ecb 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.15 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: catalogs.mk,v 1.16 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # catalog files or DTDs.  It takes care of registering them into the right
@@ -52,8 +52,8 @@ FILES_SUBST+=	SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog"
 FILES_SUBST+=	XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog"
 FILES_SUBST+=	SGML_ENTRIES=${SGML_ENTRIES:Q}
 FILES_SUBST+=	XML_ENTRIES=${XML_ENTRIES:Q}
-INSTALL_TEMPLATE+=	../../textproc/xmlcatmgr/files/install.tmpl
-DEINSTALL_TEMPLATE+=	../../textproc/xmlcatmgr/files/deinstall.tmpl
+INSTALL_TEMPLATES+=	../../textproc/xmlcatmgr/files/install.tmpl
+DEINSTALL_TEMPLATES+=	../../textproc/xmlcatmgr/files/deinstall.tmpl
 .endif # !empty(SGML_ENTRIES) || !empty(XML_ENTRIES)
 
 PRINT_PLIST_AWK+=	/^share\/(sgml|xml)\/catalog$$/ \
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 02f09a1b3e7..07842cc1966 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.33 2006/06/03 08:04:36 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.34 2006/06/15 22:13:59 jlam Exp $
 
 MOZILLA_BIN=		firefox-bin
 MOZ_VER=		1.5.0.4
@@ -33,4 +33,4 @@ BUILD_MATHML=		# yes
 
 .include "../../www/firefox/Makefile.common"
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../www/firefox/INSTALL
+INSTALL_TEMPLATES+=	${.CURDIR}/../../www/firefox/INSTALL
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
index 7b0124d20e4..fc82d0e7ea7 100644
--- a/www/firefox/Makefile.common
+++ b/www/firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/06/15 22:13:59 jlam Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -18,7 +18,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=		yes
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../www/mozilla/INSTALL
+INSTALL_TEMPLATES+=	${.CURDIR}/../../www/mozilla/INSTALL
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index e4f0e3a29ae..9456bb7bf78 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile.common,v 1.74 2006/06/15 22:13:59 jlam Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -18,7 +18,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=		yes
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../www/mozilla/INSTALL
+INSTALL_TEMPLATES+=	${.CURDIR}/../../www/mozilla/INSTALL
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index 70120d1092c..a3a43b165f5 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2006/06/07 21:25:55 rillig Exp $
+# $NetBSD: Makefile.common,v 1.6 2006/06/15 22:13:59 jlam Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		seamonkey-${MOZ_DIST_VER}.source
@@ -21,7 +21,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=		yes
 
-INSTALL_TEMPLATE+=	${.CURDIR}/../../www/seamonkey/INSTALL
+INSTALL_TEMPLATES+=	${.CURDIR}/../../www/seamonkey/INSTALL
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk
index 8a900d9a75d..6208121d614 100644
--- a/x11/gtk2/modules.mk
+++ b/x11/gtk2/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.13 2006/03/14 11:35:00 tron Exp $
+# $NetBSD: modules.mk,v 1.14 2006/06/15 22:13:59 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -25,16 +25,16 @@ GTK2_LOADERS=		YES
 FILES_SUBST+=		GTK_IMMODULES_DB=${GTK_IMMODULES_DB:Q}
 FILES_SUBST+=		GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q}
 GTK_IMMODULES_DB=	${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gtk.immodules
-INSTALL_TEMPLATE+=	../../x11/gtk2/files/immodules.tmpl
-DEINSTALL_TEMPLATE+=	../../x11/gtk2/files/immodules.tmpl
+INSTALL_TEMPLATES+=	../../x11/gtk2/files/immodules.tmpl
+DEINSTALL_TEMPLATES+=	../../x11/gtk2/files/immodules.tmpl
 .endif
 
 .if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss])
 FILES_SUBST+=		GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
 FILES_SUBST+=		GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
 GDK_PIXBUF_LOADERS_DB=	${BUILDLINK_PREFIX.gtk2}/libdata/gtk-2.0/gdk-pixbuf.loaders
-INSTALL_TEMPLATE+=	../../x11/gtk2/files/loaders.tmpl
-DEINSTALL_TEMPLATE+=	../../x11/gtk2/files/loaders.tmpl
+INSTALL_TEMPLATES+=	../../x11/gtk2/files/loaders.tmpl
+DEINSTALL_TEMPLATES+=	../../x11/gtk2/files/loaders.tmpl
 .endif
 
 PRINT_PLIST_AWK+=	/^libdata\/gtk-2.0/ { next; }