pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Pluralize INSTALL_TEMPLATE and DEINSTALL_TEMPLATE vari...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b89e397075f4
branches: trunk
changeset: 514657:b89e397075f4
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Jun 15 22:13:58 2006 +0000
description:
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:
databases/shared-mime-info/mimedb.mk | 6 +++---
devel/GConf2/schemas.mk | 6 +++---
graphics/hicolor-icon-theme/Makefile | 6 +++---
graphics/hicolor-icon-theme/buildlink3.mk | 6 +++---
lang/perl5/buildlink3.mk | 4 ++--
lang/perl5/packlist.mk | 6 +++---
lang/scsl-jre15/Makefile | 10 +++++-----
lang/sun-jre15/Makefile | 10 +++++-----
mail/mailman/Makefile | 6 +++---
mk/alternatives.mk | 6 +++---
mk/pkginstall/bsd.pkginstall.mk | 30 +++++++++++++++---------------
multimedia/gstreamer0.8/plugins.mk | 6 +++---
print/dvipdfmx/map.mk | 6 +++---
print/foomatic-filters/Makefile | 6 +++---
print/teTeX/module.mk | 6 +++---
sysutils/desktop-file-utils/desktopdb.mk | 6 +++---
sysutils/webmin/wbm.mk | 4 ++--
textproc/scrollkeeper/omf.mk | 6 +++---
textproc/xmlcatmgr/catalogs.mk | 6 +++---
www/firefox/Makefile-firefox.common | 4 ++--
www/firefox/Makefile.common | 4 ++--
www/mozilla/Makefile.common | 4 ++--
www/seamonkey/Makefile.common | 4 ++--
x11/gtk2/modules.mk | 10 +++++-----
24 files changed, 84 insertions(+), 84 deletions(-)
diffs (truncated from 546 to 300 lines):
diff -r 8658b57dd42d -r b89e397075f4 databases/shared-mime-info/mimedb.mk
--- a/databases/shared-mime-info/mimedb.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/databases/shared-mime-info/mimedb.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
.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 -r 8658b57dd42d -r b89e397075f4 devel/GConf2/schemas.mk
--- a/devel/GConf2/schemas.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/devel/GConf2/schemas.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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_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 -r 8658b57dd42d -r b89e397075f4 graphics/hicolor-icon-theme/Makefile
--- a/graphics/hicolor-icon-theme/Makefile Thu Jun 15 22:06:08 2006 +0000
+++ b/graphics/hicolor-icon-theme/Makefile Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
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 -r 8658b57dd42d -r b89e397075f4 graphics/hicolor-icon-theme/buildlink3.mk
--- a/graphics/hicolor-icon-theme/buildlink3.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/graphics/hicolor-icon-theme/buildlink3.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
.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 -r 8658b57dd42d -r b89e397075f4 lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/lang/perl5/buildlink3.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
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 -r 8658b57dd42d -r b89e397075f4 lang/perl5/packlist.mk
--- a/lang/perl5/packlist.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/lang/perl5/packlist.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
### 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 -r 8658b57dd42d -r b89e397075f4 lang/scsl-jre15/Makefile
--- a/lang/scsl-jre15/Makefile Thu Jun 15 22:06:08 2006 +0000
+++ b/lang/scsl-jre15/Makefile Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
.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 @@
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 -r 8658b57dd42d -r b89e397075f4 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile Thu Jun 15 22:06:08 2006 +0000
+++ b/lang/sun-jre15/Makefile Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
.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 @@
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 -r 8658b57dd42d -r b89e397075f4 mail/mailman/Makefile
--- a/mail/mailman/Makefile Thu Jun 15 22:06:08 2006 +0000
+++ b/mail/mailman/Makefile Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
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 -r 8658b57dd42d -r b89e397075f4 mk/alternatives.mk
--- a/mk/alternatives.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/mk/alternatives.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
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 -r 8658b57dd42d -r b89e397075f4 mk/pkginstall/bsd.pkginstall.mk
--- a/mk/pkginstall/bsd.pkginstall.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/mk/pkginstall/bsd.pkginstall.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
# 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 @@
# _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 -r 8658b57dd42d -r b89e397075f4 multimedia/gstreamer0.8/plugins.mk
--- a/multimedia/gstreamer0.8/plugins.mk Thu Jun 15 22:06:08 2006 +0000
+++ b/multimedia/gstreamer0.8/plugins.mk Thu Jun 15 22:13:58 2006 +0000
@@ -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 @@
FILES_SUBST+= GST0.8_DBDIR=${GST0.8_DBDIR:Q}
Home |
Main Index |
Thread Index |
Old Index