4 files changed, 41 insertions, 80 deletions

diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 7db199e79a54..b38321791708 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -4,7 +4,7 @@
 # Date created:         4 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.56 1998/08/14 00:22:06 ache Exp $
+# $Id: Makefile,v 1.57 1998/09/07 20:38:02 ache Exp $
 #
 
 DISTNAME=	ncftp-3.0beta14-src
@@ -34,12 +34,23 @@ do-install:
 	@cd ${WRKSRC}/bin ; $(INSTALL_PROGRAM) \
 		ncftpbatch ncftpget ncftpls ncftpput ncftpbookmarks \
 		$(PREFIX)/bin
-	@$(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_DATA) $(WRKSRC)/Strn/libStrn.so.1 $(PREFIX)/lib/$(LIBSTRN)
+	@cd $(PREFIX)/lib && ${LN} -s $(LIBSTRN) libStrn.so
+	@$(INSTALL_DATA) $(WRKSRC)/libncftp/libncftp.so.2 $(PREFIX)/lib/$(LIBNCFTP)
+	@cd $(PREFIX)/lib && ${LN} -s $(LIBNCFTP) libncftp.so
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@$(INSTALL_MAN) $(WRKSRC)/doc/man/ncftp.1 $(PREFIX)/man/man1/ncftp3.1
 	@cd ${WRKSRC}/doc/man ; $(INSTALL_MAN) \
 		ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1 \
 		$(PREFIX)/man/man1
 	@$(INSTALL_MAN) $(WRKSRC)/Strn/Strn.3 $(PREFIX)/man/man3
+
 .include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+LIBNCFTP= libncftp.so.2
+LIBSTRN=libStrn.so.1
+.else
+LIBNCFTP= libncftp.so.2.0
+LIBSTRN=libStrn.so.1.0
+.endif
diff --git a/ftp/ncftp3/files/patch-ae b/ftp/ncftp3/files/patch-ae
index b1844072b3f6..59a39996305d 100644
--- a/ftp/ncftp3/files/patch-ae
+++ b/ftp/ncftp3/files/patch-ae
@@ -1,36 +1,11 @@
-*** 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)
-  
+--- libncftp/Makefile.in.orig	Wed Nov 12 17:43:48 1997
++++ libncftp/Makefile.in	Sat Sep 26 19:48:19 1998
+@@ -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)
+ 
diff --git a/ftp/ncftp3/files/patch-af b/ftp/ncftp3/files/patch-af
index 11d901fadec8..e1789260866b 100644
--- a/ftp/ncftp3/files/patch-af
+++ b/ftp/ncftp3/files/patch-af
@@ -1,36 +1,11 @@
-*** 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)
-  
+--- Strn/Makefile.orig	Tue Nov 11 04:28:01 1997
++++ Strn/Makefile	Sat Sep 26 19:47:28 1998
+@@ -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)
+ 
diff --git a/ftp/ncftp3/pkg-plist b/ftp/ncftp3/pkg-plist
index fe338db589a4..4f2636235272 100644
--- a/ftp/ncftp3/pkg-plist
+++ b/ftp/ncftp3/pkg-plist
@@ -1,7 +1,7 @@
-lib/libStrn.so.1.0
-lib/libncftp.so.2.0
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+lib/libStrn.so.1
+lib/libncftp.so.2
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 bin/ncftp3
 bin/ncftpbatch
 bin/ncftpget