diff options
| author | wiz <wiz@pkgsrc.org> | 2004-03-08 13:26:03 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-03-08 13:26:03 +0000 |
| commit | 7c34813f590f52e8d9f51f0afa79e0e2320ff233 (patch) | |
| tree | 7b06a0d8833b3871a8ca16ce6ac31057e29cc5f0 /devel/ncurses/patches | |
| parent | 1c3055f7809bd98e6fd12083ef2a546dfadf5c32 (diff) | |
| download | pkgsrc-7c34813f590f52e8d9f51f0afa79e0e2320ff233.tar.gz | |
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.
Diffstat (limited to 'devel/ncurses/patches')
| -rw-r--r-- | devel/ncurses/patches/patch-ab | 38 | ||||
| -rw-r--r-- | devel/ncurses/patches/patch-ad | 22 |
2 files changed, 60 insertions, 0 deletions
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 |