Updated databases/postgresql to 7.3.1.

================================================================== | NOTE: A dump-and-restore is required to update your databases | | if you wish to update postgresql-server. If your | | application examines the system catalogs, additional | | changes will be required due to the introduction of | | schemas in 7.3; for more information, see: | | | | http://www.ca.postgresql.org/docs/momjian/upgrade_tips_7.3 | ================================================================== Major changes from version 7.2.3 include: Schemas Schemas allow users to create objects in separate namespaces, so two people or applications can have tables with the same name. There is also a public schema for shared tables. Table/index creation can be restricted by removing permissions on the public schema. Drop Column PostgreSQL now supports the ALTER TABLE ... DROP COLUMN functionality. Table Functions Functions returning multiple rows and/or multiple columns are now much easier to use than before. You can call such a "table function" in the SELECT FROM clause, treating its output like a table. Also, PL/pgSQL functions can now return sets. Prepared Queries PostgreSQL now supports prepared queries, for improved performance. Dependency Tracking PostgreSQL now records object dependencies, which allows improvements in many areas. "DROP" statements now take either CASCADE or RESTRICT to control whether dependent objects are also dropped. Privileges Functions and procedural languages now have privileges, and functions can be defined to run with the privileges of their creator. Internationalization Both multibyte and locale support are now always enabled. Logging A variety of logging options have been enhanced. Interfaces A large number of interfaces have been moved to http://gborg.postgresql.org where they can be developed and released independently. Functions/Identifiers By default, functions can now take up to 32 parameters, and identifiers can be up to 63 bytes long. Also, OPAQUE is now deprecated: there are specific "pseudo-datatypes" to represent each of the former meanings of OPAQUE in function argument and result types.
author: jlam <jlam> 2003-01-05 20:12:07 +0000
committer: jlam <jlam> 2003-01-05 20:12:07 +0000
commit: 7f0030bc39078609aaf6637c4c9853aa4e08ad1b (patch)
tree: 8842dbd7cb62a42e6ad7ce2170133b6607b61bc2 /databases/postgresql
parent: a6d803aaabd8c6ce7a12d84e8b008e97bcb6d72b (diff)
download: pkgsrc-7f0030bc39078609aaf6637c4c9853aa4e08ad1b.tar.gz
14 files changed, 106 insertions, 440 deletions
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 23c5d9951a8..db046e6ded4 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2002/10/19 04:01:22 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2003/01/05 20:12:07 jlam Exp $
 
 PKGNAME=	postgresql-${BASE_VERS}
 COMMENT=	Robust, next generation, object-relational DBMS
@@ -7,10 +7,9 @@ DEPENDS+=	postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
 DEPENDS+=	postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
 DEPENDS+=	postgresql-docs>=${BASE_VERS}:../../databases/postgresql-docs
 
-.include "../../databases/postgresql/Makefile.common"
+.include "Makefile.common"
 
 EXTRACT_ONLY=	# empty
-USE_BUILDLINK2=	YES
 NO_CHECKSUM=	YES
 NO_PATCH=	YES
 NO_CONFIGURE=	YES
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index e8a00e6807b..3360454d3c0 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2002/10/19 03:03:49 jlam Exp $
+# $NetBSD: Makefile.common,v 1.32 2003/01/05 20:12:08 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -25,55 +25,47 @@ HOMEPAGE?=		http://www.postgresql.org/
 
 CONFLICTS+=		postgresql-[0-6]* postgresql-7.0*
 
-DISTINFO_FILE?=		${.CURDIR}/../../databases/postgresql/distinfo
-COMMON_FILESDIR?=	${.CURDIR}/../../databases/postgresql/files
-PATCHDIR?=		${.CURDIR}/../../databases/postgresql/patches
+DISTINFO_FILE?=		${.CURDIR}/../postgresql/distinfo
+COMMON_FILESDIR?=	${.CURDIR}/../postgresql/files
+PATCHDIR?=		${.CURDIR}/../postgresql/patches
 
 # Version numbering scheme:
 #
 # DIST_VERS		version number on the postgresql distfile
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
-DIST_VERS?=		7.2.3
+DIST_VERS?=		7.3.1
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=${BASE_VERS}
 BUILDLINK_DEPENDS.tcl-postgresql?=	tcl-postgresql>=${BASE_VERS}
 
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
+PKG_SYSCONFSUBDIR=	postgresql
 
 .include "../../mk/bsd.prefs.mk"
 
-# PG_MB_ENCODING may be set to any of:
-#
-# SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW, UNICODE, MULE_INTERNAL,
-# LATIN1, LATIN2, LATIN3, LATIN4, LATIN5, KOI8, WIN, ALT
-#
-# This variable controls the language encoding on the backend process.
-
-.if defined(PG_MB_ENCODING)
-CONFIGURE_ARGS+=	--enable-multibyte=${PG_MB_ENCODING}
-.else
-CONFIGURE_ARGS+=	--enable-multibyte	# accept default
+PGSQL_TEMPLATE.SunOS=		solaris
+.if !defined(PGSQL_TEMPLATE.${OPSYS})
+PGSQL_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
-CONFIGURE_ARGS+=	--disable-odbc
+CONFIGURE_ARGS+=	--with-template="${PGSQL_TEMPLATE.${OPSYS}}"
+CONFIGURE_ARGS+=	--without-readline
+CONFIGURE_ARGS+=	--without-zlib
+
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/postgresql
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/doc/html/postgresql
+
 CONFIGURE_ARGS+=	--without-java
 CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-tcl
 CONFIGURE_ARGS+=	--without-tk
 
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/pgsql
-CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/doc/html/postgresql
-
-CONFIGURE_ARGS+=	--disable-readline
-CONFIGURE_ARGS+=	--enable-locale
-CONFIGURE_ARGS+=	--enable-syslog
-CONFIGURE_ARGS+=	--with-CXX
-CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}"
-
 post-extract:
 	if [ -d ${WRKSRC}/src ]; then					\
 		${RM} -f ${WRKSRC}/src/Makefile.custom;			\
@@ -85,3 +77,13 @@ post-extract:
 		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
 			${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
 	fi
+	if [ -d ${WRKSRC}/src/interfaces/libpgtcl ]; then		\
+		${RM} -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
+		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
+			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
+	fi
+
+pre-configure:
+	cd ${WRKSRC} && ${AUTOCONF}
+
+.include "../../mk/autoconf.mk"
diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo
index 6e729a0d0d8..dea47041e00 100644
--- a/databases/postgresql/distinfo
+++ b/databases/postgresql/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.13 2002/10/19 03:03:50 jlam Exp $
+$NetBSD: distinfo,v 1.14 2003/01/05 20:12:09 jlam Exp $
 
-SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791
-Size (postgresql-7.2.3.tar.gz) = 9244039 bytes
-SHA1 (patch-aa) = 598f14b74b0dc54680ed85f4c26b6396898f5a7e
-SHA1 (patch-ab) = 0d1dee0d7c8b3bbff8507e18b9561c0b198f409f
-SHA1 (patch-ac) = eaed6eaeb65e3bb394252c5cb97a306bffb3e503
-SHA1 (patch-ad) = 581a5311c9197efd4fbd4182a2c9d906fbac3074
-SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046
-SHA1 (patch-af) = fb4994293ee5fa5aeb06cd0d9463b3b11ae0747e
-SHA1 (patch-ah) = 1c25241c808c70a59c93ef4536aa962c91957b3b
-SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2
-SHA1 (patch-al) = 3479fe6f0077cd9db7e13f6e3443209007342550
-SHA1 (patch-am) = 22a73cc84e28a0d45923311aa5fb3d57cdd0d8e5
+SHA1 (postgresql-7.3.1.tar.gz) = 428757df30ab4acad3c87254d4c75140f0a3406d
+Size (postgresql-7.3.1.tar.gz) = 11171551 bytes
+SHA1 (patch-aa) = df84b28c7074ba396ece0ea070277bcda9287a87
+SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7
+SHA1 (patch-ad) = 90a1e22fbb09774e852e08e7779650c6fc24e9ee
+SHA1 (patch-ae) = 5b46ea9782da574ee0c4b1c02534e0f74d640559
+SHA1 (patch-af) = 874e6733bef527054aaa34dcc2114c6d4ca98f12
+SHA1 (patch-ag) = 6d12184b8401e63b8a05c620beb27f28248c22da
diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa
index 9efab02b180..200562b5a14 100644
--- a/databases/postgresql/patches/patch-aa
+++ b/databases/postgresql/patches/patch-aa
@@ -1,60 +1,21 @@
-$NetBSD: patch-aa,v 1.9 2002/04/04 07:48:24 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2003/01/05 20:12:10 jlam Exp $
 
---- configure.in.orig	Sun Feb  3 16:04:12 2002
+--- configure.in.orig	Tue Dec 17 21:07:20 2002
 +++ configure.in
-@@ -150,6 +150,25 @@
+@@ -330,6 +330,16 @@ IFS=$ac_save_IFS
  
  
  #
 +# Location for HTML documentation
 +#
 +htmldir='${docdir}/html'
-+PGAC_ARG_REQ(with, htmldir,
-+             [  --with-htmldir=DIR      HTML documentation in DIR],
-+             [htmldir=$withval])
-+AC_SUBST(htmldir)
++AC_MSG_CHECKING([where to install HTML documentation])
++PGAC_ARG_REQ(with, htmldir, [  --with-htmldir=DIR      install HTML documentation into DIR], [htmldir=$withval])
++AC_MSG_RESULT([$htmldir])
++AC_SUBST([htmldir])
 +
 +
 +#
-+# Readline support
-+#
-+AC_MSG_CHECKING([whether to build with readline support])
-+PGAC_ARG_BOOL(enable, readline, yes,
-+              [  --disable-readline      disable readline support])
-+AC_MSG_RESULT([$enable_readline])
-+
-+
-+#
- # Locale (--enable-locale)
+ # Tcl/Tk
  #
- AC_MSG_CHECKING([whether to build with locale support])
-@@ -398,6 +417,18 @@
- AC_MSG_RESULT([$with_python])
- AC_SUBST(with_python)
- 
-+# If python is enabled (above), then optionally byte-compile the modules.
-+AC_MSG_CHECKING([whether to byte-compile Python modules])
-+if test "$with_python" = yes; then
-+  PGAC_ARG_BOOL(with, python_compile, no,
-+    [  --with-python-compile   byte-compile modules if Python is enabled])
-+else
-+  with_python_compile=no
-+fi
-+AC_MSG_RESULT([$with_python_compile])
-+AC_SUBST([with_python_compile])
-+
-+
- #
- # Optionally build the Java/JDBC tools
- #
-@@ -682,8 +713,10 @@
- ## Libraries
- ##
- 
-+if test "$enable_readline" = yes; then
- PGAC_CHECK_READLINE
- AC_SEARCH_LIBS(using_history, history, [AC_DEFINE(HAVE_HISTORY_FUNCTIONS)])
-+fi
- 
- if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
- then
+ AC_MSG_CHECKING([whether to build with Tcl])
diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab
deleted file mode 100644
index 69e25287260..00000000000
--- a/databases/postgresql/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2002/04/04 07:48:24 jlam Exp $
-
---- config/programs.m4.orig	Tue Aug 28 10:59:11 2001
-+++ config/programs.m4
-@@ -80,6 +80,14 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])
- AC_MSG_CHECKING([for readline])
- 
-+case $host_os in netbsd* | openbsd* )
-+  if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then
-+    objformat=a.out
-+  else
-+    objformat=ELF
-+  fi
-+esac
-+
- AC_CACHE_VAL([pgac_cv_check_readline],
- [pgac_cv_check_readline=no
- for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-@@ -87,12 +95,14 @@
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-     AC_TRY_LINK_FUNC([readline], [[
--      # NetBSD and OpenBSD have a broken linker that does not
-+      # NetBSD and OpenBSD have a broken a.out linker that does not
-       # recognize dependent libraries
-       case $host_os in netbsd* | openbsd* )
--        case $pgac_lib in
--          *curses*) ;;
--          *) pgac_lib=" -lcurses" ;;
-+        case $objformat in a.out )
-+          case $pgac_lib in
-+            *curses*) ;;
-+            *) pgac_lib=" -lcurses" ;;
-+          esac
-         esac
-       esac
- 
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
index ca7c34cf317..8f84b146c40 100644
--- a/databases/postgresql/patches/patch-ac
+++ b/databases/postgresql/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2002/04/05 16:27:28 jlam Exp $
+$NetBSD: patch-ac,v 1.12 2003/01/05 20:12:13 jlam Exp $
 
---- doc/Makefile.orig	Thu Feb  7 04:29:35 2002
+--- doc/Makefile.orig	Wed Nov 27 18:21:20 2002
 +++ doc/Makefile
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ endif # found_man
  
  install: all installdirs
  ifdef found_html
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.11 2002/04/05 16:27:28 jlam Exp $
  endif
  ifdef found_man
  	for file in man1/*.1 man$(sqlmansectnum)/*.$(sqlmansect) ; do \
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ endif
  
  installdirs:
  ifdef found_html
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.11 2002/04/05 16:27:28 jlam Exp $
  endif
  ifdef found_man
  	$(mkinstalldirs) $(addprefix $(DESTDIR)$(mandir)/man, 1 $(sqlmansectnum))
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ endif
  
  uninstall:
  ifdef found_html
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
index 1ed06912a80..ea92b4d8c8f 100644
--- a/databases/postgresql/patches/patch-ad
+++ b/databases/postgresql/patches/patch-ad
@@ -1,37 +1,40 @@
-$NetBSD: patch-ad,v 1.11 2002/04/04 07:48:25 jlam Exp $
+$NetBSD: patch-ad,v 1.12 2003/01/05 20:12:13 jlam Exp $
 
---- src/Makefile.global.in.orig	Thu Dec 20 16:23:05 2001
+--- src/Makefile.global.in.orig	Wed Sep  4 18:54:18 2002
 +++ src/Makefile.global.in
-@@ -107,6 +107,13 @@
+@@ -111,6 +111,13 @@ override docdir := $(docdir)/postgresql
  endif
  endif
  
 +htmldir := @htmldir@
 +ifeq "$(findstring pgsql, $(htmldir))" ""
 +ifeq "$(findstring postgres, $(htmldir))" ""
-+override htmldir := $(htmldir)/postgresql
++override htmldir := $(docdir)/postgresql
 +endif
 +endif
 +
- odbcinst_ini_dir = @odbcinst_ini_dir@
- 
  javadir := $(DESTDIR)$(datadir)/java
-@@ -123,6 +130,7 @@
- with_java	= @with_java@
- with_perl	= @with_perl@
- with_python	= @with_python@
-+with_python_compile = @with_python_compile@
- with_tcl	= @with_tcl@
- with_tk		= @with_tk@
- enable_odbc	= @enable_odbc@
-@@ -279,6 +287,10 @@
- libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
+ localedir := @localedir@
+ 
+@@ -285,13 +292,20 @@ libpq_srcdir = $(top_srcdir)/src/interfa
  libpq_builddir = $(top_builddir)/src/interfaces/libpq
  libpq = -L$(libpq_builddir) -lpq
-+
+ 
 +libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
 +libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
 +libpgtcl = -L$(libpgtcl_builddir) -lpgtcl
++
+ submake-libpq:
+ 	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport:
+ 	$(MAKE) -C $(top_builddir)/src/port all
+ 
+-.PHONY: submake-libpq submake-libpgport
++submake-libpgtcl:
++	$(MAKE) -C $(libpgtcl_builddir) all
++
++.PHONY: submake-libpq submake-libpgport submake-libpgtcl
  
  
  ##########################################################################
diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae
index 66a6216fdf3..446e8c093a2 100644
--- a/databases/postgresql/patches/patch-ae
+++ b/databases/postgresql/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.13 2001/05/14 14:52:38 jlam Exp $
+$NetBSD: patch-ae,v 1.14 2003/01/05 20:12:13 jlam Exp $
 
---- src/bin/pgtclsh/Makefile.orig	Fri Feb 23 13:12:17 2001
+--- src/bin/pgtclsh/Makefile.orig	Thu Jun 20 16:29:42 2002
 +++ src/bin/pgtclsh/Makefile
-@@ -22,19 +22,17 @@
- -include Makefile.tkdefs
- endif
+@@ -15,19 +15,17 @@ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
  
 -libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
 -libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
@@ -15,26 +15,27 @@ $NetBSD: patch-ae,v 1.13 2001/05/14 14:52:38 jlam Exp $
  
  # If we are here then Tcl is available
  PROGRAMS = pgtclsh
-+INSTALL_TARGET = install-tcl
++INSTALL_TARGETS = install-tcl
  
  # Add Tk targets if Tk is available
  ifeq ($(with_tk), yes)
  PROGRAMS += pgtksh
-+INSTALL_TARGET += install-tk
++INSTALL_TARGETS += install-tk
  endif
  
  all: submake $(PROGRAMS)
-@@ -49,8 +47,12 @@
+@@ -42,9 +40,13 @@ pgtksh: pgtkAppInit.o
  submake:
  	$(MAKE) -C $(libpgtcl_builddir) all
  
 -install: all installdirs
-+install: $(INSTALL_TARGET)
++install: $(INSTALL_TARGETS)
 +
-+install-tcl: installdirs pgtclsh
++install-tcl: pgtclsh installdirs
  	$(INSTALL_PROGRAM) pgtclsh $(DESTDIR)$(bindir)/pgtclsh
 +
-+install-tk: installdirs pgtksh
  ifeq ($(with_tk), yes)
++install-tk: pgtksh installdirs
  	$(INSTALL_PROGRAM) pgtksh $(DESTDIR)$(bindir)/pgtksh
  endif
+ 
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
index 29d5c876c27..7481852960a 100644
--- a/databases/postgresql/patches/patch-af
+++ b/databases/postgresql/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.14 2002/04/04 07:48:26 jlam Exp $
+$NetBSD: patch-af,v 1.15 2003/01/05 20:12:14 jlam Exp $
 
---- src/interfaces/ecpg/lib/Makefile.orig	Fri Feb 23 13:12:20 2001
+--- src/interfaces/ecpg/lib/Makefile.orig	Tue Dec 10 23:08:04 2002
 +++ src/interfaces/ecpg/lib/Makefile
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.glo
  
  NAME= ecpg
  SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 3.0
-+SO_MINOR_VERSION= 3
+-SO_MINOR_VERSION= 4.1
++SO_MINOR_VERSION= 4
  
  override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS)
  
diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag
new file mode 100644
index 00000000000..a1309dad55d
--- /dev/null
+++ b/databases/postgresql/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.10 2003/01/05 20:12:14 jlam Exp $
+
+--- src/include/Makefile.orig	Tue Aug 28 10:20:28 2001
++++ src/include/Makefile
+@@ -15,7 +15,10 @@ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+ 
+-all: pg_config.h pg_config_os.h
++all: pg_config.h pg_config_os.h utils/fmgroids.h parser/parse.h
++
++utils/fmgroids.h parser/parse.h:
++	$(MAKE) -C $(top_builddir)/src/backend $(top_builddir)/src/include/$@
+ 
+ 
+ # Install only selected headers
diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah
deleted file mode 100644
index 0c3cafeed44..00000000000
--- a/databases/postgresql/patches/patch-ah
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ah,v 1.10 2002/04/04 07:48:28 jlam Exp $
-
---- src/interfaces/python/GNUmakefile.orig	Thu Dec 13 18:39:04 2001
-+++ src/interfaces/python/GNUmakefile	Tue Feb 12 17:37:45 2002
-@@ -19,7 +19,14 @@
- 
- override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec)
- 
--all: all-lib
-+PY_SCRIPTS = pg.py pgdb.py
-+ifeq ($(with_python_compile), yes)
-+PY_COMPILED_SCRIPTS = $(PY_SCRIPTS:%.py=%.pyc) $(PY_SCRIPTS:%.py=%.pyo)
-+else
-+PY_COMPILED_SCRIPTS =
-+endif
-+
-+all: all-lib $(PY_COMPILED_SCRIPTS)
- 
- all-lib: libpq-all
- 
-@@ -27,6 +34,12 @@
- libpq-all:
- 	$(MAKE) -C $(libpq_builddir) all
- 
-+%.pyc: %.py
-+	$(PYTHON) -c "import py_compile; py_compile.compile(\"$<\")"
-+
-+%.pyo: %.py
-+	$(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")"
-+
- install-warning-msg := { \
- echo "*** Skipping the installation of the Python interface module for lack"; \
- echo "*** of permissions.  To install it, change to the directory"; \
-@@ -35,6 +48,9 @@
- 
- install: all installdirs
- 	@if test -w $(DESTDIR)$(python_moduleexecdir) && test -w $(DESTDIR)$(python_moduledir); then \
-+	  for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \
-+		$(INSTALL_DATA) $$i $(python_moduledir) ; \
-+	  done ; \
- 	  echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX)"; \
- 	  $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX); \
- 	\
diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai
deleted file mode 100644
index e1687e7dd4f..00000000000
--- a/databases/postgresql/patches/patch-ai
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ai,v 1.8 2001/05/14 14:52:38 jlam Exp $
-
---- src/interfaces/python/Setup.in.raw.orig	Sun Apr  1 15:17:33 2001
-+++ src/interfaces/python/Setup.in.raw
-@@ -1,3 +1,3 @@
- *shared*
- 
--_pg  pgmodule.c -I@libpq_srcdir@ @INCLUDES@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@
-+_pg  pgmodule.c -I@libpq_srcdir@ @INCLUDES@ @libpq@ @EXTRA_LIBS@
diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al
deleted file mode 100644
index f0701eb56cd..00000000000
--- a/databases/postgresql/patches/patch-al
+++ /dev/null
@@ -1,182 +0,0 @@
-$NetBSD: patch-al,v 1.6 2002/04/04 07:48:30 jlam Exp $
-
---- configure.orig	Sun Feb  3 16:04:11 2002
-+++ configure
-@@ -19,6 +19,10 @@
- ac_help="$ac_help
-   --with-libs=DIRS        alternative spelling of --with-libraries"
- ac_help="$ac_help
-+  --with-htmldir=DIR      HTML documentation in DIR"
-+ac_help="$ac_help
-+  --disable-readline      disable readline support"
-+ac_help="$ac_help
-   --enable-locale         enable locale support"
- ac_help="$ac_help
-   --enable-recode         enable character set recode support"
-@@ -53,6 +57,8 @@
- ac_help="$ac_help
-   --with-python           build Python interface module"
- ac_help="$ac_help
-+  --with-python-compile   byte-compile modules if Python is enabled"
-+ac_help="$ac_help
-   --with-java             build JDBC interface and Java tools"
- ac_help="$ac_help
-   --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]"
-@@ -817,6 +823,54 @@
- 
- 
- #
-+# Location for HTML documentation
-+#
-+htmldir='${docdir}/html'
-+# Check whether --with-htmldir was given
-+if test x"${with_htmldir+set}" = xset; then
-+  case $with_htmldir in
-+    yes)
-+      { echo "configure: error: argument required for --with-htmldir option" 1>&2; exit 1; }
-+      ;;
-+    no)
-+      { echo "configure: error: argument required for --with-htmldir option" 1>&2; exit 1; }
-+      ;;
-+    *)
-+      withval=$with_htmldir
-+      htmldir=$withval
-+      ;;
-+  esac # $with_htmldir
-+fi
-+
-+
-+
-+#
-+# Readline support
-+#
-+echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6
-+echo "configure:852: checking whether to build with readline support" >&5
-+# Check whether --enable-readline was given
-+if test x"${enable_readline+set}" = xset; then
-+  case $enable_readline in
-+    yes)
-+      :
-+      ;;
-+    no)
-+      :
-+      ;;
-+    *)
-+      enableval=$enable_readline
-+      { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; }
-+      ;;
-+  esac # $enable_readline
-+else
-+  enable_readline=yes
-+
-+fi
-+echo "$ac_t""$enable_readline" 1>&6
-+
-+
-+#
- # Locale (--enable-locale)
- #
- echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6
-@@ -1859,6 +1913,35 @@
- echo "$ac_t""$with_python" 1>&6
- 
- 
-+# If python is enabled (above), then optionally byte-compile the modules.
-+echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6
-+echo "configure:1919: checking whether to byte-compile Python modules" >&5
-+if test "$with_python" = yes; then
-+  # Check whether --with-python_compile was given
-+if test x"${with_python_compile+set}" = xset; then
-+  case $with_python_compile in
-+    yes)
-+      :
-+      ;;
-+    no)
-+      :
-+      ;;
-+    *)
-+      withval=$with_python_compile
-+      { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; }
-+      ;;
-+  esac # $with_python_compile
-+else
-+  with_python_compile=no
-+
-+fi
-+else
-+  with_python_compile=no
-+fi
-+echo "$ac_t""$with_python_compile" 1>&6
-+
-+
-+
- #
- # Optionally build the Java/JDBC tools
- #
-@@ -3282,9 +3365,18 @@
- ## Libraries
- ##
- 
-+if test "$enable_readline" = yes; then
- 
- echo $ac_n "checking for readline""... $ac_c" 1>&6
--echo "configure:3288: checking for readline" >&5
-+echo "configure:3372: checking for readline" >&5
-+
-+case $host_os in netbsd* | openbsd* )
-+  if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then
-+    objformat=a.out
-+  else
-+    objformat=ELF
-+  fi
-+esac
- 
- if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3306,15 +3398,17 @@
- readline()
- ; return 0; }
- EOF
--if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   
--      # NetBSD and OpenBSD have a broken linker that does not
-+      # NetBSD and OpenBSD have a broken a.out linker that does not
-       # recognize dependent libraries
-       case $host_os in netbsd* | openbsd* )
--        case $pgac_lib in
--          *curses*) ;;
--          *) pgac_lib=" -lcurses" ;;
-+        case $objformat in a.out )
-+          case $pgac_lib in
-+            *termcap*) ;;
-+            *) pgac_lib=" -ltermcap" ;;
-+          esac
-         esac
-       esac
- 
-@@ -3408,6 +3502,7 @@
- else :
-   
- fi
-+fi
- 
- if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
- then
-@@ -8991,6 +9086,7 @@
- s%@host_os@%$host_os%g
- s%@PORTNAME@%$PORTNAME%g
- s%@TAS@%$TAS%g
-+s%@htmldir@%$htmldir%g
- s%@MULTIBYTE@%$MULTIBYTE%g
- s%@enable_nls@%$enable_nls%g
- s%@WANTED_LANGUAGES@%$WANTED_LANGUAGES%g
-@@ -9007,6 +9103,7 @@
- s%@with_tk@%$with_tk%g
- s%@with_perl@%$with_perl%g
- s%@with_python@%$with_python%g
-+s%@with_python_compile@%$with_python_compile%g
- s%@ANT@%$ANT%g
- s%@with_java@%$with_java%g
- s%@with_krb4@%$with_krb4%g
diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am
deleted file mode 100644
index 289868dcb07..00000000000
--- a/databases/postgresql/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.7 2002/04/04 07:48:31 jlam Exp $
-
---- src/interfaces/python/pgmodule.c.orig	Mon Dec  3 04:39:44 2001
-+++ src/interfaces/python/pgmodule.c
-@@ -343,7 +343,7 @@
- 		PQclear(self->last_result);
- 
- 	Py_XDECREF(self->pgcnx);
--	PyMem_DEL(self);
-+	PyObject_DEL(self);
- }
- 
- /* closes object */
-@@ -990,7 +990,7 @@
- 		lo_close(self->pgcnx->cnx, self->lo_fd);
- 
- 	Py_XDECREF(self->pgcnx);
--	PyMem_DEL(self);
-+	PyObject_DEL(self);
- }
- 
- /* opens large object */
-@@ -1546,7 +1546,7 @@
- 	if (self->cnx)
- 		PQfinish(self->cnx);
- 
--	PyMem_DEL(self);
-+	PyObject_DEL(self);
- }
- 
- /* close without deleting */
-@@ -1579,7 +1579,7 @@
- 	if (self->last_result)
- 		PQclear(self->last_result);
- 
--	PyMem_DEL(self);
-+	PyObject_DEL(self);
- }
- 
- /* resets connection */
author	jlam <jlam>	2003-01-05 20:12:07 +0000
committer	jlam <jlam>	2003-01-05 20:12:07 +0000
commit	7f0030bc39078609aaf6637c4c9853aa4e08ad1b (patch)
tree	8842dbd7cb62a42e6ad7ce2170133b6607b61bc2 /databases/postgresql
parent	a6d803aaabd8c6ce7a12d84e8b008e97bcb6d72b (diff)
download	pkgsrc-7f0030bc39078609aaf6637c4c9853aa4e08ad1b.tar.gz