summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/ncftp2/Makefile9
-rw-r--r--net/ncftp2/patches/patch-aa41
-rw-r--r--net/ncftp2/patches/patch-ab56
-rw-r--r--net/ncftp2/pkg/PLIST1
4 files changed, 43 insertions, 64 deletions
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index b175f9f778c..ff924f4bc7e 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -3,6 +3,7 @@
# Date created: 4 Nov 1994
# Whom: ache
#
+# $NetBSD: Makefile,v 1.2 1998/02/20 14:28:46 tron Exp $
# $FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
#
@@ -12,12 +13,14 @@ MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
MAINTAINER= ache@FreeBSD.ORG
+LIB_DEPENDS= ncurses.3.4:${PORTSDIR}/devel/ncurses
+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
+CONFIGURE_ARGS+= --with-curses=${PREFIX} --disable-readline
MAN1= ncftp2.1
do-install:
- $(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/ncftp2
- $(INSTALL_MAN) $(WRKSRC)/ncftp.1 $(PREFIX)/man/man1/ncftp2.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
+ ${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
.include <bsd.port.mk>
diff --git a/net/ncftp2/patches/patch-aa b/net/ncftp2/patches/patch-aa
index c5dfa7bceac..6227ca32a60 100644
--- a/net/ncftp2/patches/patch-aa
+++ b/net/ncftp2/patches/patch-aa
@@ -1,19 +1,22 @@
-*** Makefile.in.orig Thu Oct 17 04:37:03 1996
---- Makefile.in Fri Oct 18 02:12:57 1996
-***************
-*** 34,40 ****
- VPATH=@srcdir@
- CPPFLAGS=-I. -I@srcdir@ @CPPFLAGS@
-
-! LIBS=@LIBS@
- SHARED_LDFLAGS=@LDFLAGS@
- STATIC_LDFLAGS=@LDFLAGS@ @SLDFLAGS@
-
---- 34,40 ----
- VPATH=@srcdir@
- CPPFLAGS=-I. -I@srcdir@ @CPPFLAGS@
-
-! LIBS= -lreadline -lncurses -lmytinfo
- SHARED_LDFLAGS=@LDFLAGS@
- STATIC_LDFLAGS=@LDFLAGS@ @SLDFLAGS@
-
+--- Main.c.orig Fri Oct 18 07:01:58 1996
++++ Main.c Fri Feb 20 14:46:28 1998
+@@ -22,6 +22,9 @@
+ #include <pwd.h>
+ #include <errno.h>
+ #include <ctype.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++#include <locale.h>
++#endif
+ #include <signal.h>
+ #include <setjmp.h>
+ #include <stdlib.h>
+@@ -866,6 +869,9 @@
+ int opt, result;
+ OpenOptions openopt;
+
++#ifdef __FreeBSD__
++ setlocale(LC_ALL, "");
++#endif
+ Init();
+ RunStartupScript();
+
diff --git a/net/ncftp2/patches/patch-ab b/net/ncftp2/patches/patch-ab
index cf312ee7193..af7712331dd 100644
--- a/net/ncftp2/patches/patch-ab
+++ b/net/ncftp2/patches/patch-ab
@@ -1,42 +1,14 @@
-*** Complete.c.bak Fri Oct 18 09:10:31 1996
---- Complete.c Thu Jan 9 15:17:48 1997
-***************
-*** 241,247 ****
---- 241,251 ----
- static int
- CompareStrings(char **a, char **b)
- {
-+ #ifdef __FreeBSD__
-+ return strcoll(*a, *b);
-+ #else
- return strcmp(*a, *b);
-+ #endif
- }
-
- static void
-*** Main.c.bak Fri Oct 18 09:01:58 1996
---- Main.c Thu Jan 9 15:24:22 1997
-***************
-*** 22,27 ****
---- 22,30 ----
- #include <pwd.h>
- #include <errno.h>
- #include <ctype.h>
-+ #ifdef __FreeBSD__
-+ #include <locale.h>
-+ #endif
- #include <signal.h>
- #include <setjmp.h>
- #include <stdlib.h>
-***************
-*** 866,871 ****
---- 869,877 ----
- int opt, result;
- OpenOptions openopt;
-
-+ #ifdef __FreeBSD__
-+ setlocale(LC_ALL, "");
-+ #endif
- Init();
- RunStartupScript();
-
+--- Complete.c.orig Fri Oct 18 07:10:31 1996
++++ Complete.c Fri Feb 20 14:47:06 1998
+@@ -241,7 +241,11 @@
+ static int
+ CompareStrings(char **a, char **b)
+ {
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++ return strcoll(*a, *b);
++#else
+ return strcmp(*a, *b);
++#endif
+ }
+
+ static void
diff --git a/net/ncftp2/pkg/PLIST b/net/ncftp2/pkg/PLIST
index 1852fd433af..70a7a9c793a 100644
--- a/net/ncftp2/pkg/PLIST
+++ b/net/ncftp2/pkg/PLIST
@@ -1,2 +1,3 @@
+@comment $NetBSD: PLIST,v 1.2 1998/02/20 14:28:47 tron Exp $
bin/ncftp2
man/man1/ncftp2.1.gz