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.

4 files changed, 15 insertions, 15 deletions

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)