Remove explicit inclusion of -I$(includedir) into CPPFLAGS and -L$(libdir)

into LDFLAGS.  This makes building of ncurses on a system already having
ncurses installed possible.  This is just another chapter of the continuing
buildlink saga.

7 files changed, 129 insertions, 1 deletions

diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 57c793301e5..90dff8ba4f7 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/04/30 14:47:03 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/06/19 05:35:38 jlam Exp $
 
 SHA1 (ncurses-5.2.tar.gz) = 47e13874118568c48bdb6034d716dcf424f3bf12
 Size (ncurses-5.2.tar.gz) = 1743818 bytes
 SHA1 (patch-aa) = 235774ae5a52a31b833ff3a8a48d4b3e8ead9d3b
 SHA1 (patch-ab) = c523e86cf4faf08930c95f0aee59be85c962a147
+SHA1 (patch-ac) = 905fb542adc987817b5ad8c1b760e9f0109ed8a4
+SHA1 (patch-ad) = ae507553363a7c0514a18848b47bcd3de18d35c4
+SHA1 (patch-ae) = 5a2d1f13c0b202ddec6f966576498b9c6c693bf0
+SHA1 (patch-af) = aba9d358b7f79a432a8981eeb01e39bba74cb171
+SHA1 (patch-ag) = 5210e65902a912bb560dce856ddc93171fc1123a
+SHA1 (patch-ah) = 18565f7fdfbb3dbdf6e4e8a938ebb679ed8e1a36
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
new file mode 100644
index 00000000000..5789c2adab0
--- /dev/null
+++ b/devel/ncurses/patches/patch-ac
@@ -0,0 +1,54 @@
+$NetBSD: patch-ac,v 1.9 2001/06/19 05:35:39 jlam Exp $
+
+--- configure.orig	Fri Oct 20 18:58:49 2000
++++ configure
+@@ -6999,17 +6999,6 @@
+ if test "$srcdir" != "."; then
+ 	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../include"
+ fi
+-if test "$GCC" != yes; then
+-	CPPFLAGS="$CPPFLAGS -I\$(includedir)"
+-elif test "$includedir" != "/usr/include"; then
+-	if test "$includedir" = '${prefix}/include' ; then
+-		if test $prefix != /usr ; then
+-			CPPFLAGS="$CPPFLAGS -I\$(includedir)"
+-		fi
+-	else
+-		CPPFLAGS="$CPPFLAGS -I\$(includedir)"
+-	fi
+-fi
+ 
+ 
+ 
+@@ -7017,17 +7006,6 @@
+ if test "$srcdir" != "."; then
+ 	ACPPFLAGS="$ACPPFLAGS -I\$(srcdir)/../../include"
+ fi
+-if test "$GCC" != yes; then
+-	ACPPFLAGS="$ACPPFLAGS -I\$(includedir)"
+-elif test "$includedir" != "/usr/include"; then
+-	if test "$includedir" = '${prefix}/include' ; then
+-		if test $prefix != /usr ; then
+-			ACPPFLAGS="$ACPPFLAGS -I\$(includedir)"
+-		fi
+-	else
+-		ACPPFLAGS="$ACPPFLAGS -I\$(includedir)"
+-	fi
+-fi
+ 
+ 
+ 
+@@ -7191,11 +7169,11 @@
+ 	fi
+ done
+ echo "$ac_t""$cf_cv_src_modules" 1>&6
+-TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
++TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+ 
+ 
+ 
+-PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
++PROG_ARGS="-L${LIB_DIR} $PROG_ARGS"
+ 
+ 
+ SRC_SUBDIRS="man include"
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
new file mode 100644
index 00000000000..b490171f073
--- /dev/null
+++ b/devel/ncurses/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.6 2001/06/19 05:35:39 jlam Exp $
+
+--- c++/Makefile.in.orig	Sat Oct 14 20:43:38 2000
++++ c++/Makefile.in
+@@ -87,9 +87,9 @@
+ LIBNAME_NORMAL	= @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
+ LIBNAME		= @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
+ 
+-LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT)
++LINK_FLAGS	= @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)
+ 
+-LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME)
++LINK_LIBTOOL	= @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
+ LINK_NORMAL	= $(LINK_FLAGS)
+ LINK_DEBUG	= $(LINK_FLAGS)
+ LINK_PROFILE	= $(LINK_FLAGS)
diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae
new file mode 100644
index 00000000000..228aa4bcfa0
--- /dev/null
+++ b/devel/ncurses/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2001/06/19 05:35:39 jlam Exp $
+
+--- form/Makefile.in.orig	Sat Oct 14 13:57:02 2000
++++ form/Makefile.in
+@@ -85,7 +85,7 @@
+ LINK		= $(LIBTOOL) $(CC)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+-SHLIB_DIRS	= -L../lib -L$(libdir)
++SHLIB_DIRS	= -L../lib
+ SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+ 
+ MK_SHARED_LIB	= @MK_SHARED_LIB@
diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af
new file mode 100644
index 00000000000..82ae744520b
--- /dev/null
+++ b/devel/ncurses/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.6 2001/06/19 05:35:39 jlam Exp $
+
+--- menu/Makefile.in.orig	Sat Oct 14 13:57:02 2000
++++ menu/Makefile.in
+@@ -85,7 +85,7 @@
+ LINK		= $(LIBTOOL) $(CC)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+-SHLIB_DIRS	= -L../lib -L$(libdir)
++SHLIB_DIRS	= -L../lib
+ SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+ 
+ MK_SHARED_LIB	= @MK_SHARED_LIB@
diff --git a/devel/ncurses/patches/patch-ag b/devel/ncurses/patches/patch-ag
new file mode 100644
index 00000000000..6b0c9c1fff7
--- /dev/null
+++ b/devel/ncurses/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.5 2001/06/19 05:35:39 jlam Exp $
+
+--- ncurses/Makefile.in.orig	Sat Oct 14 18:55:35 2000
++++ ncurses/Makefile.in
+@@ -99,7 +99,7 @@
+ LINK		= $(LIBTOOL) $(CC)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+-SHLIB_DIRS	= -L../lib -L$(libdir)
++SHLIB_DIRS	= -L../lib
+ SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@
+ TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@
+ 
diff --git a/devel/ncurses/patches/patch-ah b/devel/ncurses/patches/patch-ah
new file mode 100644
index 00000000000..4c96720bc74
--- /dev/null
+++ b/devel/ncurses/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.5 2001/06/19 05:35:39 jlam Exp $
+
+--- panel/Makefile.in.orig	Sat Oct 14 13:57:02 2000
++++ panel/Makefile.in
+@@ -86,7 +86,7 @@
+ LINK		= $(LIBTOOL) $(CC)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+-SHLIB_DIRS	= -L../lib -L$(libdir)
++SHLIB_DIRS	= -L../lib
+ SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+ 
+ MK_SHARED_LIB	= @MK_SHARED_LIB@