diff options
| author | richard <richard@pkgsrc.org> | 2014-07-21 07:50:45 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2014-07-21 07:50:45 +0000 |
| commit | d9bce95add2f90c8e8caaee2374a17fafbc874d0 (patch) | |
| tree | f90a10dc601eb123d3729d831337095b0723aec1 /devel | |
| parent | d9ab371b0796f76bc414bfcc350eb6564d5ee15e (diff) | |
| download | pkgsrc-d9bce95add2f90c8e8caaee2374a17fafbc874d0.tar.gz | |
Be a bit more forgiving with external compilers (earlier than gcc 4.6) and
avoid preprocessor problems with g++ on SunOS.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ncurses/Makefile.common | 7 | ||||
| -rw-r--r-- | devel/ncurses/distinfo | 4 | ||||
| -rw-r--r-- | devel/ncurses/patches/patch-ac | 22 |
3 files changed, 11 insertions, 22 deletions
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common index 316ec23842c..940506d6781 100644 --- a/devel/ncurses/Makefile.common +++ b/devel/ncurses/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2013/10/04 10:46:25 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.21 2014/07/21 07:50:45 richard Exp $ # # used by devel/ncursesw/Makefile @@ -58,8 +58,11 @@ CONFIGURE_ARGS+= --without-manpage-tbl .endif .if ${OPSYS} == "SunOS" +USE_LANGUAGES+= c99 .include "../../mk/compiler.mk" -. if !empty(CC_VERSION:Mgcc-4.[6-9].*) +. if !empty(CC_VERSION:Mgcc-4.*) +#This may yet need to be adapted for systems prior to Solaris 10 +BUILDLINK_TRANSFORM+= rename:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600 BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED . endif TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index d83b0e0e056..592298cd063 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.23 2014/05/11 16:55:17 rodent Exp $ +$NetBSD: distinfo,v 1.24 2014/07/21 07:50:45 richard Exp $ SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5 RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e Size (ncurses-5.9.tar.gz) = 2826473 bytes SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719 SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31 -SHA1 (patch-ac) = e88ab440c19d9087169325eaef8ec0144c82b1a3 +SHA1 (patch-ac) = aed2235f976f1893ac4c1f71f14adeb867afcf09 SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20 SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3 diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac index 65f141700ea..49168658814 100644 --- a/devel/ncurses/patches/patch-ac +++ b/devel/ncurses/patches/patch-ac @@ -1,22 +1,8 @@ -$NetBSD: patch-ac,v 1.20 2014/05/11 16:55:17 rodent Exp $ +$NetBSD: patch-ac,v 1.21 2014/07/21 07:50:45 richard Exp $ ---- configure.orig Thu Mar 31 23:35:51 2011 +--- configure.orig 2011-03-31 23:35:51.000000000 +0000 +++ configure -@@ -7096,6 +7096,13 @@ sco*) #(vi - # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer - ;; - solaris2.1[0-9]) #(vi -+ case "$GCC_VERSION" in -+ 4.[678].*) -+ cf_XOPEN_SOURCE=600 -+ cf_add_cflags=-std=c99 -+ CPPFLAGS="$CPPFLAGS -std=c99" -+ ;; -+ esac - cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; - solaris2.[1-9]) #(vi -@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi +@@ -9640,12 +9645,7 @@ case ".$MANPAGE_RENAMES" in #(vi .no) #(vi ;; .|.yes) @@ -29,7 +15,7 @@ $NetBSD: patch-ac,v 1.20 2014/05/11 16:55:17 rodent Exp $ ;; esac -@@ -18592,7 +18594,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6 +@@ -18592,7 +18592,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated |