pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove pre-buildlink and post-buildlink as part of get...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8e4563ee2525
branches: trunk
changeset: 484650:8e4563ee2525
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Nov 28 19:19:51 2004 +0000
description:
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".
diffstat:
databases/postgresql73-lib/Makefile | 4 ++--
databases/postgresql73-server/Makefile | 9 ++++++---
databases/postgresql74-lib/Makefile | 4 ++--
databases/postgresql74-server/Makefile | 9 ++++++---
devel/gettext-lib/builtin.mk | 4 ++--
finance/gnucash/Makefile | 4 ++--
graphics/Mesa/Makefile | 3 +--
lang/gcc3-ada/Makefile | 4 ++--
lang/sather/Makefile | 4 ++--
mail/libesmtp/Makefile | 4 ++--
mail/qmail/options.mk | 4 ++--
math/xgap/Makefile | 4 ++--
mk/buildlink3/bsd.buildlink3.mk | 14 +++-----------
multimedia/mplayer-plugin-firefox/Makefile.common | 4 ++--
net/net-snmp/Makefile | 4 ++--
security/heimdal/Makefile | 4 ++--
x11/XFree86-clients/Makefile | 4 ++--
x11/xorg-clients/Makefile | 4 ++--
18 files changed, 44 insertions(+), 47 deletions(-)
diffs (truncated from 372 to 300 lines):
diff -r ab8b5dec82f1 -r 8e4563ee2525 databases/postgresql73-lib/Makefile
--- a/databases/postgresql73-lib/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/databases/postgresql73-lib/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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+= 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 -r ab8b5dec82f1 -r 8e4563ee2525 databases/postgresql73-server/Makefile
--- a/databases/postgresql73-server/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/databases/postgresql73-server/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
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 @@
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 -r ab8b5dec82f1 -r 8e4563ee2525 databases/postgresql74-lib/Makefile
--- a/databases/postgresql74-lib/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/databases/postgresql74-lib/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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="@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 -r ab8b5dec82f1 -r 8e4563ee2525 databases/postgresql74-server/Makefile
--- a/databases/postgresql74-server/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/databases/postgresql74-server/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
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 @@
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 -r ab8b5dec82f1 -r 8e4563ee2525 devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk Sun Nov 28 18:37:37 2004 +0000
+++ b/devel/gettext-lib/builtin.mk Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
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 -r ab8b5dec82f1 -r 8e4563ee2525 finance/gnucash/Makefile
--- a/finance/gnucash/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/finance/gnucash/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
.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 -r ab8b5dec82f1 -r 8e4563ee2525 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/graphics/Mesa/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
EXTRACT_ONLY= # empty
do-patch: # empty
-do-buildlink: # empty
do-install: # empty
.include "Makefile.common"
diff -r ab8b5dec82f1 -r 8e4563ee2525 lang/gcc3-ada/Makefile
--- a/lang/gcc3-ada/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/lang/gcc3-ada/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
${CP} $$i ${WRKSRC}/gcc/ada; \
done
-post-buildlink:
+post-wrapper:
${LN} -sf ${ADA_BOOT_GNATBIND} ${BUILDLINK_DIR}/bin
post-configure:
diff -r ab8b5dec82f1 -r 8e4563ee2525 lang/sather/Makefile
--- a/lang/sather/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/lang/sather/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
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 -r ab8b5dec82f1 -r 8e4563ee2525 mail/libesmtp/Makefile
--- a/mail/libesmtp/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/mail/libesmtp/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
# 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 -r ab8b5dec82f1 -r 8e4563ee2525 mail/qmail/options.mk
--- a/mail/qmail/options.mk Sun Nov 28 18:37:37 2004 +0000
+++ b/mail/qmail/options.mk Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
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 -r ab8b5dec82f1 -r 8e4563ee2525 math/xgap/Makefile
--- a/math/xgap/Makefile Sun Nov 28 18:37:37 2004 +0000
+++ b/math/xgap/Makefile Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
GAP_PKG_NAME= xgap
-post-buildlink:
+pre-configure:
(cd ${WRKDIR} && ${LN} -s ${GAP_DIRECTORY}/cnf cnf)
do-install:
diff -r ab8b5dec82f1 -r 8e4563ee2525 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk Sun Nov 28 18:37:37 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk Sun Nov 28 19:19:51 2004 +0000
@@ -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_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 @@
-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 -r ab8b5dec82f1 -r 8e4563ee2525 multimedia/mplayer-plugin-firefox/Makefile.common
--- a/multimedia/mplayer-plugin-firefox/Makefile.common Sun Nov 28 18:37:37 2004 +0000
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common Sun Nov 28 19:19:51 2004 +0000
@@ -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 @@
${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
Home |
Main Index |
Thread Index |
Old Index