updates

Changed files:
    postgresql-DESTDIR.patch -> 1.6
    postgresql-perl.patch -> 1.3
    postgresql-pgaccess-typo.patch -> 1.2
    postgresql-python.patch -> 1.2

diff --git a/postgresql-DESTDIR.patch b/postgresql-DESTDIR.patch
index 2b38382322748edfcc42826d2af9868c68a46b5f..6e5d9d81013a45849adedb210ad33844390542e8 100644 (file)
--- a/postgresql-DESTDIR.patch
+++ b/postgresql-DESTDIR.patch
@@ -1,6 +1,34 @@
+diff -urN postgresql-7.1.org/src/interfaces/perl5/GNUmakefile postgresql-7.1/src/interfaces/perl5/GNUmakefile
+--- postgresql-7.1.org/src/interfaces/perl5/GNUmakefile        Thu Apr 19 21:50:23 2001
++++ postgresql-7.1/src/interfaces/perl5/GNUmakefile    Thu Apr 19 22:49:37 2001
+@@ -40,8 +40,8 @@
+         POSTGRES_INCLUDE="$(includedir)" \
+         $(PERL) $(srcdir)/Makefile.PL
+       $(MAKE) -f Makefile all
+-      -@if [ -w "`$(MAKE) --quiet -f Makefile echo-installdir`" ]; then \
+-              $(MAKE) -f Makefile install; \
++      -@if [ -w "`$(MAKE) --quiet -f Makefile DESTDIR=\"$(DESTDIR)\" echo-installdir`" ]; then \
++              $(MAKE) -f Makefile DESTDIR=\"$(DESTDIR)\" install; \
+               $(MAKE) clean; \
+       else \
+               echo "*****" ;\
+diff -urN postgresql-7.1.org/src/interfaces/python/GNUmakefile postgresql-7.1/src/interfaces/python/GNUmakefile
+--- postgresql-7.1.org/src/interfaces/python/GNUmakefile       Thu Apr 19 21:50:23 2001
++++ postgresql-7.1/src/interfaces/python/GNUmakefile   Thu Apr 19 23:24:36 2001
+@@ -34,8 +34,8 @@
+ 
+ install: all
+       @echo "Installing Python module"
+-      @if ( $(INSTALL_DATA) pg.py $(python_moduledir) && \
+-          $(MAKE) -f Makefile install ); then : ; else \
++      @if ( $(INSTALL_DATA) pg.py $(DESTDIR)$(python_moduledir) && \
++          $(MAKE) -f Makefile LIBDIR=\"$(LIBDIR)\" install ); then : ; else \
+               echo "*****" ;\
+               echo "* Skipping the installation of the Python interface module for lack"; \
+               echo "* of permissions. To install it, change to the directory"; \
 diff -urN postgresql-7.1.org/src/pl/plperl/GNUmakefile postgresql-7.1/src/pl/plperl/GNUmakefile
---- postgresql-7.1.org/src/pl/plperl/GNUmakefile       Wed Apr 18 13:45:31 2001
-+++ postgresql-7.1/src/pl/plperl/GNUmakefile   Wed Apr 18 13:46:08 2001
+--- postgresql-7.1.org/src/pl/plperl/GNUmakefile       Thu Apr 19 21:50:23 2001
++++ postgresql-7.1/src/pl/plperl/GNUmakefile   Thu Apr 19 21:50:33 2001
 @@ -16,7 +16,7 @@
        $(PERL) $<
  
@@ -10,3 +38,15 @@ diff -urN postgresql-7.1.org/src/pl/plperl/GNUmakefile postgresql-7.1/src/pl/plp
  
  installdirs:
        $(mkinstalldirs) $(DESTDIR)$(plperl_installdir)
+diff -urN postgresql-7.1.org/src/pl/plperl/Makefile.PL postgresql-7.1/src/pl/plperl/Makefile.PL
+--- postgresql-7.1.org/src/pl/plperl/Makefile.PL       Thu Apr 19 21:50:23 2001
++++ postgresql-7.1/src/pl/plperl/Makefile.PL   Thu Apr 19 21:50:53 2001
+@@ -84,7 +84,7 @@
+ 
+ qq[
+ install :: all
+-      cp \$(INST_DYNAMIC) $ENV{plperl_installdir}
++      cp \$(INST_DYNAMIC) \$(DESTDIR)$ENV{plperl_installdir}
+ ];
+ 
+ }

diff --git a/postgresql-perl.patch b/postgresql-perl.patch
deleted file mode 100644 (file)
index 93887ec..0000000
--- a/postgresql-perl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- postgresql-6.4.2.old/src/interfaces/Makefile       Wed Jun 30 11:32:56 1999
-+++ postgresql-6.4.2/src/interfaces/Makefile   Wed Jun 30 11:35:29 1999
-@@ -34,12 +34,8 @@
-       $(MAKE) -C libpgtcl $@
- endif
- ifeq ($(USE_PERL), true)
--      if [ "$@" = "install" ]; then \
--              $(MAKE) $(MFLAGS) install-perl5; \
--      else \
--              $(MAKE) $(MFLAGS) perl5/Makefile; \
--              $(MAKE) $(MFLAGS) -C perl5 $@; \
--      fi
-+      $(MAKE) $(MFLAGS) perl5/Makefile; 
-+      $(MAKE) $(MFLAGS) -C perl5 $@; 
- endif
- ifeq ($(USE_ODBC), true)
-       $(MAKE) -C odbc $@

diff --git a/postgresql-pgaccess-typo.patch b/postgresql-pgaccess-typo.patch
deleted file mode 100644 (file)
index f73d2ee..0000000
--- a/postgresql-pgaccess-typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN postgresql-7.0.2/src/bin/pgaccess/Makefile postgresql-7.0.2-new/src/bin/pgaccess/Makefile
---- postgresql-7.0.2/src/bin/pgaccess/Makefile Fri Oct  6 17:55:59 2000
-+++ postgresql-7.0.2-new/src/bin/pgaccess/Makefile     Fri Oct  6 17:54:22 2000
-@@ -22,7 +22,7 @@
- 
- install:
-       $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/help
--      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/anguages
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/languages
-       $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/images
-       $(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(DESTDIR)$(BINDIR)/pgaccess
-       $(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(DESTDIR)$(LIBDIR)/pgaccess

diff --git a/postgresql-python.patch b/postgresql-python.patch
deleted file mode 100644 (file)
index ffb9aab..0000000
--- a/postgresql-python.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru postgresql-7.0.2/src/interfaces/python/mkdefines postgresql-7.0.2.new/src/interfaces/python/mkdefines
---- postgresql-7.0.2/src/interfaces/python/mkdefines   Mon May 17 08:15:27 1999
-+++ postgresql-7.0.2.new/src/interfaces/python/mkdefines       Thu Jul  6 02:34:09 2000
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#! /usr/bin/python
- 
- import string
- 
-diff -Nru postgresql-7.0.2/src/interfaces/python/tutorial/advanced.py postgresql-7.0.2.new/src/interfaces/python/tutorial/advanced.py
---- postgresql-7.0.2/src/interfaces/python/tutorial/advanced.py        Mon May 17 08:06:28 1999
-+++ postgresql-7.0.2.new/src/interfaces/python/tutorial/advanced.py    Thu Jul  6 02:32:57 2000
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#! /usr/bin/python
- # advanced.py - demo of advanced features of PostGres. Some may not be ANSI.
- # inspired from the Postgres tutorial 
- # adapted to Python 1995 by Pascal Andre
-diff -Nru postgresql-7.0.2/src/interfaces/python/tutorial/basics.py postgresql-7.0.2.new/src/interfaces/python/tutorial/basics.py
---- postgresql-7.0.2/src/interfaces/python/tutorial/basics.py  Mon May 17 08:06:30 1999
-+++ postgresql-7.0.2.new/src/interfaces/python/tutorial/basics.py      Thu Jul  6 02:32:50 2000
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#! /usr/bin/python
- # basics.py - basic SQL commands tutorial
- # inspired from the Postgres95 tutorial 
- # adapted to Python 1995 by Pascal ANDRE
-diff -Nru postgresql-7.0.2/src/interfaces/python/tutorial/pgtools.py postgresql-7.0.2.new/src/interfaces/python/tutorial/pgtools.py
---- postgresql-7.0.2/src/interfaces/python/tutorial/pgtools.py Mon May 17 08:06:34 1999
-+++ postgresql-7.0.2.new/src/interfaces/python/tutorial/pgtools.py     Thu Jul  6 02:32:46 2000
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/python
-+#! /usr/bin/python
- # pgtools.py - valuable functions for PostGreSQL tutorial
- # written 1995 by Pascal ANDRE
-