diff options
| author | joerg <joerg@pkgsrc.org> | 2006-03-28 19:48:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-03-28 19:48:22 +0000 |
| commit | a153c48230b5af5a6c9096108b27e046f99a280a (patch) | |
| tree | 0bc57546bc749d3672eced65fc40c22de38a9669 /databases | |
| parent | 2dc7d51cb4b0faadce3a1779c3e33705c12bc5fc (diff) | |
| download | pkgsrc-a153c48230b5af5a6c9096108b27e046f99a280a.tar.gz | |
Move pre-configure rule for Dragonfly into post-extract rule like
the other postgresql packages do. Fixes build of PL packages.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql81-client/Makefile | 15 | ||||
| -rw-r--r-- | databases/postgresql81-server/Makefile | 15 | ||||
| -rw-r--r-- | databases/postgresql81/Makefile.common | 19 |
3 files changed, 20 insertions, 29 deletions
diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile index 0be9c94f9af..cc6224c0f8b 100644 --- a/databases/postgresql81-client/Makefile +++ b/databases/postgresql81-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $ +# $NetBSD: Makefile,v 1.3 2006/03/28 19:48:22 joerg Exp $ PKGNAME= postgresql81-client-${BASE_VERS} COMMENT= PostgreSQL database client programs @@ -68,19 +68,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 && \ diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 22d1618824d..eb00bd4e4f9 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $ +# $NetBSD: Makefile,v 1.3 2006/03/28 19:48:22 joerg Exp $ PKGNAME= postgresql81-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -75,19 +75,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 && \ diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common index 5578f463a21..b2d017e3c8a 100644 --- a/databases/postgresql81/Makefile.common +++ b/databases/postgresql81/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2006/03/21 06:39:33 martti Exp $ +# $NetBSD: Makefile.common,v 1.3 2006/03/28 19:48:22 joerg Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -135,6 +135,23 @@ post-extract: >${WRKSRC}/src/backend/port/dynloader/$$template.c fi .endif + if ${TEST} -d ${WRKSRC}/src/template; then \ + ${TOUCH} ${WRKSRC}/src/template/dragonfly; \ + fi + if ${TEST} -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; \ + fi + if ${TEST} -d ${WRKSRC}/src/include/port; then \ + ${CP} ${WRKSRC}/src/include/port/freebsd.h \ + ${WRKSRC}/src/include/port/dragonfly.h; \ + fi + if ${TEST} -d ${WRKSRC}/src/makefiles; then \ + ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \ + ${WRKSRC}/src/makefiles/Makefile.dragonfly; \ + fi # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. # This also limits the size of a tuple. The valid values are powers |