diff options
author | toshii <toshii> | 2003-04-03 18:06:12 +0000 |
---|---|---|
committer | toshii <toshii> | 2003-04-03 18:06:12 +0000 |
commit | 516178d95334fede16adc381d0342a7bad7602f6 (patch) | |
tree | 1d12e4507e9aae8fc7bb57c27562397c13cd9dcc | |
parent | 81c5007a2543dc42f417379bbad77b852659ccf8 (diff) | |
download | pkgsrc-516178d95334fede16adc381d0342a7bad7602f6.tar.gz |
Build py-postgresql from the postgresql 7.3.2 tarball. PKGREVISION++
Remove files and patches in the py-postgresql directory and add necessary
ones in the postgresql directory.
-rw-r--r-- | databases/postgresql/distinfo | 8 | ||||
-rw-r--r-- | databases/postgresql/patches/patch-aa | 25 | ||||
-rw-r--r-- | databases/postgresql/patches/patch-ad | 16 | ||||
-rw-r--r-- | databases/postgresql/patches/patch-ah (renamed from databases/py-postgresql/patches/patch-ac) | 2 | ||||
-rw-r--r-- | databases/postgresql/patches/patch-ai (renamed from databases/py-postgresql/patches/patch-ad) | 2 | ||||
-rw-r--r-- | databases/py-postgresql/Makefile | 66 | ||||
-rw-r--r-- | databases/py-postgresql/distinfo | 9 | ||||
-rw-r--r-- | databases/py-postgresql/files/GNUmakefile.libpq | 20 | ||||
-rw-r--r-- | databases/py-postgresql/files/Makefile.custom | 9 | ||||
-rw-r--r-- | databases/py-postgresql/patches/patch-aa | 50 | ||||
-rw-r--r-- | databases/py-postgresql/patches/patch-ab | 12 | ||||
-rw-r--r-- | databases/py-postgresql/patches/patch-ae | 40 |
12 files changed, 44 insertions, 215 deletions
diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo index ea069a76ae4..2d8b07e2f47 100644 --- a/databases/postgresql/distinfo +++ b/databases/postgresql/distinfo @@ -1,10 +1,12 @@ -$NetBSD: distinfo,v 1.15 2003/02/21 16:09:51 mycroft Exp $ +$NetBSD: distinfo,v 1.16 2003/04/03 18:06:12 toshii Exp $ SHA1 (postgresql-7.3.2.tar.gz) = 6866da7bed0823e03ef47b435eb5c627160b529f Size (postgresql-7.3.2.tar.gz) = 11194355 bytes -SHA1 (patch-aa) = df84b28c7074ba396ece0ea070277bcda9287a87 +SHA1 (patch-aa) = 61fbeb664b0d89c83a36c79cca3fbdc78d6f5059 SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7 -SHA1 (patch-ad) = 90a1e22fbb09774e852e08e7779650c6fc24e9ee +SHA1 (patch-ad) = d9e010b38855bf9f1d7b85404ea6770066831093 SHA1 (patch-ae) = 5b46ea9782da574ee0c4b1c02534e0f74d640559 SHA1 (patch-af) = 874e6733bef527054aaa34dcc2114c6d4ca98f12 SHA1 (patch-ag) = 6d12184b8401e63b8a05c620beb27f28248c22da +SHA1 (patch-ah) = 210c0dda3c32481280fe5f2a9525d33f1d989c6d +SHA1 (patch-ai) = d7889e05ab7963f2b93b46c953cbf1a44e9c0fe5 diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa index 200562b5a14..8db0c97d78a 100644 --- a/databases/postgresql/patches/patch-aa +++ b/databases/postgresql/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2003/01/05 20:12:10 jlam Exp $ +$NetBSD: patch-aa,v 1.11 2003/04/03 18:06:13 toshii Exp $ ---- configure.in.orig Tue Dec 17 21:07:20 2002 +--- configure.in.orig Mon Feb 3 04:56:45 2003 +++ configure.in -@@ -330,6 +330,16 @@ IFS=$ac_save_IFS +@@ -330,6 +330,16 @@ # @@ -19,3 +19,22 @@ $NetBSD: patch-aa,v 1.10 2003/01/05 20:12:10 jlam Exp $ # Tcl/Tk # AC_MSG_CHECKING([whether to build with Tcl]) +@@ -373,6 +383,18 @@ + PGAC_ARG_BOOL(with, python, no, [ --with-python build Python interface module]) + 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 diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad index ea92b4d8c8f..35ffec5f6d8 100644 --- a/databases/postgresql/patches/patch-ad +++ b/databases/postgresql/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.12 2003/01/05 20:12:13 jlam Exp $ +$NetBSD: patch-ad,v 1.13 2003/04/03 18:06:13 toshii Exp $ ---- src/Makefile.global.in.orig Wed Sep 4 18:54:18 2002 +--- src/Makefile.global.in.orig Thu Sep 5 07:54:18 2002 +++ src/Makefile.global.in -@@ -111,6 +111,13 @@ override docdir := $(docdir)/postgresql +@@ -111,6 +111,13 @@ endif endif @@ -16,7 +16,15 @@ $NetBSD: patch-ad,v 1.12 2003/01/05 20:12:13 jlam Exp $ javadir := $(DESTDIR)$(datadir)/java localedir := @localedir@ -@@ -285,13 +292,20 @@ libpq_srcdir = $(top_srcdir)/src/interfa +@@ -124,6 +131,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_shared = @enable_shared@ +@@ -285,13 +293,20 @@ libpq_builddir = $(top_builddir)/src/interfaces/libpq libpq = -L$(libpq_builddir) -lpq diff --git a/databases/py-postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ah index 9e01a5740c0..21d3933420c 100644 --- a/databases/py-postgresql/patches/patch-ac +++ b/databases/postgresql/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2003/01/05 19:26:20 jlam Exp $ +$NetBSD: patch-ah,v 1.12 2003/04/03 18:06:13 toshii Exp $ --- src/interfaces/python/GNUmakefile.orig Thu Dec 13 13:39:04 2001 +++ src/interfaces/python/GNUmakefile diff --git a/databases/py-postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ai index d575d55e17a..91ee4bd0e08 100644 --- a/databases/py-postgresql/patches/patch-ad +++ b/databases/postgresql/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2003/01/05 19:26:21 jlam Exp $ +$NetBSD: patch-ai,v 1.10 2003/04/03 18:06:14 toshii Exp $ --- src/interfaces/python/Setup.in.raw.orig Sun Mar 25 14:44:04 2001 +++ src/interfaces/python/Setup.in.raw diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index b5aafdade04..2d55c1b6405 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,62 +1,18 @@ -# $NetBSD: Makefile,v 1.25 2003/01/05 20:14:26 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2003/04/03 18:06:14 toshii Exp $ -DISTNAME= postgresql-${DIST_VERS} -DIST_VERS= 7.2.3 -BASE_VERS= ${DIST_VERS} PKGNAME= ${PYPKGPREFIX}-postgresql-3.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= databases -MASTER_SITES= http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \ - ftp://ftp.postgresql.org/pub/source/v${DIST_VERS}/ \ - ftp://ftp.de.postgresql.org/pub/source/v${DIST_VERS}/ \ - ftp://ch.postgresql.org/mirror/postgresql/source/v${DIST_VERS}/ \ - ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/source/v${DIST_VERS}/ \ - ftp://looking-glass.usask.ca/pub/postgresql/source/v${DIST_VERS}/ \ - ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/v${DIST_VERS}/ \ - ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/v${DIST_VERS}/ - -CONFLICTS+= postgresql-[0-6]* postgresql-7.0* MAINTAINER= darcy@netbsd.org -HOMEPAGE= http://www.postgresql.org/ COMMENT= Python interface to PostgreSQL -USE_BUILDLINK2= YES -GNU_CONFIGURE= YES -AUTOCONF_REQD= 2.13 - -.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 -.endif +.include "../postgresql/Makefile.common" -CONFIGURE_ARGS+= --without-CXX -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} -CONFIGURE_ARGS+= --disable-readline -CONFIGURE_ARGS+= --enable-locale -CONFIGURE_ARGS+= --enable-syslog -CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" - -CONFIGURE_ARGS+= --disable-odbc -CONFIGURE_ARGS+= --without-java -CONFIGURE_ARGS+= --without-perl -CONFIGURE_ARGS+= --without-tcl -CONFIGURE_ARGS+= --without-tk CONFIGURE_ARGS+= --with-python CONFIGURE_ARGS+= --with-python-compile CONFIGURE_ENV+= PYTHON="${PYTHONBIN}" -USE_GMAKE= YES MAKEFILE= GNUmakefile MAKE_ENV+= INSTALLED_LIBPQ=1 MAKEFLAGS+= PYTHON_VERSION="${PYVERSSUFFIX}" @@ -67,21 +23,6 @@ PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} BUILD_DIRS= ${WRKSRC}/src/interfaces/python DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-postgresql -post-extract: - if [ -d ${WRKSRC}/src ]; then \ - ${RM} -f ${WRKSRC}/src/Makefile.custom; \ - ${CP} -f ${FILESDIR}/Makefile.custom \ - ${WRKSRC}/src/Makefile.custom; \ - fi - if [ -d ${WRKSRC}/src/interfaces/libpq ]; then \ - ${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile; \ - ${CP} -f ${FILESDIR}/GNUmakefile.libpq \ - ${WRKSRC}/src/interfaces/libpq/GNUmakefile; \ - fi - -pre-configure: - cd ${WRKSRC} && ${AUTOCONF} - post-install: ${INSTALL_DATA_DIR} ${DOCDIR}/tutorial ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} @@ -93,5 +34,4 @@ post-install: .include "../../time/py-mxDateTime/buildlink2.mk" .include "../../lang/python/extension.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo deleted file mode 100644 index 920400ae601..00000000000 --- a/databases/py-postgresql/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.4 2003/01/05 19:26:17 jlam Exp $ - -SHA1 (postgresql-7.2.3.tar.gz) = f98acadb3b06ea0f09f82857ca880ec198e3c791 -Size (postgresql-7.2.3.tar.gz) = 9244039 bytes -SHA1 (patch-aa) = 631ff6e24af142ebbb14bb19e61108af9db698d7 -SHA1 (patch-ab) = 73a26d8ce79b28b5245e0c5739f73b967e30cdd5 -SHA1 (patch-ac) = 210c0dda3c32481280fe5f2a9525d33f1d989c6d -SHA1 (patch-ad) = d7889e05ab7963f2b93b46c953cbf1a44e9c0fe5 -SHA1 (patch-ae) = d738fc27a64812fac6b497f2615566bdccd28eb6 diff --git a/databases/py-postgresql/files/GNUmakefile.libpq b/databases/py-postgresql/files/GNUmakefile.libpq deleted file mode 100644 index 98bc603b323..00000000000 --- a/databases/py-postgresql/files/GNUmakefile.libpq +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: GNUmakefile.libpq,v 1.1 2003/01/05 19:26:18 jlam Exp $ -# -# This GNUmakefile overrides the `all' target of $(libpq_srcdir)/Makefile -# to be empty if INSTALLED_LIBPQ is defined. This handles the submake -# targets sprinkled throughout the PostgreSQL Makefiles that execute -# -# @$(MAKE) -C $(libpq_builddir) all -# -# to ensure that the libpq libraries are built first. If INSTALLED_LIBPQ -# is defined, then have the `all' target simple return success. - -ifdef INSTALLED_LIBPQ -all: - @test -f libpq.a || touch libpq.a -endif - -%: force - @$(MAKE) -f Makefile $@ - -force: ; diff --git a/databases/py-postgresql/files/Makefile.custom b/databases/py-postgresql/files/Makefile.custom deleted file mode 100644 index f5158e12c08..00000000000 --- a/databases/py-postgresql/files/Makefile.custom +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: Makefile.custom,v 1.1 2003/01/05 19:26:19 jlam Exp $ -# -# This file is included by Makefile.global, which is included by every -# sub-Makefile in the build tree. Makefiles for shared libraries include -# Makefile.global then Makefile.shlib. - -ifdef INSTALLED_LIBPQ -libpq = -lpq -endif diff --git a/databases/py-postgresql/patches/patch-aa b/databases/py-postgresql/patches/patch-aa deleted file mode 100644 index 53c7fa0ab0f..00000000000 --- a/databases/py-postgresql/patches/patch-aa +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/01/05 19:26:20 jlam Exp $ - ---- configure.in.orig Mon Sep 30 23:34:28 2002 -+++ configure.in -@@ -150,6 +150,15 @@ PGAC_ARG_REQ(with, libs, [ --with- - - - # -+# 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) - # - AC_MSG_CHECKING([whether to build with locale support]) -@@ -398,6 +407,18 @@ PGAC_ARG_BOOL(with, python, no, [ --wit - 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 +703,10 @@ fi - ## 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 diff --git a/databases/py-postgresql/patches/patch-ab b/databases/py-postgresql/patches/patch-ab deleted file mode 100644 index 2f0bcbffcca..00000000000 --- a/databases/py-postgresql/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/01/05 19:26:20 jlam Exp $ - ---- src/Makefile.global.in.orig Thu Dec 20 16:23:05 2001 -+++ src/Makefile.global.in -@@ -123,6 +123,7 @@ with_CXX = @with_CXX@ - 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@ diff --git a/databases/py-postgresql/patches/patch-ae b/databases/py-postgresql/patches/patch-ae deleted file mode 100644 index eaad0c9d289..00000000000 --- a/databases/py-postgresql/patches/patch-ae +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/01/05 19:26:21 jlam Exp $ - ---- src/interfaces/python/pgmodule.c.orig Mon Dec 3 07:39:44 2001 -+++ src/interfaces/python/pgmodule.c -@@ -343,7 +343,7 @@ pgsource_dealloc(pgsourceobject * self) - PQclear(self->last_result); - - Py_XDECREF(self->pgcnx); -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* closes object */ -@@ -990,7 +990,7 @@ pglarge_dealloc(pglargeobject * self) - 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 @@ pg_dealloc(pgobject * self) - if (self->cnx) - PQfinish(self->cnx); - -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* close without deleting */ -@@ -1579,7 +1579,7 @@ pgquery_dealloc(pgqueryobject * self) - if (self->last_result) - PQclear(self->last_result); - -- PyMem_DEL(self); -+ PyObject_DEL(self); - } - - /* resets connection */ |