diff options
| author | jlam <jlam@pkgsrc.org> | 2000-03-18 17:43:16 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-03-18 17:43:16 +0000 |
| commit | 9983612216f1d1e5c31772065738fd49fcf09ff0 (patch) | |
| tree | fda70077218bb8cf29d114803ea906d30f3a3349 | |
| parent | d8e78911c9ef7e8130d3d43abdc64aec1615d077 (diff) | |
| download | pkgsrc-9983612216f1d1e5c31772065738fd49fcf09ff0.tar.gz | |
Change structure of postgresql package. Shared library build is now
unlibtoolized. Things now install into ${PREFIX} instead of
${PREFIX}/${PGSQL_USER} to match hier(7) expectations. The Tcl and Tk
interfaces are now split out into separate packages.
This closes the following PRs: 7384, 8747, 8789, 9272, 9461.
35 files changed, 782 insertions, 841 deletions
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index 08eaad250c7..5e8c7510a96 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,184 +1,98 @@ -# $NetBSD: Makefile,v 1.46 2000/02/20 00:11:19 jwise Exp $ +# $NetBSD: Makefile,v 1.47 2000/03/18 17:43:16 jlam Exp $ # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp # -DISTNAME= postgresql-6.5.3 -WRKSRC= ${WRKDIR}/${DISTNAME}/src -CATEGORIES= databases -MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/ \ - ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/ \ - ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ - -MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.PostgreSQL.ORG/ - -DEPENDS+= addnerd-1.6:../../sysutils/addnerd - BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison - -# Evil stuff follows: I haven't figured out how to add flags to configure to -# nicely disable the ncurses and readline checks in the configure script, yet. -.if exists(${LOCALBASE}/include/ncurses.h) DEPENDS+= ncurses>=4.2:../../devel/ncurses -.endif -.if exists(${LOCALBASE}/include/readline.h) -DEPENDS+= readline-4.0:../../devel/readline -.endif - -# Needs ELF clue, mips has no TAS implementation -NOT_FOR_PLATFORM= *-*-alpha *-*-mips +DEPENDS+= readline-*:../../devel/readline MAKEFILE= GNUmakefile -USE_GMAKE= YES -USE_LIBTOOL= YES - -# Don't use GNU_CONFIGURE or else bsd.pkg.mk will override our custom PREFIX. -HAS_CONFIGURE= YES .include "../../mk/bsd.prefs.mk" -# If you don't want to use the Tcl/Tk frontend pgaccess, then you need to -# remove Tcl/Tk support by defining `PGSQL_USE_TCL=NO' in /etc/mk.conf -# or by typing: ${MAKE} PGSQL_USE_TCL=NO. -# - -# Default to building with Tcl/Tk interface. -# -PGSQL_USE_TCL?= YES -PGSQL_USE_TK?= YES - -.if (${PGSQL_USE_TCL} == "YES") -DEPENDS+= tcl-8.0.5:../../lang/tcl80 - -TCLSH= ${LOCALBASE}/bin/tclsh8.0 -TCL_INCDIR= ${LOCALBASE}/include/tcl8.0 -TCL_CONFIGDIR= ${LOCALBASE}/lib/tcl8.0 - -CONFIGURE_ENV+= TCLSH="${TCLSH}" - -.if (${PGSQL_USE_TK} == "YES") -DEPENDS+= tk-8.0.5:../../x11/tk80 - -TK_INCDIR= ${LOCALBASE}/include/tk8.0 -TK_CONFIGDIR= ${LOCALBASE}/lib/tk8.0 - -USE_X11= YES - -TK_CONFIG= --with-tkconfig="${TK_CONFIGDIR}" -.endif -CONFIGURE_ARGS+= --with-tcl \ - --with-tclconfig="${TCL_CONFIGDIR}" \ - --with-includes="${TCL_INCDIR} ${TK_INCDIR}" \ - --with-libraries="${LOCALBASE}/lib" \ - ${TK_CONFIG} +.if exists(/usr/sbin/user) +USERDIR= /usr/sbin +.else +DEPENDS+= user>=20000313:../../sysutils/user +USERDIR= ${LOCALBASE}/sbin .endif +# Needs ELF clue, mips has no TAS implementation +NOT_FOR_PLATFORM= *-*-alpha *-*-mips + +# PGUSER username of the database administrator +# PGGROUP group of the database administrator +# PGUSER?= pgsql PGGROUP?= ingres -PGPREFIX= ${PREFIX}/${PGUSER} -BUILD_DEFS= PGUSER PGROUP PGSQL_USE_TCL PGSQL_USE_TK MESSAGE_FILE= ${FILESDIR}/post-install-notes -REQ_FILE= ${WRKDIR}/REQ +DEINSTALL_FILE= ${WRKDIR}/DEINSTALL +INSTALL_FILE= ${WRKDIR}/INSTALL +PGHOME= ${PREFIX}/${PGUSER} -PLIST_SRC= ${PKGDIR}/PLIST.notcl -.if (${PGSQL_USE_TCL} == "YES") -PLIST_SRC+= ${PKGDIR}/PLIST.tcl -.if (${PGSQL_USE_TK} == "YES") -PLIST_SRC+= ${PKGDIR}/PLIST.tk -.endif -.endif -PLIST_SRC+= ${PKGDIR}/PLIST.doc ${PKGDIR}/PLIST.dirrm +BUILD_DEFS= PGUSER PGROUP PLIST_SUBST= PGUSER=${PGUSER} -CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} \ - --prefix=${PGPREFIX} \ - --with-template="${LOWER_OPSYS}" \ - --enable-locale -LDFLAGS+= -Wl,-R${PGPREFIX}/lib -L${PGPREFIX}/lib +CONFIGURE_ARGS+= --without-perl --without-odbc --without-tcl +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -pre-extract: - @(case "X${PGUSER}" in \ - Xbin|Xetc|Xinclude|Xinfo|Xlib|Xlibdata|Xlibexec|Xman|Xsbin|Xshare)\ - gooduser=no; \ - ;; \ - *) \ - gooduser=yes; \ - ;; \ - esac; \ - if [ $$gooduser = "no" ]; then \ - ${ECHO} "You have choosen PGUSER=${PGUSER} which will"; \ - ${ECHO} "cause trouble, because postgres would get"; \ - ${ECHO} "installed to ${PGPREFIX}. So please"; \ +CPPFLAGS+= -I${LOCALBASE}/include # ncurses.h, readline.h + +INSTALL_TARGET= install install-man + +pre-install: + @case "X${PGUSER}" in \ + Xbin|Xetc|Xinclude|Xinfo|Xlib|Xlibdata|Xlibexec|Xman|Xsbin|Xshare) \ + ${ECHO} "You have chosen PGUSER=${PGUSER} which will"; \ + ${ECHO} "cause trouble, because the postgres home directory"; \ + ${ECHO} "would be ${PGHOME}. Please"; \ ${ECHO} "set PGUSER to something more reasonable"; \ ${ECHO} "like pgsql."; \ ${ECHO} ""; \ ${FALSE}; \ - fi) - -post-extract: - @${CP} ${FILESDIR}/Makefile.custom ${WRKSRC} - -pre-build: -.if ${PGSQL_USE_TCL} == "YES" - @${ECHO} "Building PostgreSQL with Tcl/Tk interface library." -.else - @${ECHO} "To build without the \"PostgreSQL Tcl/Tk interface library\"," - @${ECHO} "libpgtcl, type: \"${MAKE} PGSQL_USE_TCL=NO\"." -.endif - -post-build: - @${ECHO} "------------------------------------------------------------" - @${ECHO} "Dump existing databases, before installing new db version !!" - @${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}... " - @${ECHO} "------------------------------------------------------------" + ;; \ + esac -pre-install: - ${RM} -rf ${PGPREFIX} - ${MKDIR} ${PGPREFIX} - @${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' \ - -e 's|@PGUSER@|${PGUSER}|g' \ + ${SED} -e 's|@PGHOME@|${PGHOME}|g' \ + < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + ${SED} -e 's|@PGUSER@|${PGUSER}|g' \ -e 's|@PGGROUP@|${PGGROUP}|g' \ - -e 's|@PREFIX@|${PREFIX}|g' \ - < ${PKGDIR}/REQ > ${REQ_FILE} - ${SH} ${REQ_FILE} ${PKGNAME} INSTALL + -e 's|@PGHOME@|${PGHOME}|g' \ + -e 's|@USERDIR@|${USERDIR}|g' \ + < ${PKGDIR}/INSTALL > ${INSTALL_FILE} + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: - @${MV} ${PGPREFIX}/include/libpq++.H ${PGPREFIX}/include/libpq++.h - @${TOUCH} ${PGPREFIX}/include/port/bsd/.keep_me - - @if [ ! -f ${PGPREFIX}/.profile ]; then \ - (${ECHO} "PATH=\$${PATH}:${PGPREFIX}/bin"; \ - ${ECHO} "MANPATH=\$${MANPATH}:${PGPREFIX}/man"; \ - ${ECHO} "PGLIB=${PGPREFIX}/lib"; \ - ${ECHO} "# note: PGDATA overwrites the -D startup option"; \ - ${ECHO} "PGDATA=${PGPREFIX}/data"; \ - ${ECHO} "DISPLAY=:0"; \ - ${ECHO} "export PATH MANPATH PGLIB PGDATA DISPLAY"; \ - ${ECHO}; \ - ${ECHO} "# if you want to make regression tests use this TZ"; \ - ${ECHO} "#TZ=PST8PDT"; \ - ${ECHO} "#export TZ"; \ - ) > ${PGPREFIX}/.profile; \ - fi - @${SED} -e "s|@PGPREFIX@|${PGPREFIX}|g" \ + cd ${PREFIX}; ${MV} include/libpq++.H include/libpq++.h + cd ${PREFIX}/include; ${RMDIR} -p port/netbsd + +.for PROG in ecpg pg_dump pg_id pg_passwd pg_version postgres psql + strip ${PREFIX}/bin/${PROG} +.endfor + ${SED} -e 's|@PATH@|${PATH}|g' \ + -e 's|@MANPATH@|${MANPATH}|g' \ + -e 's|@PREFIX@|${PREFIX}|g' \ + < ${FILESDIR}/profile.pgsql > ${WRKDIR}/profile.pgsql + ${INSTALL_DATA} ${WRKDIR}/profile.pgsql ${PGHOME}/.profile.pgsql + ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PGHOME} + ${CHOWN} -R ${PGUSER}:${PGGROUP} ${PGHOME} + + ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ -e "s|@PGUSER@|${PGUSER}|g" \ + -e "s|@PGHOME@|${PGHOME}|g" \ < ${FILESDIR}/pgsql.sh.tmpl > ${WRKDIR}/pgsql.sh - @${INSTALL} -c -o root -g ${PGGROUP} -m 554 \ + ${INSTALL} -c -o root -g ${PGGROUP} -m 554 \ ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql.sh - @${INSTALL} -c -o ${PGUSER} -g ${PGGROUP} -m 444 \ - ${FILESDIR}/post-install-notes ${PGPREFIX} - - @cd ${WRKDIR}/${DISTNAME}/doc; ${MAKE_PROGRAM} ${INSTALL_TARGET} - @for file in \ - FAQ FAQ_DEV README.fsync TODO bug.template internals.ps \ - admin.ps.gz programmer.ps.gz tutorial.ps.gz user.ps.gz; do \ - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/$${file} \ - ${PREFIX}/share/doc/postgresql/$${file}; \ - done - @${CHOWN} -R ${PGUSER}:${PGGROUP} ${PGPREFIX} - - @${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...' - @${ECHO} '${SETENV} PATH=${PGPREFIX}/bin:$$PATH ${PGPREFIX}/bin/initdb --pglib=${PGPREFIX}/lib --pgdata=${PGPREFIX}/data' | ${SU} -l ${PGUSER} - -.include "../../mk/bsd.pkg.mk" + + cd ${WRKDIR}/${DISTNAME}/doc; \ + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all + cd ${WRKDIR}/${DISTNAME}/doc; ${INSTALL_DATA} \ + FAQ FAQ_DEV README.fsync TODO bug.template internals.ps \ + admin.ps.gz programmer.ps.gz tutorial.ps.gz user.ps.gz \ + ${PREFIX}/share/doc/postgresql + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/postgresql + + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL + +.include "../../databases/postgresql/Makefile.common" diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common new file mode 100644 index 00000000000..4e83ba72817 --- /dev/null +++ b/databases/postgresql/Makefile.common @@ -0,0 +1,36 @@ +# $NetBSD: Makefile.common,v 1.1 2000/03/18 17:43:16 jlam Exp $ + +DISTNAME= postgresql-6.5.3 +WRKSRC= ${WRKDIR}/${DISTNAME}/src +CATEGORIES= databases +MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/ \ + ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/ \ + ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/ + +MAINTAINER= jlam@netbsd.org +HOMEPAGE= http://www.PostgreSQL.ORG/ + +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf + +USE_GMAKE= yes +GNU_CONFIGURE= yes + +FILESDIR= ${.CURDIR}/../../databases/postgresql/files +PATCHDIR= ${.CURDIR}/../../databases/postgresql/patches + +.include "../../mk/bsd.prefs.mk" + +CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" \ + --enable-locale + +post-extract: + @${CP} ${FILESDIR}/Makefile.custom ${WRKSRC} + @${LN} -sf bsd.c ${WRKSRC}/backend/port/dynloader/netbsd.c + @${LN} -sf bsd.h ${WRKSRC}/backend/port/dynloader/netbsd.h + @${LN} -sf bsd.h ${WRKSRC}/include/port/netbsd.h + @${LN} -sf Makefile.bsd ${WRKSRC}/makefiles/Makefile.netbsd + +pre-configure: + cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf + +.include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql/files/Makefile.custom b/databases/postgresql/files/Makefile.custom index df9990a3aa8..700d0848ca1 100644 --- a/databases/postgresql/files/Makefile.custom +++ b/databases/postgresql/files/Makefile.custom @@ -4,20 +4,24 @@ # sub-Makefile in the build tree. Makefiles for shared libraries include # Makefile.global then Makefile.shlib. # -# $NetBSD: Makefile.custom,v 1.1 1999/09/19 04:24:54 jlam Exp $ +# $NetBSD: Makefile.custom,v 1.2 2000/03/18 17:43:16 jlam Exp $ -CUSTOM_INSTALL= ${LIBTOOL} ${INSTALL} -CUSTOM_CC= ${LIBTOOL} ${CC} -CUSTOM_CXX= ${LIBTOOL} ${CXX} +# Where the database templates are stored +# +TEMPLATEDIR= $(POSTGRESDIR)/share/postgresql # installation directory for documentation -PGDOCS= ${POSTGRESDIR}/../share/doc/postgresql +PGDOCS= $(POSTGRESDIR)/share/doc/postgresql -# Rules to build object files from source files. -# ${LIBTOOL} requires that there not be a -o flag when in compile mode. -# -%.o: %.c - ${CC} ${CPPFLAGS} ${CFLAGS} -c $< +# Where the ODBC installation-wide configuration file gets installed. +ODBCINST= etc + +ifdef INSTALLED_LIBPQ +LIBPQDIR:= $(HEADERDIR) +LIBPQ:= -L$(LIBDIR) -lpq +endif -%.o: %.cc - ${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $< +ifdef INSTALLED_LIBPGTCL +LIBPGTCLDIR:= $(HEADERDIR) +LIBPGTCL:= -L$(LIBDIR) -lpgtcl +endif diff --git a/databases/postgresql/files/odbc.ini b/databases/postgresql/files/odbc.ini new file mode 100644 index 00000000000..2176ca4d3f8 --- /dev/null +++ b/databases/postgresql/files/odbc.ini @@ -0,0 +1,19 @@ +; $NetBSD: odbc.ini,v 1.1 2000/03/18 17:43:16 jlam Exp $ +; +; /etc/odbc.ini - site-wide ODBC configuration file + +[ODBC Data Sources] +PostgresDB = PostgreSQL database description + +[PostgresDB] +Driver = @PREFIX@/lib/libpsqlodbc.so +Database = DatabaseName +Servername = localhost +Port = 5432 +Username = username +Password = "pAsSwOrD" +Debug = 0 +CommLog = 1 + +[ODBC] +InstallDir = diff --git a/databases/postgresql/files/patch-sum b/databases/postgresql/files/patch-sum index 1d9bc69d840..4b11ee57434 100644 --- a/databases/postgresql/files/patch-sum +++ b/databases/postgresql/files/patch-sum @@ -1,16 +1,22 @@ -$NetBSD: patch-sum,v 1.8 2000/03/05 19:14:30 kleink Exp $ +$NetBSD: patch-sum,v 1.9 2000/03/18 17:43:16 jlam Exp $ -MD5 (patch-aa) = 6d8e8d9ddc61cd79ecab1b0b9a26973a -MD5 (patch-ab) = eec9c83c775fa5962a28004a309236d1 -MD5 (patch-ac) = ef8e86f21029d7bab85f74d0bcec874c -MD5 (patch-ad) = 0c7ad509908b626485eb152ce4ff4ba8 -MD5 (patch-ae) = 74a20ce1af43193ee2a0152e88d8c852 -MD5 (patch-af) = 055fe149d55089efa39eaaedafc611b6 -MD5 (patch-ag) = 9fe78b65dbd36b7c1f5d2a928639ad23 -MD5 (patch-ah) = 43e39c5c596432cb3cce6ab49d005102 -MD5 (patch-aj) = fe9fc5224b1b3d1cb85f57007f005d1b -MD5 (patch-ak) = 1e22bf0d5770426882fef94d528f324e -MD5 (patch-al) = 17bff31d1a88187c0b46b2262e7fc8d6 -MD5 (patch-am) = 0af195e776b331e582cbd7f037d32e24 -MD5 (patch-an) = 6e9f217d2b9c83b68d716689a75a05b5 -MD5 (patch-ao) = a3fe5b76abeda05b2c18f92c083682e3 +MD5 (patch-aa) = bc49aa9d9fce8df90213078d92761249 +MD5 (patch-ab) = 8ca4b77d8e1b817ebc034572fbe2b1fc +MD5 (patch-ac) = 70fd9e904ad4991a9f69f1e8afcc3d4a +MD5 (patch-ad) = c9065a8a153f76ae8d673847d94a307b +MD5 (patch-ae) = c5e24d270c84b2578e2a401ff21f8741 +MD5 (patch-af) = f83f4fe4788297ce80961a3bbe80d5ab +MD5 (patch-ag) = bd973c4082172fee6ec5d4e27bd2efc5 +MD5 (patch-ah) = 4a61e815a957790c494ff8465ef2c706 +MD5 (patch-ai) = eb34208242c64709ebaa569368a8693d +MD5 (patch-aj) = 936e6e472154183587af08a273dd5596 +MD5 (patch-ak) = a4dd0fa1e1854007f452a45e79a83436 +MD5 (patch-al) = cfbc7e6e7929bd9d97dd1333e06bc97f +MD5 (patch-am) = 20bdf8b311fad190c40b35a27d0d0f35 +MD5 (patch-an) = 5896789239612120cb87d218b375c921 +MD5 (patch-ao) = 1705f355ea045f2742115a8035333df9 +MD5 (patch-ap) = 56a512c3e9aef5e09c37eef18097fcd8 +MD5 (patch-aq) = 9c3500fe79d72d4417af9137c76540d6 +MD5 (patch-ar) = fc00fb16650ec4c68f74d39b7f03a3e9 +MD5 (patch-as) = 4df43103e0a4346e2cf0ec7724192844 +MD5 (patch-at) = 0cef1d02ee234cc9a8a0a9db26810e3b diff --git a/databases/postgresql/files/pgsql.sh.tmpl b/databases/postgresql/files/pgsql.sh.tmpl index d0f26122a21..2549bf49080 100644 --- a/databases/postgresql/files/pgsql.sh.tmpl +++ b/databases/postgresql/files/pgsql.sh.tmpl @@ -1,12 +1,12 @@ #!/bin/sh -# $NetBSD: pgsql.sh.tmpl,v 1.4 1999/09/19 04:24:54 jlam Exp $ +# $NetBSD: pgsql.sh.tmpl,v 1.5 2000/03/18 17:43:16 jlam Exp $ # FreeBSD Id: pgsql.sh.tmpl,v 1.3 1997/10/05 21:00:49 andreas Exp # pgsql.sh - postgresql startup file for NetBSD -if [ -x @PGPREFIX@/bin/postmaster ]; then +if [ -x @PREFIX@/bin/postmaster ]; then echo -n ' pgsql' - su -l @PGUSER@ -c 'exec @PGPREFIX@/bin/postmaster \ - -S -o -F > @PGPREFIX@/errlog' + su -l @PGUSER@ -c 'exec @PREFIX@/bin/postmaster \ + -S -o -F > @PGHOME@/errlog' fi diff --git a/databases/postgresql/files/post-install-notes b/databases/postgresql/files/post-install-notes index 63aa4e29d4a..f2dbe83c806 100644 --- a/databases/postgresql/files/post-install-notes +++ b/databases/postgresql/files/post-install-notes @@ -1,15 +1,23 @@ -$NetBSD: post-install-notes,v 1.5 1999/09/21 03:17:37 soren Exp $ +$NetBSD: post-install-notes,v 1.6 2000/03/18 17:43:16 jlam Exp $ -Now that PostgreSQL is installed, you should read the documentation and -implementation guides. These can be found at: +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. - http://www.PostgreSQL.org/docs/ +Please check the following URL for a listing of the current user-support +mailing lists: -You may wish to subscribe to the PostgreSQL user-support mailing list. -Send an e-mail to pgsql-questions-request@postgresql.org with the -text "subscribe" in the message body. + http://www.postgresql.org -> Info Central -> Mailing Lists -If you built PostgreSQL with Tcl/Tk support, then you can also install -the Tcl/Tk database frontend "pgaccess" (databases/pgaccess) for database -operations with a GUI. +All of the mailing lists are currently archived and viewable at: + http://www.postgresql.org -> Info Central -> Mailing Lists + +And, so that we have an idea of who is using what, 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/files/profile.pgsql b/databases/postgresql/files/profile.pgsql new file mode 100644 index 00000000000..58a448e139b --- /dev/null +++ b/databases/postgresql/files/profile.pgsql @@ -0,0 +1,17 @@ +# $NetBSD: profile.pgsql,v 1.1 2000/03/18 17:43:16 jlam Exp $ +# +# profile - sets the enviroment for the postgresql superuser + +PATH=@PATH@ +MANPATH=@MANPATH@ +# +# note: PGDATA overrides the -D startup option +# +PGDATA=${HOME}/data +PGLIB=@PREFIX@/share/postgresql +DISPLAY=:0 + +export PATH MANPATH PGDATA PGLIB DISPLAY + +# if you want to make regression tests use this TZ +#TZ=PST8PDT; export TZ diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa index b37c399147b..58c4bd78cb7 100644 --- a/databases/postgresql/patches/patch-aa +++ b/databases/postgresql/patches/patch-aa @@ -1,50 +1,27 @@ -$NetBSD: patch-aa,v 1.3 1999/09/20 23:38:48 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2000/03/18 17:43:17 jlam Exp $ ---- ./Makefile.global.in.orig Fri Jul 30 00:13:44 1999 -+++ ./Makefile.global.in Mon Sep 20 00:49:27 1999 -@@ -54,6 +54,15 @@ +--- Makefile.global.in.orig Mon Nov 1 23:45:47 1999 ++++ Makefile.global.in Thu Mar 16 17:49:44 2000 +@@ -54,6 +54,11 @@ ELF_SYSTEM= @ELF_SYS@ LIBPQDIR:= $(SRCDIR)/interfaces/libpq +LIBPGTCLDIR:= $(SRCDIR)/interfaces/libpgtcl + -+ifneq ($(LIBTOOL),) -+LIBPQ:= $(LIBPQDIR)/libpq.la -+LIBPGTCL:= $(LIBPGTCLDIR)/libpgtcl.la -+else +LIBPQ:= -L$(LIBPQDIR) -lpq +LIBPGTCL:= -L$(LIBPGTCLDIR) -lpgtcl -+endif ++ # For convenience, POSTGRESDIR is where BINDIR, and LIBDIR # and other target destinations are rooted. Of course, each of these is -@@ -200,6 +209,7 @@ - #------------------------------------------------------------- - CC= @CC@ - CPP= @CPP@ -+CXX= @CXX@ - YFLAGS= @YFLAGS@ - YACC= @YACC@ - LEX= @LEX@ -@@ -243,7 +253,7 @@ - ############################################################################## - - ifneq ($(CUSTOM_INSTALL),) --INSTALL= $(CUSTOM_INSTALL) -+INSTALL:= $(CUSTOM_INSTALL) - endif - - # -@@ -274,7 +284,11 @@ - # using a i486 or better. - - ifneq ($(CUSTOM_CC),) -- CC= $(CUSTOM_CC) -+ CC:= $(CUSTOM_CC) -+endif +@@ -69,6 +74,10 @@ + # can just put the absolute pathname to the library at the end of your + # command line. + LIBDIR= $(POSTGRESDIR)/lib + -+ifneq ($(CUSTOM_CXX),) -+ CXX:= $(CUSTOM_CXX) - endif ++# Where the database templates are stored ++# ++TEMPLATEDIR= $(POSTGRESDIR)/lib - ifneq ($(CUSTOM_COPT),) + # This is the directory where IPC utilities ipcs and ipcrm are located + # diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab index e090a9a0d6f..488e1434207 100644 --- a/databases/postgresql/patches/patch-ab +++ b/databases/postgresql/patches/patch-ab @@ -1,106 +1,29 @@ -$NetBSD: patch-ab,v 1.7 1999/09/20 23:38:48 jlam Exp $ +$NetBSD: patch-ab,v 1.8 2000/03/18 17:43:17 jlam Exp $ ---- ./Makefile.shlib.orig Fri Jul 30 00:13:44 1999 -+++ ./Makefile.shlib Mon Sep 20 11:00:59 1999 -@@ -50,6 +50,7 @@ - # on a platform where we don't know how to build a shared library. - shlib := - install-shlib-dep := -+lib_to_install := lib$(NAME).a - - # For each platform we support shlibs on, set shlib and install-shlib-dep, - # and update flags as needed to build a shared lib. Note we depend on -@@ -65,20 +66,26 @@ - endif - - ifeq ($(PORTNAME), bsd) -- ifdef BSD_SHLIB -+ ifneq ($(BSD_SHLIB),) -+ ifeq ($(LIBTOOL),) - install-shlib-dep := install-shlib - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -- ifdef ELF_SYSTEM -+ ifeq ($(ELF_SYSTEM), true) - LDFLAGS_SL := -x -Bshareable -soname $(shlib) - else - LDFLAGS_SL := -x -Bshareable -Bforcearchive - endif - CFLAGS += $(CFLAGS_SL) -- endif -+ else -+ lalib := lib$(NAME).la -+ lib_to_install := $(lalib) -+ LIBTOOL_FLAGS += -rpath $(LIBDIR) -version-info $(SO_MAJOR_VERSION):$(SO_MINOR_VERSION) -+ endif # !LIBTOOL -+ endif # BSD_SHLIB - endif - - ifeq ($(PORTNAME), bsdi) -- ifdef BSD_SHLIB -+ ifneq ($(BSD_SHLIB),) - ifeq ($(DLSUFFIX), .so) - install-shlib-dep := install-shlib - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -@@ -96,9 +103,9 @@ - endif - - ifeq ($(PORTNAME), freebsd) -- ifdef BSD_SHLIB -+ ifneq $(BSD_SHLIB),) - install-shlib-dep := install-shlib -- ifdef ELF_SYSTEM -+ ifeq ($(ELF_SYSTEM), true) - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - LDFLAGS_SL := -x -shared -soname $(shlib) - else -@@ -191,7 +198,7 @@ - - # Default target definition. Note shlib is empty if not building a shlib. - --all: lib$(NAME).a $(shlib) -+all: $(lib_to_install) $(shlib) - - # Rules to build regular and shared libraries - -@@ -207,6 +214,21 @@ - +--- Makefile.shlib.orig Fri Jul 30 00:13:44 1999 ++++ Makefile.shlib Thu Mar 16 17:49:44 2000 +@@ -109,6 +109,24 @@ + endif endif -+ifneq ($(LIBTOOL),) -+ifneq ($(PORTNAME), win) -+ -+ifeq ($(CXXLIB), true) -+LINKER= CXX -+else -+LINKER= CC -+endif -+ -+$(lalib): $(OBJS) -+ $($(LINKER)) $(CPPFLAGS) $($(LINKER)FLAGS) -o $@ $(OBJS:.o=.lo) $(LIBTOOL_FLAGS) -+ -+endif ++ifeq ($(PORTNAME), netbsd) ++ ifdef BSD_SHLIB ++ install-shlib-dep := install-shlib ++ soname := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) ++ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ++ ifdef ELF_SYSTEM ++ LD := $(CC) ++ LDFLAGS_SL := -shared -Wl,-soname -Wl,$(soname) ++ ifneq ($(SHLIB_LINK),) ++ LDFLAGS_SL += -Wl,-R$(LIBDIR) ++ endif ++ else ++ LDFLAGS_SL := -x -Bshareable -Bforcearchive ++ endif ++ CFLAGS += $(CFLAGS_SL) ++ endif +endif + - ifneq ($(shlib),) - ifneq ($(PORTNAME), win) - ifneq ($(PORTNAME), aix) -@@ -250,8 +272,8 @@ - - .PHONY: all install-lib install-shlib - --install-lib: lib$(NAME).a -- $(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(LIBDIR)/lib$(NAME).a -+install-lib: $(lib_to_install) -+ $(INSTALL) $(INSTL_LIB_OPTS) $(lib_to_install) $(LIBDIR) - - install-shlib: $(shlib) - $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib) -@@ -273,4 +295,8 @@ - .PHONY: clean-shlib - - clean-shlib: -+ifneq ($(LIBTOOL),) -+ $(LIBTOOL) rm -rf $(lalib) -+else - rm -f $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) lib$(NAME)$(DLSUFFIX) -+endif + ifeq ($(PORTNAME), hpux) + install-shlib-dep := install-shlib + # HPUX doesn't believe in version numbers for shlibs diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac index 859c02313e4..5c0ddf2dce8 100644 --- a/databases/postgresql/patches/patch-ac +++ b/databases/postgresql/patches/patch-ac @@ -1,25 +1,58 @@ -$NetBSD: patch-ac,v 1.4 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2000/03/18 17:43:17 jlam Exp $ ---- ./bin/pg_dump/Makefile.in.orig Sun Jan 17 01:19:05 1999 -+++ ./bin/pg_dump/Makefile.in Sat Sep 18 03:16:08 1999 -@@ -26,17 +26,13 @@ - CFLAGS+= $(KRBFLAGS) - endif +--- backend/Makefile.orig Sun Mar 7 18:05:56 1999 ++++ backend/Makefile Thu Mar 16 17:56:36 2000 +@@ -156,10 +156,11 @@ + # and (2) the parameters of a database system should be set at initdb time, + # not at postgres build time. + +-.PHONY: install install-bin install-lib install-headers ++.PHONY: install install-bin install-templates install-headers + +-install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) \ +- install-bin install-lib install-headers ++install: $(LIBDIR) $(BINDIR) $(HEADERDIR) $(TEMPLATEDIR) \ ++ postgres $(POSTGRES_IMP) \ ++ install-bin install-templates install-headers --all: submake pg_dump -+all: pg_dump + install-bin: $(BINDIR) postgres$(X) $(POSTGRES_IMP) + $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(BINDIR)/postgres$(X) +@@ -175,22 +176,22 @@ + endif + endif --pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a -- $(CC) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) -+pg_dump: $(OBJS) -+ $(CC) -o pg_dump $(OBJS) $(LIBPQ) $(LDFLAGS) +-install-lib: $(LIBDIR) \ ++install-templates: $(TEMPLATEDIR) \ + global1.bki.source local1_template1.bki.source \ + global1.description local1_template1.description \ + libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample + $(INSTALL) $(INSTLOPTS) global1.bki.source \ +- $(LIBDIR)/global1.bki.source ++ $(TEMPLATEDIR)/global1.bki.source + $(INSTALL) $(INSTLOPTS) global1.description \ +- $(LIBDIR)/global1.description ++ $(TEMPLATEDIR)/global1.description + $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \ +- $(LIBDIR)/local1_template1.bki.source ++ $(TEMPLATEDIR)/local1_template1.bki.source + $(INSTALL) $(INSTLOPTS) local1_template1.description \ +- $(LIBDIR)/local1_template1.description ++ $(TEMPLATEDIR)/local1_template1.description + $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \ +- $(LIBDIR)/pg_hba.conf.sample ++ $(TEMPLATEDIR)/pg_hba.conf.sample + $(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \ +- $(LIBDIR)/pg_geqo.sample ++ $(TEMPLATEDIR)/pg_geqo.sample - ../../utils/strdup.o: - $(MAKE) -C ../../utils strdup.o -- --.PHONY: submake --submake: -- $(MAKE) -C $(LIBPQDIR) libpq.a + install-headers: fmgr.h $(SRCDIR)/include/config.h + @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi +@@ -253,6 +254,8 @@ + $(LIBDIR): + mkdir $@ + $(HEADERDIR): ++ mkdir $@ ++$(TEMPLATEDIR): + mkdir $@ - install: pg_dump - $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(BINDIR)/pg_dump$(X) + ############################################################################# diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad index 2c7083a9cfb..ec71d3a6e89 100644 --- a/databases/postgresql/patches/patch-ad +++ b/databases/postgresql/patches/patch-ad @@ -1,15 +1,13 @@ -$NetBSD: patch-ad,v 1.5 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-ad,v 1.6 2000/03/18 17:43:17 jlam Exp $ ---- ./bin/pg_encoding/Makefile.orig Sat Jun 5 06:27:31 1999 -+++ ./bin/pg_encoding/Makefile Sat Sep 18 03:16:50 1999 -@@ -19,8 +19,8 @@ +--- bin/pg_dump/Makefile.in.orig Sun Jan 17 01:19:05 1999 ++++ bin/pg_dump/Makefile.in Thu Mar 16 17:49:44 2000 +@@ -29,7 +29,7 @@ + all: submake pg_dump - all: pg_encoding + pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a +- $(CC) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) ++ $(CC) -o pg_dump $(OBJS) $(LIBPQ) $(LDFLAGS) --pg_encoding: $(OBJS) $(LIBPQDIR)/libpq.a -- $(CC) -o pg_encoding $(OBJS) -L$(LIBPQDIR) -lpq $(LDFLAGS) -+pg_encoding: $(OBJS) -+ $(CC) -o pg_encoding $(OBJS) $(LIBPQ) $(LDFLAGS) - - install: pg_encoding - $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(BINDIR)/pg_encoding$(X) + ../../utils/strdup.o: + $(MAKE) -C ../../utils strdup.o diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae index d28fcdb7403..41b07c34431 100644 --- a/databases/postgresql/patches/patch-ae +++ b/databases/postgresql/patches/patch-ae @@ -1,18 +1,13 @@ -$NetBSD: patch-ae,v 1.9 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-ae,v 1.10 2000/03/18 17:43:17 jlam Exp $ ---- ./bin/pg_id/Makefile.orig Sun Jan 17 01:19:10 1999 -+++ ./bin/pg_id/Makefile Sat Sep 18 03:17:25 1999 -@@ -26,11 +26,8 @@ +--- bin/pg_encoding/Makefile.orig Sat Jun 5 06:27:31 1999 ++++ bin/pg_encoding/Makefile Thu Mar 16 17:49:44 2000 +@@ -20,7 +20,7 @@ + all: pg_encoding - all: pg_id + pg_encoding: $(OBJS) $(LIBPQDIR)/libpq.a +- $(CC) -o pg_encoding $(OBJS) -L$(LIBPQDIR) -lpq $(LDFLAGS) ++ $(CC) -o pg_encoding $(OBJS) $(LIBPQ) $(LDFLAGS) --pg_id: $(OBJS) $(LIBPQDIR)/libpq.a -- $(CC) -o pg_id -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) -- --$(LIBPQDIR)/libpq.a: -- $(MAKE) -C $(LIBPQDIR) libpq.a -+pg_id: $(OBJS) -+ $(CC) -o pg_id $(OBJS) $(LIBPQ) $(LDFLAGS) - - install: pg_id - $(INSTALL) $(INSTL_EXE_OPTS) pg_id$(X) $(BINDIR)/pg_id$(X) + install: pg_encoding + $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(BINDIR)/pg_encoding$(X) diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af index ea841cbc750..769f799c0e2 100644 --- a/databases/postgresql/patches/patch-af +++ b/databases/postgresql/patches/patch-af @@ -1,21 +1,13 @@ -$NetBSD: patch-af,v 1.6 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-af,v 1.7 2000/03/18 17:43:17 jlam Exp $ ---- ./bin/pgtclsh/Makefile.orig Tue Oct 27 16:51:54 1998 -+++ ./bin/pgtclsh/Makefile Sat Sep 18 03:14:32 1999 -@@ -22,15 +22,12 @@ - include Makefile.tkdefs - endif +--- bin/pg_id/Makefile.orig Sun Jan 17 01:19:10 1999 ++++ bin/pg_id/Makefile Thu Mar 16 17:49:44 2000 +@@ -27,7 +27,7 @@ + all: pg_id --CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl -+CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR) + pg_id: $(OBJS) $(LIBPQDIR)/libpq.a +- $(CC) -o pg_id -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) ++ $(CC) -o pg_id $(OBJS) $(LIBPQ) $(LDFLAGS) - ifdef KRBVERS - LDFLAGS+= $(KRBLIBS) - CFLAGS+= $(KRBFLAGS) - endif -- --LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl --LIBPQ= -L$(LIBPQDIR) -lpq - - # If we are here then TCL is available - PGMS = pgtclsh + $(LIBPQDIR)/libpq.a: + $(MAKE) -C $(LIBPQDIR) libpq.a diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag index fcc64e17db3..8e6a94c7da6 100644 --- a/databases/postgresql/patches/patch-ag +++ b/databases/postgresql/patches/patch-ag @@ -1,25 +1,21 @@ -$NetBSD: patch-ag,v 1.4 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-ag,v 1.5 2000/03/18 17:43:17 jlam Exp $ ---- ./bin/psql/Makefile.in.orig Sun Jan 17 01:19:19 1999 -+++ ./bin/psql/Makefile.in Sat Sep 18 03:18:28 1999 -@@ -30,17 +30,13 @@ +--- bin/pgtclsh/Makefile.orig Tue Oct 27 16:51:54 1998 ++++ bin/pgtclsh/Makefile Thu Mar 16 17:49:44 2000 +@@ -22,15 +22,12 @@ + include Makefile.tkdefs + endif - OBJS= psql.o stringutils.o @STRDUP@ @STRERROR2@ +-CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl ++CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR) --all: submake psql -+all: psql - --psql: $(OBJS) $(LIBPQDIR)/libpq.a -- $(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) -+psql: $(OBJS) -+ $(CC) -o psql $(OBJS) $(LIBPQ) $(LDFLAGS) - - ../../utils/strdup.o: - $(MAKE) -C ../../utils strdup.o + ifdef KRBVERS + LDFLAGS+= $(KRBLIBS) + CFLAGS+= $(KRBFLAGS) + endif - --.PHONY: submake --submake: -- $(MAKE) -C $(LIBPQDIR) libpq.a +-LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl +-LIBPQ= -L$(LIBPQDIR) -lpq - install: psql - $(INSTALL) $(INSTL_EXE_OPTS) psql$(X) $(BINDIR)/psql$(X) + # If we are here then TCL is available + PGMS = pgtclsh diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah index 32d687ff907..a42371a607b 100644 --- a/databases/postgresql/patches/patch-ah +++ b/databases/postgresql/patches/patch-ah @@ -1,14 +1,13 @@ -$NetBSD: patch-ah,v 1.4 1999/09/20 23:38:49 jlam Exp $ +$NetBSD: patch-ah,v 1.5 2000/03/18 17:43:17 jlam Exp $ ---- ./bin/Makefile.orig Thu May 20 12:49:59 1999 -+++ ./bin/Makefile Mon Sep 20 12:09:31 1999 -@@ -27,7 +27,8 @@ - # - ifeq ($(USE_TCL), true) - ifeq ($(USE_TK), true) -- DIRS += pgaccess -+# pgaccess directory doesn't contain any sources -+# DIRS += pgaccess - endif - DIRS += pgtclsh - endif +--- bin/psql/Makefile.in.orig Sun Jan 17 01:19:19 1999 ++++ bin/psql/Makefile.in Thu Mar 16 17:49:44 2000 +@@ -33,7 +33,7 @@ + all: submake psql + + psql: $(OBJS) $(LIBPQDIR)/libpq.a +- $(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS) ++ $(CC) -o psql $(OBJS) $(LIBPQ) $(LDFLAGS) + + ../../utils/strdup.o: + $(MAKE) -C ../../utils strdup.o diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj index ae0c3f47099..0c9ca6428bd 100644 --- a/databases/postgresql/patches/patch-aj +++ b/databases/postgresql/patches/patch-aj @@ -1,31 +1,17 @@ -$NetBSD: patch-aj,v 1.4 1999/09/20 23:38:50 jlam Exp $ +$NetBSD: patch-aj,v 1.5 2000/03/18 17:43:17 jlam Exp $ ---- ./interfaces/ecpg/lib/Makefile.in.orig Wed Jun 30 19:57:23 1999 -+++ ./interfaces/ecpg/lib/Makefile.in Mon Sep 20 01:17:03 1999 -@@ -12,12 +12,16 @@ - - NAME= ecpg - SO_MAJOR_VERSION= 3 -+ifneq ($(LIBTOOL),) -+SO_MINOR_VERSION= 0 # bump this every time the patchlevel changes -+else - SO_MINOR_VERSION= 0.0 -+endif - - SRCDIR= @top_srcdir@ - include $(SRCDIR)/Makefile.global - --CFLAGS+= -I../include -I$(SRCDIR)/interfaces/libpq -+CFLAGS+= -I../include -I$(LIBPQDIR) - - ifdef KRBVERS - CFLAGS+= $(KRBFLAGS) -@@ -25,7 +29,7 @@ - - OBJS= ecpglib.o typename.o - --SHLIB_LINK= -L../../libpq -lpq -+SHLIB_LINK= $(LIBPQ) - - # Shared library stuff, also default 'all' target - include $(SRCDIR)/Makefile.shlib +--- configure.in.orig Mon Nov 1 19:24:29 1999 ++++ configure.in Thu Mar 16 17:49:44 2000 +@@ -23,11 +23,7 @@ + bsdi*) os=bsdi need_tas=no ;; + freebsd1*|freebsd2*) os=freebsd need_tas=no ;; + freebsd*) os=freebsd need_tas=no elf=yes ;; +- netbsd*) +- os=bsd need_tas=no +- case "$host_cpu" in +- powerpc) elf=yes ;; +- esac ;; ++ netbsd*) os=netbsd need_tas=no ;; + openbsd*) os=bsd need_tas=no ;; + dgux*) os=dgux need_tas=no ;; + aix*) os=aix need_tas=no ;; diff --git a/databases/postgresql/patches/patch-ak b/databases/postgresql/patches/patch-ak index 329cde1f32e..6f6622b61db 100644 --- a/databases/postgresql/patches/patch-ak +++ b/databases/postgresql/patches/patch-ak @@ -1,13 +1,24 @@ -$NetBSD: patch-ak,v 1.1 1999/09/19 04:24:55 jlam Exp $ +$NetBSD: patch-ak,v 1.2 2000/03/18 17:43:17 jlam Exp $ ---- ./interfaces/libpgtcl/Makefile.in.orig Wed Jun 30 19:57:24 1999 -+++ ./interfaces/libpgtcl/Makefile.in Sat Sep 18 03:05:39 1999 -@@ -27,7 +27,7 @@ +--- include/port/bsd.h.orig Tue May 25 12:14:29 1999 ++++ include/port/bsd.h Thu Mar 16 17:49:44 2000 +@@ -1,16 +1,16 @@ + #define USE_POSIX_TIME - OBJS= pgtcl.o pgtclCmds.o pgtclId.o +-#if defined(i386) ++#if defined(__i386__) + #define NEED_I386_TAS_ASM + #define HAS_TEST_AND_SET + #endif --SHLIB_LINK+= -L../libpq -lpq -+SHLIB_LINK+= $(LIBPQ) +-#if defined(sparc) ++#if defined(__sparc__) + #define NEED_SPARC_TAS_ASM + #define HAS_TEST_AND_SET + #endif - # If crypt is a separate library, rather than part of libc, it may need - # to be referenced separately to keep (broken) linkers happy. (This is +-#if defined(vax) ++#if defined(__vax__) + #define NEED_VAX_TAS_ASM + #define HAS_TEST_AND_SET + #endif diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al index 5a4bccd5eba..47ef39f83c4 100644 --- a/databases/postgresql/patches/patch-al +++ b/databases/postgresql/patches/patch-al @@ -1,29 +1,28 @@ -$NetBSD: patch-al,v 1.2 1999/09/20 23:38:50 jlam Exp $ +$NetBSD: patch-al,v 1.3 2000/03/18 17:43:17 jlam Exp $ ---- ./interfaces/libpq++/Makefile.in.orig Tue Sep 7 14:11:35 1999 -+++ ./interfaces/libpq++/Makefile.in Mon Sep 20 01:21:40 1999 -@@ -17,8 +17,6 @@ +--- interfaces/ecpg/lib/Makefile.in.orig Wed Jun 30 19:57:23 1999 ++++ interfaces/ecpg/lib/Makefile.in Thu Mar 16 17:49:44 2000 +@@ -12,12 +12,12 @@ + + NAME= ecpg + SO_MAJOR_VERSION= 3 +-SO_MINOR_VERSION= 0.0 ++SO_MINOR_VERSION= 0 + SRCDIR= @top_srcdir@ include $(SRCDIR)/Makefile.global --CXX=@CXX@ -- - SRCHEADERDIR = $(SRCDIR)/include - LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq +-CFLAGS+= -I../include -I$(SRCDIR)/interfaces/libpq ++CFLAGS+= -I../include -I$(LIBPQDIR) -@@ -42,10 +40,13 @@ + ifdef KRBVERS + CFLAGS+= $(KRBFLAGS) +@@ -25,7 +25,7 @@ - OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o + OBJS= ecpglib.o typename.o -+# Signify that we're building a C++ library. -+CXXLIB= true -+ - ifeq ($(PORTNAME), win) --SHLIB_LINK+= --driver-name g++ -L../libpq -lpq -+SHLIB_LINK+= --driver-name g++ $(LIBPQ) - else --SHLIB_LINK= -L../libpq -lpq +-SHLIB_LINK= -L../../libpq -lpq +SHLIB_LINK= $(LIBPQ) - endif - # For CC on IRIX, must use CC as linker/archiver of C++ libraries + # Shared library stuff, also default 'all' target + include $(SRCDIR)/Makefile.shlib diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am index da8ae01e6ee..130f17704ff 100644 --- a/databases/postgresql/patches/patch-am +++ b/databases/postgresql/patches/patch-am @@ -1,54 +1,39 @@ -$NetBSD: patch-am,v 1.3 2000/02/04 18:04:35 jlam Exp $ +$NetBSD: patch-am,v 1.4 2000/03/18 17:43:17 jlam Exp $ ---- ./pl/plpgsql/src/Makefile.in.orig Wed Jun 30 19:57:31 1999 -+++ ./pl/plpgsql/src/Makefile.in Mon Sep 20 01:27:23 1999 +--- interfaces/jdbc/Makefile.orig Wed Jun 23 01:56:17 1999 ++++ interfaces/jdbc/Makefile Thu Mar 16 17:49:44 2000 @@ -27,7 +27,7 @@ - - OBJS= pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o - --SHLIB_LINK+= -L$(LIBPQDIR) -lpq -+SHLIB_LINK+= $(LIBPQ) - - # If crypt is a separate library, rather than part of libc, it may need - # to be referenced separately to keep (broken) linkers happy. (This is -@@ -44,12 +44,18 @@ - # installed, however, so we ignore the install-shlib rule and do this - # instead: - -+ifneq ($(LIBTOOL),) -+install: install-lib -+ rm -f $(LIBDIR)/lib$(NAME).a -+ $(LN_S) -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) $(LIBDIR)/plpgsql$(DLSUFFIX) -+else - install: $(shlib) - ifneq ($(shlib),) - $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/plpgsql$(DLSUFFIX) - else - @echo "plpgsql not installed due to lack of shared library support." - endif -+endif - - - pl_handler.o: pl_handler.c plpgsql.h pl.tab.h -@@ -60,8 +66,10 @@ - - pl_funcs.o: pl_funcs.c plpgsql.h pl.tab.h - --pl_parse.o: pl_gram.c pl_scan.c plpgsql.h -- $(CC) $(CFLAGS) -c -o $@ pl_gram.c -+pl_parse.o: pl_parse.c plpgsql.h pl.tab.h -+ -+pl_parse.c: pl_gram.c pl_scan.c plpgsql.h -+ $(LN_S) -f pl_gram.c pl_parse.c - - pl_gram.c pl.tab.h: gram.y - $(YACC) $(YFLAGS) $< -@@ -79,7 +87,7 @@ - - clean: clean-shlib - rm -f lib$(NAME).a -- rm -f *.o pl.tab.h pl_gram.c pl_scan.c -+ rm -f *.o pl.tab.h pl_parse.c pl_gram.c pl_scan.c - # And the garbage that might have been left behind by partial build: - rm -f y.tab.c y.tab.h lex.yy.c - ifeq ($(PORTNAME), win) + # In 6.5, the all rule builds the makeVersion class which then calls make using + # the jdbc1 or jdbc2 rules + all: makeVersion.class +- make $$($(JAVA) makeVersion) ++ $(MAKE) $$($(JAVA) makeVersion) + @echo ------------------------------------------------------------ + @echo The JDBC driver has now been built. To make it available to + @echo other applications, copy the postgresql.jar file to a public +@@ -45,10 +45,10 @@ + @echo + @echo ------------------------------------------------------------ + @echo To build the examples, type: +- @echo " make examples" ++ @echo " $(MAKE) examples" + @echo + @echo "To build the CORBA example (requires Java2):" +- @echo " make corba" ++ @echo " $(MAKE) corba" + @echo ------------------------------------------------------------ + @echo + +@@ -121,10 +121,10 @@ + @echo JDBC 1 specification, and one to the JDBC 2 specification. + @echo + @echo To build the driver for JDBC 1 (usually for JDK 1.1 thru 1.1.7) +- @echo then type: make jdbc1 ++ @echo then type: $(MAKE) jdbc1 + @echo + @echo To build the driver for JDBC 2 (usually for JDK 1.2 and later) +- @echo then type: make jdbc2 ++ @echo then type: $(MAKE) jdbc2 + @echo + @echo If you still have problems, then please email the interfaces + @echo or bugs lists, or better still to me direct (peter@retep.org.uk) diff --git a/databases/postgresql/patches/patch-an b/databases/postgresql/patches/patch-an index 4c5b9da6ab3..0c54cccfa74 100644 --- a/databases/postgresql/patches/patch-an +++ b/databases/postgresql/patches/patch-an @@ -1,12 +1,13 @@ -$NetBSD: patch-an,v 1.1 2000/01/18 22:50:28 jwise Exp $ ---- interfaces/jdbc/Makefile.orig Tue Jan 18 17:47:01 2000 -+++ interfaces/jdbc/Makefile Tue Jan 18 17:47:15 2000 -@@ -26,7 +26,7 @@ - # In 6.5, the all rule builds the makeVersion class which then calls make using - # the jdbc1 or jdbc2 rules - all: makeVersion.class -- make $$($(JAVA) makeVersion) -+ ${GMAKE} $$($(JAVA) makeVersion) - @echo ------------------------------------------------------------ - @echo The JDBC driver has now been built. To make it available to - @echo other applications, copy the postgresql.jar file to a public +$NetBSD: patch-an,v 1.2 2000/03/18 17:43:17 jlam Exp $ + +--- interfaces/libpgtcl/Makefile.in.orig Wed Jun 30 19:57:24 1999 ++++ interfaces/libpgtcl/Makefile.in Thu Mar 16 17:49:44 2000 +@@ -27,7 +27,7 @@ + + OBJS= pgtcl.o pgtclCmds.o pgtclId.o + +-SHLIB_LINK+= -L../libpq -lpq ++SHLIB_LINK+= $(LIBPQ) + + # If crypt is a separate library, rather than part of libc, it may need + # to be referenced separately to keep (broken) linkers happy. (This is diff --git a/databases/postgresql/patches/patch-ao b/databases/postgresql/patches/patch-ao index f561b80a4a7..63229e8b86e 100644 --- a/databases/postgresql/patches/patch-ao +++ b/databases/postgresql/patches/patch-ao @@ -1,24 +1,16 @@ -$NetBSD: patch-ao,v 1.1 2000/03/05 19:12:44 kleink Exp $ +$NetBSD: patch-ao,v 1.2 2000/03/18 17:43:17 jlam Exp $ ---- include/port/bsd.h.orig Tue May 25 18:14:29 1999 -+++ include/port/bsd.h Sun Mar 5 16:54:42 2000 -@@ -1,16 +1,16 @@ - #define USE_POSIX_TIME +--- interfaces/libpq++/Makefile.in.orig Tue Sep 7 14:11:35 1999 ++++ interfaces/libpq++/Makefile.in Thu Mar 16 17:49:44 2000 +@@ -43,9 +43,9 @@ + OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o --#if defined(i386) -+#if defined(__i386__) - #define NEED_I386_TAS_ASM - #define HAS_TEST_AND_SET - #endif + ifeq ($(PORTNAME), win) +-SHLIB_LINK+= --driver-name g++ -L../libpq -lpq ++SHLIB_LINK+= --driver-name g++ $(LIBPQ) + else +-SHLIB_LINK= -L../libpq -lpq ++SHLIB_LINK= $(LIBPQ) + endif --#if defined(sparc) -+#if defined(__sparc__) - #define NEED_SPARC_TAS_ASM - #define HAS_TEST_AND_SET - #endif - --#if defined(vax) -+#if defined(__vax__) - #define NEED_VAX_TAS_ASM - #define HAS_TEST_AND_SET - #endif + # For CC on IRIX, must use CC as linker/archiver of C++ libraries diff --git a/databases/postgresql/patches/patch-ap b/databases/postgresql/patches/patch-ap new file mode 100644 index 00000000000..35d155357f4 --- /dev/null +++ b/databases/postgresql/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1 2000/03/18 17:43:17 jlam Exp $ + +--- interfaces/odbc/GNUmakefile.in.orig Wed Jun 30 19:57:29 1999 ++++ interfaces/odbc/GNUmakefile.in Thu Mar 16 17:49:44 2000 +@@ -37,8 +37,6 @@ + pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \ + gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX) + +-SHLIB_LINK= $(LIBS) +- + # Shared library stuff, also default 'all' target + include $(SRCDIR)/Makefile.shlib + diff --git a/databases/postgresql/patches/patch-aq b/databases/postgresql/patches/patch-aq new file mode 100644 index 00000000000..9686d56ab5b --- /dev/null +++ b/databases/postgresql/patches/patch-aq @@ -0,0 +1,16 @@ +$NetBSD: patch-aq,v 1.1 2000/03/18 17:43:17 jlam Exp $ + +--- interfaces/odbc/dlg_specific.h.orig Wed Jan 6 15:44:07 1999 ++++ interfaces/odbc/dlg_specific.h Thu Mar 16 17:49:45 2000 +@@ -35,9 +35,9 @@ + #ifdef ODBCINST + #define xstr(s) str(s) + #define str(s) #s +-#define ODBCINST_INI xstr(ODBCINST) "/odbcinst.ini" ++#define ODBCINST_INI xstr(ODBCINST) "/odbc.ini" + #else +-#define ODBCINST_INI "/etc/odbcinst.ini" ++#define ODBCINST_INI "/etc/odbc.ini" + #endif + #else + #define ODBC_INI "ODBC.INI" /* ODBC initialization file */ diff --git a/databases/postgresql/patches/patch-ar b/databases/postgresql/patches/patch-ar new file mode 100644 index 00000000000..f7fa377898e --- /dev/null +++ b/databases/postgresql/patches/patch-ar @@ -0,0 +1,24 @@ +$NetBSD: patch-ar,v 1.1 2000/03/18 17:43:17 jlam Exp $ + +--- interfaces/odbc/psqlodbc.c.orig Mon Dec 28 20:49:57 1998 ++++ interfaces/odbc/psqlodbc.c Thu Mar 16 17:49:45 2000 +@@ -33,8 +33,8 @@ + + GLOBAL_VALUES globals; + +-BOOL _init(void); +-BOOL _fini(void); ++static BOOL _init(void); ++static BOOL _fini(void); + RETCODE SQL_API SQLDummyOrdinal(void); + + #ifdef WIN32 +@@ -98,7 +98,7 @@ + #endif + + /* These two functions do shared library initialziation on UNIX, well at least +- * on Linux. I don't know about other systems. ++ * on Linux and NetBSD. I don't know about other systems. + */ + BOOL + _init(void) diff --git a/databases/postgresql/patches/patch-as b/databases/postgresql/patches/patch-as new file mode 100644 index 00000000000..745622c0a4d --- /dev/null +++ b/databases/postgresql/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2000/03/18 17:43:17 jlam Exp $ + +--- pl/plpgsql/src/Makefile.in.orig Wed Jun 30 19:57:31 1999 ++++ pl/plpgsql/src/Makefile.in Thu Mar 16 17:49:45 2000 +@@ -27,7 +27,7 @@ + + OBJS= pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o + +-SHLIB_LINK+= -L$(LIBPQDIR) -lpq ++SHLIB_LINK+= $(LIBPQ) + + # If crypt is a separate library, rather than part of libc, it may need + # to be referenced separately to keep (broken) linkers happy. (This is diff --git a/databases/postgresql/patches/patch-at b/databases/postgresql/patches/patch-at new file mode 100644 index 00000000000..2f1cd55c3a9 --- /dev/null +++ b/databases/postgresql/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.1 2000/03/18 17:43:17 jlam Exp $ + +--- pl/tcl/Makefile.orig Sun Dec 13 18:46:49 1998 ++++ pl/tcl/Makefile Thu Mar 16 17:49:45 2000 +@@ -75,7 +75,7 @@ + + CFLAGS+= $(TCL_DEFS) + +-LDADD+= -L$(LIBPQDIR) -lpq ++LDADD+= $(LIBPQ) + + # + # DLOBJS is the dynamically-loaded object file. diff --git a/databases/postgresql/pkg/DEINSTALL b/databases/postgresql/pkg/DEINSTALL new file mode 100644 index 00000000000..c3410eeae30 --- /dev/null +++ b/databases/postgresql/pkg/DEINSTALL @@ -0,0 +1,29 @@ +#!/bin/sh +# +# $NetBSD: DEINSTALL,v 1.1 2000/03/18 17:43:17 jlam Exp $ +# + +PKGNAME=$1 +STAGE=$2 + +PGHOME=@PGHOME@ + +case ${STAGE} in +DEINSTALL) + ;; +POST-DEINSTALL) + cat << EOF +=========================================================================== +If you won't be using ${PKGNAME} any longer, you may want to +remove the following directories: + + ${PGHOME} +=========================================================================== +EOF + ;; +*) + echo "Unexpected argument: $2" + exit 1 + ;; +esac +exit 0 diff --git a/databases/postgresql/pkg/INSTALL b/databases/postgresql/pkg/INSTALL new file mode 100644 index 00000000000..1dd01854948 --- /dev/null +++ b/databases/postgresql/pkg/INSTALL @@ -0,0 +1,61 @@ +#!/bin/sh +# +# $NetBSD: INSTALL,v 1.1 2000/03/18 17:43:18 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +USER=@PGUSER@ +GROUP=@PGGROUP@ +PGHOME=@PGHOME@ +USERDIR=@USERDIR@ + +case ${STAGE} in +PRE-INSTALL) + echo ------------------------------------------------------------ + echo Dump existing databases, before installing new db version !! + echo ------------------------------------------------------------ + + # Group... the default's shipped with NetBSD + # We need to check that ${GROUP} exists before adding the user. + # + if ${USERDIR}/group info -e ${GROUP} + then + echo "Group '${GROUP}' already exists...proceeding." + else + echo "Creating '${GROUP}' group..." + ${USERDIR}/group add ${GROUP} + echo "Done." + fi + + # use finger to be able to use NIS, ... + # + mkdir -p ${PGHOME} + if finger ${USER} 2>&1 | grep >/dev/null "no such user" + then + echo "Creating '${USER}' user..." + ${USERDIR}/user add \ + -c "PostgreSQL database administrator" \ + -d ${PGHOME} \ + -g ${GROUP} -s /bin/sh ${USER} + echo "Done." + else + echo "User '${USER}' already exists...proceeding." + fi + chown -R ${USER}:${GROUP} ${PGHOME} + ;; +POST-INSTALL) + if [ ! -f ${PGHOME}/.profile ]; then + cp ${PGHOME}/.profile.pgsql ${PGHOME}/.profile + fi + echo ------------------------------------------------------------------ + echo Initializing PostgreSQL Databases - this may take a few minutes... + echo ------------------------------------------------------------------ + echo "${PKG_PREFIX}/bin/initdb --pglib=${PKG_PREFIX}/share/postgresql --pgdata=${PGHOME}/data" | su -l ${USER} + ;; +*) + echo "Unexpected argument: $2" + exit 1 + ;; +esac +exit 0 diff --git a/databases/postgresql/pkg/PLIST.doc b/databases/postgresql/pkg/PLIST index f536c6c050b..a4bb9f61701 100644 --- a/databases/postgresql/pkg/PLIST.doc +++ b/databases/postgresql/pkg/PLIST @@ -1,4 +1,136 @@ -@comment $NetBSD: PLIST.doc,v 1.1 1999/09/19 04:24:55 jlam Exp $ +@comment $NetBSD: PLIST,v 1.11 2000/03/18 17:43:18 jlam Exp $ +bin/cleardbdir +bin/createdb +bin/createlang +bin/createuser +bin/destroydb +bin/destroylang +bin/destroyuser +bin/ecpg +bin/initdb +bin/initlocation +bin/ipcclean +bin/pg_dump +bin/pg_dumpall +bin/pg_id +bin/pg_passwd +bin/pg_upgrade +bin/pg_version +bin/postgres +bin/postmaster +bin/psql +bin/vacuumdb +include/access/attnum.h +include/c.h +include/commands/trigger.h +include/config.h +include/ecpgerrno.h +include/ecpglib.h +include/ecpgtype.h +include/executor/spi.h +include/fmgr.h +include/lib/dllist.h +include/libpq++.h +include/libpq++/pgconnection.h +include/libpq++/pgcursordb.h +include/libpq++/pgdatabase.h +include/libpq++/pglobject.h +include/libpq++/pgtransdb.h +include/libpq-fe.h +include/libpq-int.h +include/libpq/libpq-fs.h +include/libpq/pqcomm.h +include/os.h +include/postgres.h +include/postgres_ext.h +include/sqlca.h +include/utils/elog.h +include/utils/geo_decls.h +include/utils/mcxt.h +include/utils/palloc.h +lib/libecpg.a +lib/libecpg.so.3.0 +lib/libpq++.a +lib/libpq++.so.3.0 +lib/libpq.a +lib/libpq.so.2.0 +lib/plpgsql.so +man/man1/cleardbdir.1 +man/man1/createdb.1 +man/man1/createuser.1 +man/man1/destroydb.1 +man/man1/destroyuser.1 +man/man1/ecpg.1 +man/man1/initdb.1 +man/man1/initlocation.1 +man/man1/ipcclean.1 +man/man1/pg_dump.1 +man/man1/pg_dumpall.1 +man/man1/pg_passwd.1 +man/man1/pg_upgrade.1 +man/man1/postgres.1 +man/man1/postmaster.1 +man/man1/psql.1 +man/man3/catalogs.3 +man/man3/libpq.3 +man/man5/pg_hba.conf.5 +man/manl/abort.l +man/manl/alter_table.l +man/manl/alter_user.l +man/manl/begin.l +man/manl/close.l +man/manl/cluster.l +man/manl/commit.l +man/manl/copy.l +man/manl/create_aggregate.l +man/manl/create_database.l +man/manl/create_function.l +man/manl/create_index.l +man/manl/create_language.l +man/manl/create_operator.l +man/manl/create_rule.l +man/manl/create_sequence.l +man/manl/create_table.l +man/manl/create_trigger.l +man/manl/create_type.l +man/manl/create_user.l +man/manl/create_version.l +man/manl/create_view.l +man/manl/declare.l +man/manl/delete.l +man/manl/drop.l +man/manl/drop_aggregate.l +man/manl/drop_database.l +man/manl/drop_function.l +man/manl/drop_index.l +man/manl/drop_language.l +man/manl/drop_operator.l +man/manl/drop_rule.l +man/manl/drop_sequence.l +man/manl/drop_table.l +man/manl/drop_trigger.l +man/manl/drop_type.l +man/manl/drop_user.l +man/manl/drop_view.l +man/manl/end.l +man/manl/explain.l +man/manl/fetch.l +man/manl/grant.l +man/manl/insert.l +man/manl/listen.l +man/manl/load.l +man/manl/lock.l +man/manl/move.l +man/manl/notify.l +man/manl/reset.l +man/manl/revoke.l +man/manl/rollback.l +man/manl/select.l +man/manl/set.l +man/manl/show.l +man/manl/sql.l +man/manl/update.l +man/manl/vacuum.l share/doc/postgresql/FAQ share/doc/postgresql/FAQ_DEV share/doc/postgresql/README.fsync @@ -677,8 +809,8 @@ share/doc/postgresql/user/datatype.htm share/doc/postgresql/user/datetime-appendix.htm share/doc/postgresql/user/environ.htm share/doc/postgresql/user/functions.htm -share/doc/postgresql/user/index.html share/doc/postgresql/user/inherit.htm +share/doc/postgresql/user/index.html share/doc/postgresql/user/intro.htm share/doc/postgresql/user/keys.htm share/doc/postgresql/user/manage.htm @@ -784,9 +916,23 @@ share/doc/postgresql/user/x684.htm share/doc/postgresql/user/x710.htm share/doc/postgresql/user/x774.htm share/doc/postgresql/user/y2k.htm +share/postgresql/global1.bki.source +share/postgresql/global1.description +share/postgresql/local1_template1.bki.source +share/postgresql/local1_template1.description +share/postgresql/pg_geqo.sample +share/postgresql/pg_hba.conf.sample +@dirrm share/postgresql @dirrm share/doc/postgresql/user @dirrm share/doc/postgresql/tutorial @dirrm share/doc/postgresql/programmer @dirrm share/doc/postgresql/postgres @dirrm share/doc/postgresql/admin @dirrm share/doc/postgresql +@dirrm include/utils +@dirrm include/libpq +@dirrm include/libpq++ +@dirrm include/lib +@dirrm include/executor +@dirrm include/commands +@dirrm include/access diff --git a/databases/postgresql/pkg/PLIST.dirrm b/databases/postgresql/pkg/PLIST.dirrm deleted file mode 100644 index 6ffca51cb6f..00000000000 --- a/databases/postgresql/pkg/PLIST.dirrm +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD: PLIST.dirrm,v 1.1 1999/09/19 04:24:55 jlam Exp $ -@dirrm ${PGUSER}/man/manl -@dirrm ${PGUSER}/man/man5 -@dirrm ${PGUSER}/man/man3 -@dirrm ${PGUSER}/man/man1 -@dirrm ${PGUSER}/man -@dirrm ${PGUSER}/lib -@dirrm ${PGUSER}/include/utils -@dirrm ${PGUSER}/include/port/bsd -@dirrm ${PGUSER}/include/port -@dirrm ${PGUSER}/include/libpq -@dirrm ${PGUSER}/include/libpq++ -@dirrm ${PGUSER}/include/lib -@dirrm ${PGUSER}/include/executor -@dirrm ${PGUSER}/include/commands -@dirrm ${PGUSER}/include/access -@dirrm ${PGUSER}/include -@dirrm ${PGUSER}/data/base/template1 -@dirrm ${PGUSER}/data/base -@dirrm ${PGUSER}/data -@dirrm ${PGUSER}/bin -@dirrm ${PGUSER} diff --git a/databases/postgresql/pkg/PLIST.notcl b/databases/postgresql/pkg/PLIST.notcl deleted file mode 100644 index d2ee5c26325..00000000000 --- a/databases/postgresql/pkg/PLIST.notcl +++ /dev/null @@ -1,195 +0,0 @@ -@comment $NetBSD: PLIST.notcl,v 1.1 1999/09/19 04:24:56 jlam Exp $ -etc/rc.d/pgsql.sh -${PGUSER}/.profile -${PGUSER}/bin/cleardbdir -${PGUSER}/bin/createdb -${PGUSER}/bin/createlang -${PGUSER}/bin/createuser -${PGUSER}/bin/destroydb -${PGUSER}/bin/destroylang -${PGUSER}/bin/destroyuser -${PGUSER}/bin/ecpg -${PGUSER}/bin/initdb -${PGUSER}/bin/initlocation -${PGUSER}/bin/ipcclean -${PGUSER}/bin/pg_dump -${PGUSER}/bin/pg_dumpall -${PGUSER}/bin/pg_id -${PGUSER}/bin/pg_passwd -${PGUSER}/bin/pg_upgrade -${PGUSER}/bin/pg_version -${PGUSER}/bin/postgres -${PGUSER}/bin/postmaster -${PGUSER}/bin/psql -${PGUSER}/bin/vacuumdb -${PGUSER}/data/PG_VERSION -${PGUSER}/data/base/template1/PG_VERSION -${PGUSER}/data/base/template1/pg_aggregate -${PGUSER}/data/base/template1/pg_am -${PGUSER}/data/base/template1/pg_amop -${PGUSER}/data/base/template1/pg_amproc -${PGUSER}/data/base/template1/pg_attrdef -${PGUSER}/data/base/template1/pg_attrdef_adrelid_index -${PGUSER}/data/base/template1/pg_attribute -${PGUSER}/data/base/template1/pg_attribute_attrelid_index -${PGUSER}/data/base/template1/pg_attribute_relid_attnam_index -${PGUSER}/data/base/template1/pg_attribute_relid_attnum_index -${PGUSER}/data/base/template1/pg_class -${PGUSER}/data/base/template1/pg_class_oid_index -${PGUSER}/data/base/template1/pg_class_relname_index -${PGUSER}/data/base/template1/pg_description -${PGUSER}/data/base/template1/pg_description_objoid_index -${PGUSER}/data/base/template1/pg_index -${PGUSER}/data/base/template1/pg_indexes -${PGUSER}/data/base/template1/pg_inheritproc -${PGUSER}/data/base/template1/pg_inherits -${PGUSER}/data/base/template1/pg_ipl -${PGUSER}/data/base/template1/pg_language -${PGUSER}/data/base/template1/pg_listener -${PGUSER}/data/base/template1/pg_opclass -${PGUSER}/data/base/template1/pg_operator -${PGUSER}/data/base/template1/pg_proc -${PGUSER}/data/base/template1/pg_proc_oid_index -${PGUSER}/data/base/template1/pg_proc_proname_narg_type_index -${PGUSER}/data/base/template1/pg_proc_prosrc_index -${PGUSER}/data/base/template1/pg_relcheck -${PGUSER}/data/base/template1/pg_relcheck_rcrelid_index -${PGUSER}/data/base/template1/pg_rewrite -${PGUSER}/data/base/template1/pg_rules -${PGUSER}/data/base/template1/pg_statistic -${PGUSER}/data/base/template1/pg_tables -${PGUSER}/data/base/template1/pg_trigger -${PGUSER}/data/base/template1/pg_trigger_tgrelid_index -${PGUSER}/data/base/template1/pg_type -${PGUSER}/data/base/template1/pg_type_oid_index -${PGUSER}/data/base/template1/pg_type_typname_index -${PGUSER}/data/base/template1/pg_user -${PGUSER}/data/base/template1/pg_views -${PGUSER}/data/pg_database -${PGUSER}/data/pg_geqo.sample -${PGUSER}/data/pg_group -${PGUSER}/data/pg_hba.conf -${PGUSER}/data/pg_log -${PGUSER}/data/pg_pwd -${PGUSER}/data/pg_shadow -${PGUSER}/data/pg_variable -${PGUSER}/include/access/attnum.h -${PGUSER}/include/c.h -${PGUSER}/include/commands/trigger.h -${PGUSER}/include/config.h -${PGUSER}/include/ecpgerrno.h -${PGUSER}/include/ecpglib.h -${PGUSER}/include/ecpgtype.h -${PGUSER}/include/executor/spi.h -${PGUSER}/include/fmgr.h -${PGUSER}/include/lib/dllist.h -${PGUSER}/include/libpq++.h -${PGUSER}/include/libpq++/pgconnection.h -${PGUSER}/include/libpq++/pgcursordb.h -${PGUSER}/include/libpq++/pgdatabase.h -${PGUSER}/include/libpq++/pglobject.h -${PGUSER}/include/libpq++/pgtransdb.h -${PGUSER}/include/libpq-fe.h -${PGUSER}/include/libpq-int.h -${PGUSER}/include/libpq/libpq-fs.h -${PGUSER}/include/libpq/pqcomm.h -${PGUSER}/include/os.h -${PGUSER}/include/port/bsd/.keep_me -${PGUSER}/include/postgres.h -${PGUSER}/include/postgres_ext.h -${PGUSER}/include/sqlca.h -${PGUSER}/include/utils/elog.h -${PGUSER}/include/utils/geo_decls.h -${PGUSER}/include/utils/mcxt.h -${PGUSER}/include/utils/palloc.h -${PGUSER}/lib/global1.bki.source -${PGUSER}/lib/global1.description -${PGUSER}/lib/libecpg.a -${PGUSER}/lib/libecpg.so.3.0 -${PGUSER}/lib/libplpgsql.so.1.0 -${PGUSER}/lib/libpq++.a -${PGUSER}/lib/libpq++.so.3.0 -${PGUSER}/lib/libpq.a -${PGUSER}/lib/libpq.so.2.0 -${PGUSER}/lib/local1_template1.bki.source -${PGUSER}/lib/local1_template1.description -${PGUSER}/lib/plpgsql.so -${PGUSER}/lib/pg_geqo.sample -${PGUSER}/lib/pg_hba.conf.sample -${PGUSER}/man/man1/cleardbdir.1 -${PGUSER}/man/man1/createdb.1 -${PGUSER}/man/man1/createuser.1 -${PGUSER}/man/man1/destroydb.1 -${PGUSER}/man/man1/destroyuser.1 -${PGUSER}/man/man1/ecpg.1 -${PGUSER}/man/man1/initdb.1 -${PGUSER}/man/man1/initlocation.1 -${PGUSER}/man/man1/ipcclean.1 -${PGUSER}/man/man1/pg_dump.1 -${PGUSER}/man/man1/pg_dumpall.1 -${PGUSER}/man/man1/pg_passwd.1 -${PGUSER}/man/man1/pg_upgrade.1 -${PGUSER}/man/man1/postgres.1 -${PGUSER}/man/man1/postmaster.1 -${PGUSER}/man/man1/psql.1 -${PGUSER}/man/man3/catalogs.3 -${PGUSER}/man/man3/libpq.3 -${PGUSER}/man/man5/pg_hba.conf.5 -${PGUSER}/man/manl/abort.l -${PGUSER}/man/manl/alter_table.l -${PGUSER}/man/manl/alter_user.l -${PGUSER}/man/manl/begin.l -${PGUSER}/man/manl/close.l -${PGUSER}/man/manl/cluster.l -${PGUSER}/man/manl/commit.l -${PGUSER}/man/manl/copy.l -${PGUSER}/man/manl/create_aggregate.l -${PGUSER}/man/manl/create_database.l -${PGUSER}/man/manl/create_function.l -${PGUSER}/man/manl/create_index.l -${PGUSER}/man/manl/create_language.l -${PGUSER}/man/manl/create_operator.l -${PGUSER}/man/manl/create_rule.l -${PGUSER}/man/manl/create_sequence.l -${PGUSER}/man/manl/create_table.l -${PGUSER}/man/manl/create_trigger.l -${PGUSER}/man/manl/create_type.l -${PGUSER}/man/manl/create_user.l -${PGUSER}/man/manl/create_version.l -${PGUSER}/man/manl/create_view.l -${PGUSER}/man/manl/declare.l -${PGUSER}/man/manl/delete.l -${PGUSER}/man/manl/drop.l -${PGUSER}/man/manl/drop_aggregate.l -${PGUSER}/man/manl/drop_database.l -${PGUSER}/man/manl/drop_function.l -${PGUSER}/man/manl/drop_index.l -${PGUSER}/man/manl/drop_language.l -${PGUSER}/man/manl/drop_operator.l -${PGUSER}/man/manl/drop_rule.l -${PGUSER}/man/manl/drop_sequence.l -${PGUSER}/man/manl/drop_table.l -${PGUSER}/man/manl/drop_trigger.l -${PGUSER}/man/manl/drop_type.l -${PGUSER}/man/manl/drop_user.l -${PGUSER}/man/manl/drop_view.l -${PGUSER}/man/manl/end.l -${PGUSER}/man/manl/explain.l -${PGUSER}/man/manl/fetch.l -${PGUSER}/man/manl/grant.l -${PGUSER}/man/manl/insert.l -${PGUSER}/man/manl/listen.l -${PGUSER}/man/manl/load.l -${PGUSER}/man/manl/lock.l -${PGUSER}/man/manl/move.l -${PGUSER}/man/manl/notify.l -${PGUSER}/man/manl/reset.l -${PGUSER}/man/manl/revoke.l -${PGUSER}/man/manl/rollback.l -${PGUSER}/man/manl/select.l -${PGUSER}/man/manl/set.l -${PGUSER}/man/manl/show.l -${PGUSER}/man/manl/sql.l -${PGUSER}/man/manl/update.l -${PGUSER}/man/manl/vacuum.l -${PGUSER}/post-install-notes diff --git a/databases/postgresql/pkg/PLIST.tcl b/databases/postgresql/pkg/PLIST.tcl deleted file mode 100644 index 8beec5c80b1..00000000000 --- a/databases/postgresql/pkg/PLIST.tcl +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST.tcl,v 1.3 2000/02/20 00:11:20 jwise Exp $ -${PGUSER}/bin/pgtclsh -${PGUSER}/include/libpgtcl.h -${PGUSER}/lib/libpgtcl.a -${PGUSER}/lib/libpgtcl.so.2.0 -${PGUSER}/lib/pltcl.so diff --git a/databases/postgresql/pkg/PLIST.tk b/databases/postgresql/pkg/PLIST.tk deleted file mode 100644 index db340081d28..00000000000 --- a/databases/postgresql/pkg/PLIST.tk +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.tk,v 1.1 2000/02/20 00:11:21 jwise Exp $ -${PGUSER}/bin/pgtksh diff --git a/databases/postgresql/pkg/REQ b/databases/postgresql/pkg/REQ deleted file mode 100644 index 0dd141061b5..00000000000 --- a/databases/postgresql/pkg/REQ +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# $NetBSD: REQ,v 1.3 1999/09/19 17:05:31 jlam Exp $ - -PGUSER=@PGUSER@ -PGGROUP=@PGGROUP@ -ADDNERD=@LOCALBASE@/sbin/addnerd -PREFIX=@PREFIX@ - - -PKG=$1 -STAGE=$2 - -if [ "$STAGE" != "INSTALL" ]; -then - exit 0 -fi - - -# Group... the default's shipped with NetBSD -# We need to check that ${PGGROUP} exists before adding the user with -# addnerd. -# -if grep "^${PGGROUP}:" /etc/group 2>&1 >/dev/null -then - echo "Group '$PGGROUP' already exists, proceeding." -else - echo "Please add group '$PGGROUP' to /etc/group before installing." - exit 1 -fi - -# use finger to be able to use NIS, ... -if finger ${PGUSER} 2>&1 | grep >/dev/null "no such user" -then - echo "Creating '$PGUSER' user ..." - ${ADDNERD} -h ${PREFIX} -g ${PGGROUP} ${PGUSER} - echo Done. -else - echo "User '$PGUSER' already exists, proceeding." -fi |