From c9cfa07505b155d942b2d83d908707141c5a7d60 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Wed, 15 Jul 1998 12:40:14 +0000
Subject: Use automatic shared object handling

---
 databases/postgresql/Makefile  | 11 +++++++++--
 databases/postgresql/pkg/PLIST |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'databases')

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 77111c07af5..389a6fe2c3e 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/06/22 13:58:26 frueauf Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/15 12:40:14 agc Exp $
 # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
 
 DISTNAME=	postgresql-6.3.2
@@ -91,7 +91,14 @@ post-install:
 	fi
 	@/usr/sbin/chown -R ${PGUSER}:${PGGROUP} ${PREFIX}/${PGUSER}
 	@${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
-	@${LDCONFIG} -m ${PREFIX}/${PGUSER}/lib || ${TRUE}
+	@case `${GREP} -c '^${PREFIX}/${PGUSER}/lib$$' /etc/ld.so.conf` in	\
+	0)									\
+		${ECHO} "************** WARNING ********************";		\
+		${ECHO} "Please add ${PREFIX}/${PGUSER}/lib to /etc/ld.so.conf";\
+		${ECHO} "so that this package is usable after any reboot";	\
+		${ECHO} "************** WARNING ********************";		\
+		;;								\
+	esac
 	@${ECHO} '${SETENV} PATH=${PREFIX}/${PGUSER}/bin:$$PATH ${PREFIX}/${PGUSER}/bin/initdb --pglib=${PREFIX}/${PGUSER}/lib --pgdata=${PREFIX}/${PGUSER}/data' | su -l ${PGUSER}
 	@${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \
 		> ${PREFIX}/etc/rc.d/pgsql.sh
diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST
index 58c89a16890..05c29627675 100644
--- a/databases/postgresql/pkg/PLIST
+++ b/databases/postgresql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1998/06/22 14:00:16 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/07/15 12:40:14 agc Exp $
 etc/rc.d/pgsql.sh
 @PGUSER@/.profile
 @PGUSER@/bin/cleardbdir
@@ -273,7 +273,6 @@ share/doc/pgsql/src/sgml/xfunc.sgml
 share/doc/pgsql/src/sgml/xindex.sgml
 share/doc/pgsql/src/sgml/xoper.sgml
 share/doc/pgsql/src/sgml/xtypes.sgml
-@unexec /sbin/ldconfig || /usr/bin/true
 @dirrm share/doc/pgsql/src/graphics
 @dirrm share/doc/pgsql/src/sgml
 @dirrm share/doc/pgsql/src
-- 
cgit v1.2.3