Fri Jun 8 13:21:10 2012 UTC ()
Fix ncurses/ncursesw build on SunOS and GCC>=4.6


(fhajny)
diff -r1.16 -r1.17 pkgsrc/devel/ncurses/Makefile.common
cvs diff -r1.16 -r1.17 pkgsrc/devel/ncurses/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile.common 2011/04/06 14:02:47 1.16
+++ pkgsrc/devel/ncurses/Makefile.common 2012/06/08 13:21:10 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.16 2011/04/06 14:02:47 adam Exp $ 1# $NetBSD: Makefile.common,v 1.17 2012/06/08 13:21:10 fhajny 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
@@ -38,23 +38,27 @@ MAKE_JOBS_SAFE= no @@ -38,23 +38,27 @@ MAKE_JOBS_SAFE= no
38# This means that groff needs to be built to get tbl(1). 38# This means that groff needs to be built to get tbl(1).
39# We can only build groff if there is a builtin implementation of curses, 39# We can only build groff if there is a builtin implementation of curses,
40# otherwise we get a circular dependency problem. 40# otherwise we get a circular dependency problem.
41# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk 41# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk
42. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \ 42. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
43 ${OPSYS} == "Interix" 43 ${OPSYS} == "Interix"
44# None was available, so disable use of tbl(1) 44# None was available, so disable use of tbl(1)
45USE_TOOLS:= ${USE_TOOLS:Ntbl} 45USE_TOOLS:= ${USE_TOOLS:Ntbl}
46CONFIGURE_ARGS+= --without-manpage-tbl 46CONFIGURE_ARGS+= --without-manpage-tbl
47. endif 47. endif
48.endif 48.endif
49 49
50.if ${OPSYS} == "SunOS" 50.if ${OPSYS} == "SunOS"
 51.include "../../mk/compiler.mk"
 52. if !empty(CC_VERSION:Mgcc-4.[6-9].*)
 53BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED
 54. endif
51TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src 55TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src
52TERMINFODIR= share/lib/terminfo 56TERMINFODIR= share/lib/terminfo
53.else 57.else
54TERMINFODIR= share/terminfo 58TERMINFODIR= share/terminfo
55.endif 59.endif
56 60
57# This prevents tic from writing into ~/.terminfo 61# This prevents tic from writing into ~/.terminfo
58INSTALLATION_DIRS+= ${TERMINFODIR} 62INSTALLATION_DIRS+= ${TERMINFODIR}
59 63
60PLIST_SUBST+= TERMINFODIR=${TERMINFODIR} 64PLIST_SUBST+= TERMINFODIR=${TERMINFODIR}