diff options
| -rw-r--r-- | databases/postgresql/Makefile | 8 | ||||
| -rw-r--r-- | databases/postgresql/files/md5 | 4 | ||||
| -rw-r--r-- | databases/postgresql/files/patch-sum | 15 | ||||
| -rw-r--r-- | databases/postgresql/files/post-install-notes | 7 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-aa | 10 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-ab | 47 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-ah | 67 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-ai | 55 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-aj | 12 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-al | 18 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-am | 16 | ||||
| -rw-r--r-- | databases/postgresql/pkg/PLIST.tcl | 3 |
12 files changed, 87 insertions, 175 deletions
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile index b97420a998e..7527c38363f 100644 --- a/databases/postgresql/Makefile +++ b/databases/postgresql/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.41 1999/09/20 03:56:25 jlam Exp $ +# $NetBSD: Makefile,v 1.42 1999/09/20 23:38:45 jlam Exp $ # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp # -DISTNAME= postgresql-6.5.1 +DISTNAME= postgresql-6.5.2 WRKSRC= ${WRKDIR}/${DISTNAME}/src CATEGORIES= databases MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/ \ @@ -109,9 +109,9 @@ post-extract: pre-build: .if ${PGSQL_USE_TCL} == "YES" - @${ECHO} "Building PostgreSQL with \"libpgtcl\"." + @${ECHO} "Building PostgreSQL with Tcl/Tk interface library." .else - @${ECHO} "To build without the \"PostgreSQL Tcl interface library\"," + @${ECHO} "To build without the \"PostgreSQL Tcl/Tk interface library\"," @${ECHO} "libpgtcl, type: \"${MAKE} PGSQL_USE_TCL=NO\"." .endif diff --git a/databases/postgresql/files/md5 b/databases/postgresql/files/md5 index 969615f38e0..a86f5db6673 100644 --- a/databases/postgresql/files/md5 +++ b/databases/postgresql/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: md5,v 1.6 1999/09/20 23:38:47 jlam Exp $ -MD5 (postgresql-6.5.1.tar.gz) = f32379223026bd123552459958054d51 +MD5 (postgresql-6.5.2.tar.gz) = 36546d54b2ec7da1eec967522089e4ab diff --git a/databases/postgresql/files/patch-sum b/databases/postgresql/files/patch-sum index bba739f323d..c684b2dd5fc 100644 --- a/databases/postgresql/files/patch-sum +++ b/databases/postgresql/files/patch-sum @@ -1,15 +1,14 @@ -$NetBSD: patch-sum,v 1.4 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-sum,v 1.5 1999/09/20 23:38:47 jlam Exp $ -MD5 (patch-aa) = 5e8179c837c09090840c1b56d5c396d8 -MD5 (patch-ab) = 75e575fb9211ed9357e3e4789452d055 +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) = cb80c672fa0b4e68802dafada7924030 -MD5 (patch-ai) = 27e8d614ef112a233c29debd6d6f4692 -MD5 (patch-aj) = c87c762e2732893073917e5af535cc52 +MD5 (patch-ah) = 43e39c5c596432cb3cce6ab49d005102 +MD5 (patch-aj) = fe9fc5224b1b3d1cb85f57007f005d1b MD5 (patch-ak) = 1e22bf0d5770426882fef94d528f324e -MD5 (patch-al) = 1394c41ef6b8d6e89bd4875606d6f8b5 -MD5 (patch-am) = 03f21739e54e2b7eca7094a5a61d97a1 +MD5 (patch-al) = 17bff31d1a88187c0b46b2262e7fc8d6 +MD5 (patch-am) = fe992cdaa4f532dc143cad9b56f4ee61 diff --git a/databases/postgresql/files/post-install-notes b/databases/postgresql/files/post-install-notes index aded8a71e2c..719aeed92f2 100644 --- a/databases/postgresql/files/post-install-notes +++ b/databases/postgresql/files/post-install-notes @@ -1,4 +1,4 @@ -$NetBSD: post-install-notes,v 1.3 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: post-install-notes,v 1.4 1999/09/20 23:38:48 jlam Exp $ Now that PostgreSQL is installed, you should read the documentation and implementation guides. These can be found at: @@ -9,6 +9,7 @@ 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. -If you built PostgreSQL with TCL support, then you can use the -TCL/TK based database frontend "pgaccess" for database operations. +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. diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa index 2a3a2908874..b37c399147b 100644 --- a/databases/postgresql/patches/patch-aa +++ b/databases/postgresql/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-aa,v 1.3 1999/09/20 23:38:48 jlam Exp $ ---- ./Makefile.global.in.orig Thu Jun 24 20:13:45 1999 -+++ ./Makefile.global.in Sat Sep 18 03:20:03 1999 +--- ./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 @@ ELF_SYSTEM= @ELF_SYS@ @@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.2 1999/09/19 04:24:54 jlam Exp $ YFLAGS= @YFLAGS@ YACC= @YACC@ LEX= @LEX@ -@@ -242,7 +252,7 @@ +@@ -243,7 +253,7 @@ ############################################################################## ifneq ($(CUSTOM_INSTALL),) @@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 1999/09/19 04:24:54 jlam Exp $ endif # -@@ -273,7 +283,11 @@ +@@ -274,7 +284,11 @@ # using a i486 or better. ifneq ($(CUSTOM_CC),) diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab index 4daf00ae237..e090a9a0d6f 100644 --- a/databases/postgresql/patches/patch-ab +++ b/databases/postgresql/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ +$NetBSD: patch-ab,v 1.7 1999/09/20 23:38:48 jlam Exp $ ---- ./Makefile.shlib.orig Fri Jul 16 18:46:16 1999 -+++ ./Makefile.shlib Sat Sep 18 17:34:59 1999 +--- ./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 := @@ -10,16 +10,7 @@ $NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ # 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 -@@ -64,7 +65,7 @@ - endif - - ifeq ($(PORTNAME), freebsd) -- ifdef BSD_SHLIB -+ ifneq $(BSD_SHLIB),) - install-shlib-dep := install-shlib - ifdef ELF_SYSTEM - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) -@@ -78,7 +79,8 @@ +@@ -65,20 +66,26 @@ endif ifeq ($(PORTNAME), bsd) @@ -28,8 +19,10 @@ $NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ + ifeq ($(LIBTOOL),) install-shlib-dep := install-shlib shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - ifdef ELF_SYSTEM -@@ -87,11 +89,16 @@ +- ifdef ELF_SYSTEM ++ ifeq ($(ELF_SYSTEM), true) + LDFLAGS_SL := -x -Bshareable -soname $(shlib) + else LDFLAGS_SL := -x -Bshareable -Bforcearchive endif CFLAGS += $(CFLAGS_SL) @@ -48,7 +41,19 @@ $NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ ifeq ($(DLSUFFIX), .so) install-shlib-dep := install-shlib shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -@@ -183,7 +190,7 @@ +@@ -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. @@ -57,8 +62,8 @@ $NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ # Rules to build regular and shared libraries -@@ -197,6 +204,21 @@ - $(RANLIB) $@ +@@ -207,6 +214,21 @@ + endif +ifneq ($(LIBTOOL),) @@ -78,8 +83,8 @@ $NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ + ifneq ($(shlib),) ifneq ($(PORTNAME), win) - -@@ -228,8 +250,8 @@ + ifneq ($(PORTNAME), aix) +@@ -250,8 +272,8 @@ .PHONY: all install-lib install-shlib @@ -90,7 +95,7 @@ $NetBSD: patch-ab,v 1.6 1999/09/19 04:24:54 jlam Exp $ install-shlib: $(shlib) $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib) -@@ -251,4 +273,8 @@ +@@ -273,4 +295,8 @@ .PHONY: clean-shlib clean-shlib: diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah index f6200846257..32d687ff907 100644 --- a/databases/postgresql/patches/patch-ah +++ b/databases/postgresql/patches/patch-ah @@ -1,55 +1,14 @@ -$NetBSD: patch-ah,v 1.3 1999/09/19 04:24:55 jlam Exp $ +$NetBSD: patch-ah,v 1.4 1999/09/20 23:38:49 jlam Exp $ ---- ./configure.in.orig Sat May 29 20:06:44 1999 -+++ ./configure.in Sat Sep 18 03:21:22 1999 -@@ -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=bsd need_tas=no elf=maybe ;; # mix of a.out & ELF platforms - openbsd*) os=bsd need_tas=no ;; - dgux*) os=dgux need_tas=no ;; - aix*) os=aix need_tas=no ;; -@@ -58,13 +54,6 @@ - exit;; - esac - --if test "X$elf" = "Xyes" --then -- ELF_SYS=true --else -- ELF_SYS= --fi -- - if test "X$need_tas" = "Xyes" - then - AC_LINK_FILES(backend/port/tas/${tas_file}, backend/port/tas.s) -@@ -416,6 +405,23 @@ - - LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" - echo "- setting LDFLAGS=$LDFLAGS" -+ -+dnl Check for ELF after finding compiler. -+case "X$elf" in -+Xmaybe) -+ if ${CC} -E - -dM </dev/null | grep -q __ELF__; then -+ ELF_SYS=true -+ else -+ ELF_SYS= -+ fi -+ ;; -+Xyes) -+ ELF_SYS=true -+ ;; -+*) -+ ELF_SYS= -+ ;; -+esac - - AC_SUBST(ELF_SYS) - AC_SUBST(PORTNAME) +--- ./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 diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai deleted file mode 100644 index bf2e08acba1..00000000000 --- a/databases/postgresql/patches/patch-ai +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ai,v 1.3 1999/09/19 04:24:55 jlam Exp $ - ---- ./configure.orig Sat May 29 20:06:44 1999 -+++ ./configure Sat Sep 18 03:21:47 1999 -@@ -628,11 +628,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=bsd need_tas=no elf=maybe ;; # mix of a.out & ELF platforms - openbsd*) os=bsd need_tas=no ;; - dgux*) os=dgux need_tas=no ;; - aix*) os=aix need_tas=no ;; -@@ -663,13 +659,6 @@ - exit;; - esac - --if test "X$elf" = "Xyes" --then -- ELF_SYS=true --else -- ELF_SYS= --fi -- - if test "X$need_tas" = "Xyes" - then - -@@ -1418,6 +1407,23 @@ - - LDFLAGS="$LDFLAGS $PGSQL_LDFLAGS" - echo "- setting LDFLAGS=$LDFLAGS" -+ -+# Check for ELF after finding compiler. -+case "X$elf" in -+Xmaybe) -+ if ${CC} -E - -dM </dev/null | grep -q __ELF__; then -+ ELF_SYS=true -+ else -+ ELF_SYS= -+ fi -+ ;; -+Xyes) -+ ELF_SYS=true -+ ;; -+*) -+ ELF_SYS= -+ ;; -+esac - - - diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj index 83a6357cbab..ae0c3f47099 100644 --- a/databases/postgresql/patches/patch-aj +++ b/databases/postgresql/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.3 1999/09/19 04:24:55 jlam Exp $ +$NetBSD: patch-aj,v 1.4 1999/09/20 23:38:50 jlam Exp $ --- ./interfaces/ecpg/lib/Makefile.in.orig Wed Jun 30 19:57:23 1999 -+++ ./interfaces/ecpg/lib/Makefile.in Sat Sep 18 03:05:04 1999 -@@ -12,7 +12,11 @@ ++++ ./interfaces/ecpg/lib/Makefile.in Mon Sep 20 01:17:03 1999 +@@ -12,12 +12,16 @@ NAME= ecpg SO_MAJOR_VERSION= 3 @@ -14,6 +14,12 @@ $NetBSD: patch-aj,v 1.3 1999/09/19 04:24:55 jlam Exp $ 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 diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al index 05dd089a90b..5a4bccd5eba 100644 --- a/databases/postgresql/patches/patch-al +++ b/databases/postgresql/patches/patch-al @@ -1,7 +1,7 @@ -$NetBSD: patch-al,v 1.1 1999/09/19 04:24:55 jlam Exp $ +$NetBSD: patch-al,v 1.2 1999/09/20 23:38:50 jlam Exp $ ---- ./interfaces/libpq++/Makefile.in.orig Wed Jul 7 23:30:16 1999 -+++ ./interfaces/libpq++/Makefile.in Sat Sep 18 03:08:44 1999 +--- ./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 @@ SRCDIR= @top_srcdir@ include $(SRCDIR)/Makefile.global @@ -11,9 +11,13 @@ $NetBSD: patch-al,v 1.1 1999/09/19 04:24:55 jlam Exp $ SRCHEADERDIR = $(SRCDIR)/include LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq -@@ -43,10 +41,13 @@ +@@ -42,10 +40,13 @@ + OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.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) @@ -21,9 +25,5 @@ $NetBSD: patch-al,v 1.1 1999/09/19 04:24:55 jlam Exp $ -SHLIB_LINK= -L../libpq -lpq +SHLIB_LINK= $(LIBPQ) endif -+ -+# Signify that we're building a C++ library. -+CXXLIB= true - # Shared library stuff, also default 'all' target - include $(SRCDIR)/Makefile.shlib + # For CC on IRIX, must use CC as linker/archiver of C++ libraries diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am index 3e6f382297a..1d523df523b 100644 --- a/databases/postgresql/patches/patch-am +++ b/databases/postgresql/patches/patch-am @@ -1,7 +1,7 @@ -$NetBSD: patch-am,v 1.1 1999/09/19 04:24:55 jlam Exp $ +$NetBSD: patch-am,v 1.2 1999/09/20 23:38:50 jlam Exp $ --- ./pl/plpgsql/src/Makefile.in.orig Wed Jun 30 19:57:31 1999 -+++ ./pl/plpgsql/src/Makefile.in Sat Sep 18 03:10:58 1999 ++++ ./pl/plpgsql/src/Makefile.in Mon Sep 20 01:27:23 1999 @@ -27,7 +27,7 @@ OBJS= pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o @@ -11,16 +11,14 @@ $NetBSD: patch-am,v 1.1 1999/09/19 04:24:55 jlam Exp $ # 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,20 @@ +@@ -44,12 +44,18 @@ # installed, however, so we ignore the install-shlib rule and do this # instead: +ifneq ($(LIBTOOL),) -+install: install-lib post-install-lib -+ -+post-install-lib: ++install: install-lib + rm -f $(LIBDIR)/lib$(NAME).a -+ $(LN_S) -f $(LIBDIR)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) $(LIBDIR)/plpgsql$(DLSUFFIX) ++ $(LN_S) -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) $(LIBDIR)/plpgsql$(DLSUFFIX) +else install: $(shlib) ifneq ($(shlib),) @@ -32,7 +30,7 @@ $NetBSD: patch-am,v 1.1 1999/09/19 04:24:55 jlam Exp $ pl_handler.o: pl_handler.c plpgsql.h pl.tab.h -@@ -60,8 +68,10 @@ +@@ -60,8 +66,10 @@ pl_funcs.o: pl_funcs.c plpgsql.h pl.tab.h @@ -45,7 +43,7 @@ $NetBSD: patch-am,v 1.1 1999/09/19 04:24:55 jlam Exp $ pl_gram.c pl.tab.h: gram.y $(YACC) $(YFLAGS) $< -@@ -79,7 +89,7 @@ +@@ -79,7 +87,7 @@ clean: clean-shlib rm -f lib$(NAME).a diff --git a/databases/postgresql/pkg/PLIST.tcl b/databases/postgresql/pkg/PLIST.tcl index 033d6068740..e3bb756e1a0 100644 --- a/databases/postgresql/pkg/PLIST.tcl +++ b/databases/postgresql/pkg/PLIST.tcl @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST.tcl,v 1.1 1999/09/19 04:24:56 jlam Exp $ -${PGUSER}/bin/pgaccess +@comment $NetBSD: PLIST.tcl,v 1.2 1999/09/20 23:38:51 jlam Exp $ ${PGUSER}/bin/pgtclsh ${PGUSER}/bin/pgtksh ${PGUSER}/include/libpgtcl.h |