[pkgsrc/trunk]: pkgsrc/databases Move pre-configure rule for Dragonfly into p...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd9d5ba579b9
branches:  trunk
changeset: 510139:fd9d5ba579b9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 28 19:48:22 2006 +0000

description:
Move pre-configure rule for Dragonfly into post-extract rule like
the other postgresql packages do. Fixes build of PL packages.

diffstat:

 databases/postgresql81-client/Makefile |  15 +--------------
 databases/postgresql81-server/Makefile |  15 +--------------
 databases/postgresql81/Makefile.common |  19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 29 deletions(-)

diffs (91 lines):

diff -r a8e1f5124942 -r fd9d5ba579b9 databases/postgresql81-client/Makefile
--- a/databases/postgresql81-client/Makefile    Tue Mar 28 19:47:29 2006 +0000
+++ b/databases/postgresql81-client/Makefile    Tue Mar 28 19:48:22 2006 +0000
@@ -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 @@
        ${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 -r a8e1f5124942 -r fd9d5ba579b9 databases/postgresql81-server/Makefile
--- a/databases/postgresql81-server/Makefile    Tue Mar 28 19:47:29 2006 +0000
+++ b/databases/postgresql81-server/Makefile    Tue Mar 28 19:48:22 2006 +0000
@@ -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 @@
        ${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 -r a8e1f5124942 -r fd9d5ba579b9 databases/postgresql81/Makefile.common
--- a/databases/postgresql81/Makefile.common    Tue Mar 28 19:47:29 2006 +0000
+++ b/databases/postgresql81/Makefile.common    Tue Mar 28 19:48:22 2006 +0000
@@ -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 @@
                         >${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