Skip to content

Commit

Permalink
cleanup SunOS workarounds in ncurses and ncursesw since update to ncu…
Browse files Browse the repository at this point in the history
…rses 6.0

resolve for PR pkg/50175
bump PKGREVISION
  • Loading branch information
richard committed Aug 28, 2015
1 parent 741ec19 commit edcf0dd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
3 changes: 2 additions & 1 deletion devel/ncurses/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.91 2015/08/17 17:10:31 wiz Exp $
# $NetBSD: Makefile,v 1.92 2015/08/28 07:09:57 richard Exp $

PKGREVISION= 1
.include "Makefile.common"

COMMENT= CRT screen handling and optimization package
Expand Down
12 changes: 2 additions & 10 deletions devel/ncurses/Makefile.common
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.29 2015/08/17 17:10:31 wiz Exp $
# $NetBSD: Makefile.common,v 1.30 2015/08/28 07:09:57 richard Exp $
#
# used by devel/ncurses/Makefile
# used by devel/ncursesw/Makefile
Expand Down Expand Up @@ -42,10 +42,6 @@ SUBST_MESSAGE.rpath= Fixing rpath in ncurses-config.
CONFIGURE_ARGS+= --disable-mixed-case
.endif

.if ${OPSYS} == "SunOS"
USE_LANGUAGES+= c99
.endif

.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses
CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q}
Expand All @@ -68,11 +64,7 @@ CONFIGURE_ARGS+= --without-manpage-tbl
.include "../../mk/compiler.mk"

.if ${OPSYS} == "SunOS"
. if !empty(CC_VERSION:Mgcc-4.*)
#This may yet need to be adapted for systems prior to Solaris 10
BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_POSIX_C_SOURCE=200112L
BUILDLINK_TRANSFORM+= rm:-D_XOPEN_SOURCE_EXTENDED
. endif
CONFIGURE_ARGS+= --disable-const
TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src
TERMINFODIR= share/lib/terminfo
.else
Expand Down
7 changes: 2 additions & 5 deletions devel/ncursesw/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.11 2015/08/17 17:10:32 wiz Exp $
# $NetBSD: Makefile,v 1.12 2015/08/28 07:09:57 richard Exp $

PKGREVISION= 1
.include "../../devel/ncurses/Makefile.common"

PKGNAME= ${DISTNAME:S/ncurses/ncursesw/}
Expand All @@ -17,10 +18,6 @@ INSTALLATION_DIRS+= lib

BUILD_TARGET= libs

.if ${OPSYS} == "SunOS"
CXXFLAGS+= -D_XPG5
.endif

SUBST_CLASSES+= includes
SUBST_MESSAGE.includes= Fixing include paths for ncurses headers.
SUBST_STAGE.includes= post-build
Expand Down

0 comments on commit edcf0dd

Please sign in to comment.