Add ncurses to list of dependencies, and make the package understand

that it should not use "-L..." as a make-dependency.

4 files changed, 59 insertions, 1 deletions

diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 8098bb5064e..98f8661eab3 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/07/13 01:20:13 jlam Exp $
+# $NetBSD: Makefile,v 1.18 1999/10/04 23:51:00 hubertf Exp $
 #
 
 DISTNAME=		coda-5.2.4
@@ -12,6 +12,7 @@ HOMEPAGE=		http://www.coda.cs.cmu.edu/
 
 DEPENDS+=		gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=		readline-4.0:../../devel/readline
+DEPENDS+=		ncurses-4.2:../../devel/ncurses
 
 ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-ns32k
 
diff --git a/net/coda5_client/files/patch-sum b/net/coda5_client/files/patch-sum
new file mode 100644
index 00000000000..f2e76a827aa
--- /dev/null
+++ b/net/coda5_client/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 1999/10/04 23:51:36 hubertf Exp $
+
+MD5 (patch-aa) = bc560184bce196807fa3f6a73e77ea39
+MD5 (patch-ab) = 612c72a879d3348f2f1014807f889c57
diff --git a/net/coda5_client/patches/patch-aa b/net/coda5_client/patches/patch-aa
new file mode 100644
index 00000000000..efe3e561273
--- /dev/null
+++ b/net/coda5_client/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.6 1999/10/04 23:51:01 hubertf Exp $
+
+--- configure.orig	Tue Oct  5 00:24:56 1999
++++ configure	Tue Oct  5 00:25:45 1999
+@@ -1486,7 +1486,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lncurses  $LIBS"
++LIBS="-L${LOCALBASE}/lib -Wl,-R{LOCALBASE}/lib -lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1492 "configure"
+ #include "confdefs.h"
+@@ -1514,7 +1514,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LIBTERMCAP="-lncurses"
++  LIBTERMCAP="-L${LOCALBASE}/lib -Wl,-R{LOCALBASE}/lib -lncurses"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+@@ -1528,7 +1528,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lncurses $LIBTERMCAP $LIBS"
++LIBS="-L${LOCALBASE}/lib -Wl,-R{LOCALBASE}/lib -lncurses $LIBTERMCAP $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1534 "configure"
+ #include "confdefs.h"
+@@ -1552,7 +1552,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LIBCURSES="-lncurses"
++  LIBCURSES="-L${LOCALBASE}/lib -Wl,-R{LOCALBASE}/lib -lncurses"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
diff --git a/net/coda5_client/patches/patch-ab b/net/coda5_client/patches/patch-ab
new file mode 100644
index 00000000000..e94b7885399
--- /dev/null
+++ b/net/coda5_client/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 1999/10/04 23:51:02 hubertf Exp $
+
+--- coda-src/vtools/Makefile.in.orig	Tue Oct  5 01:29:57 1999
++++ coda-src/vtools/Makefile.in	Tue Oct  5 01:30:29 1999
+@@ -41,7 +41,7 @@
+ 
+ include $(TOPDIR)/configs/Makerules
+ 
+-cmon: cmon.o $(CMON_LIBS)
++cmon: cmon.o
+ 	$(CXX) $(LIBFLAGS) cmon.o $(CMON_LIBS) -o cmon
+ 
+ codacon:    codacon.o