diff options
| author | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-14 01:14:26 +0000 |
| commit | 6bd0765af7e172f63338e1591991ae18424e7d39 (patch) | |
| tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 | |
| parent | f80cc541cc91416239ab2c78422558283deb2b3f (diff) | |
| download | pkgsrc-6bd0765af7e172f63338e1591991ae18424e7d39.tar.gz | |
Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
144 files changed, 355 insertions, 519 deletions
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile index 2a0ee0de302..ba7af5e5c84 100644 --- a/audio/gqmpeg-devel/Makefile +++ b/audio/gqmpeg-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:09 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:26 jlam Exp $ DISTNAME= gqmpeg-0.91.1 PKGREVISION= 4 @@ -23,8 +23,6 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ENV+= GNOME_DATADIR=${PREFIX}/share -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index afe8107fa84..4116e9a46aa 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2006/02/05 23:08:09 joerg Exp $ +# $NetBSD: Makefile,v 1.89 2006/03/14 01:14:26 jlam Exp $ DISTNAME= gqmpeg-0.20.0 PKGREVISION= 9 @@ -19,8 +19,6 @@ USE_DIRS+= xdg-1.2 USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "options.mk" CONFIGURE_ARGS+= --without-included-gettext diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index 61ff9f37f24..0ffb0c03bb8 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2006/03/04 21:28:59 jlam Exp $ +# $NetBSD: Makefile,v 1.61 2006/03/14 01:14:26 jlam Exp $ DISTNAME= xmcd-3.0.2 PKGREVISION= 9 @@ -15,9 +15,6 @@ PATCH_DIST_STRIP= -p1 WRKSRC= ${WRKDIR}/xmcd-3.0 -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - USE_IMAKE= yes MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11 diff --git a/audio/xmms-meta-input/Makefile b/audio/xmms-meta-input/Makefile index cf229d48c77..3f9f90f2892 100644 --- a/audio/xmms-meta-input/Makefile +++ b/audio/xmms-meta-input/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:18 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:26 jlam Exp $ # DISTNAME= xmms-meta-input-0.4 @@ -11,6 +11,8 @@ HOMEPAGE= http://www.corbac.com/page3.html COMMENT= XMMS plugin wrapper for shell scripts INSTALLATION_DIRS= lib/xmms/Input +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty do-install: ${INSTALL_DATA} ${WRKSRC}/libmetainput.so ${PREFIX}/lib/xmms/Input diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index a20edf11c5d..dccc38bd31f 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/02/04 15:22:06 adrianp Exp $ +# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:26 jlam Exp $ DISTNAME= ircd-hybrid-7.2.0 EXTRACT_SUFX= .tgz @@ -23,7 +23,6 @@ BUILD_DEFS+= IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \ PKG_SYSCONFSUBDIR= ircd-hybrid HYBRID_EG= ${PREFIX}/share/examples/ircd-hybrid HYBRID_DOC= ${PREFIX}/share/doc/ircd-hybrid -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL RCD_SCRIPTS= ircd-hybrid CONF_FILES_PERMS= ${HYBRID_EG}/example.conf ${PKG_SYSCONFDIR}/ircd.conf \ diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index d2f158a2fe1..5bfd69d8d50 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/01/04 18:04:12 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2006/03/14 01:14:27 jlam Exp $ # DISTNAME= silc-server-1.0.2 @@ -18,8 +18,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool */*/*/libtool -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "../../mk/bsd.prefs.mk" SILCD_USER?= silcd diff --git a/comms/efax/Makefile b/comms/efax/Makefile index 217764a4c45..149e7868cbd 100644 --- a/comms/efax/Makefile +++ b/comms/efax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:04 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:27 jlam Exp $ DISTNAME= efax-0.9 CATEGORIES= comms @@ -10,10 +10,6 @@ COMMENT= Collection of small programs for sending and receiving faxes CONFLICTS= kdeutils<3.1 - -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - post-patch: ${SED} -e 's:@PREFIX@:${PREFIX}:g; \ s:@LOCALBASE@:${LOCALBASE}:g; \ diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index fcc0e831c39..cd2debf8dac 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2006/03/05 16:27:23 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2006/03/14 01:14:27 jlam Exp $ DISTNAME= mgetty1.1.31-Jul24 PKGNAME= mgetty-1.1.31 @@ -17,9 +17,6 @@ CONFLICTS= hylafax-[0-9]* WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - MAKE_ENV+= MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q} USE_TOOLS+= makeinfo diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 0b49a87f3e0..8072e41831c 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/02/05 23:08:32 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:27 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -19,8 +19,6 @@ CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL - PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH} PKG_GROUPS= ${MYSQL_GROUP} RCD_SCRIPTS= mysqld diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index f3c1f726501..c7c2819899c 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:32 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:27 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -18,8 +18,6 @@ CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL - PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH} PKG_GROUPS= ${MYSQL_GROUP} RCD_SCRIPTS= mysqld diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile index 7037357a317..41c66c2ff2e 100644 --- a/databases/postgresql73-lib/Makefile +++ b/databases/postgresql73-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/02/20 18:34:07 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:27 jlam Exp $ PKGNAME= postgresql73-lib-${BASE_VERS} SVR4_PKGNAME= pstgl @@ -14,8 +14,7 @@ BUILD_DIRS+= ${WRKSRC}/src/interfaces BUILD_DIRS+= ${WRKSRC}/src/pl USE_TOOLS+= gtar -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL INSTALLATION_DIRS= man diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 41f30f6a108..61f43421b61 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/20 18:34:07 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:27 jlam Exp $ PKGNAME= postgresql73-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -12,8 +12,6 @@ NOT_FOR_PLATFORM= *-*-mips .include "../../databases/postgresql73/Makefile.common" -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/src/backend diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 92606f80319..79b10c8929d 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/21 20:23:49 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $ PKGNAME= postgresql74-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -11,7 +11,6 @@ NOT_FOR_PLATFORM= *-*-mips .include "../../databases/postgresql74/Makefile.common" -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL MESSAGE_SRC= ${.CURDIR}/MESSAGE USE_TOOLS+= tar diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 09070f4dbf4..e6aa9cdbcdf 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/02/21 19:05:07 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:27 jlam Exp $ PKGNAME= postgresql80-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -12,7 +12,6 @@ NOT_FOR_PLATFORM= *-*-mips USE_LIBTOOL= yes PKG_LIBTOOL= ${PKG_SHLIBTOOL} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL MESSAGE_SRC= ${.CURDIR}/MESSAGE CONFIGURE_ARGS+= --with-openssl diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile index e78f8083a56..1223f44dbd3 100644 --- a/databases/shared-mime-info/Makefile +++ b/databases/shared-mime-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:37 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:27 jlam Exp $ # DISTNAME= shared-mime-info-0.16 @@ -23,8 +23,7 @@ CONFIGURE_ARGS+= --disable-update-mimedb CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= MIMEDB_PATH="${PREFIX}/share/mime" FILES_SUBST+= UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database" diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk index c30b32fbf9c..5fb9f1bb1d4 100644 --- a/databases/shared-mime-info/mimedb.mk +++ b/databases/shared-mime-info/mimedb.mk @@ -1,4 +1,4 @@ -# $NetBSD: mimedb.mk,v 1.3 2005/12/29 06:21:36 jlam Exp $ +# $NetBSD: mimedb.mk,v 1.4 2006/03/14 01:14:27 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_EXTRA_TMPL+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.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 9489cc8fff3..e504f5fcf29 100644 --- a/devel/GConf2/schemas.mk +++ b/devel/GConf2/schemas.mk @@ -1,4 +1,4 @@ -# $NetBSD: schemas.mk,v 1.13 2005/12/29 06:21:36 jlam Exp $ +# $NetBSD: schemas.mk,v 1.14 2006/03/14 01:14:27 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_EXTRA_TMPL+= ${.CURDIR}/../../devel/GConf2/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../devel/GConf2/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl .endif PRINT_PLIST_AWK+= /^@dirrm share\/gconf$$/ { next; } diff --git a/devel/isect/Makefile b/devel/isect/Makefile index c72f0e29361..5e8b4adc510 100644 --- a/devel/isect/Makefile +++ b/devel/isect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/03/04 21:29:16 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:27 jlam Exp $ # DISTNAME= isect-1.6.2 @@ -17,8 +17,6 @@ INFO_FILES= isect.info RCD_SCRIPTS= isect -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - DOCDIR= ${PREFIX}/share/doc/isect EGDIR= ${PREFIX}/share/examples/isect diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install index efef8ad2957..c70babdd8dd 100644 --- a/devel/rt3/Makefile.install +++ b/devel/rt3/Makefile.install @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.install,v 1.2 2005/12/05 20:50:07 rillig Exp $ +# $NetBSD: Makefile.install,v 1.3 2006/03/14 01:14:27 jlam Exp $ RT_SHARE_DIR= ${PREFIX}/share/rt3 RT_EXAMPLE_DIR= ${PREFIX}/share/examples/rt3 @@ -38,7 +38,6 @@ CONF_FILES_PERMS+= ${RT_EXAMPLE_DIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \ ${ROOT_USER} ${RT_GROUP} 0500 .endfor -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL FILES_SUBST+= RTVARDIR=${RT_VAR_DIR:Q} RTLOCALDIR=${RT_LOCAL_DIR:Q} FILES_SUBST+= WEBUSER=${APACHE_USER:Q} WEBGROUP=${APACHE_GROUP:Q} diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile index 675bc609e9d..d152acfdb2d 100644 --- a/devel/w32api/Makefile +++ b/devel/w32api/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:54 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $ DISTNAME= w32api-2.5-src PKGNAME= w32api-2.5 @@ -22,9 +22,6 @@ CRTWRKSRC= ${WRKDIR}/pe-crt-1.2.1 PE_CPPFLAGS+= -I${WRKSRC}/include MAKE_FLAGS+= PE_CPPFLAGS=${PE_CPPFLAGS:Q} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - # Building no import libraries but two static libraries. do-build: cd ${WRKSRC}/lib \ diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile index dee7d23c9a8..a34da03361a 100644 --- a/emulators/compat12/Makefile +++ b/emulators/compat12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2006/03/14 01:14:27 jlam Exp $ # DISTNAME= compat12-${MACHINE_ARCH} @@ -16,8 +16,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-ns32k \ NO_BUILD= yes NO_MTREE= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile index 2f738a1e10f..77b43164d67 100644 --- a/emulators/compat13/Makefile +++ b/emulators/compat13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:27 jlam Exp $ # DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR} @@ -19,8 +19,6 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NO_MTREE= yes NO_BUILD= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile index 353ccec5a11..3d86b1cf952 100644 --- a/emulators/compat14-crypto/Makefile +++ b/emulators/compat14-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION} @@ -23,8 +23,6 @@ CRYPTO= YES NO_MTREE= yes NO_BUILD= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile index 18a4fb1051d..2fc10b63203 100644 --- a/emulators/compat14/Makefile +++ b/emulators/compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= compat14-${MACHINE_ARCH}-${VERSION} @@ -21,8 +21,6 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NetBSD-1.4*-* NO_MTREE= yes NO_BUILD= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile index fb1b4ad4e9c..5cbc1aca1f5 100644 --- a/emulators/freebsd_lib/Makefile +++ b/emulators/freebsd_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:35 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= freebsd_lib-2.2.7 @@ -13,6 +13,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 WRKSRC= ${WRKDIR} NO_BUILD= yes +INSTALL_SRC= ${PKGDIR}/INSTALL +DEINSTALL_SRC= # empty do-install: ${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile index 53846ee4a70..943ff88ff7c 100644 --- a/emulators/netbsd32_compat14/Makefile +++ b/emulators/netbsd32_compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:35 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION} @@ -29,8 +29,6 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64 NO_MTREE= yes NO_BUILD= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile index 438dfae20a6..ef41429b455 100644 --- a/emulators/netbsd32_compat15/Makefile +++ b/emulators/netbsd32_compat15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:35 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -23,8 +23,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-sparc64 NO_MTREE= yes NO_BUILD= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile index 3a0b04c7b1c..71387c927f8 100644 --- a/emulators/netbsd32_compat16/Makefile +++ b/emulators/netbsd32_compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:35 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -32,8 +32,6 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64 NO_MTREE= yes NO_BUILD= yes SHLIB_HANDLING= NO -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile index c3cd37d6a9e..f481657ac9a 100644 --- a/emulators/osf1_lib/Makefile +++ b/emulators/osf1_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:02 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/03/14 01:14:28 jlam Exp $ DISTNAME= netscape-4.7-3.alpha PKGNAME= osf1_lib-1.1 @@ -29,6 +29,8 @@ EMULDIR= ${PREFIX}/${EMULSUBDIR} EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes +INSTALL_SRC= ${PKGDIR}/INSTALL +DEINSTALL_SRC= # empty RPMARGS= -i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES} diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile index 07beecbd236..edcfa0ed360 100644 --- a/emulators/suse100_gtk2/Makefile +++ b/emulators/suse100_gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $ +# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:28 jlam Exp $ DISTNAME= suse_gtk2-${SUSE_VERSION} CATEGORIES= emulators @@ -23,7 +23,6 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC # Initialize gtk/pango modules. FILES_SUBST+= EMULDIR=${EMULDIR:Q} PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL .if exists(Makefile.${MACHINE_ARCH}) .include "Makefile.${MACHINE_ARCH}" diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile index 3d1ad6a4e78..c163f437365 100644 --- a/emulators/suse91_base/Makefile +++ b/emulators/suse91_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/01 22:59:45 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:28 jlam Exp $ DISTNAME= suse_base-${SUSE_VERSION} PKGREVISION= 9 @@ -17,6 +17,8 @@ CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/dev/.* CHECK_FILES_SKIP+= ${PREFIX}/${EMULSUBDIR}/etc/ld.so.cache EXTRACT_ONLY= # empty +DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q} diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile index d5e87d3c48b..342a34fa691 100644 --- a/emulators/suse91_gtk2/Makefile +++ b/emulators/suse91_gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:36 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:28 jlam Exp $ DISTNAME= suse_gtk2-${SUSE_VERSION} PKGREVISION= 5 @@ -24,7 +24,6 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC # Initialize gtk/pango modules. FILES_SUBST+= EMULDIR=${EMULDIR:Q} PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL .if exists(Makefile.${MACHINE_ARCH}) .include "Makefile.${MACHINE_ARCH}" diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile index d3a8a4be7fa..7808553d500 100644 --- a/emulators/suse_base/Makefile +++ b/emulators/suse_base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2006/03/04 21:29:36 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2006/03/14 01:14:28 jlam Exp $ DISTNAME= suse_base-${SUSE_VERSION} PKGREVISION= 8 @@ -14,6 +14,8 @@ COMMENT= Linux compatibility package CONFLICTS= linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]* EXTRACT_ONLY= # empty +DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= aaa_dir.rpm gppshare.rpm ncurses.rpm \ diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile index 2a2968816a5..3cb2f447eac 100644 --- a/emulators/vmware-module/Makefile +++ b/emulators/vmware-module/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:37 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/03/14 01:14:28 jlam Exp $ DISTNAME= vmware-netbsd-1.2 PKGNAME= vmware-module-1.2 @@ -18,6 +18,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 WRKSRC= ${WRKDIR} NO_CONFIGURE= yes +DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL NO_SRC_ON_FTP= already there diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile index 6394a6b0e17..014f77af7f3 100644 --- a/emulators/vmware-module3/Makefile +++ b/emulators/vmware-module3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/09/28 20:52:21 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:28 jlam Exp $ DISTNAME= vmware-netbsd-3.2.1.7 PKGNAME= vmware-module-3.2.1.7 @@ -15,6 +15,8 @@ CONFLICTS= vmware-module-1.* ONLY_FOR_PLATFORM= NetBSD-*-i386 NO_CONFIGURE= yes +DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL NO_SRC_ON_FTP= already there diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile index c7cc7f7d0ae..cbb5e6f69eb 100644 --- a/fonts/ghostscript-cidfonts/Makefile +++ b/fonts/ghostscript-cidfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:39 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:28 jlam Exp $ DISTNAME= ghostscript-cidfonts-20000901 PKGREVISION= 2 @@ -21,8 +21,7 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_TOOLS+= gs:run -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile index 8c2ab9a3ca7..e6622759d5f 100644 --- a/fonts/ghostscript-cmaps/Makefile +++ b/fonts/ghostscript-cmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:39 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:28 jlam Exp $ DISTNAME= ghostscript-cmaps-20020913 PKGREVISION= 2 @@ -21,8 +21,7 @@ USE_TOOLS+= gs:run NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile index fadceb0eef2..763373669ac 100644 --- a/fonts/ja-kappa20/Makefile +++ b/fonts/ja-kappa20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:09 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:28 jlam Exp $ DISTNAME= Kappa20-0.394 PKGNAME= ja-kappa20-0.394 @@ -16,8 +16,6 @@ FONTDIR= ${PREFIX}/lib/X11/fonts/local ALIAS_KAPPA= ${PREFIX}/share/examples/fonts.alias.Kappa20 USE_TOOLS+= mkfontdir -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= FONTDIR=${FONTDIR:Q} FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA:Q} diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile index c29918cdd1f..ff7d6427609 100644 --- a/fonts/ja-shinonome/Makefile +++ b/fonts/ja-shinonome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:10 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= shinonome-0.9.10-src @@ -20,9 +20,6 @@ FONTDIR= ${PREFIX}/lib/X11/fonts/local FOUNDRY= Misc ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - FILES_SUBST+= FONTDIR=${FONTDIR:Q} FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME:Q} diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile index ad811f1571b..5ac997cc280 100644 --- a/fonts/vfontcap-kochi/Makefile +++ b/fonts/vfontcap-kochi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:11 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ DISTNAME= vfontcap-kochi-0.0 PKGREVISION= 2 @@ -17,9 +17,6 @@ EXTRACT_ONLY= # empty NO_CHECKSUM= YES NO_BUILD= YES -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - VFONTCAPDIR= ${PREFIX}/share/VFlib/2.24.2 FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR:Q} diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index a5ea82452e2..1b79238ced3 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/02/05 23:09:14 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= nethack_source_331_jtp_193 @@ -20,6 +20,8 @@ DIST_SUBDIR= ${PKGNAME_NOREV}-20050216-2 WRKSRC= ${WRKDIR} USE_TOOLS+= bison lex MAKE_ENV+= YACC=${TOOLS_CMDLINE_YACC:Q} +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty LIBS.SunOS+= -lm diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index 0279d65f0f0..fad61af87b8 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2006/03/06 00:18:16 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2006/03/14 01:14:29 jlam Exp $ DISTNAME= gnome-games-2.12.3 PKGREVISION= 1 @@ -22,8 +22,6 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_MSGFMT_PLURALS= yes -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - GNU_CONFIGURE= yes CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} diff --git a/games/ivan/Makefile b/games/ivan/Makefile index 756c49647a4..0cbfdcfdb98 100644 --- a/games/ivan/Makefile +++ b/games/ivan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:16 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/03/14 01:14:29 jlam Exp $ # DISTNAME= ivan-0.50 @@ -13,9 +13,11 @@ COMMENT= Graphical roguelike featuring deep gameplay PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES - CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty + .include "../../devel/SDL/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/tetrinetx/Makefile b/games/tetrinetx/Makefile index b90afc8cf90..3ea2b62dc9d 100644 --- a/games/tetrinetx/Makefile +++ b/games/tetrinetx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/02/14 17:03:54 rillig Exp $ +# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:29 jlam Exp $ DISTNAME= tetrinetx-1.13.16+qirc-1.40c PKGNAME= tetrinetx-1.13.16 @@ -13,6 +13,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME} SHAREDIR= ${PREFIX}/share/tetrinetx BINARY= tetrix.netbsd RCD_SCRIPTS= tetrinetx +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty LIBS.SunOS+= -lsocket -lnsl -lresolv diff --git a/games/xmris/Makefile b/games/xmris/Makefile index 8251bbbf158..5191a85e0a5 100644 --- a/games/xmris/Makefile +++ b/games/xmris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:25 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/03/14 01:14:29 jlam Exp $ DISTNAME= xmris.4.0.5 PKGNAME= xmris-4.05 @@ -14,8 +14,6 @@ COMMENT= Version of the Mr Do video arcade game for X USE_IMAKE= yes NO_INSTALL_MANPAGES= yes -DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL - post-patch: @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile-pre @${SED} -e 's@XXXVARBASEXXX@${VARBASE}@g' \ diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile index 69992b2633d..4a153b7683e 100644 --- a/games/xscavenger/Makefile +++ b/games/xscavenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:29 jlam Exp $ # DISTNAME= xscavenger-1.4.4 @@ -17,6 +17,8 @@ USE_IMAKE= yes CONFIGURE_DIRS= src BUILD_DIRS= ${CONFIGURE_DIRS} NO_INSTALL_MANPAGES= yes +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty CPPFLAGS+= -DSOUNDDEV="\"${DEVOSSSOUND}\"" diff --git a/ham/dpbox/Makefile b/ham/dpbox/Makefile index 9a8c7d4b0c8..689971eddc7 100644 --- a/ham/dpbox/Makefile +++ b/ham/dpbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:41 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $ # DISTNAME= dpbox-60000 @@ -21,14 +21,13 @@ MAKE_ENV+= prefix=${PREFIX:Q} DPBOX_CONF_DIR= ${PREFIX}/share/dpbox/conf DPBOX_SPOOL_DIR=/var/spool/dpbox -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL +FILES_SUBST+= DPBOX_CONF_DIR=${DPBOX_CONF_DIR} \ + DPBOX_SPOOL_DIR=${DPBOX_SPOOL_DIR} +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty post-build: - @cd ${PKGDIR}; \ - ${SED} -e 's#@DPBOX_CONF_DIR@#${DPBOX_CONF_DIR}#g' \ - -e 's#@DPBOX_SPOOL_DIR@#${DPBOX_SPOOL_DIR}#g' \ - < DEINSTALL > ${WRKDIR}/DEINSTALL; \ ${SED} -e 's#@prefix@#${PREFIX}#g' \ - < ${FILESDIR}/dpbox.ini > ${WRKDIR}/dpbox-6.00.00/dpbox.ini + < ${FILESDIR}/dpbox.ini > ${WRKDIR}/dpbox-6.00.00/dpbox.ini .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile index d24eee32c74..da381c0c0e4 100644 --- a/inputmethod/canna-server/Makefile +++ b/inputmethod/canna-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/12/29 06:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:29 jlam Exp $ # .include "../../inputmethod/canna/Makefile.common" @@ -8,8 +8,6 @@ CANNA_MODULE= server INSTALL_TARGET= instserver -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - .include "../../mk/bsd.prefs.mk" BUILD_DEFS+= CANNA_USER CANNA_GROUP diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile index cfef222c451..8fb70ab7633 100644 --- a/inputmethod/sj3-dict/Makefile +++ b/inputmethod/sj3-dict/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/10 22:29:44 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $ # DISTNAME= sj3-2.0.1.20 @@ -28,8 +28,8 @@ SJ3GROUP?= daemon MAKE_ENV+= SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \ IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q} FILES_SUBST+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR} -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL EVAL_PREFIX+= SJ3SERVERBINDIR=sj3-server-bin diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile index 2b79e8fd582..f7152cacdaf 100644 --- a/inputmethod/skkinput/Makefile +++ b/inputmethod/skkinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/10 22:30:29 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:29 jlam Exp $ DISTNAME= skkinput-2.06.3 PKGREVISION= 1 @@ -14,8 +14,8 @@ BUILD_DEFS+= USE_INET6 USE_IMAKE= YES PLIST_SUBST+= PKGBASE=${LOCALBASE:Q} -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skkinput diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile index 9d35d226063..db549faefa2 100644 --- a/inputmethod/skkserv/Makefile +++ b/inputmethod/skkserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:53 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:29 jlam Exp $ DISTNAME= skk9.6 PKGNAME= skkserv-3.9.4 @@ -15,7 +15,6 @@ HOMEPAGE= http://skk.kuis.kyoto-u.ac.jp/ COMMENT= Dictionary server for Simple Kana-Kanji conversion programs WRKSRC= ${WRKDIR}/skk-9.6 -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL BUILD_DEFS+= USE_INET6 diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 312746f115c..f6228f56598 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2005/12/29 06:21:46 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2006/03/14 01:14:29 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ @@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5 PERL5_OPTIONS?= # empty . if !empty(PERL5_OPTIONS:Mthreads) -INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/install_threads.tmpl +INSTALL_TEMPLATE+= ${.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 25d3c728a9b..7a523d1f7a7 100644 --- a/lang/perl5/packlist.mk +++ b/lang/perl5/packlist.mk @@ -1,4 +1,4 @@ -# $NetBSD: packlist.mk,v 1.3 2005/12/29 06:21:47 jlam Exp $ +# $NetBSD: packlist.mk,v 1.4 2006/03/14 01:14:29 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_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../lang/perl5/files/deinstall.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../lang/perl5/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.CURDIR}/../../lang/perl5/files/deinstall.tmpl FILES_SUBST+= PERL5_COMMENT= FILES_SUBST+= PERL5_PACKLIST=${_PERL5_PACKLIST:Q} diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index bfda3f315a1..d7372e393f5 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/01/03 14:37:24 taca Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:29 jlam Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -28,9 +28,6 @@ CONFIGURE_ENV+= PREFIX=${PREFIX:Q} INSTALL_TARGET= install install-doc WRKSRC= ${RUBY_WRKSRC} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - # Ruby build process depends on config.status's content CONFIG_STATUS_OVERRIDE= # empty diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index ce5cb579cb4..758bc943554 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/02/05 23:09:52 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:29 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -29,9 +29,9 @@ PKG_SUPPORTED_OPTIONS= sun-jre-jce .include "../../mk/bsd.options.mk" -HEADER_EXTRA_TMPL= ${WRKDIR}/HEADER.tmpl -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL.tmpl -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL.tmpl +HEADER_TEMPLATE+= ${WRKDIR}/HEADER.tmpl +INSTALL_TEMPLATE+= ${PKGDIR}/INSTALL.tmpl +DEINSTALL_TEMPLATE+= ${PKGDIR}/DEINSTALL.tmpl FILES_SUBST+= JAVA_HOME=${JAVA_HOME:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index f802a044a42..becb3a6ec11 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/02/19 00:05:11 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2006/03/14 01:14:29 jlam Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -31,8 +31,6 @@ BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER:Q} MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL - RCD_SCRIPTS= clamd freshclamd PKG_GROUPS+= ${CLAMAV_GROUP} PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\ User diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 44fcf0e74e2..19430436fd5 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/02/05 23:09:53 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2006/03/14 01:14:29 jlam Exp $ DISTNAME= courier-imap-4.0.6 PKGREVISION= 1 @@ -38,7 +38,6 @@ SSLCNF_FILES= imapd.cnf pop3d.cnf FILES_SUBST+= SSLCERTS=${SSLCERTS:Q} FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL MAKE_DIRS= ${VARBASE}/run CONF_FILES_PERMS= # empty .for FILE in ${GEN_FILES} diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile index cb11ae3a639..56ca4a73702 100644 --- a/mail/courier-maildir/Makefile +++ b/mail/courier-maildir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:54 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:30 jlam Exp $ DISTNAME= courier-0.52.2 PKGNAME= ${DISTNAME:S/-/-maildir-/} @@ -41,7 +41,6 @@ EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//} BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//} INSTALLATION_DIRS= bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin -DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL OWN_DIRS= ${PKG_SYSCONFDIR}/shared OWN_DIRS+= ${PKG_SYSCONFDIR}/shared.tmp CONF_FILES= ${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 917bb5a0630..51a34c9d8d3 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2006/02/05 23:09:54 joerg Exp $ +# $NetBSD: Makefile,v 1.62 2006/03/14 01:14:30 jlam Exp $ DISTNAME= cyrus-imapd-2.2.12 PKGREVISION= 4 @@ -15,8 +15,6 @@ GNU_CONFIGURE= yes PERL5_CONFIGURE= no BDB_ACCEPTED= db4 db3 -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "../../mk/bsd.prefs.mk" # CYRUS_USER username of the Cyrus administrator diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index bd09a67a728..bbb3553e004 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/02/05 23:09:54 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2006/03/14 01:14:30 jlam Exp $ DISTNAME= cyrus-imapd-2.1.18 PKGREVISION= 3 @@ -17,8 +17,6 @@ GNU_CONFIGURE= yes PERL5_CONFIGURE= no USE_TOOLS+= autoconf213 -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "../../mk/bsd.prefs.mk" # CYRUS_USER username of the Cyrus administrator diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 9575d10f28d..9814625bb0e 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:09:56 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/14 01:14:30 jlam Exp $ DISTNAME= mailman-2.1.7 PKGREVISION= 2 @@ -56,8 +56,8 @@ CONF_FILES+= ${EXECDIR}/Mailman/mm_cfg.py.dist ${EXECDIR}/Mailman/mm_cfg.py RCD_SCRIPTS= mailman -INSTALL_EXTRA_TMPL+= ${FILESDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${FILESDIR}/DEINSTALL +INSTALL_TEMPLATE+= ${FILESDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${FILESDIR}/DEINSTALL PYTHON_VERSIONS_ACCEPTED= 24 23 22 21 PYTHON_PATCH_SCRIPTS+= Mailman/Archiver/pipermail.py diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile index 25ce9dcb804..e4388d79219 100644 --- a/mail/mailwrapper/Makefile +++ b/mail/mailwrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:00 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/03/14 01:14:30 jlam Exp $ DISTNAME= mailwrapper-19990412 PKGREVISION= 4 @@ -13,8 +13,6 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL WRKSRC= ${WRKDIR}/mailwrapper MANCOMPRESSED_IF_MANZ= yes -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL EGDIR= ${PREFIX}/share/examples/mailwrapper MAILWRAPPER_BACKUP_SFX= .pkgsrc.mailwrapper diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index d75810583f8..69177ecd095 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/10 20:08:57 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/03/14 01:14:30 jlam Exp $ DISTNAME= majordomo-1.94.5 PKGREVISION= 1 @@ -32,8 +32,8 @@ NO_BIN_ON_CDROM= ${NO_BIN_ON_FTP} BUILD_TARGET= wrapper INSTALL_TARGET= install install-wrapper -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= ${PKGDIR}/INSTALL MAKEFILE= Makefile.netbsd MAJORDOMO_TMPDIR?= /var/tmp diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index a765b4e6c2d..d0b521551a0 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/03/13 00:05:14 markd Exp $ +# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:30 jlam Exp $ DISTNAME= mimedefang-2.56 CATEGORIES= mail @@ -23,8 +23,6 @@ USE_TOOLS+= perl:run GNU_CONFIGURE= YES PKG_SYSCONFSUBDIR?= mimedefang -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - DEFANG_SPOOLDIR?= ${VARBASE}/spool/MIMEDefang DEFANG_USER?= defang DEFANG_GROUP?= defang diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 10087c021f7..c07696ef04b 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/02/05 23:09:56 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2006/03/14 01:14:30 jlam Exp $ DISTNAME= mutt-1.5.11 PKGREVISION= 3 @@ -45,8 +45,7 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh LDFLAGS+= ${_STRIPFLAG_CC} -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL DOCDIR= ${PREFIX}/share/doc/mutt EGDIR= ${PREFIX}/share/examples/mutt CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index fd9eb797283..087b3058923 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2006/02/05 23:09:56 joerg Exp $ +# $NetBSD: Makefile,v 1.136 2006/03/14 01:14:30 jlam Exp $ DISTNAME= mutt-1.4.2.1i PKGNAME= ${DISTNAME:C/i$//} @@ -57,8 +57,7 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh LDFLAGS+= ${_STRIPFLAG_CC} -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL DOCDIR= ${PREFIX}/share/doc/mutt EGDIR= ${PREFIX}/share/examples/mutt CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index 3be6546d975..b592d768226 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/01/20 23:38:47 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/03/14 01:14:30 jlam Exp $ DISTNAME= nullmailer-1.02 CATEGORIES= mail @@ -48,8 +48,6 @@ SPECIAL_PERMS+= libexec/nullmailer/nullmailer-queue \ ${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555 SPECIAL_PERMS+= ${VARBASE}/spool/nullmailer/trigger \ ${NULLMAILER_USER} ${NULLMAILER_GROUP} 0600 -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/mailer.conf diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index a4175c2f046..f5a89f5a544 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/12/29 06:21:52 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:30 jlam Exp $ # DISTNAME= popa3d-1.0 @@ -17,9 +17,6 @@ POPA3D_GROUP?= popa3d PKG_GROUPS= ${POPA3D_GROUP} PKG_USERS= ${POPA3D_USER}:${POPA3D_GROUP} - -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - RCD_SCRIPTS= popa3d FILES_SUBST+= POPA3D_USER=${POPA3D_USER:Q} diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile index f19460d830a..92a0c18f9b8 100644 --- a/mail/pymsgauth/Makefile +++ b/mail/pymsgauth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:57 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/03/14 01:14:30 jlam Exp $ # DISTNAME= pymsgauth-2.1.0 @@ -23,8 +23,6 @@ EGDIR= share/examples/pymsgauth NO_BUILD= yes PYTHON_PATCH_SCRIPTS= ${PYMSGAUTH_PROGRAMS} *.py -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL FILES_SUBST+= SHAREDIR=${SHAREDIR:Q} INSTALLATION_DIRS= ${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 81a04990b22..ddd787deb54 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/01/20 23:47:42 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:30 jlam Exp $ # DISTNAME= qmail-run-20050415 @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR} NO_CHECKSUM= yes NO_BUILD= yes -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q} FILES_SUBST+= PKGNAME=${PKGNAME:Q} RCD_SCRIPTS= qmail qmailpop3d qmailqread qmailsend qmailsmtpd diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 95f4ce42a5f..72726ec65e9 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/03/12 14:15:43 rillig Exp $ +# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:30 jlam Exp $ # DISTNAME= netqmail-1.05 @@ -31,8 +31,6 @@ DJB_BUILD_TARGETS= man DJB_RESTRICTED= YES -DEINSTALL_EXTRA_TMPL+= ${PKGDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias MAKE_DIRS+= ${PKG_SYSCONFDIR}/control ${PKG_SYSCONFDIR}/users OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR} diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 156d3345be8..6c205de5ca7 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/03/10 20:12:28 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:30 jlam Exp $ DISTNAME= sqwebmail-5.0.7 PKGREVISION= 2 @@ -37,7 +37,6 @@ BUILD_DEFS+= SQWEBMAIL_IMAGEURL FILES_SUBST+= SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q} MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR} MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL} -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL SENDMAIL?= /usr/sbin/sendmail MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile index 747fee44511..979bdae8cf3 100644 --- a/mail/yatsvrs/Makefile +++ b/mail/yatsvrs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:54 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:30 jlam Exp $ # DISTNAME= yatsvrs-5.00p6 @@ -32,9 +32,6 @@ FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN:Q} FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID:Q} FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID:Q} -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL - .for f in ${EXAMPLES} CONF_FILES+= ${EXAMPLESDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 4a9eae52b8d..2fe8d6fd021 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/03/10 20:18:38 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/03/14 01:14:30 jlam Exp $ DISTNAME= jitterbug-1.6.2 PKGREVISION= 1 @@ -19,8 +19,8 @@ ADDGROUP= ${LOCALBASE}/sbin/groupadd .endif WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/source -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= ${PKGDIR}/INSTALL CONFIGDIR= ${WRKDIR}/${PKGNAME_NOREV}/config DOCSDIR= ${WRKDIR}/${PKGNAME_NOREV}/docs CGIBINDIR= libexec/cgi-bin diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index bba04668add..cad68cefded 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/11 11:15:39 ghen Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $ PKGNAME= openoffice-bin-2.0.2 CATEGORIES= misc @@ -42,8 +42,7 @@ PLIST_SRC+= ${WRKDIR}/PLIST # ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL .if ${OPSYS} == "NetBSD" . if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 85622aeb648..56db4035acd 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2006/02/05 23:10:14 joerg Exp $ +# $NetBSD: Makefile,v 1.58 2006/03/14 01:14:31 jlam Exp $ DISTNAME= rpm-2.5.4 PKGREVISION= 5 @@ -18,9 +18,6 @@ NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting USE_TOOLS+= gmake GNU_CONFIGURE= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - # this is needed instead of USE_PKGLOCALEDIR CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} diff --git a/mk/alternatives.mk b/mk/alternatives.mk index c5293237fa1..aa1866ed359 100644 --- a/mk/alternatives.mk +++ b/mk/alternatives.mk @@ -1,4 +1,4 @@ -# $NetBSD: alternatives.mk,v 1.5 2005/12/29 06:22:26 jlam Exp $ +# $NetBSD: alternatives.mk,v 1.6 2006/03/14 01:14:35 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_EXTRA_TMPL+= ${WRKDIR}/.altinstall -DEINSTALL_EXTRA_TMPL+= ${WRKDIR}/.altdeinstall +INSTALL_TEMPLATE+= ${WRKDIR}/.altinstall +DEINSTALL_TEMPLATE+= ${WRKDIR}/.altdeinstall .endif diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3a24e0a68ec..35deb3a15ee 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1806 2006/03/12 14:55:18 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1807 2006/03/14 01:14:35 jlam Exp $ # # This file is in the public domain. # @@ -420,18 +420,9 @@ SCRIPTS_ENV+= ${INSTALL_MACROS} # .include "../../mk/alternatives.mk" +# INSTALL/DEINSTALL script framework .include "../../mk/install/bsd.pkginstall.mk" -# Set INSTALL_FILE to be the name of any INSTALL file -.if !defined(INSTALL_FILE) && exists(${PKGDIR}/INSTALL) -INSTALL_FILE= ${PKGDIR}/INSTALL -.endif - -# Set DEINSTALL_FILE to be the name of any DEINSTALL file -.if !defined(DEINSTALL_FILE) && exists(${PKGDIR}/DEINSTALL) -DEINSTALL_FILE= ${PKGDIR}/DEINSTALL -.endif - # If MESSAGE hasn't been defined, then set MESSAGE_SRC to be a space-separated # list of files to be concatenated together to generate the MESSAGE file. # @@ -512,8 +503,12 @@ PKG_ARGS_COMMON+= -P "`${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`" . if defined(CONFLICTS) && (${PKG_INSTALLATION_TYPE} == "overwrite") PKG_ARGS_COMMON+= -C "${CONFLICTS}" . endif -PKG_ARGS_COMMON+= ${INSTALL_FILE:D-i ${INSTALL_FILE}} -PKG_ARGS_COMMON+= ${DEINSTALL_FILE:D-k ${DEINSTALL_FILE}} +. if defined(INSTALL_FILE) && exists(${INSTALL_FILE}) +PKG_ARGS_COMMON+= -i ${INSTALL_FILE} +. endif +. if defined(DEINSTALL_FILE) && exists(${DEINSTALL_FILE}) +PKG_ARGS_COMMON+= -k ${DEINSTALL_FILE} +. endif PKG_ARGS_COMMON+= ${MESSAGE:D-D ${MESSAGE}} PKG_ARGS_COMMON+= ${NO_MTREE:D:U-m ${MTREE_FILE}} PKG_ARGS_COMMON+= ${PKG_PRESERVE:D-n ${PRESERVE_FILE}} @@ -2334,7 +2329,7 @@ do-su-undo-replace: # Empty pre-* and post-* targets -.for name in fetch tools wrapper configure build test install-script install package +.for name in fetch tools wrapper configure build test install package . if !target(pre-${name}) pre-${name}: @@ -3562,20 +3557,6 @@ post-install-fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} case ${PKG_INSTALLATION_TYPE} in \ pkgview) ${TOUCH} ${PKG_DB_TMPDIR}/+VIEWS ;; \ esac - ${_PKG_SILENT}${_PKG_DEBUG} \ - case "${INSTALL_FILE}" in \ - ${PKG_DB_TMPDIR}/*|"") ;; \ - *) if ${TEST} -f ${INSTALL_FILE}; then \ - ${CP} ${INSTALL_FILE} ${PKG_DB_TMPDIR}/+INSTALL; \ - fi ;; \ - esac - ${_PKG_SILENT}${_PKG_DEBUG} \ - case "${DEINSTALL_FILE}" in \ - ${PKG_DB_TMPDIR}/*|"") ;; \ - *) if ${TEST} -f ${DEINSTALL_FILE}; then \ - ${CP} ${DEINSTALL_FILE} ${PKG_DB_TMPDIR}/+DEINSTALL; \ - fi ;; \ - esac ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${SIZE_PKG_FILE} ${SIZE_ALL_FILE} . if ${SHLIB_HANDLING} == "YES" && ${CHECK_SHLIBS} == "YES" ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index 2eeb3624c5b..8b73c9942a9 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.39 2006/03/10 23:36:08 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.40 2006/03/14 01:14:36 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -6,51 +6,6 @@ # scripts to the package. # -# _PKGINSTALL_VARS is a list of the variables that, if non-empty, indicate -# that the pkginstall framework should be used. These variables -# should be extracted from bsd.pkginstall.mk and are typically the -# variables named in the _INSTALL_<SCRIPT>_MEMBERS lists. -# -# USE_PKGINSTALL may be set to "yes" to force the pkginstall framework -# to be used. -# -_PKGINSTALL_VARS+= HEADER_EXTRA_TMPL -_PKGINSTALL_VARS+= DEINSTALL_EXTRA_TMPL -_PKGINSTALL_VARS+= INSTALL_EXTRA_TMPL -_PKGINSTALL_VARS+= DEINSTALL_SRC INSTALL_SRC - -_PKGINSTALL_VARS+= PKG_GROUPS PKG_USERS -_PKGINSTALL_VARS+= SPECIAL_PERMS -_PKGINSTALL_VARS+= CONF_FILES CONF_FILES_PERMS \ - REQD_FILES REQD_FILES_PERMS \ - RCD_SCRIPTS -_PKGINSTALL_VARS+= INFO_FILES -_PKGINSTALL_VARS+= MAKE_DIRS MAKE_DIRS_PERMS \ - REQD_DIRS REQD_DIRS_PERMS \ - OWN_DIRS OWN_DIRS_PERMS -_PKGINSTALL_VARS+= PKG_SHELL -_PKGINSTALL_VARS+= FONTS_DIRS.ttf FONTS_DIRS.type1 FONTS_DIRS.x11 - -# CONF_DEPENDS notes a dependency where the config directory for the -# package matches the dependency's config directory. CONF_DEPENDS is -# only meaningful if PKG_INSTALLATION_TYPE is "pkgviews". -# -_PKGINSTALL_VARS+= CONF_DEPENDS - -.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS]) -_USE_PKGINSTALL= yes -.else -_USE_PKGINSTALL= no -.endif - -.if !empty(_USE_PKGINSTALL:M[nN][oO]) -. for _var_ in ${_PKGINSTALL_VARS} -. if defined(${_var_}) && !empty(${_var_}:M*) -_USE_PKGINSTALL= yes -. endif -. endfor -.endif - # The Solaris /bin/sh does not know the ${foo#bar} shell substitution. # This shell function serves a similar purpose, but is specialized on # stripping ${PREFIX}/ from a pathname. @@ -65,49 +20,68 @@ _FUNC_STRIP_PREFIX= \ }' s="$$1" prefix=${PREFIX:Q}/ /dev/null; \ } -# 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_EXTRA_TMPL and INSTALL_EXTRA_TMPL to point to -# additional script fragments. These bits are included after the main -# install/deinstall script fragments. +# 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 +# point to additional script fragments. These bits are included after +# the main install/deinstall script fragments. # _HEADER_TMPL?= ${.CURDIR}/../../mk/install/header -.if !defined(HEADER_EXTRA_TMPL) && exists(${.CURDIR}/HEADER) -HEADER_EXTRA_TMPL?= ${.CURDIR}/HEADER -.else -HEADER_EXTRA_TMPL?= # empty +HEADER_TEMPLATE?= # empty +.if exists(${PKGDIR}/HEADER) && \ + empty(HEADER_TEMPLATE:M${PKGDIR}/HEADER) +HEADER_TEMPLATE+= ${PKGDIR}/HEADER .endif _DEINSTALL_PRE_TMPL?= ${.CURDIR}/../../mk/install/deinstall-pre -DEINSTALL_EXTRA_TMPL?= # empty +DEINSTALL_TEMPLATE?= # empty +.if exists(${PKGDIR}/DEINSTALL) && \ + empty(DEINSTALL_TEMPLATE:M${PKGDIR}/DEINSTALL) +DEINSTALL_TEMPLATE+= ${PKGDIR}/DEINSTALL +.endif _DEINSTALL_TMPL?= ${.CURDIR}/../../mk/install/deinstall _INSTALL_UNPACK_TMPL?= # empty _INSTALL_TMPL?= ${.CURDIR}/../../mk/install/install -INSTALL_EXTRA_TMPL?= # empty +INSTALL_TEMPLATE?= # empty +.if exists(${PKGDIR}/INSTALL) && \ + empty(INSTALL_TEMPLATE:M${PKGDIR}/INSTALL) +INSTALL_TEMPLATE+= ${PKGDIR}/INSTALL +.endif _INSTALL_POST_TMPL?= ${.CURDIR}/../../mk/install/install-post _FOOTER_TMPL?= ${.CURDIR}/../../mk/install/footer -# DEINSTALL_TEMPLATES and INSTALL_TEMPLATES are the default list of source -# files that are concatenated to form the DEINSTALL/INSTALL scripts. -# -DEINSTALL_TEMPLATES= ${_HEADER_TMPL} -DEINSTALL_TEMPLATES+= ${HEADER_EXTRA_TMPL} -DEINSTALL_TEMPLATES+= ${_DEINSTALL_PRE_TMPL} -DEINSTALL_TEMPLATES+= ${DEINSTALL_EXTRA_TMPL} -DEINSTALL_TEMPLATES+= ${_DEINSTALL_TMPL} -DEINSTALL_TEMPLATES+= ${_FOOTER_TMPL} -INSTALL_TEMPLATES= ${_HEADER_TMPL} -INSTALL_TEMPLATES+= ${HEADER_EXTRA_TMPL} -INSTALL_TEMPLATES+= ${_INSTALL_UNPACK_TMPL} -INSTALL_TEMPLATES+= ${_INSTALL_TMPL} -INSTALL_TEMPLATES+= ${INSTALL_EXTRA_TMPL} -INSTALL_TEMPLATES+= ${_INSTALL_POST_TMPL} -INSTALL_TEMPLATES+= ${_FOOTER_TMPL} +# _DEINSTALL_TEMPLATES and _INSTALL_TEMPLATES are the list of source +# files that are concatenated to form the DEINSTALL/INSTALL +# scripts. +# +# _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_PRE_TMPL} \ + ${DEINSTALL_TEMPLATE} \ + ${_DEINSTALL_TMPL} \ + ${_FOOTER_TMPL} +_INSTALL_TEMPLATES= ${_HEADER_TMPL} ${HEADER_TEMPLATE} \ + ${_INSTALL_UNPACK_TMPL} \ + ${_INSTALL_TMPL} \ + ${INSTALL_TEMPLATE} \ + ${_INSTALL_POST_TMPL} \ + ${_FOOTER_TMPL} + +_DEINSTALL_TEMPLATES_DFLT= ${_HEADER_TMPL} \ + ${_DEINSTALL_PRE_TMPL} \ + ${_DEINSTALL_TMPL} \ + ${_FOOTER_TMPL} +_INSTALL_TEMPLATES_DFLT= ${_HEADER_TMPL} \ + ${_INSTALL_TMPL} \ + ${_INSTALL_POST_TMPL} \ + ${_FOOTER_TMPL} # These are the list of source files that are concatenated to form the # INSTALL/DEINSTALL scripts. # -DEINSTALL_SRC?= ${DEINSTALL_TEMPLATES} -INSTALL_SRC?= ${INSTALL_TEMPLATES} +DEINSTALL_SRC?= ${_DEINSTALL_TEMPLATES} +INSTALL_SRC?= ${_INSTALL_TEMPLATES} # FILES_SUBST lists what to substitute in DEINSTALL/INSTALL scripts and in # rc.d scripts. @@ -798,49 +772,85 @@ INSTALL_SCRIPTS_ENV+= PKG_REFCOUNT_DBDIR=${PKG_REFCOUNT_DBDIR} .PHONY: pre-install-script post-install-script -# This section is the only part that hooks into the INSTALL/DEINSTALL -# script logic in bsd.pkg.mk -# -.if !empty(_USE_PKGINSTALL:M[yY][eE][sS]) -. if !empty(DEINSTALL_SRC) DEINSTALL_FILE= ${PKG_DB_TMPDIR}/+DEINSTALL -. endif -. if !empty(INSTALL_SRC) INSTALL_FILE= ${PKG_DB_TMPDIR}/+INSTALL -. endif - -pre-install-script: generate-install-scripts - ${_PKG_SILENT}${_PKG_DEBUG}cd ${PKG_DB_TMPDIR} && \ - ${SETENV} ${INSTALL_SCRIPTS_ENV} \ - ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL - -post-install-script: - ${_PKG_SILENT}${_PKG_DEBUG}cd ${PKG_DB_TMPDIR} && \ - ${SETENV} ${INSTALL_SCRIPTS_ENV} \ - ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.endif +_DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL +_INSTALL_FILE= ${WRKDIR}/.INSTALL +_DEINSTALL_FILE_DFLT= ${WRKDIR}/.DEINSTALL_default +_INSTALL_FILE_DFLT= ${WRKDIR}/.INSTALL_default .PHONY: generate-install-scripts post-build: generate-install-scripts -generate-install-scripts: # do nothing +generate-install-scripts: \ + ${_DEINSTALL_FILE} ${_INSTALL_FILE} \ + ${_DEINSTALL_FILE_DFLT} ${_INSTALL_FILE_DFLT} +.if !exists(${DEINSTALL_FILE}) || !exists(${INSTALL_FILE}) + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${INSTALL_FILE:H} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${DEINSTALL_FILE:H} + ${_PKG_SILENT}${_PKG_DEBUG} \ + if ${CMP} -s ${_INSTALL_FILE_DFLT:Q} ${_INSTALL_FILE:Q}; then \ + ${TRUE}; \ + else \ + ${CP} -f ${_INSTALL_FILE} ${INSTALL_FILE}; \ + ${CP} -f ${_DEINSTALL_FILE} ${DEINSTALL_FILE}; \ + fi + ${_PKG_SILENT}${_PKG_DEBUG} \ + if ${CMP} -s ${_DEINSTALL_FILE_DFLT:Q} ${_DEINSTALL_FILE:Q}; then \ + ${TRUE}; \ + else \ + ${CP} -f ${_DEINSTALL_FILE} ${DEINSTALL_FILE}; \ + fi +.endif -.if !empty(DEINSTALL_SRC) -generate-install-scripts: ${DEINSTALL_FILE} -${DEINSTALL_FILE}: ${DEINSTALL_SRC} +${_DEINSTALL_FILE_DFLT}: ${_DEINSTALL_TEMPLATES_DFLT} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} | \ ${SED} ${FILES_SUBST_SED} > ${.TARGET} ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} -.endif -.if !empty(INSTALL_SRC) -generate-install-scripts: ${INSTALL_FILE} -${INSTALL_FILE}: ${INSTALL_SRC} +${_INSTALL_FILE_DFLT}: ${_INSTALL_TEMPLATES_DFLT} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} | \ ${SED} ${FILES_SUBST_SED} > ${.TARGET} ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} -.endif + +${_DEINSTALL_FILE}: ${DEINSTALL_SRC} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} + ${_PKG_SILENT}${_PKG_DEBUG} \ + case ${.ALLSRC:Q}"" in \ + "") { ${ECHO} "#!${SH}"; \ + ${ECHO} "exit 0"; } > ${.TARGET} ;; \ + *) ${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} \ + > ${.TARGET} ;; \ + esac + ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + +${_INSTALL_FILE}: ${INSTALL_SRC} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} + ${_PKG_SILENT}${_PKG_DEBUG} \ + case ${.ALLSRC:Q}"" in \ + "") { ${ECHO} "#!${SH}"; \ + ${ECHO} "exit 0"; } > ${.TARGET} ;; \ + *) ${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} \ + > ${.TARGET} ;; \ + esac + ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + +pre-install-script: + ${_PKG_SILENT}${_PKG_DEBUG} \ + if ${TEST} -x ${INSTALL_FILE}; then \ + cd ${PKG_DB_TMPDIR} && ${SETENV} ${INSTALL_SCRIPTS_ENV} \ + ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \ + PRE-INSTALL; \ + fi + +post-install-script: + ${_PKG_SILENT}${_PKG_DEBUG} \ + if ${TEST} -x ${INSTALL_FILE}; then \ + cd ${PKG_DB_TMPDIR} && ${SETENV} ${INSTALL_SCRIPTS_ENV} \ + ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \ + POST-INSTALL; \ + fi # rc.d scripts are automatically generated and installed into the rc.d # scripts example directory at the post-install step. The following diff --git a/multimedia/gstreamer0.8/plugins.mk b/multimedia/gstreamer0.8/plugins.mk index 8682a73bec5..16f7600afab 100644 --- a/multimedia/gstreamer0.8/plugins.mk +++ b/multimedia/gstreamer0.8/plugins.mk @@ -1,4 +1,4 @@ -# $NetBSD: plugins.mk,v 1.1 2006/01/18 12:44:04 jmmv Exp $ +# $NetBSD: plugins.mk,v 1.2 2006/03/14 01:14:31 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_EXTRA_TMPL+= ../../multimedia/gstreamer0.8/files/plugins.tmpl -DEINSTALL_EXTRA_TMPL+= ../../multimedia/gstreamer0.8/files/plugins.tmpl +INSTALL_TEMPLATE+= ../../multimedia/gstreamer0.8/files/plugins.tmpl +DEINSTALL_TEMPLATE+= ../../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/net/arla/Makefile b/net/arla/Makefile index 6bf575dc3df..95877683da9 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2006/03/13 04:29:16 rillig Exp $ +# $NetBSD: Makefile,v 1.55 2006/03/14 01:14:31 jlam Exp $ DISTNAME= arla-0.41 PKGREVISION= 3 @@ -21,9 +21,6 @@ INFO_FILES= arla.info send-pr.info USE_LIBTOOL= yes GNU_CONFIGURE= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - .include "../../mk/bsd.prefs.mk" .if !exists(/usr/src/sys/lib/libkern/libkern.h) diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile index dcb955d0d60..e087825a557 100644 --- a/net/ddclient/Makefile +++ b/net/ddclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:17 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:31 jlam Exp $ DISTNAME= ddclient-3.6.6 CATEGORIES= net @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= perl:run USE_LANGUAGES= # empty -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL DOCDIR= ${PREFIX}/share/doc/ddclient EGDIR= ${PREFIX}/share/examples/ddclient diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile index be8c04ac5cf..9e94e3e9367 100644 --- a/net/djbdns-run/Makefile +++ b/net/djbdns-run/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/01/08 14:08:58 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:31 jlam Exp $ # DISTNAME= djbdns-run-20050415 @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR} NO_CHECKSUM= yes NO_BUILD= yes -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL MAKE_DIRS+= ${PKG_SYSCONFDIR}/axfrdns MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/ip MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/servers diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index c2163f62e01..804ebe373d2 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/01/19 01:36:25 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:31 jlam Exp $ DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} @@ -109,7 +109,6 @@ USE_PKGLOCALEDIR= YES USE_LANGUAGE= c USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf CONF_FILES_PERMS+= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile index 14d90fc6364..6040c0305bf 100644 --- a/net/lambdamoo/Makefile +++ b/net/lambdamoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:20 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $ DISTNAME= LambdaMOO-1.8.1 PKGNAME= lambdamoo-1.8.1 @@ -18,8 +18,6 @@ LAMBDAMOO_USER?= lambdamoo LAMBDAMOO_GROUP?= lambdamoo LAMBDAMOO_HOME?= ${PREFIX}/share/${LAMBDAMOO_USER} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - PKG_GROUPS= ${LAMBDAMOO_GROUP} PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP} _PKG_USER_HOME= ${LAMBDAMOO_HOME} diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 22b1591dd9c..d3164d19c08 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/03/11 16:59:54 rillig Exp $ +# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:31 jlam Exp $ DISTNAME= net-snmp-5.3.0.1 PKGREVISION= 2 @@ -21,8 +21,6 @@ USE_LIBTOOL= yes # `make test TEST_TARGET=perltest' TEST_TARGET?= test -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile index d5b5da8781c..b8a1567e60c 100644 --- a/net/netdisco/Makefile +++ b/net/netdisco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/10 22:15:24 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:31 jlam Exp $ # DISTNAME= netdisco-0.94_with_mibs @@ -22,9 +22,6 @@ DEPENDS+= p5-Graph-*:../../devel/p5-Graph DEPENDS+= p5-GraphViz-*:../../graphics/p5-GraphViz DEPENDS+= p5-Compress-Zlib-*:../../devel/p5-Compress-Zlib -#DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -#MESSAGE_SRC= ${.CURDIR}/MESSAGE - WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../mk/bsd.prefs.mk" diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 02310e4aa49..d834a9e8809 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:21 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:31 jlam Exp $ # DISTNAME= nocol-4.3.1 @@ -22,6 +22,8 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/cmu-snmp/snmp/libtool \ ${WRKSRC}/cmu-snmp/snmpapps/libtool INSTALL_TARGET= install root +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty post-patch: @(hostname=`/bin/hostname`; \ diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile index bc4e246c292..28806707e27 100644 --- a/net/sendfile/Makefile +++ b/net/sendfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:24 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:31 jlam Exp $ # DISTNAME= sendfile-20010216 @@ -13,8 +13,6 @@ COMMENT= Implementation of the Simple asynchronous file transfer protocol WRKSRC= ${WRKDIR}/sendfile-2.1a -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - PKG_SYSCONFSUBDIR= sendfile EGDIR= ${PREFIX}/share/examples/sendfile CONF_FILES= ${EGDIR}/sendfile.cf ${PKG_SYSCONFDIR}/sendfile.cf diff --git a/net/tor/Makefile b/net/tor/Makefile index 09245b12ec8..2357decf8f8 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/02/23 03:39:25 jschauma Exp $ +# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:31 jlam Exp $ # DISTNAME= tor-0.1.0.17 @@ -34,8 +34,6 @@ CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \ RCD_SCRIPT= tor -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL - FILES_SUBST+= PKG_HOME=${PKG_HOME:Q} FILES_SUBST+= TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q} diff --git a/net/vtun/Makefile b/net/vtun/Makefile index 57025b1662a..b395c9c7379 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/29 06:22:04 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2006/03/14 01:14:31 jlam Exp $ DISTNAME= vtun-2.6 PKGREVISION= 6 @@ -14,8 +14,6 @@ HOMEPAGE= http://vtun.sourceforge.net/ COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping WRKSRC= ${WRKDIR}/vtun -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL GNU_CONFIGURE= YES CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 85e11203a05..d9dfcc0ba90 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:33 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/14 01:14:31 jlam Exp $ DISTNAME= leafnode-1.11.3.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -14,8 +14,6 @@ COMMENT= NNTP server for small (dialup) sites CONFLICTS+= cyrus-imapd<2.2.10nb2 WRKSRC= ${WRKDIR}/${DISTNAME} -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL LEAFNODE_SPOOL?= /var/spool/leafnode LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 032bff1010f..44b04d1cc0b 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/02/05 23:10:34 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:32 jlam Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -43,6 +43,9 @@ USER_CMD= ${LOCALBASE}/sbin/user GROUP_CMD= ${LOCALBASE}/sbin/group .endif +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= ${PKGDIR}/INSTALL + post-patch: cd ${WRKSRC}; \ for f in progs/glupart/glupart.c \ diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile index d405714dd2b..5bccf71e6db 100644 --- a/pkgtools/libkver/Makefile +++ b/pkgtools/libkver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:27 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:32 jlam Exp $ DISTNAME= libkver-${VERSION} CATEGORIES= pkgtools @@ -34,9 +34,6 @@ PLIST_SUBST+= HAS_SYSCTL="@comment " FILES_SUBST+= HAS_SYSCTL=false .endif -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - INSTALLATION_DIRS+= lib man/man3 man/cat3 .if empty(LDD_SYSCTL:M*libc*) INSTALLATION_DIRS+= sbin diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile index 6cd9c4803e2..6fa183927c7 100644 --- a/pkgtools/pkg_alternatives/Makefile +++ b/pkgtools/pkg_alternatives/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:06 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:32 jlam Exp $ # DISTNAME= pkg_alternatives-1.3 @@ -21,8 +21,6 @@ DATADIR= ${PREFIX}/share/pkg_alternatives DBDIR= ${PREFIX}/libdata/pkg_alternatives EGDIR= ${PREFIX}/share/examples/pkg_alternatives -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= PKG_ALTERNATIVES=${PREFIX}/sbin/pkg_alternatives REQD_DIRS= ${DBDIR} diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 48956bca17d..dc6b8ee596e 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.124 2006/03/10 22:38:30 jlam Exp $ +# $NetBSD: Makefile,v 1.125 2006/03/14 01:14:32 jlam Exp $ # Notes to package maintainers: # @@ -60,8 +60,8 @@ PKG_ADMIN= PKG_DBDIR=${PKG_DBDIR:Q} ${PKG_ADMIN_CMD} PLIST_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} -INSTALL_SRC= ${PKGDIR}/INSTALL DEINSTALL_SRC= # empty +INSTALL_SRC= ${PKGDIR}/INSTALL FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} \ PKG_TOOLS_BIN=${PKG_TOOLS_BIN:Q} \ MKDIR=${MKDIR:Q} diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 7e03812874f..d6580ede00d 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2006/01/12 19:02:34 joerg Exp $ +# $NetBSD: Makefile,v 1.65 2006/03/14 01:14:32 jlam Exp $ DISTNAME= xpkgwedge-1.15 CATEGORIES= pkgtools devel x11 @@ -30,8 +30,6 @@ PKG_SKIP_REASON+= "xpkgwedge is not needed when X11BASE is LOCALBASE" CONFLICTS+= mkfontscale-[0-9]* .endif -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL INSTALLATION_DIRS= bin lib/X11/config # FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile index 341412a3254..21485d90211 100644 --- a/print/LPRng-core/Makefile +++ b/print/LPRng-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/02/18 14:22:13 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2006/03/14 01:14:32 jlam Exp $ DISTNAME= LPRng-3.8.28 PKGNAME= LPRng-core-3.8.28 @@ -43,8 +43,6 @@ FILTER_PATH= ${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFI MAKE_ENV+= POSTINSTALL="NO" EXAMPLESDIR= ${PREFIX}/share/examples/LPRng -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL RCD_SCRIPTS= LPRng FILES_SUBST+= CAT=${CAT:Q} diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index 41924496978..61244a669f5 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:30:28 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2006/03/14 01:14:32 jlam Exp $ # DISTNAME= apsfilter-7.2.6 @@ -32,8 +32,7 @@ PKG_SYSCONFSUBDIR?= apsfilter CONF_FILES= ${PREFIX}/share/apsfilter/template/apsfilterrc \ ${PKG_SYSCONFDIR}/apsfilterrc -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL post-patch: for i in bin/apsfilter.in SETUP.in tools/prtmgmt; do \ diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk index 0c39add7436..cc1df24af54 100644 --- a/print/dvipdfmx/map.mk +++ b/print/dvipdfmx/map.mk @@ -1,4 +1,4 @@ -# $NetBSD: map.mk,v 1.4 2005/12/29 06:22:06 jlam Exp $ +# $NetBSD: map.mk,v 1.5 2006/03/14 01:14:32 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_EXTRA_TMPL+= ../../print/dvipdfmx/files/map.tmpl -DEINSTALL_EXTRA_TMPL+= ../../print/dvipdfmx/files/map.tmpl +INSTALL_TEMPLATE+= ../../print/dvipdfmx/files/map.tmpl +DEINSTALL_TEMPLATE+= ../../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-cups/Makefile b/print/foomatic-filters-cups/Makefile index ffdba02b170..5a4133f8c3d 100644 --- a/print/foomatic-filters-cups/Makefile +++ b/print/foomatic-filters-cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:36 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $ .include "../../print/foomatic-filters/Makefile.common" @@ -22,8 +22,7 @@ EVAL_PREFIX+= CUPS_PREFIX=cups CUPS_FILTERDIR= ${CUPS_PREFIX:Q}/libexec/cups/filter FILES_SUBST+= CUPS_FILTERDIR=${CUPS_FILTERDIR} -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL do-build: # empty do-install: # empty diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile index f7d1a9d8c41..a98e58b6621 100644 --- a/print/foomatic-filters/Makefile +++ b/print/foomatic-filters/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:36 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:32 jlam Exp $ .include "Makefile.common" @@ -36,8 +36,8 @@ DEPENDS+= {cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups DEPENDS+= ${TEXTTOPS_DEPENDS}:../../print/mpage .endif -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/../../print/foomatic-filters-cups/INSTALL -INSTALL_EXTRA_TMPL= ${DEINSTALL_EXTRA_TMPL} +DEINSTALL_TEMPLATE+= ${.CURDIR}/../../print/foomatic-filters-cups/INSTALL +INSTALL_TEMPLATE+= ${.CURDIR}/../../print/foomatic-filters-cups/INSTALL EGDIR= ${PREFIX}/share/examples/foomatic CONFDIR= ${PKG_SYSCONFDIR}/foomatic diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile index 31c52bdfc7c..56c5f9acb03 100644 --- a/print/foomatic-ppds-cups/Makefile +++ b/print/foomatic-ppds-cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:36 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $ .include "../../print/foomatic-ppds/Makefile.common" @@ -22,8 +22,7 @@ EVAL_PREFIX+= CUPS_PREFIX=cups CUPS_DATADIR= ${CUPS_PREFIX:Q}/share/cups/model FILES_SUBST+= CUPS_DATADIR=${CUPS_DATADIR} -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL do-build: # empty do-install: # empty diff --git a/print/ja-jsclasses/Makefile b/print/ja-jsclasses/Makefile index 9003399858c..bc9d8ddde30 100644 --- a/print/ja-jsclasses/Makefile +++ b/print/ja-jsclasses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:37 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:32 jlam Exp $ DISTNAME= jsclasses-030624 PKGNAME= ja-${DISTNAME} @@ -14,8 +14,6 @@ COMMENT= New document class files for pLaTeX DEPENDS+= ja-ptex-bin>=2.1.3:../../print/ja-ptex-bin WRKSRC= ${WRKDIR}/jsclasses -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL PLATEX_DIR= ${PREFIX}/share/texmf.local/ptex/platex NO_BUILD= YES diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile index 293ac70c4f1..2c1c3bca3f7 100644 --- a/print/ja-ptex-bin/Makefile +++ b/print/ja-ptex-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/05 23:10:37 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:32 jlam Exp $ DISTNAME= ptex-src-${PTEX_VERS} PKGNAME= ja-ptex-bin-${PTEX_VERS} @@ -24,9 +24,6 @@ SITES_mendexk2.5.tar.gz= \ DEPENDS+= ja-ptex-share>=2.1:../../print/ja-ptex-share -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - .include "../../print/teTeX-bin/buildlink3.mk" .include "../../print/teTeX-bin/Makefile.common" diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk index d18d6632d2a..2aaf3b48c5e 100644 --- a/print/teTeX/module.mk +++ b/print/teTeX/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.11 2006/01/13 17:56:43 wiz Exp $ +# $NetBSD: module.mk,v 1.12 2006/03/14 01:14:32 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_EXTRA_TMPL+= ../../print/teTeX/files/texmf.tmpl -DEINSTALL_EXTRA_TMPL+= ../../print/teTeX/files/texmf.tmpl +INSTALL_TEMPLATE+= ../../print/teTeX/files/texmf.tmpl +DEINSTALL_TEMPLATE+= ../../print/teTeX/files/texmf.tmpl PRINT_PLIST_AWK+= /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \ { next; } diff --git a/print/xpdf-arabic/Makefile b/print/xpdf-arabic/Makefile index dd0df170824..0933e34faca 100644 --- a/print/xpdf-arabic/Makefile +++ b/print/xpdf-arabic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:32 jlam Exp $ # DISTNAME= xpdf-arabic-2003-feb-16 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-arabic NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-chinese-simplified/Makefile b/print/xpdf-chinese-simplified/Makefile index 1584d06bcd9..ad8035c02b1 100644 --- a/print/xpdf-chinese-simplified/Makefile +++ b/print/xpdf-chinese-simplified/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:32 jlam Exp $ # DISTNAME= xpdf-chinese-simplified-2004-jul-27 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-chinese-simplified NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-chinese-traditional/Makefile b/print/xpdf-chinese-traditional/Makefile index eb66586eadd..9bfa322d0ae 100644 --- a/print/xpdf-chinese-traditional/Makefile +++ b/print/xpdf-chinese-traditional/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:32 jlam Exp $ # DISTNAME= xpdf-chinese-traditional-2004-jul-27 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-chinese-traditional NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' -e 's/Arhpic/Arphic/g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-cyrillic/Makefile b/print/xpdf-cyrillic/Makefile index be429696548..3497dc5a688 100644 --- a/print/xpdf-cyrillic/Makefile +++ b/print/xpdf-cyrillic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-cyrillic-2003-jun-28 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-cyrillic NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-greek/Makefile b/print/xpdf-greek/Makefile index 6e78677f4f4..46bf8eb8239 100644 --- a/print/xpdf-greek/Makefile +++ b/print/xpdf-greek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-greek-2003-jun-28 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-greek NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-hebrew/Makefile b/print/xpdf-hebrew/Makefile index f9fd950bb8b..f1c845ebba4 100644 --- a/print/xpdf-hebrew/Makefile +++ b/print/xpdf-hebrew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-hebrew-2003-feb-16 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-hebrew NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-japanese/Makefile b/print/xpdf-japanese/Makefile index be51d6d22df..8ef52ba4a0a 100644 --- a/print/xpdf-japanese/Makefile +++ b/print/xpdf-japanese/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-japanese-2004-jul-27 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-japanese NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile index 56258566e92..0900b1faf25 100644 --- a/print/xpdf-korean/Makefile +++ b/print/xpdf-korean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-korean-2005-jul-07 @@ -20,8 +20,6 @@ WRKSRC= ${WRKDIR}/xpdf-korean NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-latin2/Makefile b/print/xpdf-latin2/Makefile index 1d828a8abcb..baec55939c1 100644 --- a/print/xpdf-latin2/Makefile +++ b/print/xpdf-latin2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-latin2-2002-oct-22 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-latin2 NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-thai/Makefile b/print/xpdf-thai/Makefile index 413986e08fc..d6049b94491 100644 --- a/print/xpdf-thai/Makefile +++ b/print/xpdf-thai/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-thai-2002-jan-16 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-thai NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/print/xpdf-turkish/Makefile b/print/xpdf-turkish/Makefile index ce86c36f840..b89925210a7 100644 --- a/print/xpdf-turkish/Makefile +++ b/print/xpdf-turkish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:32 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= xpdf-turkish-2002-apr-10 @@ -19,8 +19,6 @@ WRKSRC= ${WRKDIR}/xpdf-turkish NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - post-patch: ${MV} ${WRKSRC}/add-to-xpdfrc ${WRKSRC}/add-to-xpdfrc.orig ${SED} -e 's:/usr/local:'${PREFIX}':g' < ${WRKSRC}/add-to-xpdfrc.orig > ${WRKSRC}/add-to-xpdfrc diff --git a/security/AiCA/Makefile b/security/AiCA/Makefile index 7184923526e..8fa7012d09f 100644 --- a/security/AiCA/Makefile +++ b/security/AiCA/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= AiCA-0.81 @@ -9,7 +9,6 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://mars.elcom.nitech.ac.jp/security/ COMMENT= Manage Certification Authority and PKI utilities -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/AiCA diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index fd0bf8cc2a8..6526c5259cf 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:33 jlam Exp $ .include "Makefile.common" @@ -55,8 +55,6 @@ GEN_FILES= authdaemonrc FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} AUTHLIB_PLIST= ${AUTHEXAMPLEDIR}/authdaemonrc.dist -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - # Install the example config files into ${EGDIR}. INSTALL_AM_MAKEFLAGS= authdaemonrc=${EGDIR}/authdaemonrc \ authldaprc=${EGDIR}/authldaprc \ diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index eba44e735fa..3fda4c1a293 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/02/05 23:10:43 joerg Exp $ +# $NetBSD: Makefile,v 1.47 2006/03/14 01:14:33 jlam Exp $ .include "Makefile.common" @@ -48,8 +48,6 @@ CONFIGURE_ARGS+= --with-devrandom=${SASL_ENTROPY_SOURCE:Q} .endif BUILD_DEFS+= SASL_ENTROPY_SOURCE -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - # CYRUS_USER username of the Cyrus administrator # CYRUS_GROUP group of the Cyrus administrator # diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index da989be319b..4da99a62bb5 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/12/29 06:22:09 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/03/14 01:14:33 jlam Exp $ DISTNAME= cyrus-sasl-2.1.20 PKGNAME= ${DISTNAME:S/sasl/saslauthd/} @@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .include "options.mk" -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL RCD_SCRIPTS= saslauthd FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 385b7b45649..18d8ca28244 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/02/20 23:03:00 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:33 jlam Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -133,8 +133,6 @@ MESSAGE_SUBST+= EGDIR=${EGDIR} MESSAGE_SUBST+= OPENSSH_USER=${OPENSSH_USER} MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP} -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - pre-configure: cd ${WRKSRC} && autoreconf diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 337f2688407..326339771fa 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.165 2006/03/04 21:30:35 jlam Exp $ +# $NetBSD: Makefile,v 1.166 2006/03/14 01:14:33 jlam Exp $ DISTNAME= openssh-4.3p1 PKGNAME= openssh-4.3.1 @@ -140,8 +140,6 @@ RCD_SCRIPTS= sshd PLIST_SRC+= ${.CURDIR}/PLIST FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile index 275dd05bb7a..a95fdb64129 100644 --- a/security/smtpd/Makefile +++ b/security/smtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:38 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:33 jlam Exp $ # DISTNAME= smtpd-2.0 @@ -26,6 +26,8 @@ CFLAGS.AIX+= -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_ST OPSYSVARS+= LD_LIBS LD_LIBS.SunOS+= -lnsl -lsocket -lresolv MAKE_ENV+= LD_LIBS=${LD_LIBS:Q} +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty .include "../../mk/bsd.prefs.mk" diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile index 2eb4d7a89aa..6f1d0506428 100644 --- a/security/uvscan/Makefile +++ b/security/uvscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/03/04 21:30:38 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2006/03/14 01:14:33 jlam Exp $ DISTNAME= vlnx440e PKGNAME= uvscan-4.40 @@ -37,8 +37,6 @@ EGDATDIR= ${PREFIX}/share/examples/uvscan UVSCANDIR= ${PREFIX}/libexec/uvscan DATFILES= clean.dat internet.dat names.dat scan.dat pkgdesc.ini -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - FILES_SUBST+= UVSCANDIR=${UVSCANDIR:Q} FILES_SUBST+= DATFILES=${DATFILES:Q} diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile index 6a31e1c49d9..6e1804f5a5f 100644 --- a/sysutils/desktop-file-utils/Makefile +++ b/sysutils/desktop-file-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:49 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:34 jlam Exp $ # DISTNAME= desktop-file-utils-0.10 @@ -19,8 +19,7 @@ USE_PKGLOCALEDIR= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= EMACS=no -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= APPLICATIONS_PATH="${PREFIX}/share/applications" FILES_SUBST+= UPDATE_DESKTOPDB="${PREFIX}/bin/update-desktop-database" diff --git a/sysutils/desktop-file-utils/desktopdb.mk b/sysutils/desktop-file-utils/desktopdb.mk index 0d9c85801c3..0e72ae949c2 100644 --- a/sysutils/desktop-file-utils/desktopdb.mk +++ b/sysutils/desktop-file-utils/desktopdb.mk @@ -1,4 +1,4 @@ -# $NetBSD: desktopdb.mk,v 1.3 2005/12/29 06:22:17 jlam Exp $ +# $NetBSD: desktopdb.mk,v 1.4 2006/03/14 01:14:34 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_EXTRA_TMPL+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../sysutils/desktop-file-utils/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.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/Makefile b/sysutils/webmin/Makefile index de1f43bc51f..2d9ebe8e561 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/03 02:04:27 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:34 jlam Exp $ DISTNAME= webmin-1.170-minimal PKGNAME= ${DISTNAME:S/-minimal$//} @@ -28,7 +28,6 @@ FILES_SUBST+= WEBMIN_ETCDIR=${WEBMIN_ETCDIR:Q} FILES_SUBST+= WEBMIN_LOGDIR=${WEBMIN_LOGDIR:Q} MESSAGE_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q} -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL RCD_SCRIPTS= webmin OWN_DIRS= ${WEBMIN_LOGDIR} diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 92b6aa9dc36..ff24313a740 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/03/09 21:04:45 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:34 jlam Exp $ DISTNAME= xcdroast-${DIST_VER} PKGNAME= xcdroast-${DIST_VER:S/alpha/a/} @@ -35,8 +35,6 @@ DOCFILES= DOCUMENTATION FAQ README.nonroot manual/xcdroast-manual.pdf HTMLDIR= ${PREFIX}/share/doc/html/xcdroast CONF_FILES= /dev/null ${PKG_SYSCONFDIR}/xcdroast.conf -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - pre-build: cd ${WRKSRC}/src; for file in io.c wavplay.c; do \ ${SED} -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g" \ diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index ff69dff77fd..13ff3439340 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/03/04 21:30:51 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2006/03/14 01:14:34 jlam Exp $ # DISTNAME= scrollkeeper-0.3.14 @@ -35,8 +35,7 @@ CONFIGURE_ARGS+= --with-omfdirs=${PREFIX}/share/omf CONFIGURE_ARGS+= --with-omfdirs=${LOCALBASE}/share/omf:${X11PREFIX}/share/omf .endif -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL SCROLLKEEPER_DATADIR= ${PREFIX}/libdata/scrollkeeper SCROLLKEEPER_REBUILDDB= ${PREFIX}/bin/scrollkeeper-rebuilddb diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk index f11025b353b..9bff7873dbf 100644 --- a/textproc/scrollkeeper/omf.mk +++ b/textproc/scrollkeeper/omf.mk @@ -1,4 +1,4 @@ -# $NetBSD: omf.mk,v 1.10 2005/12/29 06:22:20 jlam Exp $ +# $NetBSD: omf.mk,v 1.11 2006/03/14 01:14:34 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_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl +INSTALL_TEMPLATE+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl +DEINSTALL_TEMPLATE+= ${.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 ee9b5c7ae42..f6b72cb8ca6 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.14 2005/12/29 06:22:20 jlam Exp $ +# $NetBSD: catalogs.mk,v 1.15 2006/03/14 01:14:34 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_EXTRA_TMPL+= ../../textproc/xmlcatmgr/files/install.tmpl -DEINSTALL_EXTRA_TMPL+= ../../textproc/xmlcatmgr/files/deinstall.tmpl +INSTALL_TEMPLATE+= ../../textproc/xmlcatmgr/files/install.tmpl +DEINSTALL_TEMPLATE+= ../../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 0d8a3ecb211..e80663b49a0 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile-firefox.common,v 1.27 2006/02/06 00:37:54 ghen Exp $ +# $NetBSD: Makefile-firefox.common,v 1.28 2006/03/14 01:14:34 jlam Exp $ MOZILLA_BIN= firefox-bin MOZ_VER= 1.5.0.1 @@ -34,4 +34,4 @@ MESSAGE= ${.CURDIR}/../../www/firefox/MESSAGE .include "../../www/firefox/Makefile.common" -INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../www/firefox/INSTALL +INSTALL_TEMPLATE+= ${.CURDIR}/../../www/firefox/INSTALL diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index 1463b029263..7b0124d20e4 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2006/02/07 09:21:38 rillig Exp $ +# $NetBSD: Makefile.common,v 1.8 2006/03/14 01:14:34 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_EXTRA_TMPL+= ${.CURDIR}/../../www/mozilla/INSTALL +INSTALL_TEMPLATE+= ${.CURDIR}/../../www/mozilla/INSTALL CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess diff --git a/www/htdig-devel/Makefile b/www/htdig-devel/Makefile index f5c7e70ce8e..3b08d9ffff3 100644 --- a/www/htdig-devel/Makefile +++ b/www/htdig-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:58 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2006/03/14 01:14:34 jlam Exp $ DISTNAME= htdig-3.2.0b6 CATEGORIES= www databases @@ -25,7 +25,6 @@ CONFIGURE_ARGS+= --with-search-dir=${PREFIX}/share/examples/htdig CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread" CXXFLAGS+= -Wno-deprecated -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL PKG_SYSCONFSUBDIR= htdig DBDIR?= ${VARBASE}/db/htdig diff --git a/www/htdig/Makefile b/www/htdig/Makefile index a6646e049e3..5973f08e32d 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/03/04 21:30:58 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:34 jlam Exp $ DISTNAME= htdig-3.1.6 PKGREVISION= 3 @@ -30,7 +30,6 @@ CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread" CXXFLAGS+= -Wno-deprecated CPPFLAGS+= ${CXXFLAGS} -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL PKG_SYSCONFSUBDIR= htdig DBDIR?= ${VARBASE}/db/htdig diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index c1a9ad55e9f..e4f0e3a29ae 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.72 2006/02/07 09:07:19 rillig Exp $ +# $NetBSD: Makefile.common,v 1.73 2006/03/14 01:14:34 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_EXTRA_TMPL+= ${.CURDIR}/../../www/mozilla/INSTALL +INSTALL_TEMPLATE+= ${.CURDIR}/../../www/mozilla/INSTALL CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 7572b66b824..0adff984f81 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/05 23:11:28 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:34 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -52,8 +52,7 @@ CONF_FILES_PERMS+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0660 OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775 -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q} diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile index ead52500a6c..93606d96129 100644 --- a/www/wwwcount/Makefile +++ b/www/wwwcount/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:04 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/03/14 01:14:34 jlam Exp $ DISTNAME= wwwcount2.5 PKGNAME= wwwcount-2.5 @@ -13,6 +13,9 @@ GNU_CONFIGURE= yes INSTALLATION_DIRS= bin man/man1 share/doc/wwwcount/Count2.5/images \ share/doc/wwwcount/Count2.5/eximages share/examples +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= # empty + pre-configure: cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} VARBASE=${VARBASE} ./Count-config diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index db9efa867ae..d9f17345022 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2006/02/22 23:01:28 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2006/03/14 01:14:34 jlam Exp $ DISTNAME= wwwoffle-2.8e PKGREVISION= 2 @@ -19,7 +19,6 @@ CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle PKG_SYSCONFSUBDIR= wwwoffle PLIST_SUBST+= GZIP_CMD=${GZIP_CMD:Q} -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL RCD_SCRIPTS= wwwoffled diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index 6ab98d52953..67eff052a09 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2006/03/09 21:04:45 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2006/03/14 01:14:34 jlam Exp $ # DISTNAME= gnome-applets-2.12.2 @@ -68,7 +68,7 @@ PRINT_PLIST_AWK+= /[Bb]attstat/ { print "$${BATTSTAT}"$$0; next; } # This must come after GConf2's schemas.mk because it will modify default # values for keys created during the registration of .schemas files. -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +INSTALL_TEMPLATE+= ${PKGDIR}/INSTALL BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0 diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 0f826a97c00..3a2788ead6c 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.114 2006/03/04 21:31:09 jlam Exp $ +# $NetBSD: Makefile,v 1.115 2006/03/14 01:14:34 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 9 @@ -47,8 +47,7 @@ GTK_MINOR_VERSION= ${GTK_VERSION:C/[^.]*\.//:C/\..*//} GTK_MICRO_VERSION= ${GTK_VERSION:C/.*\.//} .if ${PKG_INSTALLATION_TYPE} == "overwrite" -DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL .endif # We patch the version info in the configure scripts for reasons related to diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk index 61d6ed46c5a..2f0a75088ef 100644 --- a/x11/gtk2/modules.mk +++ b/x11/gtk2/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.11 2005/12/29 06:22:25 jlam Exp $ +# $NetBSD: modules.mk,v 1.12 2006/03/14 01:14:35 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,8 +25,8 @@ 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_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl -DEINSTALL_EXTRA_TMPL+= ../../x11/gtk2/files/immodules.tmpl +INSTALL_TEMPLATE+= ../../x11/gtk2/files/immodules.tmpl +DEINSTALL_TEMPLATE+= ../../x11/gtk2/files/immodules.tmpl .endif .if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss]) diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 6189d451b49..e86aaa3ff17 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2006/03/04 21:31:10 jlam Exp $ +# $NetBSD: Makefile,v 1.89 2006/03/14 01:14:35 jlam Exp $ DISTNAME= lesstif-0.94.4 PKGREVISION= 2 @@ -41,9 +41,6 @@ FILES_SUBST+= RM=${RM:Q} FILES_SUBST+= RMDIR=${RMDIR:Q} FILES_SUBST+= TRUE=${TRUE:Q} -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - post-extract: cd ${WRKSRC}/lib/config; ${MV} -f host.def LessTif.def |