From 500dbef42b1049666a70e806b9999b5270d72aca Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 2 Dec 2005 21:01:34 +0000 Subject: [PATCH] Merge DragonFly pre-configure merging back into Makefile.common's post-extract. --- databases/postgresql74-client/Makefile | 15 +-------------- databases/postgresql74-contrib/Makefile | 15 +-------------- databases/postgresql74-lib/Makefile | 15 +-------------- databases/postgresql74-server/Makefile | 15 +-------------- databases/postgresql74/Makefile.common | 21 ++++++++++++++++++++- databases/tcl-postgresql74/Makefile | 15 +-------------- 6 files changed, 25 insertions(+), 71 deletions(-) diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index 1b6d44241b0f..fcdc3341b172 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/11/08 16:40:38 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/02 21:01:34 joerg Exp $ PKGNAME= postgresql74-client-${BASE_VERS} PKGREVISION= # empty @@ -18,19 +18,6 @@ MAKE_ENV+= INSTALLED_LIBPQ=1 BUILD_DIRS= ${WRKSRC}/src/bin -pre-configure: - ${TOUCH} ${WRKSRC}/src/template/dragonfly - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.c - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/include/port/freebsd.h \ - ${WRKSRC}/src/include/port/dragonfly.h - ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ - ${WRKSRC}/src/makefiles/Makefile.dragonfly - pre-build: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \ diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile index 4f69e909d555..2e566d3f2305 100644 --- a/databases/postgresql74-contrib/Makefile +++ b/databases/postgresql74-contrib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/08 16:40:38 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/02 21:01:34 joerg Exp $ PKGNAME= postgresql74-contrib-${BASE_VERS} PKGREVISION= # empty @@ -14,19 +14,6 @@ MAKE_ENV+= INSTALLED_LIBPQ=1 BUILD_DIRS= ${WRKSRC}/contrib -pre-configure: - ${TOUCH} ${WRKSRC}/src/template/dragonfly - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.c - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/include/port/freebsd.h \ - ${WRKSRC}/src/include/port/dragonfly.h - ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ - ${WRKSRC}/src/makefiles/Makefile.dragonfly - pre-build: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \ diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile index b9d1fafd61e7..47f9f1bce7cb 100644 --- a/databases/postgresql74-lib/Makefile +++ b/databases/postgresql74-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/08 16:40:39 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/02 21:01:34 joerg Exp $ PKGNAME= postgresql74-lib-${BASE_VERS} PKGREVISION= 2 @@ -45,19 +45,6 @@ post-wrapper: ${TOUCH} ${BUILDLINK_DIR}/include/crypt.h .endif -pre-configure: - ${TOUCH} ${WRKSRC}/src/template/dragonfly - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.c - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/include/port/freebsd.h \ - ${WRKSRC}/src/include/port/dragonfly.h - ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ - ${WRKSRC}/src/makefiles/Makefile.dragonfly - do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} -C src/include install diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 6c8be3d31ee6..2d9e62a78a74 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/11/08 16:40:39 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/02 21:01:34 joerg Exp $ PKGNAME= postgresql74-server-${BASE_VERS} PKGREVISION= # empty @@ -61,19 +61,6 @@ post-wrapper: ${TOUCH} ${BUILDLINK_DIR}/include/crypt.h .endif -pre-configure: - ${TOUCH} ${WRKSRC}/src/template/dragonfly - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.c - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/include/port/freebsd.h \ - ${WRKSRC}/src/include/port/dragonfly.h - ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ - ${WRKSRC}/src/makefiles/Makefile.dragonfly - pre-build: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \ diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common index aae761296f38..5203d7e7bb36 100644 --- a/databases/postgresql74/Makefile.common +++ b/databases/postgresql74/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2005/09/12 13:19:22 hira Exp $ +# $NetBSD: Makefile.common,v 1.27 2005/12/02 21:01:34 joerg Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -131,6 +131,25 @@ post-extract: ${CP} -f ${COMMON_FILESDIR}/netbsd.[ch] \ ${WRKSRC}/src/backend/port/dynloader/; \ fi + if [ -d ${WRKSRC}/src/backend/port/dynloader ]; then \ + ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ + ${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \ + ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ + ${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \ + ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ + ${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \ + fi + if [ -d ${WRKSRC}/src/template ]; then \ + ${TOUCH} ${WRKSRC}/src/template/dragonfly; \ + fi + if [ -d ${WRKSRC}/src/include/port ]; then \ + ${CP} ${WRKSRC}/src/include/port/freebsd.h \ + ${WRKSRC}/src/include/port/dragonfly.h; \ + fi + if [ -d ${WRKSRC}/src/makefiles ]; then \ + ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ + ${WRKSRC}/src/makefiles/Makefile.dragonfly; \ + fi .if ${OPSYS} == "Interix" . include "../../devel/libltdl/buildlink3.mk" diff --git a/databases/tcl-postgresql74/Makefile b/databases/tcl-postgresql74/Makefile index 99cae1712e57..a7ece7cf109a 100644 --- a/databases/tcl-postgresql74/Makefile +++ b/databases/tcl-postgresql74/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/02 20:00:18 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/02 21:01:34 joerg Exp $ PKGNAME= tcl-postgresql74-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL @@ -16,19 +16,6 @@ BUILD_DIRS= ${WRKSRC}/src/port BUILD_DIRS+= ${WRKSRC}/src/interfaces/libpgtcl BUILD_DIRS+= ${WRKSRC}/src/bin/pgtclsh -pre-configure: - ${TOUCH} ${WRKSRC}/src/template/dragonfly - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.c - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - ${CP} ${WRKSRC}/src/include/port/freebsd.h \ - ${WRKSRC}/src/include/port/dragonfly.h - ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ - ${WRKSRC}/src/makefiles/Makefile.dragonfly - post-install: cd ${PREFIX}/man && ${TAR} -zxf ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`