pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_E...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ef2f1143499c
branches: trunk
changeset: 460489:ef2f1143499c
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Aug 30 22:51:11 2003 +0000
description:
Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if
USE_PKGINSTALL is "YES". bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.
diffstat:
audio/gqmpeg/Makefile | 4 +++-
audio/oss/Makefile | 5 ++++-
audio/xmcd/Makefile | 6 +++++-
chat/silc-server/Makefile | 4 +++-
comms/efax/Makefile | 7 +++++--
comms/mgetty+sendfax/Makefile | 5 ++++-
databases/mysql-server/Makefile | 7 +++++--
databases/postgresql-server/Makefile | 4 +++-
devel/isect/Makefile | 4 +++-
devel/w32api/Makefile | 6 ++++--
emulators/compat12/Makefile | 4 +++-
emulators/compat13/Makefile | 4 +++-
emulators/compat14-crypto/Makefile | 4 +++-
emulators/compat14/Makefile | 4 +++-
emulators/netbsd32_compat14/Makefile | 4 +++-
emulators/netbsd32_compat15/Makefile | 4 +++-
emulators/netbsd32_compat16/Makefile | 4 +++-
fonts/ja-kappa20/Makefile | 7 +++++--
fonts/ja-shinonome/Makefile | 7 +++++--
fonts/vfontcap-kochi/Makefile | 4 +++-
games/gnome2-games/Makefile | 7 +++++--
inputmethod/canna-server-bin/Makefile | 6 ++++--
inputmethod/skkserv/Makefile | 7 ++++---
mail/courier-auth/Makefile | 6 ++++--
mail/courier-imap/Makefile | 5 +++--
mail/courier-maildirmake/Makefile | 7 ++++---
mail/cyrus-imapd/Makefile | 7 +++++--
mail/cyrus-imapd21/Makefile | 7 +++++--
mail/mimedefang/Makefile | 7 +++++--
mail/popa3d/Makefile | 4 +++-
mail/qmail/Makefile | 3 ++-
mail/sqwebmail/Makefile | 7 +++++--
misc/rpm/Makefile | 7 +++++--
net/arla/Makefile | 7 +++++--
net/coda5_client/Makefile | 7 +++++--
net/coda5_server/Makefile | 7 +++++--
net/ddclient/Makefile | 3 ++-
net/ja-samba/Makefile | 3 ++-
net/lambdamoo/Makefile | 5 ++++-
net/net-snmp/Makefile | 4 +++-
net/netatalk/Makefile | 10 +++++++---
net/samba/Makefile | 3 ++-
net/samba20/Makefile | 3 ++-
net/sendfile/Makefile | 4 +++-
net/vtun/Makefile | 5 ++++-
pkgtools/xpkgwedge/Makefile | 8 +++++---
print/dvipdfmx/Makefile | 5 ++++-
print/ja-jsclasses/Makefile | 6 ++++--
print/teTeX2-bin/Makefile | 4 +++-
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/cyrus-sasl/Makefile | 5 ++++-
security/cyrus-sasl2/Makefile | 5 ++++-
security/openssh+gssapi/Makefile | 4 +++-
security/openssh/Makefile | 4 +++-
security/uvscan/Makefile | 4 +++-
sysutils/xcdroast/Makefile | 4 +++-
x11/gdm/Makefile | 6 +++++-
x11/openmotif/Makefile | 6 +++---
68 files changed, 248 insertions(+), 96 deletions(-)
diffs (truncated from 1341 to 300 lines):
diff -r 9e1bb6076826 -r ef2f1143499c audio/gqmpeg/Makefile
--- a/audio/gqmpeg/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/audio/gqmpeg/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2003/08/30 20:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2003/08/30 22:51:11 jlam Exp $
DISTNAME= gqmpeg-0.20.0
PKGREVISION= 2
@@ -21,6 +21,8 @@
USE_X11= YES
GNU_CONFIGURE= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
.include "../../mk/bsd.prefs.mk"
.if !defined(GQMPEG_NO_JAPANESE)
diff -r 9e1bb6076826 -r ef2f1143499c audio/oss/Makefile
--- a/audio/oss/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/audio/oss/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/23 21:52:29 jmc Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/30 22:51:12 jlam Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -34,6 +34,9 @@
USE_PKGINSTALL= yes
NO_CONFIGURE= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.if ${OPSYS} == "NetBSD"
MODSTAT= /usr/bin/modstat
.else
diff -r 9e1bb6076826 -r ef2f1143499c audio/xmcd/Makefile
--- a/audio/xmcd/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/audio/xmcd/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 21:23:50 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:12 jlam Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 3
@@ -16,6 +16,10 @@
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
+
+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 9e1bb6076826 -r ef2f1143499c chat/silc-server/Makefile
--- a/chat/silc-server/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/chat/silc-server/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:26:17 grant Exp $
+# $NetBSD: Makefile,v 1.25 2003/08/30 22:51:13 jlam Exp $
#
DISTNAME= silc-server-0.9.13
@@ -22,6 +22,8 @@
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
.include "../../mk/bsd.prefs.mk"
SILCD_USER?= silcd
diff -r 9e1bb6076826 -r ef2f1143499c comms/efax/Makefile
--- a/comms/efax/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/comms/efax/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/30 18:40:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/30 22:51:13 jlam Exp $
DISTNAME= efax-0.9
CATEGORIES= comms
@@ -11,7 +11,10 @@
CONFLICTS= kdeutils<3.1
USE_BUILDLINK2= # defined
-USE_PKGINSTALL= YES
+
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
post-patch:
${SED} -e 's:@PREFIX@:${PREFIX}:g; \
diff -r 9e1bb6076826 -r ef2f1143499c comms/mgetty+sendfax/Makefile
--- a/comms/mgetty+sendfax/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/comms/mgetty+sendfax/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/08/09 10:34:47 seb Exp $
+# $NetBSD: Makefile,v 1.34 2003/08/30 22:51:13 jlam Exp $
# FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
#
@@ -19,7 +19,10 @@
CONFLICTS= hylafax-[0-9]*
USE_BUILDLINK2= yes
+
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
MAKE_ENV= MGETTY_CONFDIR=${PKG_SYSCONFDIR}
diff -r 9e1bb6076826 -r ef2f1143499c databases/mysql-server/Makefile
--- a/databases/mysql-server/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/databases/mysql-server/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/08/30 20:05:13 seb Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:14 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
PKGREVISION= 4
@@ -10,8 +10,11 @@
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --without-berkeley-db
USE_BUILDLINK2= YES
+USE_GMAKE= YES
+
USE_PKGINSTALL= YES
-USE_GMAKE= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
ONLY_FOR_PLATFORM= SunOS-*-sparc Linux-*-*
diff -r 9e1bb6076826 -r ef2f1143499c databases/postgresql-server/Makefile
--- a/databases/postgresql-server/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/databases/postgresql-server/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/07/16 10:35:15 abs Exp $
+# $NetBSD: Makefile,v 1.33 2003/08/30 22:51:14 jlam Exp $
PKGNAME= postgresql-server-${BASE_VERS}
SVR4_PKGNAME= pstgs
@@ -13,6 +13,8 @@
.include "../postgresql/Makefile.common"
USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
BUILD_DIRS= ${WRKSRC}/src/backend
BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs
diff -r 9e1bb6076826 -r ef2f1143499c devel/isect/Makefile
--- a/devel/isect/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/devel/isect/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/08/30 18:46:17 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/08/30 22:51:14 jlam Exp $
#
DISTNAME= isect-1.6.2
@@ -21,6 +21,8 @@
RCD_SCRIPTS= isect
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
DOCDIR= ${PREFIX}/share/doc/isect
EGDIR= ${PREFIX}/share/examples/isect
diff -r 9e1bb6076826 -r ef2f1143499c devel/w32api/Makefile
--- a/devel/w32api/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/devel/w32api/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/08/30 18:48:35 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/08/30 22:51:15 jlam Exp $
# $PEACE: Makefile,v 1.21 2002/08/21 02:02:27 kent Exp $
DISTNAME= w32api-1.5-src
@@ -21,7 +21,9 @@
CRTWRKSRC= ${WRKDIR}/pe-crt-1.2
CFLAGS+= -I${WRKDIR}/include
-USE_PKGINSTALL= yes
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
# Building no import libraries but two static libraries.
do-build:
diff -r 9e1bb6076826 -r ef2f1143499c emulators/compat12/Makefile
--- a/emulators/compat12/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/emulators/compat12/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/08/30 18:53:07 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2003/08/30 22:51:15 jlam Exp $
#
DISTNAME= compat12-${MACHINE_ARCH}
@@ -17,6 +17,8 @@
NO_MTREE= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
diff -r 9e1bb6076826 -r ef2f1143499c emulators/compat13/Makefile
--- a/emulators/compat13/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/emulators/compat13/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/30 18:57:03 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/08/30 22:51:15 jlam Exp $
#
DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -19,6 +19,8 @@
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
diff -r 9e1bb6076826 -r ef2f1143499c emulators/compat14-crypto/Makefile
--- a/emulators/compat14-crypto/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/emulators/compat14-crypto/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/30 19:00:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:16 jlam Exp $
#
DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -23,6 +23,8 @@
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff -r 9e1bb6076826 -r ef2f1143499c emulators/compat14/Makefile
--- a/emulators/compat14/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/emulators/compat14/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 19:02:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
#
DISTNAME= compat14-${MACHINE_ARCH}-${VERSION}
@@ -21,6 +21,8 @@
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff -r 9e1bb6076826 -r ef2f1143499c emulators/netbsd32_compat14/Makefile
--- a/emulators/netbsd32_compat14/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/emulators/netbsd32_compat14/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/30 19:07:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
#
DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION}
@@ -25,6 +25,8 @@
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
diff -r 9e1bb6076826 -r ef2f1143499c emulators/netbsd32_compat15/Makefile
--- a/emulators/netbsd32_compat15/Makefile Sat Aug 30 22:25:44 2003 +0000
+++ b/emulators/netbsd32_compat15/Makefile Sat Aug 30 22:51:11 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 19:09:38 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:17 jlam Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -24,6 +24,8 @@
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
Home |
Main Index |
Thread Index |
Old Index