5499444696d919f9fbf2efcaf8e54022 postgresql-7.1.tar.gz

Changed files:
    postgresql-DESTDIR.patch -> 1.5
    postgresql-configure.patch -> 1.1
    postgresql-no_libnsl.patch -> 1.2
    postgresql-readline.patch -> 1.4

diff --git a/postgresql-DESTDIR.patch b/postgresql-DESTDIR.patch
index 4d7dd40a784a4ff7663865ec7de3e88f353493d3..2b38382322748edfcc42826d2af9868c68a46b5f 100644 (file)
--- a/postgresql-DESTDIR.patch
+++ b/postgresql-DESTDIR.patch
@@ -1,642 +1,12 @@
-diff -Nru postgresql-7.0.2/doc/Makefile postgresql-7.0.2.new/doc/Makefile
---- postgresql-7.0.2/doc/Makefile      Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/doc/Makefile  Sat Jul 22 06:29:39 2000
-@@ -57,8 +57,8 @@
-       $(MAKE) clean
- 
- man::
--      -@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
--      $(GZCAT) man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
-+      mkdir -p $(DESTDIR)$(POSTMANDIR)
-+      $(GZCAT) man.tar.gz | (cd $(DESTDIR)$(POSTMANDIR) ; $(TAR) xf - )
- 
- #
- # Generic production rules
-@@ -73,7 +73,6 @@
- #  to replace symlinks - thomas 1998-03-01
- 
- %:    %.tar.gz
--      rm -rf ./$@ $(PGDOCS)/$*
--      if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi
--      $(GZCAT) $< | (cd $(PGDOCS)/$* ; $(TAR) xf - )
-+      mkdir -p $(DESTDIR)$(PGDOCS)/$*
-+      $(GZCAT) $< | (cd $(DESTDIR)$(PGDOCS)/$* ; $(TAR) xf - )
- #     touch ./$*
-diff -Nru postgresql-7.0.2/src/Makefile.global.in postgresql-7.0.2.new/src/Makefile.global.in
---- postgresql-7.0.2/src/Makefile.global.in    Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/Makefile.global.in        Mon Jul 24 11:01:33 2000
-@@ -66,13 +66,14 @@
- 
- # Where the postgres executables live (changeable by just putting them
- # somewhere else and putting that directory in your shell PATH)
--BINDIR= $(POSTGRESDIR)/bin
-+BINDIR= @bindir@
- 
- # Where libpq.a gets installed.  You must put it where your loader will
- # look for it if you wish to use the -lpq convention.  Otherwise you
- # can just put the absolute pathname to the library at the end of your
- # command line.
--LIBDIR= $(POSTGRESDIR)/lib
-+LIBDIR= @libdir@
-+sysconfdir= @sysconfdir@
- 
- # Where the database templates are stored
- #
-@@ -84,13 +85,13 @@
- IPCRM=@ipcrm@
- 
- # Where the man pages (suitable for use with "man") get installed.
--POSTMANDIR= $(POSTGRESDIR)/man
-+POSTMANDIR= @mandir@
- 
- # Where the formatted documents (e.g., the reference manual) get installed.
- POSTDOCDIR= $(POSTGRESDIR)/doc
- 
- # Where the header files necessary to build frontend programs get installed.
--HEADERDIR= $(POSTGRESDIR)/include
-+HEADERDIR= @includedir@/pgsql
- 
- # Where the ODBC installation-wide configuration file gets installed.
- # This needs to be a client-side readable area, so can't go in $PGDATA.
-diff -Nru postgresql-7.0.2/src/Makefile.shlib postgresql-7.0.2.new/src/Makefile.shlib
---- postgresql-7.0.2/src/Makefile.shlib        Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/Makefile.shlib    Thu Jul  6 10:01:02 2000
-@@ -269,18 +269,20 @@
- .PHONY: all install-lib install-shlib
- 
- install-lib: lib$(NAME).a
--      $(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(LIBDIR)/lib$(NAME).a
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(DESTDIR)$(LIBDIR)/lib$(NAME).a
- 
- install-shlib: $(shlib)
--      $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)
- ifneq ($(PORTNAME), win)
-       if [ "$(shlib)" != "lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ]; then \
--              cd $(LIBDIR); \
-+              cd $(DESTDIR)$(LIBDIR); \
-               rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION); \
-               $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION); \
-       fi
-       if [ "$(shlib)" != "lib$(NAME)$(DLSUFFIX)" ]; then \
--              cd $(LIBDIR); \
-+              cd $(DESTDIR)$(LIBDIR); \
-               rm -f lib$(NAME)$(DLSUFFIX); \
-               $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX); \
-       fi
-diff -Nru postgresql-7.0.2/src/backend/Makefile postgresql-7.0.2.new/src/backend/Makefile
---- postgresql-7.0.2/src/backend/Makefile      Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/backend/Makefile  Sat Jul 22 07:13:08 2000
-@@ -167,118 +167,91 @@
- 
- .PHONY: install install-bin install-templates install-headers
- 
--install: $(LIBDIR) $(BINDIR) $(HEADERDIR) $(TEMPLATEDIR) \
--         postgres $(POSTGRES_IMP) \
-+install: postgres $(POSTGRES_IMP) \
-          install-bin install-templates install-headers
- 
- install-bin: $(BINDIR) postgres$(X) $(POSTGRES_IMP)
--      $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(BINDIR)/postgres$(X)
--      @rm -f $(BINDIR)/postmaster
--      ln -s postgres$(X) $(BINDIR)/postmaster
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(DESTDIR)$(BINDIR)/postgres$(X)
-+      ln -s postgres$(X) $(DESTDIR)$(BINDIR)/postmaster
- ifeq ($(MAKE_EXPORTS), true)
--      $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
-+      $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(DESTDIR)$(LIBDIR)/$(POSTGRES_IMP)
- endif
- ifeq ($(PORTNAME), win)
- ifeq ($(MAKE_DLL), true)
--#     $(INSTALL) $(INSTLOPTS) postgres.dll $(BINDIR)/postgres.dll
--      $(INSTALL) $(INSTLOPTS) libpostgres.a $(LIBDIR)/libpostgres.a
-+#     $(INSTALL) $(INSTLOPTS) postgres.dll $(DESTDIR)$(BINDIR)/postgres.dll
-+      $(INSTALL) $(INSTLOPTS) libpostgres.a $(DESTDIR)$(LIBDIR)/libpostgres.a
- endif
- endif
- 
--install-templates: $(TEMPLATEDIR) \
-+install-templates: \
-          global1.bki.source local1_template1.bki.source \
-          global1.description local1_template1.description \
-          libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample \
-        optimizer/geqo/pg_geqo.sample \
-          pg_options.sample
-+      $(INSTALL) -d $(DESTDIR)$(TEMPLATEDIR)
-       $(INSTALL) $(INSTLOPTS) global1.bki.source \
--        $(TEMPLATEDIR)/global1.bki.source
-+        $(DESTDIR)$(TEMPLATEDIR)/global1.bki.source
-       $(INSTALL) $(INSTLOPTS) global1.description \
--        $(TEMPLATEDIR)/global1.description
-+        $(DESTDIR)$(TEMPLATEDIR)/global1.description
-       $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
--        $(TEMPLATEDIR)/local1_template1.bki.source
-+        $(DESTDIR)$(TEMPLATEDIR)/local1_template1.bki.source
-       $(INSTALL) $(INSTLOPTS) local1_template1.description \
--        $(TEMPLATEDIR)/local1_template1.description
-+        $(DESTDIR)$(TEMPLATEDIR)/local1_template1.description
-       $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
--        $(TEMPLATEDIR)/pg_hba.conf.sample
-+        $(DESTDIR)$(TEMPLATEDIR)/pg_hba.conf.sample
-       $(INSTALL) $(INSTLOPTS) libpq/pg_ident.conf.sample \
--        $(TEMPLATEDIR)/pg_ident.conf.sample
-+        $(DESTDIR)$(TEMPLATEDIR)/pg_ident.conf.sample
-       $(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
--        $(TEMPLATEDIR)/pg_geqo.sample
-+        $(DESTDIR)$(TEMPLATEDIR)/pg_geqo.sample
-       $(INSTALL) $(INSTLOPTS) pg_options.sample \
--        $(TEMPLATEDIR)/pg_options.sample
-+        $(DESTDIR)$(TEMPLATEDIR)/pg_options.sample
- 
- install-headers: fmgr.h $(SRCDIR)/include/config.h
--      -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
--      -@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
--      -@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
--              then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
--      -@if [ ! -d $(HEADERDIR)/lib ]; \
--              then mkdir $(HEADERDIR)/lib; fi
--      -@if [ ! -d $(HEADERDIR)/libpq ]; \
--              then mkdir $(HEADERDIR)/libpq; fi
--      -@if [ ! -d $(HEADERDIR)/utils ]; \
--              then mkdir $(HEADERDIR)/utils; fi
--      -@if [ ! -d $(HEADERDIR)/access ]; \
--              then mkdir $(HEADERDIR)/access; fi
--      -@if [ ! -d $(HEADERDIR)/executor ]; \
--              then mkdir $(HEADERDIR)/executor; fi
--      -@if [ ! -d $(HEADERDIR)/commands ]; \
--              then mkdir $(HEADERDIR)/commands; fi
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME)
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/lib
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/libpq
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/utils
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/access
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/executor
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/commands
-       $(INSTALL) $(INSTLOPTS) fmgr.h \
--          $(HEADERDIR)/fmgr.h
-+          $(DESTDIR)$(HEADERDIR)/fmgr.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
--          $(HEADERDIR)/os.h
-+          $(DESTDIR)$(HEADERDIR)/os.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
--          $(HEADERDIR)/config.h
-+          $(DESTDIR)$(HEADERDIR)/config.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/c.h \
--          $(HEADERDIR)/c.h
-+          $(DESTDIR)$(HEADERDIR)/c.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
--          $(HEADERDIR)/postgres.h
-+          $(DESTDIR)$(HEADERDIR)/postgres.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
--          $(HEADERDIR)/postgres_ext.h
-+          $(DESTDIR)$(HEADERDIR)/postgres_ext.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
--          $(HEADERDIR)/libpq/pqcomm.h
-+          $(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
--          $(HEADERDIR)/libpq/libpq-fs.h
-+          $(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
--          $(HEADERDIR)/lib/dllist.h
-+          $(DESTDIR)$(HEADERDIR)/lib/dllist.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
--          $(HEADERDIR)/utils/geo_decls.h
-+          $(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
--          $(HEADERDIR)/utils/elog.h
-+          $(DESTDIR)$(HEADERDIR)/utils/elog.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
--          $(HEADERDIR)/utils/palloc.h
-+          $(DESTDIR)$(HEADERDIR)/utils/palloc.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/mcxt.h \
--          $(HEADERDIR)/utils/mcxt.h
-+          $(DESTDIR)$(HEADERDIR)/utils/mcxt.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
--          $(HEADERDIR)/access/attnum.h
-+          $(DESTDIR)$(HEADERDIR)/access/attnum.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
--          $(HEADERDIR)/executor/spi.h
-+          $(DESTDIR)$(HEADERDIR)/executor/spi.h
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
--          $(HEADERDIR)/commands/trigger.h
-+          $(DESTDIR)$(HEADERDIR)/commands/trigger.h
- ifeq ($(PORTNAME), hpux)
- # is this still necessary?
-       $(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
--          $(HEADERDIR)/port/hpux/fixade.h
--endif
--
--$(BINDIR):
--      mkdir $@
--
--$(LIBDIR):
--      mkdir $@
--
--$(HEADERDIR):
--      mkdir $@
--
--# TEMPLATEDIR is commonly the same as LIBDIR, but it might be different.
--# We don't want duplicate rules if they are the same.
--ifneq ($(TEMPLATEDIR),$(LIBDIR))
--
--$(TEMPLATEDIR):
--      mkdir $@
--
-+          $(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
- endif
- 
- 
-diff -Nru postgresql-7.0.2/src/bin/initdb/Makefile postgresql-7.0.2.new/src/bin/initdb/Makefile
---- postgresql-7.0.2/src/bin/initdb/Makefile   Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/initdb/Makefile       Thu Jul  6 10:01:02 2000
-@@ -20,7 +20,8 @@
-       sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/g' < initdb.sh > initdb
- 
- install: initdb
--      $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)/$+
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) $+ $(DESTDIR)$(BINDIR)/$+
- 
- clean:
-       rm -f initdb
-diff -Nru postgresql-7.0.2/src/bin/initlocation/Makefile postgresql-7.0.2.new/src/bin/initlocation/Makefile
---- postgresql-7.0.2/src/bin/initlocation/Makefile     Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/initlocation/Makefile Thu Jul  6 10:01:02 2000
-@@ -20,7 +20,8 @@
-       cp -p initlocation.sh initlocation
- 
- install: initlocation
--      $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) $+ $(DESTDIR)$(BINDIR)
- 
- clean:
-       rm -f initlocation
-diff -Nru postgresql-7.0.2/src/bin/ipcclean/Makefile postgresql-7.0.2.new/src/bin/ipcclean/Makefile
---- postgresql-7.0.2/src/bin/ipcclean/Makefile Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/ipcclean/Makefile     Thu Jul  6 10:01:02 2000
-@@ -19,7 +19,8 @@
-       cp $< $@
- 
- install: ipcclean
--      $(INSTALL) $(INSTL_EXE_OPTS) $^ $(BINDIR)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) $^ $(DESTDIR)$(BINDIR)
- 
- clean:
-       rm -f ipcclean
-diff -Nru postgresql-7.0.2/src/bin/pg_ctl/Makefile postgresql-7.0.2.new/src/bin/pg_ctl/Makefile
---- postgresql-7.0.2/src/bin/pg_ctl/Makefile   Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pg_ctl/Makefile       Thu Jul  6 10:01:02 2000
-@@ -20,8 +20,10 @@
-       cat pg_ctl.sh > pg_ctl
- 
- install: pg_ctl
--      $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
--      $(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(TEMPLATEDIR)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) -d $(DESTDIR)$(TEMPLATEDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) $+ $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(DESTDIR)$(TEMPLATEDIR)
- 
- clean:
-       rm -f pg_ctl
-diff -Nru postgresql-7.0.2/src/bin/pg_dump/Makefile.in postgresql-7.0.2.new/src/bin/pg_dump/Makefile.in
---- postgresql-7.0.2/src/bin/pg_dump/Makefile.in       Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pg_dump/Makefile.in   Thu Jul  6 10:01:02 2000
-@@ -39,9 +39,10 @@
-       $(MAKE) -C $(LIBPQDIR) libpq.a
- 
- install: pg_dump
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(BINDIR)/pg_dump$(X)
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_upgrade $(BINDIR)/pg_upgrade
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(DESTDIR)$(BINDIR)/pg_dump$(X)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(DESTDIR)$(BINDIR)/pg_dumpall
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_upgrade $(DESTDIR)$(BINDIR)/pg_upgrade
- 
- depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-diff -Nru postgresql-7.0.2/src/bin/pg_encoding/Makefile postgresql-7.0.2.new/src/bin/pg_encoding/Makefile
---- postgresql-7.0.2/src/bin/pg_encoding/Makefile      Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pg_encoding/Makefile  Thu Jul  6 10:01:02 2000
-@@ -30,7 +30,8 @@
-       $(MAKE) -C $(LIBPQDIR) libpq.a
- 
- install: pg_encoding
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(BINDIR)/pg_encoding$(X)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(DESTDIR)$(BINDIR)/pg_encoding$(X)
- 
- depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-diff -Nru postgresql-7.0.2/src/bin/pg_id/Makefile postgresql-7.0.2.new/src/bin/pg_id/Makefile
---- postgresql-7.0.2/src/bin/pg_id/Makefile    Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pg_id/Makefile        Thu Jul  6 10:01:02 2000
-@@ -20,7 +20,8 @@
-       $(CC) -o pg_id $(OBJS) $(LDFLAGS)
- 
- install: pg_id
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_id$(X) $(BINDIR)/pg_id$(X)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_id$(X) $(DESTDIR)$(BINDIR)/pg_id$(X)
- 
- depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-diff -Nru postgresql-7.0.2/src/bin/pg_passwd/Makefile postgresql-7.0.2.new/src/bin/pg_passwd/Makefile
---- postgresql-7.0.2/src/bin/pg_passwd/Makefile        Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pg_passwd/Makefile    Thu Jul  6 10:01:02 2000
-@@ -15,7 +15,8 @@
-       $(CC) $(CFLAGS) -o pg_passwd $(OBJS) $(LDFLAGS)
- 
- install: pg_passwd
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd$(X) $(BINDIR)/pg_passwd$(X)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd$(X) $(DESTDIR)$(BINDIR)/pg_passwd$(X)
- 
- .PHONY: submake
- submake:
-diff -Nru postgresql-7.0.2/src/bin/pg_version/Makefile.in postgresql-7.0.2.new/src/bin/pg_version/Makefile.in
---- postgresql-7.0.2/src/bin/pg_version/Makefile.in    Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pg_version/Makefile.in        Thu Jul  6 10:01:02 2000
-@@ -27,7 +27,8 @@
-       $(MAKE) -C $(SRCDIR)/utils version.o
- 
- install: pg_version
--      $(INSTALL) $(INSTL_EXE_OPTS) pg_version$(X) $(BINDIR)/pg_version$(X)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pg_version$(X) $(DESTDIR)$(BINDIR)/pg_version$(X)
- 
- depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
-diff -Nru 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 Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pgaccess/Makefile     Wed Jul 12 18:41:32 2000
-@@ -21,17 +21,15 @@
-                       > pgaccess
- 
- install:
--      $(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
--      -@if [ ! -d $(POSTGRESDIR)/pgaccess ]; then mkdir $(POSTGRESDIR)/pgaccess; fi
--      $(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(POSTGRESDIR)/pgaccess
--      -@if [ ! -d $(POSTGRESDIR)/pgaccess/lib ]; then mkdir $(POSTGRESDIR)/pgaccess/lib; fi
--      $(INSTALL) $(INSTLOPTS) lib/*.tcl $(POSTGRESDIR)/pgaccess/lib
--      -@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/help ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/help; fi
--      $(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(POSTGRESDIR)/pgaccess/lib/help
--      -@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/languages ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/languages; fi
--      $(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(POSTGRESDIR)/pgaccess/lib/languages
--      -@if [ ! -d $(POSTGRESDIR)/pgaccess/images ]; then mkdir $(POSTGRESDIR)/pgaccess/images; fi
--      $(INSTALL) $(INSTLOPTS) images/*.gif $(POSTGRESDIR)/pgaccess/images
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/help
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/anguages
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/images
-+      $(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(DESTDIR)$(BINDIR)/pgaccess
-+      $(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(DESTDIR)$(LIBDIR)/pgaccess
-+      $(INSTALL) $(INSTLOPTS) lib/*.tcl $(DESTDIR)$(LIBDIR)/pgaccess
-+      $(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(DESTDIR)$(LIBDIR)/pgaccess/help
-+      $(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(DESTDIR)$(LIBDIR)/pgaccess/languages
-+      $(INSTALL) $(INSTLOPTS) images/*.gif $(DESTDIR)$(LIBDIR)/pgaccess/images
- 
- clean:
-       rm -f pgaccess
-diff -Nru postgresql-7.0.2/src/bin/pgtclsh/Makefile postgresql-7.0.2.new/src/bin/pgtclsh/Makefile
---- postgresql-7.0.2/src/bin/pgtclsh/Makefile  Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/pgtclsh/Makefile      Thu Jul  6 10:01:02 2000
-@@ -53,10 +53,12 @@
- install: $(INSTPGMS)
- 
- install_tcl: pgtclsh
--      $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
- 
- install_tk: pgtksh
--      $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
- 
- Makefile.tcldefs: mkMakefile.tcldefs.sh
-       /bin/sh mkMakefile.tcldefs.sh
-diff -Nru postgresql-7.0.2/src/bin/psql/Makefile.in postgresql-7.0.2.new/src/bin/psql/Makefile.in
---- postgresql-7.0.2/src/bin/psql/Makefile.in  Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/psql/Makefile.in      Thu Jul  6 10:01:02 2000
-@@ -76,7 +76,8 @@
-       $(MAKE) -C $(LIBPQDIR) libpq.a
- 
- install: psql
--      $(INSTALL) $(INSTL_EXE_OPTS) psql$(X) $(BINDIR)/psql$(X)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) psql$(X) $(DESTDIR)$(BINDIR)/psql$(X)
- 
- depend dep:
-       $(CC) -MM -MG $(CFLAGS) *.c >depend
-diff -Nru postgresql-7.0.2/src/bin/scripts/Makefile postgresql-7.0.2.new/src/bin/scripts/Makefile
---- postgresql-7.0.2/src/bin/scripts/Makefile  Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/bin/scripts/Makefile      Thu Jul  6 10:01:02 2000
-@@ -32,7 +32,8 @@
- vacuumdb:
- 
- install: $(SCRIPTS)
--      for i in $+; do $(INSTALL) $(INSTL_EXE_OPTS) $$i $(BINDIR); done
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      for i in $+; do $(INSTALL) $(INSTL_EXE_OPTS) $$i $(DESTDIR)$(BINDIR); done
- 
- clean:
-       rm -f createlang
-diff -Nru postgresql-7.0.2/src/interfaces/ecpg/include/Makefile postgresql-7.0.2.new/src/interfaces/ecpg/include/Makefile
---- postgresql-7.0.2/src/interfaces/ecpg/include/Makefile      Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/ecpg/include/Makefile  Thu Jul  6 10:01:02 2000
-@@ -6,11 +6,12 @@
-       @echo Nothing to be done.
- 
- install::
--      $(INSTALL) $(INSTLOPTS) ecpgerrno.h $(HEADERDIR)        
--      $(INSTALL) $(INSTLOPTS) ecpglib.h $(HEADERDIR)  
--      $(INSTALL) $(INSTLOPTS) ecpgtype.h $(HEADERDIR) 
--      $(INSTALL) $(INSTLOPTS) sqlca.h $(HEADERDIR)    
--      $(INSTALL) $(INSTLOPTS) sql3types.h $(HEADERDIR)        
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
-+      $(INSTALL) $(INSTLOPTS) ecpgerrno.h $(DESTDIR)$(HEADERDIR)      
-+      $(INSTALL) $(INSTLOPTS) ecpglib.h $(DESTDIR)$(HEADERDIR)        
-+      $(INSTALL) $(INSTLOPTS) ecpgtype.h $(DESTDIR)$(HEADERDIR)       
-+      $(INSTALL) $(INSTLOPTS) sqlca.h $(DESTDIR)$(HEADERDIR)  
-+      $(INSTALL) $(INSTLOPTS) sql3types.h $(DESTDIR)$(HEADERDIR)      
- 
- uninstall::
-       rm -f $(HEADERDIR)/ecpgerrno.h
-diff -Nru postgresql-7.0.2/src/interfaces/ecpg/preproc/Makefile.in postgresql-7.0.2.new/src/interfaces/ecpg/preproc/Makefile.in
---- postgresql-7.0.2/src/interfaces/ecpg/preproc/Makefile.in   Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/ecpg/preproc/Makefile.in       Thu Jul  6 10:01:02 2000
-@@ -42,7 +42,8 @@
- # to ship those files in the distribution, for people with inadequate tools.
- 
- install: all
--      $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(BINDIR)
-+      $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(DESTDIR)$(BINDIR)
- 
- uninstall:
-       rm -f $(BINDIR)/ecpg
-diff -Nru postgresql-7.0.2/src/interfaces/libpgeasy/Makefile.in postgresql-7.0.2.new/src/interfaces/libpgeasy/Makefile.in
---- postgresql-7.0.2/src/interfaces/libpgeasy/Makefile.in      Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/libpgeasy/Makefile.in  Thu Jul  6 10:01:02 2000
-@@ -39,8 +39,8 @@
- install: install-headers install-lib $(install-shlib-dep)
- 
- install-headers: libpgeasy.h
--      -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
--      $(INSTALL) $(INSTLOPTS) libpgeasy.h $(HEADERDIR)/libpgeasy.h
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
-+      $(INSTALL) $(INSTLOPTS) libpgeasy.h $(DESTDIR)$(HEADERDIR)/libpgeasy.h
- 
- .PHONY: clean
- 
-diff -Nru postgresql-7.0.2/src/interfaces/libpgtcl/Makefile.in postgresql-7.0.2.new/src/interfaces/libpgtcl/Makefile.in
---- postgresql-7.0.2/src/interfaces/libpgtcl/Makefile.in       Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/libpgtcl/Makefile.in   Thu Jul  6 10:01:02 2000
-@@ -43,11 +43,8 @@
- install: install-headers install-lib $(install-shlib-dep)
- 
- install-headers: beforeinstall-headers libpgtcl.h
--      $(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
--
--beforeinstall-headers:
--      -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
--
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
-+      $(INSTALL) $(INSTLOPTS) libpgtcl.h $(DESTDIR)$(HEADERDIR)/libpgtcl.h
- 
- .PHONY: clean
- 
-diff -Nru postgresql-7.0.2/src/interfaces/libpq/Makefile.in postgresql-7.0.2.new/src/interfaces/libpq/Makefile.in
---- postgresql-7.0.2/src/interfaces/libpq/Makefile.in  Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/libpq/Makefile.in      Thu Jul  6 10:01:02 2000
-@@ -83,11 +83,10 @@
- install: install-headers install-lib $(install-shlib-dep)
- 
- install-headers: libpq-fe.h libpq-int.h
--      -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
--      $(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
--      $(INSTALL) $(INSTLOPTS) libpq-int.h $(HEADERDIR)/libpq-int.h
--      $(INSTALL) $(INSTLOPTS) pqexpbuffer.h $(HEADERDIR)/pqexpbuffer.h
--
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
-+      $(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
-+      $(INSTALL) $(INSTLOPTS) libpq-int.h $(DESTDIR)$(HEADERDIR)/libpq-int.h
-+      $(INSTALL) $(INSTLOPTS) pqexpbuffer.h $(DESTDIR)$(HEADERDIR)/pqexpbuffer.h
- 
- .PHONY: clean
- 
-diff -Nru postgresql-7.0.2/src/interfaces/libpq++/Makefile.in postgresql-7.0.2.new/src/interfaces/libpq++/Makefile.in
---- postgresql-7.0.2/src/interfaces/libpq++/Makefile.in        Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/libpq++/Makefile.in    Thu Jul  6 10:01:02 2000
-@@ -73,16 +73,13 @@
-                pgcursordb.h \
-                pglobject.h
- 
--install-headers: beforeinstall-headers $(MAINHEADER)
--      @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER)
-+install-headers: $(MAINHEADER)
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR) $(DESTDIR)$(LIBPGXXHEADERDIR)
-+      @$(INSTALL) $(MAINHEADER) $(DESTDIR)$(HEADERDIR)/$(MAINHEADER)
-       @for i in ${LIBPGXXHEADERS}; do \
-               echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \
--              $(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \
-+              $(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)$(LIBPGXXHEADERDIR)/$$i; \
-       done
--
--beforeinstall-headers:
--      -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
--      -@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
- 
- .PHONY: clean
- 
-diff -Nru postgresql-7.0.2/src/interfaces/odbc/GNUmakefile.in postgresql-7.0.2.new/src/interfaces/odbc/GNUmakefile.in
---- postgresql-7.0.2/src/interfaces/odbc/GNUmakefile.in        Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/odbc/GNUmakefile.in    Mon Jul 24 10:57:29 2000
-@@ -15,6 +15,7 @@
- NAME = psqlodbc
- SRCDIR= @top_srcdir@
- ODBCSRCDIR= @srcdir@
-+sysconfdir= @sysconfdir@
- include $(SRCDIR)/Makefile.global
- 
- include Version.mk
-@@ -46,22 +47,17 @@
- 
- .PHONY: install install-ini beforeinstall-headers install-headers
- 
--install: $(HEADERDIR) $(LIBDIR) $(ODBCINST) install-headers \
--      install-ini install-lib $(install-shlib-dep)
-+install: install-headers install-ini install-lib $(install-shlib-dep)
- 
--$(HEADERDIR) $(LIBDIR) $(ODBCINST):
--      mkdir -p $@
--
--install-headers: beforeinstall-headers isql.h isqlext.h iodbc.h
--      $(INSTALL) $(INSTLOPTS) iodbc.h $(HEADERDIR)/iodbc/iodbc.h
--      $(INSTALL) $(INSTLOPTS) isql.h $(HEADERDIR)/iodbc/isql.h
--      $(INSTALL) $(INSTLOPTS) isqlext.h $(HEADERDIR)/iodbc/isqlext.h
--
--beforeinstall-headers:
--      @if [ ! -d $(HEADERDIR)/iodbc ]; then mkdir -p $(HEADERDIR)/iodbc; fi
-+install-headers: isql.h isqlext.h iodbc.h
-+      $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/iodbc
-+      $(INSTALL) $(INSTLOPTS) iodbc.h $(DESTDIR)$(HEADERDIR)/iodbc/iodbc.h
-+      $(INSTALL) $(INSTLOPTS) isql.h $(DESTDIR)$(HEADERDIR)/iodbc/isql.h
-+      $(INSTALL) $(INSTLOPTS) isqlext.h $(DESTDIR)$(HEADERDIR)/iodbc/isqlext.h
- 
- install-ini: odbcinst.ini
--      $(INSTALL) $(INSTL_LIB_OPTS) odbcinst.ini $(ODBCINST)/odbcinst.ini
-+      $(INSTALL) -d $(DESTDIR)$(sysconfdir)
-+      $(INSTALL) $(INSTL_LIB_OPTS) odbcinst.ini $(DESTDIR)$(sysconfdir)/odbcinst.ini
- 
- .PHONY: clean
- 
-diff -Nru postgresql-7.0.2/src/interfaces/odbc/Makefile.global.in postgresql-7.0.2.new/src/interfaces/odbc/Makefile.global.in
---- postgresql-7.0.2/src/interfaces/odbc/Makefile.global.in    Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/interfaces/odbc/Makefile.global.in        Sat Jul 22 08:10:28 2000
-@@ -78,11 +78,11 @@
- #POSTDOCDIR= $(POSTGRESDIR)/doc
- 
- # Where the header files necessary to build frontend programs get installed.
--HEADERDIR= $(POSTGRESDIR)/include
-+HEADERDIR= @includedir@/pgsql
- 
- # Where the odbcinst.ini file will be placed
- 
--ODBCINST= @ODBCINST@
-+sysconfdir= @sysconfdir@
- 
- ##############################################################################
- #
-diff -Nru postgresql-7.0.2/src/pl/plpgsql/src/Makefile.in postgresql-7.0.2.new/src/pl/plpgsql/src/Makefile.in
---- postgresql-7.0.2/src/pl/plpgsql/src/Makefile.in    Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/pl/plpgsql/src/Makefile.in        Wed Jul 12 18:42:56 2000
-@@ -40,7 +40,8 @@
- 
- install: $(shlib)
- ifneq ($(shlib),)
--      $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/plpgsql$(DLSUFFIX)
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/plpgsql$(DLSUFFIX)
- else
-       @echo "plpgsql not installed due to lack of shared library support."
- endif
-diff -Nru postgresql-7.0.2/src/pl/tcl/Makefile postgresql-7.0.2.new/src/pl/tcl/Makefile
---- postgresql-7.0.2/src/pl/tcl/Makefile       Mon Jul 24 10:56:31 2000
-+++ postgresql-7.0.2.new/src/pl/tcl/Makefile   Wed Jul 12 18:44:19 2000
-@@ -103,7 +103,8 @@
- all: $(INFILES)
- 
- install: all
--      $(INSTALL) $(INSTL_SHLIB_OPTS) $(DLOBJS) $(LIBDIR)/$(DLOBJS)
-+      $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) $(INSTL_SHLIB_OPTS) $(DLOBJS) $(DESTDIR)$(LIBDIR)/$(DLOBJS)
- 
- else
- 
+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
+@@ -16,7 +16,7 @@
+       $(PERL) $<
+ 
+ install: all installdirs
+-      $(MAKE) -f Makefile install
++      $(MAKE) -f Makefile install DESTDIR=\"$(DESTDIR)\"
+ 
+ installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(plperl_installdir)

diff --git a/postgresql-configure.patch b/postgresql-configure.patch
new file mode 100644 (file)
index 0000000..642a940
--- /dev/null
+++ b/postgresql-configure.patch
@@ -0,0 +1,23 @@
+diff -urN postgresql-7.1.org/configure.in postgresql-7.1/configure.in
+--- postgresql-7.1.org/configure.in    Wed Apr 18 14:00:58 2001
++++ postgresql-7.1/configure.in        Wed Apr 18 14:07:04 2001
+@@ -17,9 +17,7 @@
+ dnl The GNU folks apparently haven't heard that some people don't use
+ dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
+ define([info], [doc])
+-define([infodir], [docdir])
+ AC_INIT(src/backend/access/common/heaptuple.c)
+-undefine([infodir])
+ undefine([info])
+ 
+ AC_PREFIX_DEFAULT(/usr/local/pgsql)
+@@ -31,6 +29,9 @@
+ VERSION='7.1'
+ AC_SUBST(VERSION)
+ AC_DEFINE_UNQUOTED(PG_VERSION, "$VERSION")
++
++docdir=$infodir
++AC_SUBST(docdir)
+ 
+ unset CDPATH
+ 

diff --git a/postgresql-no_libnsl.patch b/postgresql-no_libnsl.patch
index d76ca87c870013c61946d6f3cf49639240bb34ec..c1a98bead2c6b00473e1edcd9fd9941132fe900f 100644 (file)
--- a/postgresql-no_libnsl.patch
+++ b/postgresql-no_libnsl.patch
@@ -1,7 +1,7 @@
-diff -Nru postgresql-7.0.2/src/configure.in postgresql-7.0.2.new/src/configure.in
---- postgresql-7.0.2/src/configure.in  Thu May 25 00:43:59 2000
-+++ postgresql-7.0.2.new/src/configure.in      Wed Aug 23 00:47:11 2000
-@@ -692,7 +692,6 @@
+diff -urN postgresql-7.1.org/configure.in postgresql-7.1/configure.in
+--- postgresql-7.1.org/configure.in    Wed Apr 18 13:50:14 2001
++++ postgresql-7.1/configure.in        Wed Apr 18 13:50:20 2001
+@@ -661,7 +661,6 @@
  AC_CHECK_LIB(m,        main)
  AC_CHECK_LIB(dl,       main)
  AC_CHECK_LIB(socket,   main)

diff --git a/postgresql-readline.patch b/postgresql-readline.patch
index eaa569b1945605a813a52f12e91ec827973a236e..eb2a627e8589430c7304969f10729273997e4d70 100644 (file)
--- a/postgresql-readline.patch
+++ b/postgresql-readline.patch
@@ -1,17 +1,28 @@
---- postgresql-7.0.3/src/bin/psql/tab-complete.c.wiget Fri Apr 13 17:05:43 2001
-+++ postgresql-7.0.3/src/bin/psql/tab-complete.c       Fri Apr 13 18:36:40 2001
-@@ -50,8 +50,8 @@
- #include "common.h"
+diff -urN postgresql-7.1.org/configure.in postgresql-7.1/configure.in
+--- postgresql-7.1.org/configure.in    Wed Apr 18 13:29:38 2001
++++ postgresql-7.1/configure.in        Wed Apr 18 13:32:55 2001
+@@ -903,7 +903,7 @@
+ else
+     _readline_header='xxx'
+ fi
+-AC_EGREP_HEADER([filename_completion_function], [$_readline_header],
++AC_EGREP_HEADER([rl_filename_completion_function], [$_readline_header],
+ [AC_DEFINE(HAVE_FILENAME_COMPLETION_FUNCTION_DECL)
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
+diff -urN postgresql-7.1.org/src/bin/psql/tab-complete.c postgresql-7.1/src/bin/psql/tab-complete.c
+--- postgresql-7.1.org/src/bin/psql/tab-complete.c     Wed Apr 18 13:29:38 2001
++++ postgresql-7.1/src/bin/psql/tab-complete.c Wed Apr 18 13:30:35 2001
+@@ -61,7 +61,7 @@
  #include "settings.h"
  
--#if defined(HAVE_FILENAME_COMPLETION_FUNCTION) && !defined(HAVE_FILENAME_COMPLETION_FUNCTION_DECL)
+ #ifndef HAVE_FILENAME_COMPLETION_FUNCTION_DECL
 -char     *filename_completion_function(char *, int);
-+#if defined(HAVE_RL_FILENAME_COMPLETION_FUNCTION) && !defined(HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL)
 +char     *rl_filename_completion_function(char *, int);
  
  #endif
  
-@@ -62,9 +62,9 @@
+@@ -72,9 +72,9 @@
  /* Forward declaration of functions */
  static char **psql_completion(char *text, int start, int end);
  static char *create_command_generator(char *text, int state);
@@ -24,7 +35,7 @@
  
  static PGresult *exec_query(char *query);
  char     *quote_file_name(char *text, int match_type, char *quote_pointer);
-@@ -152,13 +152,13 @@
+@@ -162,13 +162,13 @@
     4) The list of attributes to the given table.
  */
  #define COMPLETE_WITH_QUERY(query) \
@@ -42,7 +53,7 @@
  
  
  /* The completion function. Acc. to readline spec this gets passed the text
-@@ -257,7 +257,7 @@
+@@ -298,7 +298,7 @@
  /* CREATE or DROP */
        /* complete with something you can create or drop */
        else if (strcasecmp(prev_wd, "CREATE") == 0 || strcasecmp(prev_wd, "DROP") == 0)
@@ -50,19 +61,17 @@
 +              matches = rl_completion_matches(text, create_command_generator);
  
  /* ALTER */
-       /* complete with what you can alter (TABLE or USER) */
-@@ -619,8 +619,8 @@
+       /* complete with what you can alter (TABLE, GROUP, USER) */
+@@ -731,7 +731,7 @@
+                        strcmp(prev_wd, "\\s") == 0 ||
                   strcmp(prev_wd, "\\w") == 0 || strcmp(prev_wd, "\\write") == 0
                )
-       {
--#ifdef HAVE_FILENAME_COMPLETION_FUNCTION
 -              matches = completion_matches(text, filename_completion_function);
-+#ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION
-+              matches = rl_completion_matches(text, rl_filename_completion_function);
- #else
++              matches = completion_matches(text, rl_filename_completion_function);
  
-               /*
-@@ -728,7 +728,7 @@
+ 
+       /*
+@@ -829,7 +829,7 @@
     etc.
  */
  static char *
@@ -71,7 +80,7 @@
  {
        static int      list_index,
                                string_length;
-@@ -776,7 +776,7 @@
+@@ -877,7 +877,7 @@
     SQL words that can appear at certain spot.
  */
  static char *
@@ -80,7 +89,7 @@
  {
        static int      string_length,
                                list_index;
-@@ -810,7 +810,7 @@
+@@ -911,7 +911,7 @@
     The string to be passed must be in completion_charp.
  */
  static char *
@@ -89,27 +98,3 @@
  {
        (void) text;                            /* We don't care about what was entered
                                                                 * already. */
---- postgresql-7.0.3/src/configure.in.wiget    Fri Apr 13 17:53:57 2001
-+++ postgresql-7.0.3/src/configure.in  Fri Apr 13 17:55:00 2001
-@@ -915,14 +915,14 @@
- dnl Check for readline's filename_completion_function.
- dnl Some versions have it but it's not in the headers, so we have to take
- dnl care of that, too.
--AC_CHECK_FUNCS(filename_completion_function,
--    AC_EGREP_HEADER(filename_completion_function, readline.h,
--        AC_DEFINE(HAVE_FILENAME_COMPLETION_FUNCTION_DECL),
--        [AC_EGREP_HEADER(filename_completion_function, readline/readline.h,
--            AC_DEFINE(HAVE_FILENAME_COMPLETION_FUNCTION_DECL))])
-+AC_CHECK_FUNCS(rl_filename_completion_function,
-+    AC_EGREP_HEADER(rl_filename_completion_function, readline.h,
-+        AC_DEFINE(HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL),
-+        [AC_EGREP_HEADER(rl_filename_completion_function, readline/readline.h,
-+            AC_DEFINE(HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL))])
- )
--AC_SUBST(HAVE_FILENAME_COMPLETION_FUNCTION)
--AC_SUBST(HAVE_FILENAME_COMPLETION_FUNCTION_DECL)
-+AC_SUBST(HAVE_RL_FILENAME_COMPLETION_FUNCTION)
-+AC_SUBST(HAVE_RL_FILENAME_COMPLETION_FUNCTION_DECL)
- 
- dnl Check for GNU style long options support (getopt_long)
- AC_CHECK_FUNCS(getopt_long)