diff options
| author | tron <tron> | 1999-05-22 22:32:03 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-05-22 22:32:03 +0000 |
| commit | 2780970a77733f0001926943815702e7a6bc4d9c (patch) | |
| tree | f753db45b154afe16aec182df6b19ddd1fb93571 /net/ncftp2 | |
| parent | 23cb83b6ae9a3a218beb92901314bcb67ad2b42a (diff) | |
| download | pkgsrc-2780970a77733f0001926943815702e7a6bc4d9c.tar.gz | |
Make sure that "ncurses" package is really used. Fixes PR pkg/7615
by Eric Mumpower.
Diffstat (limited to 'net/ncftp2')
| -rw-r--r-- | net/ncftp2/Makefile | 5 | ||||
| -rw-r--r-- | net/ncftp2/patches/patch-ac | 35 |
2 files changed, 35 insertions, 5 deletions
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index a34243cd7d9..0f7a1f8c04d 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 1999/03/12 11:26:26 agc Exp $ +# $NetBSD: Makefile,v 1.12 1999/05/22 22:32:03 tron Exp $ # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp # @@ -29,6 +29,9 @@ CONFIGURE_ARGS+= --enable-socks5 DEPENDS+= socks5-1.0.2:../../net/socks5 .endif .endif +CPPFLAGS+= -I${PREFIX}/include +LDFLAGS+= -L${PREFIX}/lib +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2 diff --git a/net/ncftp2/patches/patch-ac b/net/ncftp2/patches/patch-ac index b1a2cdb7e2c..5905e358c36 100644 --- a/net/ncftp2/patches/patch-ac +++ b/net/ncftp2/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.3 1998/08/07 11:10:48 agc Exp $ +$NetBSD: patch-ac,v 1.4 1999/05/22 22:32:04 tron Exp $ ---- configure.orig Fri Jul 31 22:54:32 1998 -+++ configure Fri Jul 31 22:52:16 1998 +--- configure.orig Sun Jun 8 07:25:04 1997 ++++ configure Sun May 23 00:25:56 1999 @@ -1072,7 +1072,7 @@ echo "checking for extra include and lib directories..." 1>&6 b1=`cd .. ; pwd` b2=`cd ../.. ; pwd` -exdirs="$HOME $j $b1 $b2 $prefix /usr/local /usr/ccs" -+exdirs="$HOME $j $b1 $b2 $prefix /usr/ccs" ++exdirs="$HOME $j $b1 $b2 $prefix" subexdirs="-" if test "$subexdirs" = "" ; then @@ -20,3 +20,30 @@ $NetBSD: patch-ac,v 1.3 1998/08/07 11:10:48 agc Exp $ nc_cv_socks=no else LIBS="$savelibs" +@@ -2285,7 +2285,7 @@ + echo "checking for extra include and lib directories..." 1>&6 + b1=`cd .. ; pwd` + b2=`cd ../.. ; pwd` +-exdirs="$HOME $j $b1 $b2 $prefix /usr/local /usr /usr/ccs" ++exdirs="$HOME $j $b1 $b2 $prefix" + + subexdirs="ncurses" + if test "$subexdirs" = "" ; then +@@ -2345,7 +2345,7 @@ + + # See if we should add -I/usr/local/ncurses + +-incdir="/usr/local/ncurses" ++incdir="$prefix/ncurses" + if test -r $incdir ; then + case "$CPPFLAGS" in + *${incdir}*) +@@ -2366,7 +2366,7 @@ + # Some people (me) have two versions of ncurses on + # the system. Use the one in /usr/local first. + case "$CPPFLAGS" in +- */usr/local/include/ncurses*/usr/include/ncurses*) ++ *$prefix/include/ncurses*/usr/include/ncurses*) + CPPFLAGS=`echo "$CPPFLAGS" | sed 's@-I/usr/include/ncurses@@g'` + esac + fi |