From bb494e9cb2a1ddee8f81c805383c6fa9aa0399f7 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Thu, 4 Feb 1999 02:06:37 +0000
Subject: Fix build for ELF and update PLIST to match the current state of
 affairs.

PR:		9685
---
 databases/postgresql-devel-server/files/patch-ar | 16 ++++++++++++++++
 databases/postgresql-devel/files/patch-ar        | 16 ++++++++++++++++
 databases/postgresql7/files/patch-ar             | 16 ++++++++++++++++
 databases/postgresql73-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql73/files/patch-ar            | 16 ++++++++++++++++
 databases/postgresql74-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql80-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql81-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql82-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql83-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql84-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql90-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql91-server/files/patch-ar     | 16 ++++++++++++++++
 databases/postgresql92-server/files/patch-ar     | 16 ++++++++++++++++
 14 files changed, 224 insertions(+)
 create mode 100644 databases/postgresql-devel-server/files/patch-ar
 create mode 100644 databases/postgresql-devel/files/patch-ar
 create mode 100644 databases/postgresql7/files/patch-ar
 create mode 100644 databases/postgresql73-server/files/patch-ar
 create mode 100644 databases/postgresql73/files/patch-ar
 create mode 100644 databases/postgresql74-server/files/patch-ar
 create mode 100644 databases/postgresql80-server/files/patch-ar
 create mode 100644 databases/postgresql81-server/files/patch-ar
 create mode 100644 databases/postgresql82-server/files/patch-ar
 create mode 100644 databases/postgresql83-server/files/patch-ar
 create mode 100644 databases/postgresql84-server/files/patch-ar
 create mode 100644 databases/postgresql90-server/files/patch-ar
 create mode 100644 databases/postgresql91-server/files/patch-ar
 create mode 100644 databases/postgresql92-server/files/patch-ar

(limited to 'databases')

diff --git a/databases/postgresql-devel-server/files/patch-ar b/databases/postgresql-devel-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql-devel-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql-devel/files/patch-ar b/databases/postgresql-devel/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql-devel/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql7/files/patch-ar b/databases/postgresql7/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql7/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql73-server/files/patch-ar b/databases/postgresql73-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql73-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql73/files/patch-ar b/databases/postgresql73/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql73/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql74-server/files/patch-ar b/databases/postgresql74-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql74-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql80-server/files/patch-ar b/databases/postgresql80-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql80-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql81-server/files/patch-ar b/databases/postgresql81-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql81-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql82-server/files/patch-ar b/databases/postgresql82-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql82-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql83-server/files/patch-ar b/databases/postgresql83-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql83-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql84-server/files/patch-ar b/databases/postgresql84-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql90-server/files/patch-ar b/databases/postgresql90-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql90-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql91-server/files/patch-ar b/databases/postgresql91-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
diff --git a/databases/postgresql92-server/files/patch-ar b/databases/postgresql92-server/files/patch-ar
new file mode 100644
index 000000000000..a1fd3d50d464
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-ar
@@ -0,0 +1,16 @@
+--- Makefile.shlib.orig	Wed Feb  3 19:16:02 1999
++++ Makefile.shlib	Wed Feb  3 19:18:28 1999
+@@ -59,10 +59,11 @@
+ ifeq ($(PORTNAME), freebsd)
+   ifdef BSD_SHLIB
+     install-shlib-dep	:= install-shlib
+-    shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+     ifdef ELF_SYSTEM
+-      LDFLAGS_SL	:= -x -Bshareable
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++      LDFLAGS_SL	:= -x -shared -soname $(shlib)
+     else
++      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+       LDFLAGS_SL	:= -x -Bshareable -Bforcearchive
+     endif
+     CFLAGS		+= $(CFLAGS_SL)
-- 
cgit v1.2.3