From 189534dad2770eca06f0e17d225f5bb2f20680ba Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 29 Dec 2005 13:33:42 +0000
Subject: Move DragonFly file handling into Makefile.common, like the other
 postgresql packages do. Fixes -pl* at the same time.

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

diff --git a/databases/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile
index f887497385e..75c67f472d7 100644
--- a/databases/postgresql80-client/Makefile
+++ b/databases/postgresql80-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 13:33:42 joerg Exp $
 
 PKGNAME=	postgresql80-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/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 8ad6adb2210..ef75e315dec 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/29 13:33:43 joerg Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -76,19 +76,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/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 42429b9e269..c01a023f989 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/12/17 05:20:21 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/12/29 13:33:42 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
-- 
cgit v1.2.3