Add two patches (that will end up in the next ncurses release) to make

this build with NetBSD make older than Dec 26 2003.
Problem was that ${FOO:$o=.lo} was not expanded as in GNU make
before that date; problem found by Thomas Dickey.
Remove USE_GNU_TOOLS+=make.

4 files changed, 65 insertions, 3 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 09b755865d1..2ac2f959960 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2004/03/04 23:51:24 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2004/03/08 13:26:03 wiz Exp $
 
 DISTNAME=	ncurses-${NC_VERS}
 NC_VERS=	5.4
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--without-gpm
 CONFIGURE_ARGS+=	--with-manpage-format=normal
 CONFIGURE_ARGS+=	--with-manpage-tbl
 
-USE_GNU_TOOLS+=		awk make
+USE_GNU_TOOLS+=		awk
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 15aea7dfa8b..bea84d7c8bd 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/03/03 13:36:09 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/03/08 13:26:03 wiz Exp $
 
 SHA1 (ncurses-5.4.tar.gz) = c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7
 Size (ncurses-5.4.tar.gz) = 2154022 bytes
 SHA1 (patch-aa) = 436c8b4ad94efa1144a0506f05b23a8a36af37fa
+SHA1 (patch-ab) = f5399f83b013345685530042b28f91e37a8e66e2
 SHA1 (patch-ac) = a27f115e6d3654ac0b57667435be48d9c798ea0f
+SHA1 (patch-ad) = f9ad26a687a8da6883bdc2eb4c2a7fb414896e70
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
new file mode 100644
index 00000000000..a022a4e773e
--- /dev/null
+++ b/devel/ncurses/patches/patch-ab
@@ -0,0 +1,38 @@
+$NetBSD: patch-ab,v 1.13 2004/03/08 13:26:03 wiz Exp $
+
+--- mk-1st.awk.orig	Sat Jan 10 21:48:43 2004
++++ mk-1st.awk
+@@ -287,7 +287,7 @@ END	{
+ 				}
+ 				end_name = lib_name;
+ 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
+-				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS
++				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)\n", compile, lib_name, OBJS
+ 				print  ""
+ 				print  "install \\"
+ 				print  "install.libs \\"
+@@ -353,7 +353,7 @@ END	{
+ 			print "mostlyclean::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ 			if ( MODEL == "LIBTOOL" ) {
+-				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
++				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ 			}
+ 		}
+ 		else if ( found == 2 )
+@@ -362,13 +362,13 @@ END	{
+ 			print "mostlyclean::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ 			if ( MODEL == "LIBTOOL" ) {
+-				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
++				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ 			}
+ 			print ""
+ 			print "clean ::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ 			if ( MODEL == "LIBTOOL" ) {
+-				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
++				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ 			}
+ 		}
+ 	}
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
new file mode 100644
index 00000000000..f4ecaf27af1
--- /dev/null
+++ b/devel/ncurses/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.8 2004/03/08 13:26:03 wiz Exp $
+
+--- c++/Makefile.in.orig	Fri Jan 16 23:44:56 2004
++++ c++/Makefile.in
+@@ -149,7 +149,7 @@ LIB_OBJS = \
+ 
+ ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
+ 	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
+-		-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
++		-o $(LIBNAME) $(LIB_OBJS:.o=.lo) \
+ 		-rpath $(INSTALL_PREFIX)$(libdir) \
+ 		-version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(SHLIB_LIST)
+ 
+@@ -184,7 +184,7 @@ mostlyclean ::
+ clean :: mostlyclean
+ 	-sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
+ 	-rm -rf $(MODEL)/SunWS_cache
+-	-$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:$o=.lo) $(OBJS_DEMO)
++	-$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:.o=.lo) $(OBJS_DEMO)
+ 	-rm -rf .libs
+ 
+ distclean :: clean