pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Modify the pkginstall framework so that it manages all...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2b1953f2f1c
branches:  trunk
changeset: 509735:e2b1953f2f1c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 14 01:14:26 2006 +0000

description:
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.

diffstat:

 audio/gqmpeg-devel/Makefile              |    4 +-
 audio/gqmpeg/Makefile                    |    4 +-
 audio/xmcd/Makefile                      |    5 +-
 audio/xmms-meta-input/Makefile           |    4 +-
 chat/ircd-hybrid/Makefile                |    3 +-
 chat/silc-server/Makefile                |    4 +-
 comms/efax/Makefile                      |    6 +-
 comms/mgetty+sendfax/Makefile            |    5 +-
 databases/mysql4-server/Makefile         |    4 +-
 databases/mysql5-server/Makefile         |    4 +-
 databases/postgresql73-lib/Makefile      |    5 +-
 databases/postgresql73-server/Makefile   |    4 +-
 databases/postgresql74-server/Makefile   |    3 +-
 databases/postgresql80-server/Makefile   |    3 +-
 databases/shared-mime-info/Makefile      |    5 +-
 databases/shared-mime-info/mimedb.mk     |    6 +-
 devel/GConf2/schemas.mk                  |    6 +-
 devel/isect/Makefile                     |    4 +-
 devel/rt3/Makefile.install               |    3 +-
 devel/w32api/Makefile                    |    5 +-
 emulators/compat12/Makefile              |    4 +-
 emulators/compat13/Makefile              |    4 +-
 emulators/compat14-crypto/Makefile       |    4 +-
 emulators/compat14/Makefile              |    4 +-
 emulators/freebsd_lib/Makefile           |    4 +-
 emulators/netbsd32_compat14/Makefile     |    4 +-
 emulators/netbsd32_compat15/Makefile     |    4 +-
 emulators/netbsd32_compat16/Makefile     |    4 +-
 emulators/osf1_lib/Makefile              |    4 +-
 emulators/suse100_gtk2/Makefile          |    3 +-
 emulators/suse91_base/Makefile           |    4 +-
 emulators/suse91_gtk2/Makefile           |    3 +-
 emulators/suse_base/Makefile             |    4 +-
 emulators/vmware-module/Makefile         |    4 +-
 emulators/vmware-module3/Makefile        |    4 +-
 fonts/ghostscript-cidfonts/Makefile      |    5 +-
 fonts/ghostscript-cmaps/Makefile         |    5 +-
 fonts/ja-kappa20/Makefile                |    4 +-
 fonts/ja-shinonome/Makefile              |    5 +-
 fonts/vfontcap-kochi/Makefile            |    5 +-
 games/falcons-eye/Makefile               |    4 +-
 games/gnome2-games/Makefile              |    4 +-
 games/ivan/Makefile                      |    6 +-
 games/tetrinetx/Makefile                 |    4 +-
 games/xmris/Makefile                     |    4 +-
 games/xscavenger/Makefile                |    4 +-
 ham/dpbox/Makefile                       |   13 +-
 inputmethod/canna-server/Makefile        |    4 +-
 inputmethod/sj3-dict/Makefile            |    4 +-
 inputmethod/skkinput/Makefile            |    4 +-
 inputmethod/skkserv/Makefile             |    3 +-
 lang/perl5/buildlink3.mk                 |    4 +-
 lang/perl5/packlist.mk                   |    6 +-
 lang/ruby18-base/Makefile                |    5 +-
 lang/sun-jre15/Makefile                  |    8 +-
 mail/clamav/Makefile                     |    4 +-
 mail/courier-imap/Makefile               |    3 +-
 mail/courier-maildir/Makefile            |    3 +-
 mail/cyrus-imapd/Makefile                |    4 +-
 mail/cyrus-imapd21/Makefile              |    4 +-
 mail/mailman/Makefile                    |    6 +-
 mail/mailwrapper/Makefile                |    4 +-
 mail/majordomo/Makefile                  |    4 +-
 mail/mimedefang/Makefile                 |    4 +-
 mail/mutt-devel/Makefile                 |    5 +-
 mail/mutt/Makefile                       |    5 +-
 mail/nullmailer/Makefile                 |    4 +-
 mail/popa3d/Makefile                     |    5 +-
 mail/pymsgauth/Makefile                  |    4 +-
 mail/qmail-run/Makefile                  |    3 +-
 mail/qmail/Makefile                      |    4 +-
 mail/sqwebmail/Makefile                  |    3 +-
 mail/yatsvrs/Makefile                    |    5 +-
 misc/jitterbug/Makefile                  |    4 +-
 misc/openoffice2-bin/Makefile            |    5 +-
 misc/rpm/Makefile                        |    5 +-
 mk/alternatives.mk                       |    6 +-
 mk/bsd.pkg.mk                            |   37 +----
 mk/install/bsd.pkginstall.mk             |  214 ++++++++++++++++--------------
 multimedia/gstreamer0.8/plugins.mk       |    6 +-
 net/arla/Makefile                        |    5 +-
 net/ddclient/Makefile                    |    3 +-
 net/djbdns-run/Makefile                  |    3 +-
 net/ja-samba/Makefile                    |    3 +-
 net/lambdamoo/Makefile                   |    4 +-
 net/net-snmp/Makefile                    |    4 +-
 net/netdisco/Makefile                    |    5 +-
 net/nocol/Makefile                       |    4 +-
 net/sendfile/Makefile                    |    4 +-
 net/tor/Makefile                         |    4 +-
 net/vtun/Makefile                        |    4 +-
 news/leafnode/Makefile                   |    4 +-
 parallel/glunix/Makefile                 |    5 +-
 pkgtools/libkver/Makefile                |    5 +-
 pkgtools/pkg_alternatives/Makefile       |    4 +-
 pkgtools/pkg_install/Makefile            |    4 +-
 pkgtools/xpkgwedge/Makefile              |    4 +-
 print/LPRng-core/Makefile                |    4 +-
 print/apsfilter/Makefile                 |    5 +-
 print/dvipdfmx/map.mk                    |    6 +-
 print/foomatic-filters-cups/Makefile     |    5 +-
 print/foomatic-filters/Makefile          |    6 +-
 print/foomatic-ppds-cups/Makefile        |    5 +-
 print/ja-jsclasses/Makefile              |    4 +-
 print/ja-ptex-bin/Makefile               |    5 +-
 print/teTeX/module.mk                    |    6 +-
 print/xpdf-arabic/Makefile               |    4 +-
 print/xpdf-chinese-simplified/Makefile   |    4 +-
 print/xpdf-chinese-traditional/Makefile  |    4 +-
 print/xpdf-cyrillic/Makefile             |    4 +-
 print/xpdf-greek/Makefile                |    4 +-
 print/xpdf-hebrew/Makefile               |    4 +-
 print/xpdf-japanese/Makefile             |    4 +-
 print/xpdf-korean/Makefile               |    4 +-
 print/xpdf-latin2/Makefile               |    4 +-
 print/xpdf-thai/Makefile                 |    4 +-
 print/xpdf-turkish/Makefile              |    4 +-
 security/AiCA/Makefile                   |    3 +-
 security/courier-authlib/Makefile        |    4 +-
 security/cyrus-sasl2/Makefile            |    4 +-
 security/cyrus-saslauthd/Makefile        |    3 +-
 security/openssh+gssapi/Makefile         |    4 +-
 security/openssh/Makefile                |    4 +-
 security/smtpd/Makefile                  |    4 +-
 security/uvscan/Makefile                 |    4 +-
 sysutils/desktop-file-utils/Makefile     |    5 +-
 sysutils/desktop-file-utils/desktopdb.mk |    6 +-
 sysutils/webmin/Makefile                 |    3 +-
 sysutils/xcdroast/Makefile               |    4 +-
 textproc/scrollkeeper/Makefile           |    5 +-
 textproc/scrollkeeper/omf.mk             |    6 +-
 textproc/xmlcatmgr/catalogs.mk           |    6 +-
 www/firefox/Makefile-firefox.common      |    4 +-
 www/firefox/Makefile.common              |    4 +-
 www/htdig-devel/Makefile                 |    3 +-
 www/htdig/Makefile                       |    3 +-
 www/mozilla/Makefile.common              |    4 +-
 www/privoxy/Makefile                     |    5 +-
 www/wwwcount/Makefile                    |    5 +-
 www/wwwoffle/Makefile                    |    3 +-
 x11/gnome2-applets/Makefile              |    4 +-
 x11/gtk/Makefile                         |    5 +-
 x11/gtk2/modules.mk                      |    6 +-
 x11/lesstif/Makefile                     |    5 +-
 144 files changed, 354 insertions(+), 518 deletions(-)

diffs (truncated from 2960 to 300 lines):

diff -r eb612f2fe878 -r e2b1953f2f1c audio/gqmpeg-devel/Makefile
--- a/audio/gqmpeg-devel/Makefile       Tue Mar 14 01:10:49 2006 +0000
+++ b/audio/gqmpeg-devel/Makefile       Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 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 -r eb612f2fe878 -r e2b1953f2f1c audio/gqmpeg/Makefile
--- a/audio/gqmpeg/Makefile     Tue Mar 14 01:10:49 2006 +0000
+++ b/audio/gqmpeg/Makefile     Tue Mar 14 01:14:26 2006 +0000
@@ -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_PKGLOCALEDIR=      YES
 GNU_CONFIGURE=         YES
 
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-
 .include "options.mk"
 
 CONFIGURE_ARGS+=       --without-included-gettext
diff -r eb612f2fe878 -r e2b1953f2f1c audio/xmcd/Makefile
--- a/audio/xmcd/Makefile       Tue Mar 14 01:10:49 2006 +0000
+++ b/audio/xmcd/Makefile       Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 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 -r eb612f2fe878 -r e2b1953f2f1c audio/xmms-meta-input/Makefile
--- a/audio/xmms-meta-input/Makefile    Tue Mar 14 01:10:49 2006 +0000
+++ b/audio/xmms-meta-input/Makefile    Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 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 -r eb612f2fe878 -r e2b1953f2f1c chat/ircd-hybrid/Makefile
--- a/chat/ircd-hybrid/Makefile Tue Mar 14 01:10:49 2006 +0000
+++ b/chat/ircd-hybrid/Makefile Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 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 -r eb612f2fe878 -r e2b1953f2f1c chat/silc-server/Makefile
--- a/chat/silc-server/Makefile Tue Mar 14 01:10:49 2006 +0000
+++ b/chat/silc-server/Makefile Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 USE_LIBTOOL=           yes
 SHLIBTOOL_OVERRIDE=    libtool */*/*/libtool
 
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
 SILCD_USER?=           silcd
diff -r eb612f2fe878 -r e2b1953f2f1c comms/efax/Makefile
--- a/comms/efax/Makefile       Tue Mar 14 01:10:49 2006 +0000
+++ b/comms/efax/Makefile       Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 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 -r eb612f2fe878 -r e2b1953f2f1c comms/mgetty+sendfax/Makefile
--- a/comms/mgetty+sendfax/Makefile     Tue Mar 14 01:10:49 2006 +0000
+++ b/comms/mgetty+sendfax/Makefile     Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 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 -r eb612f2fe878 -r e2b1953f2f1c databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/mysql4-server/Makefile  Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 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 -r eb612f2fe878 -r e2b1953f2f1c databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/mysql5-server/Makefile  Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 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 -r eb612f2fe878 -r e2b1953f2f1c databases/postgresql73-lib/Makefile
--- a/databases/postgresql73-lib/Makefile       Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/postgresql73-lib/Makefile       Tue Mar 14 01:14:26 2006 +0000
@@ -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/pl
 USE_TOOLS+=            gtar
 
-DEINSTALL_EXTRA_TMPL=  ${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL=    ${.CURDIR}/INSTALL
+DEINSTALL_TEMPLATE+=   ${PKGDIR}/INSTALL
 
 INSTALLATION_DIRS=     man
 
diff -r eb612f2fe878 -r e2b1953f2f1c databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile    Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/postgresql73-server/Makefile    Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 .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 -r eb612f2fe878 -r e2b1953f2f1c databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile    Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/postgresql74-server/Makefile    Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 .include "../../databases/postgresql74/Makefile.common"
 
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 MESSAGE_SRC=           ${.CURDIR}/MESSAGE
 USE_TOOLS+=            tar
 
diff -r eb612f2fe878 -r e2b1953f2f1c databases/postgresql80-server/Makefile
--- a/databases/postgresql80-server/Makefile    Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/postgresql80-server/Makefile    Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 USE_LIBTOOL=           yes
 PKG_LIBTOOL=           ${PKG_SHLIBTOOL}
 
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 MESSAGE_SRC=           ${.CURDIR}/MESSAGE
 
 CONFIGURE_ARGS+=       --with-openssl
diff -r eb612f2fe878 -r e2b1953f2f1c databases/shared-mime-info/Makefile
--- a/databases/shared-mime-info/Makefile       Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/shared-mime-info/Makefile       Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 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 -r eb612f2fe878 -r e2b1953f2f1c databases/shared-mime-info/mimedb.mk
--- a/databases/shared-mime-info/mimedb.mk      Tue Mar 14 01:10:49 2006 +0000
+++ b/databases/shared-mime-info/mimedb.mk      Tue Mar 14 01:14:26 2006 +0000
@@ -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 @@
 
 .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 -r eb612f2fe878 -r e2b1953f2f1c devel/GConf2/schemas.mk
--- a/devel/GConf2/schemas.mk   Tue Mar 14 01:10:49 2006 +0000
+++ b/devel/GConf2/schemas.mk   Tue Mar 14 01:14:26 2006 +0000
@@ -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 $
 #



Home | Main Index | Thread Index | Old Index