5 files changed, 62 insertions, 12 deletions

diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index d3332a891aa9..cc7cbc82b46f 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -1,23 +1,39 @@
+# ex:ts=8
 # New ports collection makefile for:    ncftp2
 # Version required:     2.4.2
 # Date created:         4 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.37 1996/11/18 11:35:35 asami Exp $
+# $Id: Makefile,v 1.38 1997/01/09 11:58:47 ache Exp $
 #
 
-DISTNAME=       ncftp-2.4.2
+DISTNAME=	ncftp-3.0beta6-src
+PKGNAME=	ncftp-3.0b6
 CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.probe.net/pub/ncftp/
+MASTER_SITES=	ftp://ftp.probe.net/pub/ncftp/3.0BETA/
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ENV=  ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
-MAN1=		ncftp2.1
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
+MAN1=		ncftp3.1 ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1
+MAN3=		Strn.3
 
-do-install:
-	$(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/ncftp2
-	$(INSTALL_MAN) $(WRKSRC)/ncftp.1 $(PREFIX)/man/man1/ncftp2.1
+pre-build:
+	cd ${WRKSRC}/Strn ; make so
+	cd ${WRKSRC}/libncftp ; make so
 
+do-install:
+	@$(INSTALL_PROGRAM) $(WRKSRC)/bin/ncftp $(PREFIX)/bin/ncftp3
+	@cd ${WRKSRC}/bin ; $(INSTALL_PROGRAM) \
+		ncftpbatch ncftpget ncftpls ncftpput $(PREFIX)/bin
+	@$(INSTALL_DATA) $(WRKSRC)/Strn/libStrn.so.1 $(PREFIX)/lib
+	@$(INSTALL_DATA) $(WRKSRC)/libncftp/libncftp.so.2 $(PREFIX)/lib
+	@${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>
diff --git a/ftp/ncftp3/distinfo b/ftp/ncftp3/distinfo
index 081e9fc1a515..e0626e50ef09 100644
--- a/ftp/ncftp3/distinfo
+++ b/ftp/ncftp3/distinfo
@@ -1 +1 @@
-MD5 (ncftp-2.4.2.tar.gz) = 7ca452f7932820c4bad98cfb78d8bba8
+MD5 (ncftp-3.0beta6-src.tar.gz) = a9209ab896cf58d67e08d7cb3aeca95b
diff --git a/ftp/ncftp3/files/patch-ae b/ftp/ncftp3/files/patch-ae
new file mode 100644
index 000000000000..f5031b3c2975
--- /dev/null
+++ b/ftp/ncftp3/files/patch-ae
@@ -0,0 +1,11 @@
+--- 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)
++	gcc -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
new file mode 100644
index 000000000000..63681bfa82b6
--- /dev/null
+++ b/ftp/ncftp3/files/patch-af
@@ -0,0 +1,11 @@
+--- 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)
++	gcc -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 1852fd433af6..bcdce30cc12a 100644
--- a/ftp/ncftp3/pkg-plist
+++ b/ftp/ncftp3/pkg-plist
@@ -1,2 +1,14 @@
-bin/ncftp2
-man/man1/ncftp2.1.gz
+lib/libStrn.so.1
+lib/libncftp.so.2
+@exec /sbin/ldconfig -m %D/lib
+bin/ncftp3
+bin/ncftpbatch
+bin/ncftpget
+bin/ncftpls
+bin/ncftpput
+man/man1/ncftp3.1.gz
+man/man1/ncftpbatch.1.gz
+man/man1/ncftpget.1.gz
+man/man1/ncftpls.1.gz
+man/man1/ncftpput.1.gz
+man/man3/Strn.3.gz