diff options
Diffstat (limited to 'databases/postgresql')
| -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 | 43 | ||||
| -rw-r--r-- | databases/postgresql/patches/patch-ai | 9 |
5 files changed, 91 insertions, 10 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/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah new file mode 100644 index 00000000000..21d3933420c --- /dev/null +++ b/databases/postgresql/patches/patch-ah @@ -0,0 +1,43 @@ +$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 +@@ -19,7 +19,14 @@ include $(top_srcdir)/src/Makefile.shlib + + 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 @@ all-lib: libpq-all + 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 @@ echo "*** become the appropriate user, a + + 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 new file mode 100644 index 00000000000..91ee4bd0e08 --- /dev/null +++ b/databases/postgresql/patches/patch-ai @@ -0,0 +1,9 @@ +$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 +@@ -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@ |