Permalink
Browse files

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.
  • Loading branch information...
1 parent 1ab7a54 commit 45d877a6f9b517120a9b1c6a1cf6389783c73034 jlam committed Aug 30, 2003
Showing with 248 additions and 96 deletions.
  1. +3 −1 audio/gqmpeg/Makefile
  2. +4 −1 audio/oss/Makefile
  3. +5 −1 audio/xmcd/Makefile
  4. +3 −1 chat/silc-server/Makefile
  5. +5 −2 comms/efax/Makefile
  6. +4 −1 comms/mgetty+sendfax/Makefile
  7. +5 −2 databases/mysql-server/Makefile
  8. +3 −1 databases/postgresql-server/Makefile
  9. +3 −1 devel/isect/Makefile
  10. +4 −2 devel/w32api/Makefile
  11. +3 −1 emulators/compat12/Makefile
  12. +3 −1 emulators/compat13/Makefile
  13. +3 −1 emulators/compat14-crypto/Makefile
  14. +3 −1 emulators/compat14/Makefile
  15. +3 −1 emulators/netbsd32_compat14/Makefile
  16. +3 −1 emulators/netbsd32_compat15/Makefile
  17. +3 −1 emulators/netbsd32_compat16/Makefile
  18. +5 −2 fonts/ja-kappa20/Makefile
  19. +5 −2 fonts/ja-shinonome/Makefile
  20. +3 −1 fonts/vfontcap-kochi/Makefile
  21. +5 −2 games/gnome2-games/Makefile
  22. +4 −2 inputmethod/canna-server-bin/Makefile
  23. +4 −3 inputmethod/skkserv/Makefile
  24. +4 −2 mail/courier-auth/Makefile
  25. +3 −2 mail/courier-imap/Makefile
  26. +4 −3 mail/courier-maildirmake/Makefile
  27. +5 −2 mail/cyrus-imapd/Makefile
  28. +5 −2 mail/cyrus-imapd21/Makefile
  29. +5 −2 mail/mimedefang/Makefile
  30. +3 −1 mail/popa3d/Makefile
  31. +2 −1 mail/qmail/Makefile
  32. +5 −2 mail/sqwebmail/Makefile
  33. +5 −2 misc/rpm/Makefile
  34. +5 −2 net/arla/Makefile
  35. +5 −2 net/coda5_client/Makefile
  36. +5 −2 net/coda5_server/Makefile
  37. +2 −1 net/ddclient/Makefile
  38. +2 −1 net/ja-samba/Makefile
  39. +4 −1 net/lambdamoo/Makefile
  40. +3 −1 net/net-snmp/Makefile
  41. +7 −3 net/netatalk/Makefile
  42. +2 −1 net/samba/Makefile
  43. +2 −1 net/samba20/Makefile
  44. +3 −1 net/sendfile/Makefile
  45. +4 −1 net/vtun/Makefile
  46. +5 −3 pkgtools/xpkgwedge/Makefile
  47. +4 −1 print/dvipdfmx/Makefile
  48. +4 −2 print/ja-jsclasses/Makefile
  49. +3 −1 print/teTeX2-bin/Makefile
  50. +3 −1 print/xpdf-arabic/Makefile
  51. +3 −1 print/xpdf-chinese-simplified/Makefile
  52. +3 −1 print/xpdf-chinese-traditional/Makefile
  53. +3 −1 print/xpdf-cyrillic/Makefile
  54. +3 −1 print/xpdf-greek/Makefile
  55. +3 −1 print/xpdf-hebrew/Makefile
  56. +3 −1 print/xpdf-japanese/Makefile
  57. +3 −1 print/xpdf-korean/Makefile
  58. +3 −1 print/xpdf-latin2/Makefile
  59. +3 −1 print/xpdf-thai/Makefile
  60. +3 −1 print/xpdf-turkish/Makefile
  61. +4 −1 security/cyrus-sasl/Makefile
  62. +4 −1 security/cyrus-sasl2/Makefile
  63. +3 −1 security/openssh+gssapi/Makefile
  64. +3 −1 security/openssh/Makefile
  65. +3 −1 security/uvscan/Makefile
  66. +3 −1 sysutils/xcdroast/Makefile
  67. +5 −1 x11/gdm/Makefile
  68. +3 −3 x11/openmotif/Makefile
View
@@ -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_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
.include "../../mk/bsd.prefs.mk"
.if !defined(GQMPEG_NO_JAPANESE)
View
@@ -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_BUILDLINK2= yes
USE_PKGINSTALL= yes
NO_CONFIGURE= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.if ${OPSYS} == "NetBSD"
MODSTAT= /usr/bin/modstat
.else
View
@@ -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 @@ PATCH_DIST_STRIP= -p1
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
@@ -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_GMAKE= YES
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
View
@@ -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 @@ COMMENT= Collection of small programs for sending and receiving faxes
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; \
@@ -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 @@ BUILD_DEPENDS+= texi2roff-[0-9]*:../../textproc/texi2roff
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}
@@ -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,9 +10,12 @@ COMMENT= MySQL, a free SQL database (server)
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --without-berkeley-db
USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
USE_GMAKE= YES
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
ONLY_FOR_PLATFORM= SunOS-*-sparc Linux-*-*
# on NetBSD, if native threads are not available, hardwire
@@ -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 @@ NOT_FOR_PLATFORM= *-*-mips
.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
View
@@ -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 @@ INFO_FILES= isect.info
RCD_SCRIPTS= isect
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+
DOCDIR= ${PREFIX}/share/doc/isect
EGDIR= ${PREFIX}/share/examples/isect
View
@@ -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 @@ PE_AR= ${CROSSBASE}/bin/i386-netbsdpe-ar
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:
@@ -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_BUILD= # defined
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}
@@ -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_MTREE= # defined
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}
@@ -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_MTREE= # defined
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}
@@ -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_MTREE= # defined
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}
@@ -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_MTREE= # defined
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}
@@ -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_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR}
FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR}
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 19:11:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/30 22:51:17 jlam Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
@@ -25,6 +25,8 @@ NO_MTREE= # defined
NO_BUILD= # defined
SHLIB_HANDLING= NO
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR}
FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH}
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/30 10:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/08/30 22:51:17 jlam Exp $
DISTNAME= Kappa20-0.394
PKGNAME= ja-kappa20-0.394
@@ -10,11 +10,14 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://kappa.allnet.ne.jp/20dot.fonts/
COMMENT= 20x20 dots X11 bitmap font for Japanese with several extra fonts
-USE_PKGINSTALL= YES
USE_X11BASE= YES
FONTDIR= ${PREFIX}/lib/X11/fonts/local
ALIAS_KAPPA= ${PREFIX}/share/examples/fonts.alias.Kappa20
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
FILES_SUBST+= FONTDIR=${FONTDIR}
FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA}
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/30 10:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:17 jlam Exp $
#
DISTNAME= shinonome-0.9.10-src
@@ -14,13 +14,16 @@ COMMENT= 12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
GNU_CONFIGURE= YES
USE_PERL5= build
-USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_GMAKE= YES
FONTDIR= ${PREFIX}/lib/X11/fonts/local
FOUNDRY= Misc
ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome
+USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
FILES_SUBST+= FONTDIR=${FONTDIR}
FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME}
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/20 04:49:28 kei Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/30 22:51:18 jlam Exp $
DISTNAME= vfontcap-kochi-0.0
WRKSRC= ${WRKDIR}
@@ -18,6 +18,8 @@ NO_BUILD= YES
USE_X11= YES # kochi font defines this as well.
USE_PKGINSTALL= YES
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
VFONTCAPDIR= ${PREFIX}/share/VFlib/2.24.2
FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR}
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:18 jlam Exp $
DISTNAME= gnome-games-2.2.1
PKGREVISION= 4
@@ -16,14 +16,17 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs
CONFLICTS= xbill-[0-9]*
USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GMAKE= yes
USE_X11= yes
USE_CONFIG_WRAPPER= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+USE_PKGINSTALL= yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
CONFIGURE_ARGS+= --localstatedir=/var
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:18 jlam Exp $
#
.include "../canna/Makefile.common"
@@ -7,9 +7,11 @@ PKGREVISION= 1
CANNA_MODULE= server-bin
USE_BUILDLINK2= # defined
-USE_PKGINSTALL= YES
INSTALL_TARGET= instserver
+USE_PKGINSTALL= YES
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= CANNA_USER CANNA_GROUP
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 20:22:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/30 22:51:19 jlam Exp $
DISTNAME= skk9.6
PKGNAME= skkserv-3.9.4
@@ -15,8 +15,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://skk.kuis.kyoto-u.ac.jp/
COMMENT= Dictionary server for Simple Kana-Kanji conversion programs
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
BUILD_DEFS+= USE_INET6
Oops, something went wrong.

0 comments on commit 45d877a

Please sign in to comment.