Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

3 files changed, 19 insertions, 19 deletions

diff --git a/databases/postgresql-server/MESSAGE b/databases/postgresql-server/MESSAGE
index 8bae0e26ede..7e1666577e3 100644
--- a/databases/postgresql-server/MESSAGE
+++ b/databases/postgresql-server/MESSAGE
@@ -1,23 +1,16 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 00:12:41 zuntum Exp $
+$NetBSD: MESSAGE,v 1.1.2.1 2002/08/25 21:19:59 jlam Exp $
 
-PostgreSQL has a Web site at http://www.postgresql.org/ which carries
-details on the latest release, upcoming features, and other information to
-make your work or play with PostgreSQL more productive.
+To enable this package, put the following into your /etc/rc.conf:
 
-Please check the following URL for a listing of the current user-support
-mailing lists:
+	pgsql=yes
+	pgsql_flags="-i"        # allows TCP/IP connections
+	pgsql_flags="-i -l"     # enables SSL connections (TCP/IP required)
 
-	http://www.postgresql.org/ -> Info Central -> Mailing Lists
+and make sure
 
-All of the mailing lists are currently archived and viewable at:
+	/usr/pkg/etc/rc.d/pgsql start
 
-	http://www.postgresql.org/ -> Info Central -> Mailing Lists
+is started at boot time.
 
-And optionally, please connect to the following registration URL:
-
-	http://www.postgresql.org/ -> Helping Us -> Survey/Register
-
-Thank you for choosing PostgreSQL, the most advanced open source database 
-engine.
 ===========================================================================
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 61ed0e7d192..8591cdc1521 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19.2.2 2002/06/21 23:05:04 jlam Exp $
+# $NetBSD: Makefile,v 1.19.2.3 2002/08/25 21:20:00 jlam Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 COMMENT=		PostgreSQL database server programs
@@ -41,6 +41,13 @@ OWN_DIRS_PERMS=		${PGHOME} ${PGUSER} ${PGGROUP} 0755
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
 do-build:
+#
+# Avoid conflict between "${LOCALBASE}/include/openssl/des.h" and
+# "/usr/include/crypt.h" -- we want the definitions in the former.
+#
+.if (${OPSYS} == "SunOS")
+	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+.endif
 .for DIR in ${DIRS_TO_BUILD}
 	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
 		${MAKE_PROGRAM} ${ALL_TARGET}
diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh
index 3b5e633e6ef..9fa790a1136 100644
--- a/databases/postgresql-server/files/pgsql.sh
+++ b/databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pgsql.sh,v 1.9 2002/04/05 16:23:23 jlam Exp $
+# $NetBSD: pgsql.sh,v 1.9.2.1 2002/08/25 21:20:01 jlam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -17,8 +17,6 @@
 # "pgsql_flags" contains options for the PostgreSQL postmaster.  See
 # postmaster(1) for possible options.
 
-PGHOME="@PGHOME@"
-
 if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
@@ -29,6 +27,8 @@ rcd_dir=`@DIRNAME@ $0`
 name="pgsql"
 rcvar=$name
 pgsql_user="@PGUSER@"
+eval PGHOME="~$pgsql_user"
+
 command="@PREFIX@/bin/postmaster"
 ctl_command="@PREFIX@/bin/pg_ctl"
 pidfile="${PGHOME}/data/postmaster.pid"