Added libpq and postgresql from the tree to fix a couple of bugs

svn path=/testing/; revision=266

10 files changed, 289 insertions, 0 deletions

diff --git a/dev-db/libpq/files/digest-libpq-7.3.19 b/dev-db/libpq/files/digest-libpq-7.3.19
new file mode 100644
index 0000000..332998d
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.3.19
@@ -0,0 +1,6 @@
+MD5 b9b2dca0468bafff72486bd54812c317 postgresql-base-7.3.19.tar.bz2 5691127
+RMD160 802bbba70d1368097a74de6b67589ab9645597cc postgresql-base-7.3.19.tar.bz2 5691127
+SHA256 1804e0424e4444f67acfb98b4e4ad2ede26748d1ddb4a9201cbff7627e394e6a postgresql-base-7.3.19.tar.bz2 5691127
+MD5 1fe88fa959492155518787c0eb197b14 postgresql-opt-7.3.19.tar.bz2 342076
+RMD160 7ee1dea5c906d88ba3384ea805368a9dcb8af47d postgresql-opt-7.3.19.tar.bz2 342076
+SHA256 2735bceed9f0d27befb3ec26b5d76f9272da1cdf2434ceb9d68327494912017f postgresql-opt-7.3.19.tar.bz2 342076
diff --git a/dev-db/libpq/files/digest-libpq-7.4.17 b/dev-db/libpq/files/digest-libpq-7.4.17
new file mode 100644
index 0000000..1ee7a5e
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.4.17
@@ -0,0 +1,3 @@
+MD5 c513ae755abd4fb011378351be9e1ba0 postgresql-base-7.4.17.tar.bz2 6609512
+RMD160 cd5aed1fb45cc42e12cca0cd31174b6726dae97b postgresql-base-7.4.17.tar.bz2 6609512
+SHA256 f1b7ff754ccb43d4a3a62a9124b1c8ac215e48e5549e620bfcde59124c6f1bc5 postgresql-base-7.4.17.tar.bz2 6609512
diff --git a/dev-db/libpq/files/digest-libpq-8.0.13 b/dev-db/libpq/files/digest-libpq-8.0.13
new file mode 100644
index 0000000..95e9f17
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.0.13
@@ -0,0 +1,6 @@
+MD5 d3b5185dc6a12f2443f06f83cdee03d0 postgresql-base-8.0.13.tar.bz2 7848290
+RMD160 de34ef01b76d777e9b22bcd16dd29328a11d35cf postgresql-base-8.0.13.tar.bz2 7848290
+SHA256 5627ad76e6a6c8eb85c1debe5fce2c12b42611434dabe0fd5763b8a72c7ac49d postgresql-base-8.0.13.tar.bz2 7848290
+MD5 824caf8451dec685a0d5886eb4892807 postgresql-opt-8.0.13.tar.bz2 134769
+RMD160 f3fb741c5dcff23045a58baf57f4386099e3c563 postgresql-opt-8.0.13.tar.bz2 134769
+SHA256 9f63fc12ede1a605934cdc462ff45c0e924288284f411ae38dec1c5b6e87ce25 postgresql-opt-8.0.13.tar.bz2 134769
diff --git a/dev-db/libpq/files/digest-libpq-8.1.9 b/dev-db/libpq/files/digest-libpq-8.1.9
new file mode 100644
index 0000000..9e6ea56
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.1.9
@@ -0,0 +1,6 @@
+MD5 44582cd7184badf63d9c558f91cdd128 postgresql-base-8.1.9.tar.bz2 8108212
+RMD160 e10c91f95e16cfcdf10235d533855676f8e03ceb postgresql-base-8.1.9.tar.bz2 8108212
+SHA256 4d11584d545d5f18566bc1bf65409794adceef1825dc4850514238f6b5d3f5fd postgresql-base-8.1.9.tar.bz2 8108212
+MD5 26fed39417431ff56e213caf11dc7215 postgresql-opt-8.1.9.tar.bz2 144737
+RMD160 3541c7c2d86e7a9d129d521c3a7bac189758d1a5 postgresql-opt-8.1.9.tar.bz2 144737
+SHA256 b8c5c3098c53e8c8b722ba8928787eb7478beeb3c6b42adbaad1d8ca24d2e49f postgresql-opt-8.1.9.tar.bz2 144737
diff --git a/dev-db/libpq/files/digest-libpq-8.2.4 b/dev-db/libpq/files/digest-libpq-8.2.4
new file mode 100644
index 0000000..3e31b4b
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.2.4
@@ -0,0 +1,9 @@
+MD5 5c0576627c9969a3cedb6b014fb6ae05 postgresql-base-8.2.4.tar.bz2 8549159
+RMD160 876105c3cc9d36b66cf9dc9b687d4b6f6b2c3d9c postgresql-base-8.2.4.tar.bz2 8549159
+SHA256 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca postgresql-base-8.2.4.tar.bz2 8549159
+MD5 b71b0526e7c8af22d82fbc7b6f81a750 postgresql-opt-8.2.4.tar.bz2 167612
+RMD160 aaacb743be86afbfe0f885b7994c15c94fef2413 postgresql-opt-8.2.4.tar.bz2 167612
+SHA256 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35 postgresql-opt-8.2.4.tar.bz2 167612
+MD5 0fefe28b8c9d16ebdf6f05c366477a9d postgresql-test-8.2.4.tar.bz2 985819
+RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae postgresql-test-8.2.4.tar.bz2 985819
+SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504 postgresql-test-8.2.4.tar.bz2 985819
diff --git a/dev-db/libpq/files/libpq-7.3.19-gentoo.patch b/dev-db/libpq/files/libpq-7.3.19-gentoo.patch
new file mode 100644
index 0000000..254dafd
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.3.19-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Nru postgresql-7.3.16.orig/src/interfaces/libpq/Makefile postgresql-7.3.16/src/interfaces/libpq/Makefile
+--- postgresql-7.3.16.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.16/src/interfaces/libpq/Makefile	2006-11-05 13:21:19.000000000 +0100
+@@ -18,6 +18,8 @@
+ SO_MAJOR_VERSION= 3
+ SO_MINOR_VERSION= 0
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
+diff -Nru postgresql-7.3.16.orig/src/interfaces/libpq/nls.mk postgresql-7.3.16/src/interfaces/libpq/nls.mk
+--- postgresql-7.3.16.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.16/src/interfaces/libpq/nls.mk	2006-11-05 13:21:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.8 2002/09/22 20:57:21 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-3
+ AVAIL_LANGUAGES	:= cs de es fr pt_BR ru sv zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext
+diff -Nru postgresql-7.3.16.orig/src/Makefile.shlib postgresql-7.3.16/src/Makefile.shlib
+--- postgresql-7.3.16.orig/src/Makefile.shlib	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.16/src/Makefile.shlib	2006-11-05 13:23:20.000000000 +0100
+@@ -221,7 +221,7 @@
+ 
+ all-lib: all-static-lib all-shared-lib
+ 
+-all-static-lib: lib$(NAME).a
++all-static-lib: lib$(NAME_STATIC_LIB).a
+ 
+ all-shared-lib: $(shlib)
+ 
+@@ -231,7 +231,7 @@
+ MK_NO_LORDER := true
+ endif
+ 
+-lib$(NAME).a: $(OBJS)
++lib$(NAME_STATIC_LIB).a: $(OBJS)
+ ifdef MK_NO_LORDER
+ 	$(LINK.static) $@ $^
+ else
+@@ -302,8 +302,8 @@
+ .PHONY: install-lib install-lib-static install-lib-shared
+ install-lib: install-lib-static install-lib-shared
+ 
+-install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++install-lib-static: lib$(NAME_STATIC_LIB).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ 
+ ifeq ($(enable_shared), yes)
+ install-lib-shared: $(shlib)
diff --git a/dev-db/libpq/files/libpq-7.4.17-gentoo.patch b/dev-db/libpq/files/libpq-7.4.17-gentoo.patch
new file mode 100644
index 0000000..b2a9730
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.4.17-gentoo.patch
@@ -0,0 +1,67 @@
+diff -Nru postgresql-7.4.14.orig/src/interfaces/libpq/Makefile postgresql-7.4.14/src/interfaces/libpq/Makefile
+--- postgresql-7.4.14.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:18.000000000 +0100
++++ postgresql-7.4.14/src/interfaces/libpq/Makefile	2006-11-05 13:23:46.000000000 +0100
+@@ -18,6 +18,8 @@
+ SO_MAJOR_VERSION= 3
+ SO_MINOR_VERSION= 1
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
+@@ -66,7 +68,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
+ 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
+-	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
++	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-$(SO_MAJOR_VERSION).conf.sample
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
+diff -Nru postgresql-7.4.14.orig/src/interfaces/libpq/nls.mk postgresql-7.4.14/src/interfaces/libpq/nls.mk
+--- postgresql-7.4.14.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:18.000000000 +0100
++++ postgresql-7.4.14/src/interfaces/libpq/nls.mk	2006-11-05 13:23:46.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.13.2.1 2004/10/30 08:22:16 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-3
+ AVAIL_LANGUAGES	:= cs de es fr hr it nb pt_BR ru sl sv tr zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
+diff -Nru postgresql-7.4.14.orig/src/Makefile.shlib postgresql-7.4.14/src/Makefile.shlib
+--- postgresql-7.4.14.orig/src/Makefile.shlib	2006-11-05 13:20:18.000000000 +0100
++++ postgresql-7.4.14/src/Makefile.shlib	2006-11-05 13:23:46.000000000 +0100
+@@ -229,7 +229,7 @@
+ 
+ all-lib: all-static-lib all-shared-lib
+ 
+-all-static-lib: lib$(NAME).a
++all-static-lib: lib$(NAME_STATIC_LIB).a
+ 
+ all-shared-lib: $(shlib)
+ 
+@@ -239,7 +239,7 @@
+ MK_NO_LORDER := true
+ endif
+ 
+-lib$(NAME).a: $(OBJS)
++lib$(NAME_STATIC_LIB).a: $(OBJS)
+ ifdef MK_NO_LORDER
+ 	$(LINK.static) $@ $^
+ else
+@@ -310,11 +310,11 @@
+ .PHONY: install-lib install-lib-static install-lib-shared
+ install-lib: install-lib-static install-lib-shared
+ 
+-install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++install-lib-static: lib$(NAME_STATIC_LIB).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ ifeq ($(PORTNAME), darwin)
+ 	cd $(DESTDIR)$(libdir) && \
+-	ranlib lib$(NAME).a
++	ranlib lib$(NAME_STATIC_LIB).a
+ endif
+ 
+ ifeq ($(enable_shared), yes)
diff --git a/dev-db/libpq/files/libpq-8.0.13-gentoo.patch b/dev-db/libpq/files/libpq-8.0.13-gentoo.patch
new file mode 100644
index 0000000..e6a3700
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.0.13-gentoo.patch
@@ -0,0 +1,47 @@
+diff -Nru postgresql-8.0.9.orig/src/interfaces/libpq/Makefile postgresql-8.0.9/src/interfaces/libpq/Makefile
+--- postgresql-8.0.9.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:26.000000000 +0100
++++ postgresql-8.0.9/src/interfaces/libpq/Makefile	2006-11-05 13:24:34.000000000 +0100
+@@ -20,6 +20,8 @@
+ SO_MINOR_VERSION= 0
+ DLTYPE= library
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+ override CFLAGS += $(PTHREAD_CFLAGS)
+ 
+@@ -136,7 +138,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
+ 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
+-	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
++	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-$(SO_MAJOR_VERSION).conf.sample
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
+diff -Nru postgresql-8.0.9.orig/src/interfaces/libpq/nls.mk postgresql-8.0.9/src/interfaces/libpq/nls.mk
+--- postgresql-8.0.9.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:26.000000000 +0100
++++ postgresql-8.0.9/src/interfaces/libpq/nls.mk	2006-11-05 13:24:34.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-4
+ AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
+diff -Nru postgresql-8.0.9.orig/src/Makefile.shlib postgresql-8.0.9/src/Makefile.shlib
+--- postgresql-8.0.9.orig/src/Makefile.shlib	2006-11-05 13:20:26.000000000 +0100
++++ postgresql-8.0.9/src/Makefile.shlib	2006-11-05 13:24:34.000000000 +0100
+@@ -360,10 +360,10 @@
+ install-lib: install-lib-static install-lib-shared
+ 
+ install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ ifeq ($(PORTNAME), darwin)
+ 	cd $(DESTDIR)$(libdir) && \
+-	ranlib lib$(NAME).a
++	ranlib lib$(NAME_STATIC_LIB).a
+ endif
+ 
+ ifeq ($(enable_shared), yes)
diff --git a/dev-db/libpq/files/libpq-8.1.9-gentoo.patch b/dev-db/libpq/files/libpq-8.1.9-gentoo.patch
new file mode 100644
index 0000000..859daa5
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.1.9-gentoo.patch
@@ -0,0 +1,47 @@
+diff -Nru postgresql-8.1.5.orig/src/interfaces/libpq/Makefile postgresql-8.1.5/src/interfaces/libpq/Makefile
+--- postgresql-8.1.5.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:34.000000000 +0100
++++ postgresql-8.1.5/src/interfaces/libpq/Makefile	2006-11-05 13:28:00.000000000 +0100
+@@ -20,6 +20,8 @@
+ SO_MINOR_VERSION= 1
+ DLTYPE= library
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+ ifneq ($(PORTNAME), win32)
+ override CFLAGS += $(PTHREAD_CFLAGS)
+@@ -135,7 +137,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
+ 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
+-	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
++	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-$(SO_MAJOR_VERSION).conf.sample
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
+diff -Nru postgresql-8.1.5.orig/src/interfaces/libpq/nls.mk postgresql-8.1.5/src/interfaces/libpq/nls.mk
+--- postgresql-8.1.5.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:34.000000000 +0100
++++ postgresql-8.1.5/src/interfaces/libpq/nls.mk	2006-11-05 13:28:00.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-4
+ AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
+diff -Nru postgresql-8.1.5.orig/src/Makefile.shlib postgresql-8.1.5/src/Makefile.shlib
+--- postgresql-8.1.5.orig/src/Makefile.shlib	2006-11-05 13:20:34.000000000 +0100
++++ postgresql-8.1.5/src/Makefile.shlib	2006-11-05 13:28:00.000000000 +0100
+@@ -366,10 +366,10 @@
+ install-lib: install-lib-static install-lib-shared
+ 
+ install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ ifeq ($(PORTNAME), darwin)
+ 	cd $(DESTDIR)$(libdir) && \
+-	ranlib lib$(NAME).a
++	ranlib lib$(NAME_STATIC_LIB).a
+ endif
+ 
+ ifeq ($(enable_shared), yes)
diff --git a/dev-db/libpq/files/libpq-8.2.4-gentoo.patch b/dev-db/libpq/files/libpq-8.2.4-gentoo.patch
new file mode 100644
index 0000000..428232c
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.2.4-gentoo.patch
@@ -0,0 +1,44 @@
+--- postgresql-8.2.3.orig/src/interfaces/libpq/Makefile	2006-12-28 01:01:12.000000000 +0100
++++ postgresql-8.2.3/src/interfaces/libpq/Makefile	2007-03-29 10:24:27.000000000 +0200
+@@ -20,6 +20,8 @@
+ SO_MINOR_VERSION= 0
+ DLTYPE= library
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+ ifneq ($(PORTNAME), win32)
+ override CFLAGS += $(PTHREAD_CFLAGS)
+@@ -160,7 +162,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h '$(DESTDIR)$(includedir)'
+ 	$(INSTALL_DATA) $(srcdir)/libpq-int.h '$(DESTDIR)$(includedir_internal)'
+ 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h '$(DESTDIR)$(includedir_internal)'
+-	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample '$(DESTDIR)$(datadir)/pg_service.conf.sample'
++	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample '$(DESTDIR)$(datadir)/pg_service-$(SO_MAJOR_VERSION).conf.sample'
+ 
+ installdirs:
+ 	$(mkinstalldirs) '$(DESTDIR)$(libdir)' '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)'
+--- postgresql-8.2.3.orig/src/interfaces/libpq/nls.mk	2005-01-14 09:57:06.000000000 +0100
++++ postgresql-8.2.3/src/interfaces/libpq/nls.mk	2007-03-29 10:24:55.000000000 +0200
+@@ -1,5 +1,5 @@
+ # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-4
+ AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
+--- postgresql-8.2.3.orig/src/Makefile.shlib	2006-09-19 17:36:07.000000000 +0200
++++ postgresql-8.2.3/src/Makefile.shlib	2007-03-29 10:28:42.000000000 +0200
+@@ -346,10 +346,10 @@
+ install-lib: install-lib-static install-lib-shared
+ 
+ install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< '$(DESTDIR)$(libdir)/lib$(NAME).a'
++	$(INSTALL_STLIB) $< '$(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a'
+ ifeq ($(PORTNAME), darwin)
+ 	cd '$(DESTDIR)$(libdir)' && \
+-	ranlib lib$(NAME).a
++	ranlib lib$(NAME_STATIC_LIB).a
+ endif
+ 
+ ifeq ($(enable_shared), yes)