diff options
author | jlam <jlam@pkgsrc.org> | 2001-04-30 14:47:03 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-04-30 14:47:03 +0000 |
commit | a19f6a74b75977e5936d3757249b486f8aca329d (patch) | |
tree | 06f74d5c05e4ed618d59acf0e8c23d741ca315f7 /devel/ncurses | |
parent | bda726ddb7f9b23dec4f31517d025880e31df3a6 (diff) | |
download | pkgsrc-a19f6a74b75977e5936d3757249b486f8aca329d.tar.gz |
Back out changes to build *_pic.a libraries. This change was thought to be
needed for the xerces-p package, but ended up not being necessary. By
removing this hack, we reduce the number of places in pkgsrc where we depend
upon libtool internals.
Diffstat (limited to 'devel/ncurses')
-rw-r--r-- | devel/ncurses/distinfo | 3 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ac | 25 | ||||
-rw-r--r-- | devel/ncurses/pkg/PLIST | 6 |
3 files changed, 2 insertions, 32 deletions
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index c0f58e09df3..57c793301e5 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:31 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/04/30 14:47:03 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) = 9bc254dd43a959e1f96526c813cbcfd7341e67ed diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac deleted file mode 100644 index 0b06ec43dd5..00000000000 --- a/devel/ncurses/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2001/03/12 15:51:51 jlam Exp $ - ---- mk-1st.awk.orig Sat Oct 14 13:57:02 2000 -+++ mk-1st.awk -@@ -223,14 +223,20 @@ - compile="CC" - } - end_name = lib_name; -+ piclib_suffix = "_pic.a"; -+ piclib_name = sprintf("%s%s%s", prefix, name, piclib_suffix) - printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS - printf "\tcd ../lib && $(LIBTOOL) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", compile, lib_name, OBJS -+ printf "\t$(AR) $(AR_OPTS) ../lib/%s $(%s_OBJS:../obj_lo/%=../obj_lo/.libs/%)\n", piclib_name, OBJS -+ printf "\t$(RANLIB) ../lib/%s\n", piclib_name - print "" - print "install \\" - print "install.libs \\" - printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name - printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name - printf "\tcd ../lib; $(LIBTOOL) $(INSTALL_DATA) %s $(DESTDIR)$(libdir)\n", lib_name -+ printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", piclib_name, piclib_name -+ printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", piclib_name, piclib_name - print "" - print "uninstall \\" - print "uninstall.libs \\" diff --git a/devel/ncurses/pkg/PLIST b/devel/ncurses/pkg/PLIST index f80a215d446..ba433f4b991 100644 --- a/devel/ncurses/pkg/PLIST +++ b/devel/ncurses/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2001/03/12 15:51:51 jlam Exp $ +@comment $NetBSD: PLIST,v 1.18 2001/04/30 14:47:04 jlam Exp $ bin/captoinfo bin/infocmp bin/infotocap @@ -25,13 +25,11 @@ lib/libform.la lib/libform.so lib/libform.so.5 lib/libform.so.5.2 -lib/libform_pic.a lib/libmenu.a lib/libmenu.la lib/libmenu.so lib/libmenu.so.5 lib/libmenu.so.5.2 -lib/libmenu_pic.a lib/libncurses++.a lib/libncurses++.la lib/libncurses++.so @@ -42,13 +40,11 @@ lib/libncurses.la lib/libncurses.so lib/libncurses.so.5 lib/libncurses.so.5.2 -lib/libncurses_pic.a lib/libpanel.a lib/libpanel.la lib/libpanel.so lib/libpanel.so.5 lib/libpanel.so.5.2 -lib/libpanel_pic.a man/man1/captoinfo.1 man/man1/infocmp.1 man/man1/infotocap.1 |