Module Name:	pkgsrc
Committed By:	jlam
Date:		Tue Mar 14 01:14:36 UTC 2006

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.88 -r1.89 pkgsrc/audio/gqmpeg/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/audio/gqmpeg-devel/Makefile
cvs rdiff -r1.60 -r1.61 pkgsrc/audio/xmcd/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/audio/xmms-meta-input/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/chat/ircd-hybrid/Makefile
cvs rdiff -r1.48 -r1.49 pkgsrc/chat/silc-server/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/comms/efax/Makefile
cvs rdiff -r1.51 -r1.52 pkgsrc/comms/mgetty+sendfax/Makefile
cvs rdiff -r1.27 -r1.28 pkgsrc/databases/mysql4-server/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/databases/mysql5-server/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/databases/postgresql73-lib/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/databases/postgresql73-server/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/databases/postgresql74-server/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/databases/postgresql80-server/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/databases/shared-mime-info/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/databases/shared-mime-info/mimedb.mk
cvs rdiff -r1.13 -r1.14 pkgsrc/devel/GConf2/schemas.mk
cvs rdiff -r1.33 -r1.34 pkgsrc/devel/isect/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/devel/rt3/Makefile.install
cvs rdiff -r1.24 -r1.25 pkgsrc/devel/w32api/Makefile
cvs rdiff -r1.29 -r1.30 pkgsrc/emulators/compat12/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/emulators/compat13/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/emulators/compat14/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/emulators/compat14-crypto/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/emulators/freebsd_lib/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/emulators/netbsd32_compat14/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/emulators/netbsd32_compat15/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/emulators/netbsd32_compat16/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/emulators/osf1_lib/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/emulators/suse100_gtk2/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/emulators/suse91_base/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/emulators/suse91_gtk2/Makefile
cvs rdiff -r1.58 -r1.59 pkgsrc/emulators/suse_base/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/emulators/vmware-module/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/emulators/vmware-module3/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/fonts/ghostscript-cidfonts/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/fonts/ghostscript-cmaps/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/fonts/ja-kappa20/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/fonts/ja-shinonome/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/fonts/vfontcap-kochi/Makefile
cvs rdiff -r1.30 -r1.31 pkgsrc/games/falcons-eye/Makefile
cvs rdiff -r1.63 -r1.64 pkgsrc/games/gnome2-games/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/games/ivan/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/games/tetrinetx/Makefile
cvs rdiff -r1.9 -r1.10 pkgsrc/games/xmris/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/games/xscavenger/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/ham/dpbox/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/inputmethod/canna-server/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/inputmethod/sj3-dict/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/inputmethod/skkinput/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/inputmethod/skkserv/Makefile
cvs rdiff -r1.29 -r1.30 pkgsrc/lang/perl5/buildlink3.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/lang/perl5/packlist.mk
cvs rdiff -r1.17 -r1.18 pkgsrc/lang/ruby18-base/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/lang/sun-jre15/Makefile
cvs rdiff -r1.53 -r1.54 pkgsrc/mail/clamav/Makefile
cvs rdiff -r1.50 -r1.51 pkgsrc/mail/courier-imap/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/mail/courier-maildir/Makefile
cvs rdiff -r1.61 -r1.62 pkgsrc/mail/cyrus-imapd/Makefile
cvs rdiff -r1.39 -r1.40 pkgsrc/mail/cyrus-imapd21/Makefile
cvs rdiff -r1.31 -r1.32 pkgsrc/mail/mailman/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/mail/mailwrapper/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/mail/majordomo/Makefile
cvs rdiff -r1.33 -r1.34 pkgsrc/mail/mimedefang/Makefile
cvs rdiff -r1.135 -r1.136 pkgsrc/mail/mutt/Makefile
cvs rdiff -r1.44 -r1.45 pkgsrc/mail/mutt-devel/Makefile
cvs rdiff -r1.21 -r1.22 pkgsrc/mail/nullmailer/Makefile
cvs rdiff -r1.43 -r1.44 pkgsrc/mail/popa3d/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/mail/pymsgauth/Makefile
cvs rdiff -r1.46 -r1.47 pkgsrc/mail/qmail/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -r1.46 -r1.47 pkgsrc/mail/sqwebmail/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/mail/yatsvrs/Makefile
cvs rdiff -r1.27 -r1.28 pkgsrc/misc/jitterbug/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/misc/openoffice2-bin/Makefile
cvs rdiff -r1.57 -r1.58 pkgsrc/misc/rpm/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/alternatives.mk
cvs rdiff -r1.1806 -r1.1807 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.39 -r1.40 pkgsrc/mk/install/bsd.pkginstall.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/multimedia/gstreamer0.8/plugins.mk
cvs rdiff -r1.54 -r1.55 pkgsrc/net/arla/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/net/ddclient/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/net/djbdns-run/Makefile
cvs rdiff -r1.43 -r1.44 pkgsrc/net/ja-samba/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/net/lambdamoo/Makefile
cvs rdiff -r1.46 -r1.47 pkgsrc/net/net-snmp/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/net/netdisco/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/net/nocol/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/net/sendfile/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/net/tor/Makefile
cvs rdiff -r1.37 -r1.38 pkgsrc/net/vtun/Makefile
cvs rdiff -r1.31 -r1.32 pkgsrc/news/leafnode/Makefile
cvs rdiff -r1.33 -r1.34 pkgsrc/parallel/glunix/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/pkgtools/libkver/Makefile
cvs rdiff -r1.8 -r1.9 pkgsrc/pkgtools/pkg_alternatives/Makefile
cvs rdiff -r1.124 -r1.125 pkgsrc/pkgtools/pkg_install/Makefile
cvs rdiff -r1.64 -r1.65 pkgsrc/pkgtools/xpkgwedge/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/print/LPRng-core/Makefile
cvs rdiff -r1.26 -r1.27 pkgsrc/print/apsfilter/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/print/dvipdfmx/map.mk
cvs rdiff -r1.10 -r1.11 pkgsrc/print/foomatic-filters/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/print/foomatic-filters-cups/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/print/foomatic-ppds-cups/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/print/ja-jsclasses/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/print/ja-ptex-bin/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/print/teTeX/module.mk
cvs rdiff -r1.14 -r1.15 pkgsrc/print/xpdf-arabic/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/print/xpdf-chinese-simplified/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/print/xpdf-chinese-traditional/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/print/xpdf-cyrillic/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/print/xpdf-greek/Makefile
cvs rdiff -r1.15 -r1.16 pkgsrc/print/xpdf-hebrew/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/print/xpdf-japanese/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/print/xpdf-korean/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/print/xpdf-latin2/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/print/xpdf-thai/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/print/xpdf-turkish/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/security/AiCA/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/security/courier-authlib/Makefile
cvs rdiff -r1.46 -r1.47 pkgsrc/security/cyrus-sasl2/Makefile
cvs rdiff -r1.28 -r1.29 pkgsrc/security/cyrus-saslauthd/Makefile
cvs rdiff -r1.165 -r1.166 pkgsrc/security/openssh/Makefile
cvs rdiff -r1.32 -r1.33 pkgsrc/security/openssh+gssapi/Makefile
cvs rdiff -r1.16 -r1.17 pkgsrc/security/smtpd/Makefile
cvs rdiff -r1.35 -r1.36 pkgsrc/security/uvscan/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/sysutils/desktop-file-utils/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/sysutils/desktop-file-utils/desktopdb.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/sysutils/webmin/Makefile
cvs rdiff -r1.43 -r1.44 pkgsrc/sysutils/xcdroast/Makefile
cvs rdiff -r1.35 -r1.36 pkgsrc/textproc/scrollkeeper/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/textproc/scrollkeeper/omf.mk
cvs rdiff -r1.14 -r1.15 pkgsrc/textproc/xmlcatmgr/catalogs.mk
cvs rdiff -r1.27 -r1.28 pkgsrc/www/firefox/Makefile-firefox.common
cvs rdiff -r1.7 -r1.8 pkgsrc/www/firefox/Makefile.common
cvs rdiff -r1.32 -r1.33 pkgsrc/www/htdig/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/www/htdig-devel/Makefile
cvs rdiff -r1.72 -r1.73 pkgsrc/www/mozilla/Makefile.common
cvs rdiff -r1.24 -r1.25 pkgsrc/www/privoxy/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/www/wwwcount/Makefile
cvs rdiff -r1.63 -r1.64 pkgsrc/www/wwwoffle/Makefile
cvs rdiff -r1.58 -r1.59 pkgsrc/x11/gnome2-applets/Makefile
cvs rdiff -r1.114 -r1.115 pkgsrc/x11/gtk/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/x11/gtk2/modules.mk
cvs rdiff -r1.88 -r1.89 pkgsrc/x11/lesstif/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.