Mon Jul 21 07:50:45 2014 UTC ()
Be a bit more forgiving with external compilers (earlier than gcc 4.6) and
avoid preprocessor problems with g++ on SunOS.


(richard)
diff -r1.20 -r1.21 pkgsrc/devel/ncurses/Makefile.common
diff -r1.23 -r1.24 pkgsrc/devel/ncurses/distinfo
diff -r1.20 -r1.21 pkgsrc/devel/ncurses/patches/patch-ac
cvs diff -r1.20 -r1.21 pkgsrc/devel/ncurses/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile.common 2013/10/04 10:46:25 1.20
+++ pkgsrc/devel/ncurses/Makefile.common 2014/07/21 07:50:45 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.20 2013/10/04 10:46:25 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.21 2014/07/21 07:50:45 richard Exp $
2# 2#
3# used by devel/ncursesw/Makefile 3# used by devel/ncursesw/Makefile
4 4
5DISTNAME= ncurses-${NC_VERS} 5DISTNAME= ncurses-${NC_VERS}
6NC_VERS= 5.9 6NC_VERS= 5.9
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \ 8MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \
9 ftp://dickey.his.com/ncurses/ \ 9 ftp://dickey.his.com/ncurses/ \
10 ftp://dickey.his.com/ncurses/${NC_VERS}/ 10 ftp://dickey.his.com/ncurses/${NC_VERS}/
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html 13HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html
14LICENSE= mit 14LICENSE= mit
@@ -48,27 +48,30 @@ CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${L @@ -48,27 +48,30 @@ CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${L
48# This means that groff needs to be built to get tbl(1). 48# This means that groff needs to be built to get tbl(1).
49# We can only build groff if there is a builtin implementation of curses, 49# We can only build groff if there is a builtin implementation of curses,
50# otherwise we get a circular dependency problem. 50# otherwise we get a circular dependency problem.
51# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk 51# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk
52. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \ 52. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
53 ${OPSYS} == "Interix" 53 ${OPSYS} == "Interix"
54# None was available, so disable use of tbl(1) 54# None was available, so disable use of tbl(1)
55USE_TOOLS:= ${USE_TOOLS:Ntbl} 55USE_TOOLS:= ${USE_TOOLS:Ntbl}
56CONFIGURE_ARGS+= --without-manpage-tbl 56CONFIGURE_ARGS+= --without-manpage-tbl
57. endif 57. endif
58.endif 58.endif
59 59
60.if ${OPSYS} == "SunOS" 60.if ${OPSYS} == "SunOS"
 61USE_LANGUAGES+= c99
61.include "../../mk/compiler.mk" 62.include "../../mk/compiler.mk"
62. if !empty(CC_VERSION:Mgcc-4.[6-9].*) 63. if !empty(CC_VERSION:Mgcc-4.*)
 64#This may yet need to be adapted for systems prior to Solaris 10
 65BUILDLINK_TRANSFORM+= rename:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600
63BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED 66BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED
64. endif 67. endif
65TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src 68TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src
66TERMINFODIR= share/lib/terminfo 69TERMINFODIR= share/lib/terminfo
67.else 70.else
68TERMINFODIR= share/terminfo 71TERMINFODIR= share/terminfo
69.endif 72.endif
70 73
71# This prevents tic from writing into ~/.terminfo 74# This prevents tic from writing into ~/.terminfo
72INSTALLATION_DIRS+= ${TERMINFODIR} 75INSTALLATION_DIRS+= ${TERMINFODIR}
73 76
74PLIST_SUBST+= TERMINFODIR=${TERMINFODIR} 77PLIST_SUBST+= TERMINFODIR=${TERMINFODIR}
cvs diff -r1.23 -r1.24 pkgsrc/devel/ncurses/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/distinfo 2014/05/11 16:55:17 1.23
+++ pkgsrc/devel/ncurses/distinfo 2014/07/21 07:50:45 1.24
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.23 2014/05/11 16:55:17 rodent Exp $ 1$NetBSD: distinfo,v 1.24 2014/07/21 07:50:45 richard Exp $
2 2
3SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5 3SHA1 (ncurses-5.9.tar.gz) = 3e042e5f2c7223bffdaac9646a533b8c758b65b5
4RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e 4RMD160 (ncurses-5.9.tar.gz) = dd7dffe38fcc908230ce3e036b71ced2d270ac9e
5Size (ncurses-5.9.tar.gz) = 2826473 bytes 5Size (ncurses-5.9.tar.gz) = 2826473 bytes
6SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719 6SHA1 (patch-aa) = e2bafc25f1c9e39062de06eccbe1e71321dbd719
7SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31 7SHA1 (patch-ab) = 12ed75d0228793d9ceac5933d8ac8741d2852c31
8SHA1 (patch-ac) = e88ab440c19d9087169325eaef8ec0144c82b1a3 8SHA1 (patch-ac) = aed2235f976f1893ac4c1f71f14adeb867afcf09
9SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe 9SHA1 (patch-ad) = 15d74d0105a22d0cb1aef5c841e6a6085c498bfe
10SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20 10SHA1 (patch-cxx_cursesf.h) = ed10202764d97d7d94d4eb4b35e84424cabc4c20
11SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3 11SHA1 (patch-cxx_cursesm.h) = 0b371901959ce9e36493e57d8df65356284b9ef3
12SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = faaf60ec21e9e4e6a4b14d9f245e569b526572df 12SHA1 (patch-ncurses_tinfo_lib__baudrate.c) = faaf60ec21e9e4e6a4b14d9f245e569b526572df
cvs diff -r1.20 -r1.21 pkgsrc/devel/ncurses/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/patches/Attic/patch-ac 2014/05/11 16:55:17 1.20
+++ pkgsrc/devel/ncurses/patches/Attic/patch-ac 2014/07/21 07:50:45 1.21
@@ -1,40 +1,26 @@ @@ -1,40 +1,26 @@
1$NetBSD: patch-ac,v 1.20 2014/05/11 16:55:17 rodent Exp $ 1$NetBSD: patch-ac,v 1.21 2014/07/21 07:50:45 richard Exp $
2 2
3--- configure.orig Thu Mar 31 23:35:51 2011 3--- configure.orig 2011-03-31 23:35:51.000000000 +0000
4+++ configure 4+++ configure
5@@ -7096,6 +7096,13 @@ sco*) #(vi 5@@ -9640,12 +9645,7 @@ case ".$MANPAGE_RENAMES" in #(vi
6 # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer 
7 ;; 
8 solaris2.1[0-9]) #(vi 
9+ case "$GCC_VERSION" in  
10+ 4.[678].*) 
11+ cf_XOPEN_SOURCE=600 
12+ cf_add_cflags=-std=c99 
13+ CPPFLAGS="$CPPFLAGS -std=c99" 
14+ ;; 
15+ esac 
16 cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 
17 ;; 
18 solaris2.[1-9]) #(vi 
19@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi 
20 .no) #(vi 6 .no) #(vi
21 ;; 7 ;;
22 .|.yes) 8 .|.yes)
23- # Debian 'man' program? 9- # Debian 'man' program?
24- if test -f /etc/debian_version ; then 10- if test -f /etc/debian_version ; then
25- MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames 11- MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
26- else 12- else
27 MANPAGE_RENAMES=no 13 MANPAGE_RENAMES=no
28- fi 14- fi
29 ;; 15 ;;
30 esac 16 esac
31  17
32@@ -18592,7 +18594,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6 18@@ -18592,7 +18592,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
33  19
34 ### Construct the list of include-directories to be generated 20 ### Construct the list of include-directories to be generated
35  21
36-CPPFLAGS="$CPPFLAGS -I. -I../include" 22-CPPFLAGS="$CPPFLAGS -I. -I../include"
37+CPPFLAGS="-I. -I../include $CPPFLAGS" 23+CPPFLAGS="-I. -I../include $CPPFLAGS"
38 if test "$srcdir" != "."; then 24 if test "$srcdir" != "."; then
39 CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include" 25 CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
40 fi 26 fi