diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ncurses/Makefile | 4 | ||||
-rw-r--r-- | devel/ncurses/PLIST | 8 | ||||
-rw-r--r-- | devel/ncurses/builtin.mk | 6 | ||||
-rw-r--r-- | devel/ncurses/distinfo | 9 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ab | 20 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ac | 50 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-aclocal.m4 | 53 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-c++_Makefile.in | 22 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-configure.in | 17 | ||||
-rw-r--r-- | devel/ncursesw/Makefile | 6 | ||||
-rw-r--r-- | devel/ncursesw/PLIST | 8 | ||||
-rw-r--r-- | devel/ncursesw/builtin.mk | 6 |
12 files changed, 185 insertions, 24 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 431ab7a15c7..022db665f4e 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.93 2016/07/09 06:38:10 wiz Exp $ +# $NetBSD: Makefile,v 1.94 2016/12/18 23:30:34 joerg Exp $ -PKGREVISION= 2 +PKGREVISION= 3 .include "Makefile.common" COMMENT= CRT screen handling and optimization package diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST index 29d49f6a0bc..a5bb4a96cb8 100644 --- a/devel/ncurses/PLIST +++ b/devel/ncurses/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2015/08/17 17:10:31 wiz Exp $ +@comment $NetBSD: PLIST,v 1.22 2016/12/18 23:30:34 joerg Exp $ bin/captoinfo bin/clear bin/infocmp @@ -30,11 +30,11 @@ include/ncurses/term_entry.h include/ncurses/termcap.h include/ncurses/tic.h include/ncurses/unctrl.h -lib/libform.la -lib/libmenu.la +lib/libgnuform.la +lib/libgnumenu.la lib/libncurses++.la lib/libncurses.la -lib/libpanel.la +lib/libgnupanel.la man/man1/captoinfo.1 man/man1/clear.1 man/man1/infocmp.1 diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index 51ef080022b..e2d9c31f790 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.37 2015/09/08 11:57:49 jperkin Exp $ +# $NetBSD: builtin.mk,v 1.38 2016/12/18 23:30:34 joerg Exp $ BUILTIN_PKG:= ncurses @@ -154,6 +154,10 @@ BUILDLINK_LIBNAME.ncurses= ${BUILTIN_LIBNAME.ncurses} BUILDLINK_TRANSFORM+= l:ncurses:${BUILTIN_LIBNAME.ncurses} BUILDLINK_TARGETS+= buildlink-curses-ncurses-h BUILDLINK_TARGETS+= buildlink-ncurses-extra-includes +. else +BUILDLINK_TRANSFORM+= l:form:gnuform +BUILDLINK_TRANSFORM+= l:panel:gnupanel +BUILDLINK_TRANSFORM+= l:menu:gnumenu . endif # A full ncurses implementation provides more headers than some curses diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index 772297f2b7a..62a8f8e7dde 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -1,11 +1,14 @@ -$NetBSD: distinfo,v 1.29 2015/11/03 03:27:50 agc Exp $ +$NetBSD: distinfo,v 1.30 2016/12/18 23:30:34 joerg Exp $ SHA1 (ncurses-6.0.tar.gz) = acd606135a5124905da770803c05f1f20dd3b21c RMD160 (ncurses-6.0.tar.gz) = 4d9e5938f00b400bfb0d37f3c54f2f36c4157d48 SHA512 (ncurses-6.0.tar.gz) = 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963 Size (ncurses-6.0.tar.gz) = 3131891 bytes SHA1 (patch-aa) = 6acf84077e84fd693bb2b52377774db3d15b4f8f -SHA1 (patch-ab) = 235ae1d844721a5ea9d027d051eedc0f7898413c -SHA1 (patch-ac) = fd1892bfb4dcf8a22ae4654eb944eda9725f964e +SHA1 (patch-ab) = d5fdedbe750dab1b7e895860a563062cd850b760 +SHA1 (patch-ac) = 85738d32b84b5eda18c6acc0dd678c2616dbb8fa +SHA1 (patch-aclocal.m4) = efb1a966687d2c35fc3e3e1d5345e80aaf2822f6 +SHA1 (patch-c++_Makefile.in) = 974f89c75737a8079977fc35a924b54d32e98df2 +SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527 SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = e383a11530a3045e729ab8c738e57a9e217a994f diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab index a95cdb36961..ea6e9d6be18 100644 --- a/devel/ncurses/patches/patch-ab +++ b/devel/ncurses/patches/patch-ab @@ -1,8 +1,18 @@ -$NetBSD: patch-ab,v 1.18 2015/08/17 17:10:32 wiz Exp $ +$NetBSD: patch-ab,v 1.19 2016/12/18 23:30:34 joerg Exp $ --- mk-1st.awk.orig 2014-12-20 23:54:22.000000000 +0000 +++ mk-1st.awk -@@ -447,7 +447,7 @@ END { +@@ -67,6 +67,9 @@ function is_termlib() { + } + # see lib_name + function lib_name_of(a_name) { ++ if (a_name == "form" || a_name == "panel" || a_name == "menu" || a_name == "formw" || a_name == "panelw" || a_name == "menuw") ++ return sprintf("%sgnu%s%s", prefix, a_name, suffix) ++ else + return sprintf("%s%s%s", prefix, a_name, suffix) + } + # see imp_name +@@ -447,7 +450,7 @@ END { which_list = "SHLIB_LIST"; } printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG; @@ -11,7 +21,7 @@ $NetBSD: patch-ab,v 1.18 2015/08/17 17:10:32 wiz Exp $ printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n"; printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list; print "" -@@ -471,7 +471,7 @@ END { +@@ -471,7 +474,7 @@ END { printf "\t$(RANLIB) $@\n" if ( host == "vxworks" ) { @@ -20,7 +30,7 @@ $NetBSD: patch-ab,v 1.18 2015/08/17 17:10:32 wiz Exp $ } print "" print "install \\" -@@ -517,7 +517,7 @@ END { +@@ -517,7 +520,7 @@ END { print "mostlyclean::" printf "\t-rm -f $(%s_OBJS)\n", OBJS if ( MODEL == "LIBTOOL" ) { @@ -29,7 +39,7 @@ $NetBSD: patch-ab,v 1.18 2015/08/17 17:10:32 wiz Exp $ } } else if ( found == 2 ) -@@ -526,13 +526,13 @@ END { +@@ -526,13 +529,13 @@ END { print "mostlyclean::" printf "\t-rm -f $(%s_OBJS)\n", OBJS if ( MODEL == "LIBTOOL" ) { diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac index d5a9cee5bcd..3e68b0f0c71 100644 --- a/devel/ncurses/patches/patch-ac +++ b/devel/ncurses/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.23 2015/08/17 17:10:32 wiz Exp $ +$NetBSD: patch-ac,v 1.24 2016/12/18 23:30:34 joerg Exp $ Allow ncurses to build with compiler from pkgsrc by dropping the use of -no-cpp-precomp which is specific to Apple's supplied toolchain. @@ -21,3 +21,51 @@ Include local paths before utilising flags from build env ;; esac +@@ -21894,8 +21889,16 @@ EOF + #define HAVE_LIB${cf_have_include} 1 + EOF + +- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" +- TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2" ++ case ${cf_dir} in ++ form|menu|panel) ++ TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}gnu${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" ++ TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}gnu${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2" ++ ;; ++ *) ++ TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" ++ TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2" ++ ;; ++ esac + if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" + TEST_ARG2="${TEST_DEP2}" +@@ -22181,9 +22184,9 @@ fi + ADAHTML_DIR=../../doc/html/ada + + # these could be configurable, but are not currently +-PANEL_NAME=panel +-MENU_NAME=menu +-FORM_NAME=form ++PANEL_NAME=gnupanel ++MENU_NAME=gnumenu ++FORM_NAME=gnuform + CXX_NAME=ncurses++ + + # workaround for g++ versus Solaris (20131116) +@@ -23565,7 +23570,14 @@ CF_EOF + cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}" + fi + +- cf_libname=$cf_dir ++ case $cf_dir in ++ form|menu|panel) ++ cf_libname=gnu$cf_dir ++ ;; ++ *) ++ cf_libname=$cf_dir ++ ;; ++ esac + test "$cf_dir" = c++ && cf_libname=ncurses++ + if test $cf_item = shared ; then + if test -n "${LIB_SUFFIX}" diff --git a/devel/ncurses/patches/patch-aclocal.m4 b/devel/ncurses/patches/patch-aclocal.m4 new file mode 100644 index 00000000000..b54c4c6208a --- /dev/null +++ b/devel/ncurses/patches/patch-aclocal.m4 @@ -0,0 +1,53 @@ +$NetBSD: patch-aclocal.m4,v 1.1 2016/12/18 23:30:34 joerg Exp $ + +--- aclocal.m4.orig 2015-08-06 00:46:34.000000000 +0000 ++++ aclocal.m4 +@@ -3309,7 +3309,15 @@ CF_EOF + for cf_item in $cf_LIST_MODELS + do + CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf) +- cf_libname=$cf_dir ++ case $cf_dir in ++ form|menu|panel) ++ cf_libname=gnu$cf_dir ++ ;; ++ *) ++ cf_libname=$cf_dir ++ ;; ++ esac ++ + test "$cf_dir" = c++ && cf_libname=ncurses++ + if test $cf_item = shared ; then + if test -n "${LIB_SUFFIX}" +@@ -4250,11 +4258,7 @@ case ".$MANPAGE_RENAMES" in + ;; + (.|.yes) + # Debian 'man' program? +- if test -f /etc/debian_version ; then +- MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames +- else +- MANPAGE_RENAMES=no +- fi ++ MANPAGE_RENAMES=no + ;; + esac + +@@ -6174,8 +6178,16 @@ do + CF_UPPER(cf_have_include,$cf_dir) + AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H) + AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include}) +- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" +- TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2" ++ case ${cf_dir} in ++ form|menu|panel) ++ TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}gnu${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" ++ TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}gnu${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2" ++ ;; ++ *) ++ TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" ++ TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2" ++ ;; ++ esac + if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" + TEST_ARG2="${TEST_DEP2}" diff --git a/devel/ncurses/patches/patch-c++_Makefile.in b/devel/ncurses/patches/patch-c++_Makefile.in new file mode 100644 index 00000000000..35f10ee595e --- /dev/null +++ b/devel/ncurses/patches/patch-c++_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-c++_Makefile.in,v 1.1 2016/12/18 23:30:34 joerg Exp $ + +--- c++/Makefile.in.orig 2015-08-05 23:15:41.000000000 +0000 ++++ c++/Makefile.in +@@ -84,7 +84,7 @@ RANLIB = @LIB_PREP@ + CXX = @CXX@ + CPP = @CXXCPP@ + CXXFLAGS = @CXXFLAGS@ @EXTRA_CXXFLAGS@ +-CXXLIBS = @CXXLIBS@ ++CXXLIBS = + + INCDIR = ../include + CPPFLAGS = -DHAVE_CONFIG_H @CPPFLAGS@ +@@ -112,7 +112,7 @@ LOCAL_LIBDIR = @top_builddir@/lib + + LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@ + SHLIB_DIRS = -L../lib +-SHLIB_LIST = $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ ++SHLIB_LIST = $(SHLIB_DIRS) -lgnuform@USE_LIB_SUFFIX@ -lgnumenu@USE_LIB_SUFFIX@ -lgnupanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ + + LIBROOT = ncurses++ + diff --git a/devel/ncurses/patches/patch-configure.in b/devel/ncurses/patches/patch-configure.in new file mode 100644 index 00000000000..3d5ee6d68f2 --- /dev/null +++ b/devel/ncurses/patches/patch-configure.in @@ -0,0 +1,17 @@ +$NetBSD: patch-configure.in,v 1.1 2016/12/18 23:30:34 joerg Exp $ + +--- configure.in.orig 2016-03-24 16:40:57.606323008 +0000 ++++ configure.in +@@ -2065,9 +2065,9 @@ ADAHTML_DIR=../../doc/html/ada + AC_SUBST(ADAHTML_DIR) + + # these could be configurable, but are not currently +-PANEL_NAME=panel +-MENU_NAME=menu +-FORM_NAME=form ++PANEL_NAME=gnupanel ++MENU_NAME=gnumenu ++FORM_NAME=gnuform + CXX_NAME=ncurses++ + + AC_SUBST(PANEL_NAME) diff --git a/devel/ncursesw/Makefile b/devel/ncursesw/Makefile index 6fc56f613af..3df4392aeb2 100644 --- a/devel/ncursesw/Makefile +++ b/devel/ncursesw/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2015/08/28 07:09:57 richard Exp $ +# $NetBSD: Makefile,v 1.13 2016/12/18 23:30:34 joerg Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../devel/ncurses/Makefile.common" PKGNAME= ${DISTNAME:S/ncurses/ncursesw/} @@ -29,7 +29,7 @@ do-install: cd ${WRKSRC}/include && \ ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install ${INSTALL_SCRIPT} ${WRKSRC}/misc/ncurses-config ${DESTDIR}${PREFIX}/bin/ncursesw${NC_VERS:R}-config - for LIB in form menu ncurses++ ncurses panel; do \ + for LIB in gnuform gnumenu ncurses++ ncurses gnupanel; do \ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ ${WRKSRC}/lib/lib$${LIB}w.la ${DESTDIR}${PREFIX}/lib; \ done diff --git a/devel/ncursesw/PLIST b/devel/ncursesw/PLIST index cd91aa6b988..9b975cdeeff 100644 --- a/devel/ncursesw/PLIST +++ b/devel/ncursesw/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2015/08/17 17:10:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/12/18 23:30:34 joerg Exp $ bin/ncursesw6-config include/ncursesw/curses.h include/ncursesw/nc_tparm.h @@ -9,8 +9,8 @@ include/ncursesw/term_entry.h include/ncursesw/termcap.h include/ncursesw/tic.h include/ncursesw/unctrl.h -lib/libformw.la -lib/libmenuw.la +lib/libgnuformw.la +lib/libgnumenuw.la lib/libncurses++w.la lib/libncursesw.la -lib/libpanelw.la +lib/libgnupanelw.la diff --git a/devel/ncursesw/builtin.mk b/devel/ncursesw/builtin.mk index 7084c45a432..4fddb187f4b 100644 --- a/devel/ncursesw/builtin.mk +++ b/devel/ncursesw/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.11 2013/11/23 11:29:35 obache Exp $ +# $NetBSD: builtin.mk,v 1.12 2016/12/18 23:30:34 joerg Exp $ BUILTIN_PKG:= ncursesw @@ -117,6 +117,10 @@ BUILDLINK_TRANSFORM+= l:ncursesw:${BUILTIN_LIBNAME.ncursesw} empty(H_NB_CURSESW:M${LOCALBASE}/*) BUILDLINK_CPPFLAGS.ncursesw+= -DHAVE_WCHAR=1 . endif +. else +BUILDLINK_TRANSFORM+= l:formw:gnuformw +BUILDLINK_TRANSFORM+= l:panelw:gnupanelw +BUILDLINK_TRANSFORM+= l:menuw:gnumenuw . endif # According to the ncurses(3) manual page, applications that want to use |