Permalink
Browse files

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.
  • Loading branch information...
jlam
jlam committed Mar 14, 2006
1 parent 0e4f9f6 commit 9e2ef3feae64a73fdabc57e99d6a58bd3ab9cde4
Showing with 355 additions and 519 deletions.
  1. +1 −3 audio/gqmpeg-devel/Makefile
  2. +1 −3 audio/gqmpeg/Makefile
  3. +1 −4 audio/xmcd/Makefile
  4. +3 −1 audio/xmms-meta-input/Makefile
  5. +1 −2 chat/ircd-hybrid/Makefile
  6. +1 −3 chat/silc-server/Makefile
  7. +1 −5 comms/efax/Makefile
  8. +1 −4 comms/mgetty+sendfax/Makefile
  9. +1 −3 databases/mysql4-server/Makefile
  10. +1 −3 databases/mysql5-server/Makefile
  11. +2 −3 databases/postgresql73-lib/Makefile
  12. +1 −3 databases/postgresql73-server/Makefile
  13. +1 −2 databases/postgresql74-server/Makefile
  14. +1 −2 databases/postgresql80-server/Makefile
  15. +2 −3 databases/shared-mime-info/Makefile
  16. +3 −3 databases/shared-mime-info/mimedb.mk
  17. +3 −3 devel/GConf2/schemas.mk
  18. +1 −3 devel/isect/Makefile
  19. +1 −2 devel/rt3/Makefile.install
  20. +1 −4 devel/w32api/Makefile
  21. +1 −3 emulators/compat12/Makefile
  22. +1 −3 emulators/compat13/Makefile
  23. +1 −3 emulators/compat14-crypto/Makefile
  24. +1 −3 emulators/compat14/Makefile
  25. +3 −1 emulators/freebsd_lib/Makefile
  26. +1 −3 emulators/netbsd32_compat14/Makefile
  27. +1 −3 emulators/netbsd32_compat15/Makefile
  28. +1 −3 emulators/netbsd32_compat16/Makefile
  29. +3 −1 emulators/osf1_lib/Makefile
  30. +1 −2 emulators/suse100_gtk2/Makefile
  31. +3 −1 emulators/suse91_base/Makefile
  32. +1 −2 emulators/suse91_gtk2/Makefile
  33. +3 −1 emulators/suse_base/Makefile
  34. +3 −1 emulators/vmware-module/Makefile
  35. +3 −1 emulators/vmware-module3/Makefile
  36. +2 −3 fonts/ghostscript-cidfonts/Makefile
  37. +2 −3 fonts/ghostscript-cmaps/Makefile
  38. +1 −3 fonts/ja-kappa20/Makefile
  39. +1 −4 fonts/ja-shinonome/Makefile
  40. +1 −4 fonts/vfontcap-kochi/Makefile
  41. +3 −1 games/falcons-eye/Makefile
  42. +1 −3 games/gnome2-games/Makefile
  43. +4 −2 games/ivan/Makefile
  44. +3 −1 games/tetrinetx/Makefile
  45. +1 −3 games/xmris/Makefile
  46. +3 −1 games/xscavenger/Makefile
  47. +6 −7 ham/dpbox/Makefile
  48. +1 −3 inputmethod/canna-server/Makefile
  49. +2 −2 inputmethod/sj3-dict/Makefile
  50. +2 −2 inputmethod/skkinput/Makefile
  51. +1 −2 inputmethod/skkserv/Makefile
  52. +2 −2 lang/perl5/buildlink3.mk
  53. +3 −3 lang/perl5/packlist.mk
  54. +1 −4 lang/ruby18-base/Makefile
  55. +4 −4 lang/sun-jre15/Makefile
  56. +1 −3 mail/clamav/Makefile
  57. +1 −2 mail/courier-imap/Makefile
  58. +1 −2 mail/courier-maildir/Makefile
  59. +1 −3 mail/cyrus-imapd/Makefile
  60. +1 −3 mail/cyrus-imapd21/Makefile
  61. +3 −3 mail/mailman/Makefile
  62. +1 −3 mail/mailwrapper/Makefile
  63. +2 −2 mail/majordomo/Makefile
  64. +1 −3 mail/mimedefang/Makefile
  65. +2 −3 mail/mutt-devel/Makefile
  66. +2 −3 mail/mutt/Makefile
  67. +1 −3 mail/nullmailer/Makefile
  68. +1 −4 mail/popa3d/Makefile
  69. +1 −3 mail/pymsgauth/Makefile
  70. +1 −2 mail/qmail-run/Makefile
  71. +1 −3 mail/qmail/Makefile
  72. +1 −2 mail/sqwebmail/Makefile
  73. +1 −4 mail/yatsvrs/Makefile
  74. +2 −2 misc/jitterbug/Makefile
  75. +2 −3 misc/openoffice2-bin/Makefile
  76. +1 −4 misc/rpm/Makefile
  77. +3 −3 mk/alternatives.mk
  78. +9 −28 mk/bsd.pkg.mk
  79. +113 −103 mk/install/bsd.pkginstall.mk
  80. +3 −3 multimedia/gstreamer0.8/plugins.mk
  81. +1 −4 net/arla/Makefile
  82. +1 −2 net/ddclient/Makefile
  83. +1 −2 net/djbdns-run/Makefile
  84. +1 −2 net/ja-samba/Makefile
  85. +1 −3 net/lambdamoo/Makefile
  86. +1 −3 net/net-snmp/Makefile
  87. +1 −4 net/netdisco/Makefile
  88. +3 −1 net/nocol/Makefile
  89. +1 −3 net/sendfile/Makefile
  90. +1 −3 net/tor/Makefile
  91. +1 −3 net/vtun/Makefile
  92. +1 −3 news/leafnode/Makefile
  93. +4 −1 parallel/glunix/Makefile
  94. +1 −4 pkgtools/libkver/Makefile
  95. +1 −3 pkgtools/pkg_alternatives/Makefile
  96. +2 −2 pkgtools/pkg_install/Makefile
  97. +1 −3 pkgtools/xpkgwedge/Makefile
  98. +1 −3 print/LPRng-core/Makefile
  99. +2 −3 print/apsfilter/Makefile
  100. +3 −3 print/dvipdfmx/map.mk
  101. +2 −3 print/foomatic-filters-cups/Makefile
  102. +3 −3 print/foomatic-filters/Makefile
  103. +2 −3 print/foomatic-ppds-cups/Makefile
  104. +1 −3 print/ja-jsclasses/Makefile
  105. +1 −4 print/ja-ptex-bin/Makefile
  106. +3 −3 print/teTeX/module.mk
  107. +1 −3 print/xpdf-arabic/Makefile
  108. +1 −3 print/xpdf-chinese-simplified/Makefile
  109. +1 −3 print/xpdf-chinese-traditional/Makefile
  110. +1 −3 print/xpdf-cyrillic/Makefile
  111. +1 −3 print/xpdf-greek/Makefile
  112. +1 −3 print/xpdf-hebrew/Makefile
  113. +1 −3 print/xpdf-japanese/Makefile
  114. +1 −3 print/xpdf-korean/Makefile
  115. +1 −3 print/xpdf-latin2/Makefile
  116. +1 −3 print/xpdf-thai/Makefile
  117. +1 −3 print/xpdf-turkish/Makefile
  118. +1 −2 security/AiCA/Makefile
  119. +1 −3 security/courier-authlib/Makefile
  120. +1 −3 security/cyrus-sasl2/Makefile
  121. +1 −2 security/cyrus-saslauthd/Makefile
  122. +1 −3 security/openssh+gssapi/Makefile
  123. +1 −3 security/openssh/Makefile
  124. +3 −1 security/smtpd/Makefile
  125. +1 −3 security/uvscan/Makefile
  126. +2 −3 sysutils/desktop-file-utils/Makefile
  127. +3 −3 sysutils/desktop-file-utils/desktopdb.mk
  128. +1 −2 sysutils/webmin/Makefile
  129. +1 −3 sysutils/xcdroast/Makefile
  130. +2 −3 textproc/scrollkeeper/Makefile
  131. +3 −3 textproc/scrollkeeper/omf.mk
  132. +3 −3 textproc/xmlcatmgr/catalogs.mk
  133. +2 −2 www/firefox/Makefile-firefox.common
  134. +2 −2 www/firefox/Makefile.common
  135. +1 −2 www/htdig-devel/Makefile
  136. +1 −2 www/htdig/Makefile
  137. +2 −2 www/mozilla/Makefile.common
  138. +2 −3 www/privoxy/Makefile
  139. +4 −1 www/wwwcount/Makefile
  140. +1 −2 www/wwwoffle/Makefile
  141. +2 −2 x11/gnome2-applets/Makefile
  142. +2 −3 x11/gtk/Makefile
  143. +3 −3 x11/gtk2/modules.mk
  144. +1 −4 x11/lesstif/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"
View
@@ -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
View
@@ -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
@@ -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
@@ -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 \
@@ -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
View
@@ -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; \
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -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"
View
@@ -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; }
View
@@ -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
@@ -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}
View
@@ -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 \
@@ -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}
@@ -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}
@@ -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}
@@ -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}
@@ -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
@@ -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}
Oops, something went wrong.

0 comments on commit 9e2ef3f

Please sign in to comment.