Unbreak.

Submitted by:	steve

3 files changed, 8 insertions, 11 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 1d91986f62c8..42e4d1614a0f 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		April 2, 1997
 # Whom:			Marc G. Fournier <scrappy@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.26 1998/09/25 10:07:42 asami Exp $
+# $Id: Makefile,v 1.27 1998/10/12 04:12:35 jseger Exp $
 #
 
 DISTNAME=	postgresql-6.3.2
@@ -20,8 +20,6 @@ LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
 WITH_TCL=	--with-tcl
 .endif
 
-BROKEN_ELF=	yes
-
 NO_PACKAGE=	"Requires pgsql uid"
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
@@ -101,7 +99,7 @@ post-install:
 	fi
 	@ chown -R pgsql:pgsql ${PREFIX}/pgsql
 	@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
-	@ ${LDCONFIG} -m ${PREFIX}/pgsql/lib
+	@ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/pgsql/lib
 	@ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
 	@ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \
 		> ${PREFIX}/etc/rc.d/pgsql.sh
diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist
index 90b209b0cf1b..69fcca04897d 100644
--- a/databases/postgresql74-server/pkg-plist
+++ b/databases/postgresql74-server/pkg-plist
@@ -14,9 +14,8 @@ pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
 pgsql/bin/pg_passwd
 pgsql/bin/pg_version
-pgsql/bin/pgtclsh
-pgsql/bin/pgtksh
 pgsql/bin/postgres
+pgsql/bin/postmaster
 pgsql/bin/psql
 pgsql/data/PG_VERSION
 pgsql/data/base/template1/PG_VERSION
@@ -68,7 +67,6 @@ pgsql/data/pg_log
 pgsql/data/pg_pwd
 pgsql/data/pg_shadow
 pgsql/data/pg_variable
-pgsql/errlog
 pgsql/include/access/attnum.h
 pgsql/include/c.h
 pgsql/include/commands/trigger.h
@@ -78,7 +76,6 @@ pgsql/include/ecpgtype.h
 pgsql/include/executor/spi.h
 pgsql/include/fmgr.h
 pgsql/include/lib/dllist.h
-pgsql/include/libpgtcl.h
 pgsql/include/libpq-fe.h
 pgsql/include/libpq/libpq-fs.h
 pgsql/include/libpq/pqcomm.h
@@ -92,11 +89,13 @@ pgsql/include/utils/palloc.h
 pgsql/lib/global1.bki.source
 pgsql/lib/global1.description
 pgsql/lib/libecpg.a
+pgsql/lib/libecpg.so
 pgsql/lib/libecpg.so.1.1
-pgsql/lib/libpgtcl.a
-pgsql/lib/libpgtcl.so.1.0
 pgsql/lib/libpq.a
+pgsql/lib/libpq.so
 pgsql/lib/libpq.so.1.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 pgsql/lib/local1_template1.bki.source
 pgsql/lib/local1_template1.description
 pgsql/lib/pg_geqo.sample
diff --git a/databases/postgresql74-server/scripts/createuser b/databases/postgresql74-server/scripts/createuser
index ceb99626e648..2abe201e7a4b 100644
--- a/databases/postgresql74-server/scripts/createuser
+++ b/databases/postgresql74-server/scripts/createuser
@@ -32,7 +32,7 @@ if( getgrnam( "pgsql" ) ) {
 print "pgsql user using uid $pgUID\n";
 print "pgsql user using gid $pgGID\n";
 
-system( "/usr/bin/chpass -a \"pgsql:*:$pgUID:$pgGID::0:0:PostgreSQL pseudo-user:$ENV{'PREFIX'}/pgsql:/bin/sh\"" );
+system( "/usr/bin/chpass -a \"pgsql:*:$pgUID:$pgGID\:\:0:0:PostgreSQL pseudo-user:$ENV{'PREFIX'}/pgsql:/bin/sh\"" );
 
 sub append_file {
 	local($file,@list) = @_;