Remove pre-buildlink and post-buildlink as part of getting pkgsrc ready

for pkgsrc-2004Q4.  The "buildlink" phase was removed for the last branch,
and this is the final cleanup.  "post-buildlink" is now "post-wrapper".

18 files changed, 44 insertions, 47 deletions

diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile
index df3378a9e7b..24778e6c275 100644
--- a/databases/postgresql73-lib/Makefile
+++ b/databases/postgresql73-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/10 17:46:07 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/28 19:19:51 jlam Exp $
 
 PKGNAME=		postgresql73-lib-${BASE_VERS}
 PKGREVISION=		# empty
@@ -29,7 +29,7 @@ PLIST_SUBST+=		LIBECPG=
 PLIST_SUBST+=		LIBPQ=
 .endif
 
-post-buildlink:
+post-wrapper:
 #
 # Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 0e68ed22eb4..9f751de46fb 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/10/10 17:46:07 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/28 19:19:51 jlam Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=		1
 SVR4_PKGNAME=		pstgs
 COMMENT=		PostgreSQL database server programs
 
@@ -21,6 +21,9 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 BUILD_DIRS=		${WRKSRC}/src/backend
 BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 
+# PostgreSQL has loadable server-side language modules.
+.include "../../mk/dlopen.buildlink3.mk"
+
 .if defined(USE_PAM)
 .  include "../../security/PAM/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
@@ -44,7 +47,7 @@ PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql
 
-post-buildlink:
+post-wrapper:
 #
 # Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index 1753b885522..f7ef71c4e15 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/11/09 21:09:13 seb Exp $
+# $NetBSD: Makefile,v 1.13 2004/11/28 19:19:51 jlam Exp $
 
 PKGNAME=		postgresql74-lib-${BASE_VERS}
 PKGREVISION=		# empty
@@ -34,7 +34,7 @@ PLIST_SUBST+=		PG_HIER=
 PLIST_SUBST+=		PG_HIER="@comment "
 .endif
 
-post-buildlink:
+post-wrapper:
 #
 # Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index f864829f04f..c0c6121c32e 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/10/10 07:30:23 jdolecek Exp $
+# $NetBSD: Makefile,v 1.6 2004/11/28 19:19:51 jlam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=		1
 SVR4_PKGNAME=		pstgs
 COMMENT=		PostgreSQL database server programs
 
@@ -20,6 +20,9 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 BUILD_DIRS=		${WRKSRC}/src/backend
 BUILD_DIRS+=		${WRKSRC}/src/backend/utils/mb/conversion_procs
 
+# PostgreSQL has loadable server-side language modules.
+.include "../../mk/dlopen.buildlink3.mk"
+
 .if defined(USE_PAM)
 .  include "../../security/PAM/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
@@ -43,7 +46,7 @@ PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql
 
-post-buildlink:
+post-wrapper:
 #
 # Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index e88e45f9e64..1e1ba14f14f 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2004/11/27 23:35:37 wiz Exp $
+# $NetBSD: builtin.mk,v 1.16 2004/11/28 19:19:52 jlam Exp $
 
 .for _lib_ in intl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -213,7 +213,7 @@ USE_PERL5?=		build
 CONFIGURE_ENV+=		MSGFMT=${BUILDLINK_DIR}/bin/msgfmt
 
 SUBST_CLASSES+=			fix-msgfmt
-SUBST_STAGE.fix-msgfmt=		post-buildlink
+SUBST_STAGE.fix-msgfmt=		post-wrapper
 SUBST_MESSAGE.fix-msgfmt=	"Fixing paths in msgfmt wrapper."
 SUBST_FILES.fix-msgfmt=		${BUILDLINK_DIR}/bin/msgfmt
 SUBST_SED.fix-msgfmt=		-e 's|@PERL@|${PERL5}|g'
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index a1c1cf883be..6a3069c35bd 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2004/11/20 22:10:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.72 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=		gnucash-1.8.9
 PKGREVISION=		3
@@ -52,7 +52,7 @@ SUBST_SED.guile14+=	"s, guile , ${PREFIX}/${GUILE14_SUBDIR}/bin/guile ,"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-post-buildlink:
+post-wrapper:
 	if [ ! -f /usr/include/wctype.h ]; then				\
 		${TOUCH} ${BUILDLINK_DIR}/include/wctype.h;		\
 	fi
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 4518a0cd62b..5bf519426d3 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2004/10/29 01:34:39 minskim Exp $
+# $NetBSD: Makefile,v 1.62 2004/11/28 19:19:52 jlam Exp $
 
 PKGNAME=	Mesa-${MESA_VERSION}
 MASTER_SITES= 	# empty
@@ -17,7 +17,6 @@ NO_PATCH=		yes
 EXTRACT_ONLY=		# empty
 
 do-patch:	# empty
-do-buildlink:	# empty
 do-install:	# empty
 
 .include "Makefile.common"
diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile
index 49035bdf28f..cd19dcdb752 100644
--- a/lang/gcc3-ada/Makefile
+++ b/lang/gcc3-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/02 15:40:01 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/28 19:19:52 jlam Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
 COMMENT=	GNU Compiler Collection, v3 - Ada compiler
@@ -54,7 +54,7 @@ post-patch:
 		${CP} $$i ${WRKSRC}/gcc/ada;				\
 	done
 
-post-buildlink:
+post-wrapper:
 	${LN} -sf ${ADA_BOOT_GNATBIND} ${BUILDLINK_DIR}/bin
 
 post-configure:
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index d0b13607db5..119b9b284aa 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:15:02 tv Exp $
+# $NetBSD: Makefile,v 1.22 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		5
@@ -21,7 +21,7 @@ INFO_FILES=		sather.info sather-tutorial.info sather-mode.info
 REPLACE_PERL=		Browser/Web/ps2gif
 
 SUBST_CLASSES+=		sather-configure
-SUBST_STAGE.sather-configure=	post-buildlink
+SUBST_STAGE.sather-configure=	post-wrapper
 SUBST_MESSAGE.sather-configure=	"Configuring sources"
 SUBST_FILES.sather-configure=			\
 	Boot/sacomp.code/Makefile		\
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 27c4405b75c..5af2ead1575 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=	libesmtp-1.0.3r1
 PKGNAME=	${DISTNAME:S/r1//}
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-isoc
 #    which is backward-compatible. Create a symlink to find
 #    <openssl/des.h> as <des.h>.
 #
-post-buildlink:
+post-wrapper:
 	if [ ! -f /usr/include/des.h ]; then \
 		${LN} -s ${SSLBASE}/include/openssl/des.h \
 			${BUILDLINK_DIR}/include; \
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 42eda8e297b..6280e70f5a9 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/08/27 06:29:08 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2004/11/28 19:19:52 jlam Exp $
 
 .if ${OPSYS} == "Darwin"
 PKG_DEFAULT_OPTIONS+=	darwin
@@ -41,7 +41,7 @@ DARWIN_PATCH=		panther.patch
 PATCHFILES+=		${DARWIN_PATCH}
 SITES_${DARWIN_PATCH}=	http://http.netdevice.com:9080/qmail/patch/
 PATCH_DIST_STRIP.${DARWIN_PATCH}=	-p1
-post-buildlink:
+post-wrapper:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	nameser8_compat_h="include/nameser8_compat.h";			\
 	if [ ! -e /usr/$${nameser8_compat_h} ]; then			\
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index f1aeaf95ff6..4ed691be6a0 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/25 03:48:25 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/28 19:19:52 jlam Exp $
 #
 
 DISTNAME=	xgap4r16
@@ -22,7 +22,7 @@ CONFIGURE_ENV+=	GAP_DIRECTORY=${GAP_DIRECTORY}
 
 GAP_PKG_NAME=	xgap
 
-post-buildlink:
+pre-configure:
 	(cd ${WRKDIR} && ${LN} -s ${GAP_DIRECTORY}/cnf cnf)
 
 do-install:
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 634856cf836..b629bc7ac7b 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.163 2004/11/17 21:01:00 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.164 2004/11/28 19:19:52 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -91,7 +91,7 @@ BUILDLINK_BINDIR=	${BUILDLINK_DIR}/bin
 BUILDLINK_SRCDIR=	${.CURDIR}/../../mk/buildlink3
 BUILDLINK_X11_DIR=	${BUILDLINK_DIR:H}/.x11-buildlink
 
-.PHONY: pre-buildlink do-buildlink post-buildlink
+.PHONY: do-buildlink
 
 # Prepend ${BUILDLINK_BINDIR} to the PATH.
 PREPEND_PATH+=	${BUILDLINK_BINDIR}
@@ -1083,19 +1083,11 @@ ${WRAPPER_TMPDIR}/transform-libtool: ${BUILDLINK_SRCDIR}/transform-libtool
 			 -e "s|@PWD@|${PWD_CMD:Q}|g"			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
-WRAPPER_TARGETS+=	pre-buildlink do-buildlink post-buildlink
-.if !target(pre-buildlink)
-pre-buildlink:
-	@${DO_NADA}
-.endif
+WRAPPER_TARGETS+=	do-buildlink
 .if !target(do-buildlink)
 do-buildlink:
 	@${DO_NADA}
 .endif
-.if !target(post-buildlink)
-post-buildlink:
-	@${DO_NADA}
-.endif
 
 .endif	# PHASES_AFTER_WRAPPER
 ###
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 7cbbced62d2..bf68a01ac0c 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/11/17 02:31:34 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/11/28 19:19:52 jlam Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -38,7 +38,7 @@ post-extract:
 		${FILESDIR}/mozilla-${f}.pc.in > ${WRKSRC}/mozilla-${f}.pc
 .endfor	
 
-post-buildlink:
+post-wrapper:
 	@${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig
 	@${CP} ${WRKSRC}/*.pc ${BUILDLINK_DIR}/lib/pkgconfig	
 
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index ba4dcdf61db..ee1e338d6c8 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/11/05 10:33:07 seb Exp $
+# $NetBSD: Makefile,v 1.26 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=	net-snmp-5.1.2
 PKGREVISION=	2
@@ -111,7 +111,7 @@ RCD_SCRIPTS=	snmpd snmptrapd
 .include "../../lang/perl5/module.mk"
 .include "../../lang/perl5/buildlink3.mk"
 
-post-buildlink:
+post-wrapper:
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386)
 	${MKDIR} ${BUILDLINK_DIR}/include/sys
 	${CP} ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 12a25e4a039..9e433f3f0d9 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/11/19 23:16:02 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=	heimdal-0.6.3
 PKGREVISION=	2
@@ -101,7 +101,7 @@ SUBST_SED.heimdal=							\
 # The configure script only groks the OpenSSL 0.9.6 DES API, so make the
 # newer OpenSSL releases look more like the old one.
 #
-post-buildlink:
+post-wrapper:
 	if ${GREP} -q des_cblock ${SSLBASE}/include/openssl/des.h 2>/dev/null; then \
 		: ;							\
 	else								\
diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index bca175b5642..4e1c58368de 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:18:27 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-clients-${XF_VER}
@@ -21,7 +21,7 @@ XBUILD_DIRS=		lib/xtrans lib/lbxutil programs fonts/util
 XINSTALL_DIRS=		programs fonts/util
 XINSTALL_MAN_DIRS=	programs
 
-post-buildlink:
+post-wrapper:
 	@${MKDIR} ${WRKSRC}/exports/include
 	@${CP} ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include
 
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 19b81862913..37d6091aced 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/11/05 02:58:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/11/28 19:19:52 jlam Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-clients-${XORG_VER}
@@ -48,7 +48,7 @@ CONF_FILES_PERMS+=	${EGDIR}/GiveConsole ${PKG_SYSCONFDIR}/GiveConsole \
 CONF_FILES_PERMS+=	${EGDIR}/Xwilling ${PKG_SYSCONFDIR}/Xwilling \
 	${ROOT_USER} ${ROOT_GROUP} 0755
 
-post-buildlink:
+post-wrapper:
 	@${MKDIR} ${WRKSRC}/exports/include
 	@${CP} ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include