New ld.so (a.out) can't understand libraries with major only

4 files changed, 77 insertions, 27 deletions

diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index e8c15f90e178..7db199e79a54 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -4,7 +4,7 @@
 # Date created:         4 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.54 1998/08/13 23:26:43 ache Exp $
+# $Id: Makefile,v 1.56 1998/08/14 00:22:06 ache Exp $
 #
 
 DISTNAME=	ncftp-3.0beta14-src
@@ -34,8 +34,8 @@ do-install:
 	@cd ${WRKSRC}/bin ; $(INSTALL_PROGRAM) \
 		ncftpbatch ncftpget ncftpls ncftpput ncftpbookmarks \
 		$(PREFIX)/bin
-	@$(INSTALL_DATA) $(WRKSRC)/Strn/libStrn.so.1 $(PREFIX)/lib
-	@$(INSTALL_DATA) $(WRKSRC)/libncftp/libncftp.so.2 $(PREFIX)/lib
+	@$(INSTALL_DATA) $(WRKSRC)/Strn/libStrn.so.1.0 $(PREFIX)/lib
+	@$(INSTALL_DATA) $(WRKSRC)/libncftp/libncftp.so.2.0 $(PREFIX)/lib
 	@${LDCONFIG} -m ${PREFIX}/lib
 	@$(INSTALL_MAN) $(WRKSRC)/doc/man/ncftp.1 $(PREFIX)/man/man1/ncftp3.1
 	@cd ${WRKSRC}/doc/man ; $(INSTALL_MAN) \
diff --git a/ftp/ncftp3/files/patch-ae b/ftp/ncftp3/files/patch-ae
index ad9de6fc0037..b1844072b3f6 100644
--- a/ftp/ncftp3/files/patch-ae
+++ b/ftp/ncftp3/files/patch-ae
@@ -1,11 +1,36 @@
---- libncftp/Makefile.in.orig	Wed Nov 12 17:43:48 1997
-+++ libncftp/Makefile.in	Sat Dec 13 16:47:46 1997
-@@ -55,7 +55,7 @@
- 
- $(LIBSO): $(SOBJS)
- 	/bin/rm -f $(LIBSO) $(LIBSOS)
--	gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
-+	$(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
- 	/bin/ln -s $(LIBSO) $(LIBSOS)
- 	-@/bin/ls -l $(LIBSO)
- 
+*** libncftp/Makefile.in.orig	Thu Nov 13 04:43:48 1997
+--- libncftp/Makefile.in	Tue Sep  8 00:22:36 1998
+***************
+*** 14,20 ****
+  LIBS=-lStrn @LIBS@
+  LDFLAGS=-L@srcdir@/../Strn @LDFLAGS@
+  LIB=libncftp.a
+! LIBSO=libncftp.so.2
+  LIBSOS=libncftp.so
+  
+  # Any -D definitions:
+--- 14,20 ----
+  LIBS=-lStrn @LIBS@
+  LDFLAGS=-L@srcdir@/../Strn @LDFLAGS@
+  LIB=libncftp.a
+! LIBSO=libncftp.so.2.0
+  LIBSOS=libncftp.so
+  
+  # Any -D definitions:
+***************
+*** 55,61 ****
+  
+  $(LIBSO): $(SOBJS)
+  	/bin/rm -f $(LIBSO) $(LIBSOS)
+! 	gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
+  	/bin/ln -s $(LIBSO) $(LIBSOS)
+  	-@/bin/ls -l $(LIBSO)
+  
+--- 55,61 ----
+  
+  $(LIBSO): $(SOBJS)
+  	/bin/rm -f $(LIBSO) $(LIBSOS)
+! 	$(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
+  	/bin/ln -s $(LIBSO) $(LIBSOS)
+  	-@/bin/ls -l $(LIBSO)
+  
diff --git a/ftp/ncftp3/files/patch-af b/ftp/ncftp3/files/patch-af
index b40bc6161cf4..11d901fadec8 100644
--- a/ftp/ncftp3/files/patch-af
+++ b/ftp/ncftp3/files/patch-af
@@ -1,11 +1,36 @@
---- Strn/Makefile.orig	Tue Nov 11 04:28:01 1997
-+++ Strn/Makefile	Sat Dec 13 23:28:53 1997
-@@ -42,7 +42,7 @@
- 
- $(LIBSO): $(SOBJS)
- 	/bin/rm -f $(LIBSO)
--	gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
-+	$(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
- 	/bin/ln -s $(LIBSO) $(LIBSOS)
- 	-@/bin/ls -l $(LIBSOS) $(LIBSO)
- 
+*** Strn/Makefile.orig	Tue Nov 11 15:28:01 1997
+--- Strn/Makefile	Tue Sep  8 00:25:07 1998
+***************
+*** 6,12 ****
+  SHELL=/bin/sh
+  .SUFFIXES: .c .o .so
+  LIB=libStrn.a
+! LIBSO=libStrn.so.1
+  LIBSOS=libStrn.so
+  CC=cc
+  CPPFLAGS=
+--- 6,12 ----
+  SHELL=/bin/sh
+  .SUFFIXES: .c .o .so
+  LIB=libStrn.a
+! LIBSO=libStrn.so.1.0
+  LIBSOS=libStrn.so
+  CC=cc
+  CPPFLAGS=
+***************
+*** 42,48 ****
+  
+  $(LIBSO): $(SOBJS)
+  	/bin/rm -f $(LIBSO)
+! 	gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
+  	/bin/ln -s $(LIBSO) $(LIBSOS)
+  	-@/bin/ls -l $(LIBSOS) $(LIBSO)
+  
+--- 42,48 ----
+  
+  $(LIBSO): $(SOBJS)
+  	/bin/rm -f $(LIBSO)
+! 	$(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
+  	/bin/ln -s $(LIBSO) $(LIBSOS)
+  	-@/bin/ls -l $(LIBSOS) $(LIBSO)
+  
diff --git a/ftp/ncftp3/pkg-plist b/ftp/ncftp3/pkg-plist
index b2a3351b864e..fe338db589a4 100644
--- a/ftp/ncftp3/pkg-plist
+++ b/ftp/ncftp3/pkg-plist
@@ -1,5 +1,5 @@
-lib/libStrn.so.1
-lib/libncftp.so.2
+lib/libStrn.so.1.0
+lib/libncftp.so.2.0
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R
 bin/ncftp3