Put SONAME entries into shared libraries.

Submitted by:	wollman

26 files changed, 451 insertions, 0 deletions

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 2e29b6be0554..6fac2d71b8a3 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.2.8
+PORTREVISION=		1
 CATEGORIES=		security
 # USE_MIT_TARBALL tells the port that the user has fetched the source
 # directly from MIT rather than the default crypto-publish.org.
diff --git a/security/krb5/files/patch-appl::configure b/security/krb5/files/patch-appl::configure
new file mode 100644
index 000000000000..70d4267b1091
--- /dev/null
+++ b/security/krb5/files/patch-appl::configure
@@ -0,0 +1,18 @@
+--- appl/configure.orig	Tue Apr  8 17:11:48 2003
++++ appl/configure	Wed May  7 06:55:53 2003
+@@ -2133,13 +2133,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-appl::gssftp::configure b/security/krb5/files/patch-appl::gssftp::configure
new file mode 100644
index 000000000000..b1150768685d
--- /dev/null
+++ b/security/krb5/files/patch-appl::gssftp::configure
@@ -0,0 +1,18 @@
+--- appl/gssftp/configure.orig	Tue Apr  8 17:11:48 2003
++++ appl/gssftp/configure	Wed May  7 06:58:08 2003
+@@ -3990,13 +3990,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-appl::telnet::telnet::configure b/security/krb5/files/patch-appl::telnet::telnet::configure
new file mode 100644
index 000000000000..e7febc4ca2fd
--- /dev/null
+++ b/security/krb5/files/patch-appl::telnet::telnet::configure
@@ -0,0 +1,18 @@
+--- appl/telnet/telnet/configure.orig	Tue Apr  8 17:11:49 2003
++++ appl/telnet/telnet/configure	Wed May  7 13:31:45 2003
+@@ -2774,13 +2774,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-appl::telnet::telnetd::configure b/security/krb5/files/patch-appl::telnet::telnetd::configure
new file mode 100644
index 000000000000..16fe919a54e8
--- /dev/null
+++ b/security/krb5/files/patch-appl::telnet::telnetd::configure
@@ -0,0 +1,18 @@
+--- appl/telnet/telnetd/configure.orig	Tue Apr  8 17:11:50 2003
++++ appl/telnet/telnetd/configure	Wed May  7 13:33:34 2003
+@@ -2518,13 +2518,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-clients::configure b/security/krb5/files/patch-clients::configure
new file mode 100644
index 000000000000..f6f91152b216
--- /dev/null
+++ b/security/krb5/files/patch-clients::configure
@@ -0,0 +1,18 @@
+--- clients/configure.orig	Tue Apr  8 17:11:51 2003
++++ clients/configure	Wed May  7 13:35:57 2003
+@@ -1932,13 +1932,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-configure b/security/krb5/files/patch-configure
new file mode 100644
index 000000000000..ed80b9bf8ffc
--- /dev/null
+++ b/security/krb5/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig	Tue Apr  8 17:11:46 2003
++++ configure	Wed May  7 06:53:40 2003
+@@ -1992,13 +1992,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-kadmin::configure b/security/krb5/files/patch-kadmin::configure
new file mode 100644
index 000000000000..7e96fdca346f
--- /dev/null
+++ b/security/krb5/files/patch-kadmin::configure
@@ -0,0 +1,18 @@
+--- kadmin/configure.orig	Tue Apr  8 17:11:55 2003
++++ kadmin/configure	Wed May  7 13:38:20 2003
+@@ -3229,13 +3229,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-kdc::configure b/security/krb5/files/patch-kdc::configure
new file mode 100644
index 000000000000..348327637ad7
--- /dev/null
+++ b/security/krb5/files/patch-kdc::configure
@@ -0,0 +1,18 @@
+--- kdc/configure.orig	Tue Apr  8 17:11:51 2003
++++ kdc/configure	Wed May  7 13:35:06 2003
+@@ -2614,13 +2614,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-krb524::configure b/security/krb5/files/patch-krb524::configure
new file mode 100644
index 000000000000..97b97f7a109b
--- /dev/null
+++ b/security/krb5/files/patch-krb524::configure
@@ -0,0 +1,18 @@
+--- krb524/configure.orig	Tue Apr  8 17:11:55 2003
++++ krb524/configure	Wed May  7 13:39:07 2003
+@@ -1933,13 +1933,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::crypto::configure b/security/krb5/files/patch-lib::crypto::configure
new file mode 100644
index 000000000000..fccbe4edcc56
--- /dev/null
+++ b/security/krb5/files/patch-lib::crypto::configure
@@ -0,0 +1,18 @@
+--- lib/crypto/configure.orig	Tue Apr  8 17:11:56 2003
++++ lib/crypto/configure	Wed May  7 13:41:20 2003
+@@ -2027,13 +2027,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::des425::configure b/security/krb5/files/patch-lib::des425::configure
new file mode 100644
index 000000000000..9902d993381d
--- /dev/null
+++ b/security/krb5/files/patch-lib::des425::configure
@@ -0,0 +1,18 @@
+--- lib/des425/configure.orig	Tue Apr  8 17:11:57 2003
++++ lib/des425/configure	Wed May  7 13:43:40 2003
+@@ -2116,13 +2116,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::gssapi::configure b/security/krb5/files/patch-lib::gssapi::configure
new file mode 100644
index 000000000000..211dab73d33b
--- /dev/null
+++ b/security/krb5/files/patch-lib::gssapi::configure
@@ -0,0 +1,18 @@
+--- lib/gssapi/configure.orig	Tue Apr  8 17:11:57 2003
++++ lib/gssapi/configure	Wed May  7 13:45:34 2003
+@@ -2430,13 +2430,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::kadm5::configure b/security/krb5/files/patch-lib::kadm5::configure
new file mode 100644
index 000000000000..d7051e3198e5
--- /dev/null
+++ b/security/krb5/files/patch-lib::kadm5::configure
@@ -0,0 +1,18 @@
+--- lib/kadm5/configure.orig	Tue Apr  8 17:11:58 2003
++++ lib/kadm5/configure	Wed May  7 14:02:39 2003
+@@ -3227,13 +3227,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::kdb::configure b/security/krb5/files/patch-lib::kdb::configure
new file mode 100644
index 000000000000..dcb351933336
--- /dev/null
+++ b/security/krb5/files/patch-lib::kdb::configure
@@ -0,0 +1,18 @@
+--- lib/kdb/configure.orig	Tue Apr  8 17:11:56 2003
++++ lib/kdb/configure	Wed May  7 13:42:32 2003
+@@ -2203,13 +2203,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::krb4::configure b/security/krb5/files/patch-lib::krb4::configure
new file mode 100644
index 000000000000..5499de900739
--- /dev/null
+++ b/security/krb5/files/patch-lib::krb4::configure
@@ -0,0 +1,18 @@
+--- lib/krb4/configure.orig	Tue Apr  8 17:11:58 2003
++++ lib/krb4/configure	Wed May  7 14:20:05 2003
+@@ -2445,13 +2445,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::krb5::configure b/security/krb5/files/patch-lib::krb5::configure
new file mode 100644
index 000000000000..615eeeabe1fd
--- /dev/null
+++ b/security/krb5/files/patch-lib::krb5::configure
@@ -0,0 +1,18 @@
+--- lib/krb5/configure.orig	Tue Apr  8 17:11:59 2003
++++ lib/krb5/configure	Wed May  7 14:04:55 2003
+@@ -2658,13 +2658,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::krb5util::configure b/security/krb5/files/patch-lib::krb5util::configure
new file mode 100644
index 000000000000..e4be2657a8bc
--- /dev/null
+++ b/security/krb5/files/patch-lib::krb5util::configure
@@ -0,0 +1,18 @@
+--- lib/krb5util/configure.orig	Tue Apr  8 17:11:59 2003
++++ lib/krb5util/configure	Wed May  7 14:05:52 2003
+@@ -2044,13 +2044,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::rpc::configure b/security/krb5/files/patch-lib::rpc::configure
new file mode 100644
index 000000000000..fad09e67cfb5
--- /dev/null
+++ b/security/krb5/files/patch-lib::rpc::configure
@@ -0,0 +1,18 @@
+--- lib/rpc/configure.orig	Tue Apr  8 17:12:01 2003
++++ lib/rpc/configure	Wed May  7 14:07:47 2003
+@@ -2524,13 +2524,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-lib::rpc::unit-test::configure b/security/krb5/files/patch-lib::rpc::unit-test::configure
new file mode 100644
index 000000000000..d0583a35c75a
--- /dev/null
+++ b/security/krb5/files/patch-lib::rpc::unit-test::configure
@@ -0,0 +1,18 @@
+--- lib/rpc/unit-test/configure.orig	Tue Apr  8 17:12:00 2003
++++ lib/rpc/unit-test/configure	Wed May  7 14:06:51 2003
+@@ -2700,13 +2700,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-slave::configure b/security/krb5/files/patch-slave::configure
new file mode 100644
index 000000000000..1864338febe4
--- /dev/null
+++ b/security/krb5/files/patch-slave::configure
@@ -0,0 +1,18 @@
+--- slave/configure.orig	Tue Apr  8 17:12:01 2003
++++ slave/configure	Wed May  7 14:08:31 2003
+@@ -1975,13 +1975,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-tests::configure b/security/krb5/files/patch-tests::configure
new file mode 100644
index 000000000000..5bd048bec288
--- /dev/null
+++ b/security/krb5/files/patch-tests::configure
@@ -0,0 +1,18 @@
+--- tests/configure.orig	Tue Apr  8 17:12:02 2003
++++ tests/configure	Wed May  7 14:09:13 2003
+@@ -1868,13 +1868,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-util::et::configure b/security/krb5/files/patch-util::et::configure
new file mode 100644
index 000000000000..090e9573bdc9
--- /dev/null
+++ b/security/krb5/files/patch-util::et::configure
@@ -0,0 +1,18 @@
+--- util/et/configure.orig	Tue Apr  8 17:12:04 2003
++++ util/et/configure	Wed May  7 14:13:49 2003
+@@ -2607,13 +2607,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-util::profile::configure b/security/krb5/files/patch-util::profile::configure
new file mode 100644
index 000000000000..b89ac6584c7c
--- /dev/null
+++ b/security/krb5/files/patch-util::profile::configure
@@ -0,0 +1,18 @@
+--- util/profile/configure.orig	Tue Apr  8 17:12:04 2003
++++ util/profile/configure	Wed May  7 14:14:47 2003
+@@ -2269,13 +2269,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-util::pty::configure b/security/krb5/files/patch-util::pty::configure
new file mode 100644
index 000000000000..9129f7f78b42
--- /dev/null
+++ b/security/krb5/files/patch-util::pty::configure
@@ -0,0 +1,18 @@
+--- util/pty/configure.orig	Tue Apr  8 17:12:05 2003
++++ util/pty/configure	Wed May  7 14:15:42 2003
+@@ -3751,13 +3751,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5/files/patch-util::ss::configure b/security/krb5/files/patch-util::ss::configure
new file mode 100644
index 000000000000..1e3cf80f6978
--- /dev/null
+++ b/security/krb5/files/patch-util::ss::configure
@@ -0,0 +1,18 @@
+--- util/ss/configure.orig	Tue Apr  8 17:12:06 2003
++++ util/ss/configure	Wed May  7 14:16:25 2003
+@@ -2677,13 +2677,14 @@
+ 	PICFLAGS=-fpic
+ 	if test "x$objformat" = "xelf" ; then
+ 		SHLIBVEXT='.so.$(LIBMAJOR)'
++		LDCOMBINE='cc -shared -Wl,-soname,lib$(LIB)$(SHLIBVEXT)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+ 	else
++		LDCOMBINE='ld -Bshareable'
+ 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 		CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ 	fi
+ 	SHLIBEXT=.so
+-	LDCOMBINE='ld -Bshareable'
+ 	SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'