Fri Aug 28 07:09:58 2015 UTC ()
cleanup SunOS workarounds in ncurses and ncursesw since update to ncurses 6.0
resolve for PR pkg/50175
bump PKGREVISION


(richard)
diff -r1.91 -r1.92 pkgsrc/devel/ncurses/Makefile
diff -r1.29 -r1.30 pkgsrc/devel/ncurses/Makefile.common
diff -r1.11 -r1.12 pkgsrc/devel/ncursesw/Makefile
cvs diff -r1.91 -r1.92 pkgsrc/devel/ncurses/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile 2015/08/17 17:10:31 1.91
+++ pkgsrc/devel/ncurses/Makefile 2015/08/28 07:09:57 1.92
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.91 2015/08/17 17:10:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.92 2015/08/28 07:09:57 richard Exp $
2 2
 3PKGREVISION= 1
3.include "Makefile.common" 4.include "Makefile.common"
4 5
5COMMENT= CRT screen handling and optimization package 6COMMENT= CRT screen handling and optimization package
6 7
7INSTALLATION_DIRS+= share/examples 8INSTALLATION_DIRS+= share/examples
8 9
9PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo 10PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo
10 11
11post-configure: 12post-configure:
12 cd ${WRKSRC}/man; \ 13 cd ${WRKSRC}/man; \
13 for f in *.1m; do \ 14 for f in *.1m; do \
14 mv -f $${f} `${BASENAME} $${f} .1m`.1; \ 15 mv -f $${f} `${BASENAME} $${f} .1m`.1; \
15 done; \ 16 done; \
cvs diff -r1.29 -r1.30 pkgsrc/devel/ncurses/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile.common 2015/08/17 17:10:31 1.29
+++ pkgsrc/devel/ncurses/Makefile.common 2015/08/28 07:09:57 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.29 2015/08/17 17:10:31 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.30 2015/08/28 07:09:57 richard Exp $
2# 2#
3# used by devel/ncurses/Makefile 3# used by devel/ncurses/Makefile
4# used by devel/ncursesw/Makefile 4# used by devel/ncursesw/Makefile
5 5
6DISTNAME= ncurses-${NC_VERS} 6DISTNAME= ncurses-${NC_VERS}
7NC_VERS= 6.0 7NC_VERS= 6.0
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \ 9MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \
10 ftp://dickey.his.com/ncurses/ \ 10 ftp://dickey.his.com/ncurses/ \
11 ftp://dickey.his.com/ncurses/${NC_VERS}/ 11 ftp://dickey.his.com/ncurses/${NC_VERS}/
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html 14HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html
@@ -32,57 +32,49 @@ CONFIGURE_ARGS+= --includedir=${PREFIX}/ @@ -32,57 +32,49 @@ CONFIGURE_ARGS+= --includedir=${PREFIX}/
32 32
33SUBST_CLASSES+= rpath 33SUBST_CLASSES+= rpath
34SUBST_FILES.rpath+= misc/ncurses-config 34SUBST_FILES.rpath+= misc/ncurses-config
35SUBST_STAGE.rpath= post-configure 35SUBST_STAGE.rpath= post-configure
36SUBST_SED.rpath+= -e "s|-L\\(.libdir\\)|${COMPILER_RPATH_FLAG}\\1 -L\\1|" 36SUBST_SED.rpath+= -e "s|-L\\(.libdir\\)|${COMPILER_RPATH_FLAG}\\1 -L\\1|"
37SUBST_MESSAGE.rpath= Fixing rpath in ncurses-config. 37SUBST_MESSAGE.rpath= Fixing rpath in ncurses-config.
38 38
39.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
40 40
41.if ${OPSYS} == "Darwin" 41.if ${OPSYS} == "Darwin"
42CONFIGURE_ARGS+= --disable-mixed-case 42CONFIGURE_ARGS+= --disable-mixed-case
43.endif 43.endif
44 44
45.if ${OPSYS} == "SunOS" 
46USE_LANGUAGES+= c99 
47.endif 
48 
49.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 45.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
50TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses 46TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses
51CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q} 47CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q}
52CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${LOCALBASE}/bin/tic 48CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${LOCALBASE}/bin/tic
53.endif 49.endif
54 50
55.if !defined(TOOLS_TBL) 51.if !defined(TOOLS_TBL)
56# This means that groff needs to be built to get tbl(1). 52# This means that groff needs to be built to get tbl(1).
57# We can only build groff if there is a builtin implementation of curses, 53# We can only build groff if there is a builtin implementation of curses,
58# otherwise we get a circular dependency problem. 54# otherwise we get a circular dependency problem.
59# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk 55# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk
60. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \ 56. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
61 ${OPSYS} == "Interix" 57 ${OPSYS} == "Interix"
62# None was available, so disable use of tbl(1) 58# None was available, so disable use of tbl(1)
63USE_TOOLS:= ${USE_TOOLS:Ntbl} 59USE_TOOLS:= ${USE_TOOLS:Ntbl}
64CONFIGURE_ARGS+= --without-manpage-tbl 60CONFIGURE_ARGS+= --without-manpage-tbl
65. endif 61. endif
66.endif 62.endif
67 63
68.include "../../mk/compiler.mk" 64.include "../../mk/compiler.mk"
69 65
70.if ${OPSYS} == "SunOS" 66.if ${OPSYS} == "SunOS"
71. if !empty(CC_VERSION:Mgcc-4.*) 67CONFIGURE_ARGS+= --disable-const
72#This may yet need to be adapted for systems prior to Solaris 10 
73BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_POSIX_C_SOURCE=200112L 
74BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED 
75. endif 
76TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src 68TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src
77TERMINFODIR= share/lib/terminfo 69TERMINFODIR= share/lib/terminfo
78.else 70.else
79TERMINFODIR= share/terminfo 71TERMINFODIR= share/terminfo
80.endif 72.endif
81 73
82.if !empty(CC_VERSION:Mgcc-5.*) 74.if !empty(CC_VERSION:Mgcc-5.*)
83# Inhibit generation of line markers in the output from the preprocessor 75# Inhibit generation of line markers in the output from the preprocessor
84# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723 76# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723
85CPPFLAGS+= -P 77CPPFLAGS+= -P
86.endif 78.endif
87 79
88# This prevents tic from writing into ~/.terminfo 80# This prevents tic from writing into ~/.terminfo
cvs diff -r1.11 -r1.12 pkgsrc/devel/ncursesw/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ncursesw/Makefile 2015/08/17 17:10:32 1.11
+++ pkgsrc/devel/ncursesw/Makefile 2015/08/28 07:09:57 1.12
@@ -1,36 +1,33 @@ @@ -1,36 +1,33 @@
1# $NetBSD: Makefile,v 1.11 2015/08/17 17:10:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2015/08/28 07:09:57 richard Exp $
2 2
 3PKGREVISION= 1
3.include "../../devel/ncurses/Makefile.common" 4.include "../../devel/ncurses/Makefile.common"
4 5
5PKGNAME= ${DISTNAME:S/ncurses/ncursesw/} 6PKGNAME= ${DISTNAME:S/ncurses/ncursesw/}
6COMMENT= Wide character CRT screen handling and optimization package 7COMMENT= Wide character CRT screen handling and optimization package
7 8
8PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches 9PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches
9DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo
10 11
11CONFIGURE_ARGS+= --enable-widec 12CONFIGURE_ARGS+= --enable-widec
12CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncursesw 13CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncursesw
13 14
14INSTALLATION_DIRS+= include/ncursesw 15INSTALLATION_DIRS+= include/ncursesw
15INSTALLATION_DIRS+= bin 16INSTALLATION_DIRS+= bin
16INSTALLATION_DIRS+= lib 17INSTALLATION_DIRS+= lib
17 18
18BUILD_TARGET= libs 19BUILD_TARGET= libs
19 20
20.if ${OPSYS} == "SunOS" 
21CXXFLAGS+= -D_XPG5 
22.endif 
23 
24SUBST_CLASSES+= includes 21SUBST_CLASSES+= includes
25SUBST_MESSAGE.includes= Fixing include paths for ncurses headers. 22SUBST_MESSAGE.includes= Fixing include paths for ncurses headers.
26SUBST_STAGE.includes= post-build 23SUBST_STAGE.includes= post-build
27SUBST_FILES.includes= include/curses.h 24SUBST_FILES.includes= include/curses.h
28SUBST_SED.includes= -e 's,<ncurses_dll\.h>,<ncurses/ncurses_dll\.h>,' 25SUBST_SED.includes= -e 's,<ncurses_dll\.h>,<ncurses/ncurses_dll\.h>,'
29SUBST_SED.includes+= -e 's,<unctrl\.h>,<ncurses/unctrl\.h>,' 26SUBST_SED.includes+= -e 's,<unctrl\.h>,<ncurses/unctrl\.h>,'
30 27
31do-install: 28do-install:
32 cd ${WRKSRC}/include && \ 29 cd ${WRKSRC}/include && \
33 ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install 30 ${MAKE_ENV} ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install
34 ${INSTALL_SCRIPT} ${WRKSRC}/misc/ncurses-config ${DESTDIR}${PREFIX}/bin/ncursesw${NC_VERS:R}-config 31 ${INSTALL_SCRIPT} ${WRKSRC}/misc/ncurses-config ${DESTDIR}${PREFIX}/bin/ncursesw${NC_VERS:R}-config
35 for LIB in form menu ncurses++ ncurses panel; do \ 32 for LIB in form menu ncurses++ ncurses panel; do \
36 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ 33 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \