From 14a963c151f2b11b4b7947db7961a73bbe228791 Mon Sep 17 00:00:00 2001
From: recht <recht@pkgsrc.org>
Date: Thu, 4 Nov 2004 20:10:13 +0000
Subject: Fix the build on Darwin.

---
 databases/postgresql74-lib/Makefile | 26 ++++++++++++++++++++------
 databases/postgresql74-lib/PLIST    |  4 +++-
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'databases/postgresql74-lib')

diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index 0341d33a189..3d5f3fd35fd 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/10 07:30:23 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/04 20:10:13 recht Exp $
 
 PKGNAME=		postgresql74-lib-${BASE_VERS}
 PKGREVISION=		# empty
@@ -9,11 +9,18 @@ COMMENT=		PostgreSQL database headers and libraries
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
-BUILD_DIRS=		${WRKSRC}/src/include
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DIRS+=		${WRKSRC}/src/include
 BUILD_DIRS+=		${WRKSRC}/src/interfaces
-BUILD_DIRS+=		${WRKSRC}/src/pl
 
-.include "../../mk/bsd.prefs.mk"
+# without this the Darwin build fails
+# (-bundle_loader related)
+.if ${OPSYS} == "Darwin"
+BUILD_DIRS+=		${WRKSRC}/src/backend
+.endif
+
+BUILD_DIRS+=		${WRKSRC}/src/pl
 
 # As told by Josh Berkus
 .include "../../mk/pthread.buildlink3.mk"
@@ -37,10 +44,17 @@ post-buildlink:
 .if (${OPSYS} == "SunOS")
 	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
 .endif
+do-install:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
+		${MAKE_PROGRAM} -C src/include install
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
+		${MAKE_PROGRAM} -C src/interfaces install
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
+		${MAKE_PROGRAM} -C src/pl install
+	cd ${WRKSRC}/src/include && ${SETENV} ${MAKE_ENV}	\
+		${MAKE_PROGRAM} install-all-headers
 
 post-install:
-	cd ${WRKSRC}/src/include && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} install-all-headers
 	${EGREP} -v "^#" ${FILESDIR}/man.lib > ${WRKDIR}/man_tar
 	cd ${PREFIX}/man && ${TAR} -zxm -T ${WRKDIR}/man_tar  		\
 		-f ${WRKSRC}/doc/man.tar.gz
diff --git a/databases/postgresql74-lib/PLIST b/databases/postgresql74-lib/PLIST
index 11c59c9c742..4a56d9eee80 100644
--- a/databases/postgresql74-lib/PLIST
+++ b/databases/postgresql74-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/27 16:38:32 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/04 20:10:13 recht Exp $
 bin/ecpg
 include/ecpg_informix.h
 include/ecpgerrno.h
@@ -212,6 +212,7 @@ include/postgresql/server/optimizer/var.h
 include/postgresql/server/parser/analyze.h
 include/postgresql/server/parser/gramparse.h
 include/postgresql/server/parser/keywords.h
+include/postgresql/server/parser/parse.h
 include/postgresql/server/parser/parse_agg.h
 include/postgresql/server/parser/parse_clause.h
 include/postgresql/server/parser/parse_coerce.h
@@ -318,6 +319,7 @@ include/postgresql/server/utils/dynahash.h
 include/postgresql/server/utils/dynamic_loader.h
 include/postgresql/server/utils/elog.h
 include/postgresql/server/utils/errcodes.h
+include/postgresql/server/utils/fmgroids.h
 include/postgresql/server/utils/fmgrtab.h
 include/postgresql/server/utils/formatting.h
 include/postgresql/server/utils/geo_decls.h
-- 
cgit v1.2.3