Fri Oct 4 10:46:25 2013 UTC ()
Always disable mixed case support on OSX, otherwise a package built
with WRKOBJDIR on a case-sensitive file system cannot be installed
onto a case-insensitive one.

Bump PKGREVISION.


(jperkin)
diff -r1.87 -r1.88 pkgsrc/devel/ncurses/Makefile
diff -r1.19 -r1.20 pkgsrc/devel/ncurses/Makefile.common

cvs diff -r1.87 -r1.88 pkgsrc/devel/ncurses/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile 2013/05/31 12:40:01 1.87
+++ pkgsrc/devel/ncurses/Makefile 2013/10/04 10:46:25 1.88
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.87 2013/05/31 12:40:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.88 2013/10/04 10:46:25 jperkin Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5COMMENT= CRT screen handling and optimization package 5COMMENT= CRT screen handling and optimization package
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8INSTALLATION_DIRS+= share/examples 8INSTALLATION_DIRS+= share/examples
9 9
10.if ${OPSYS} == "SunOS" 10.if ${OPSYS} == "SunOS"
11# misc/screen installs screen, screen-bce and screen-s, so we need to remove 11# misc/screen installs screen, screen-bce and screen-s, so we need to remove
12# these here to avoid a conflict; this means we also remove the entries which 12# these here to avoid a conflict; this means we also remove the entries which
13# have a use=screen in them 13# have a use=screen in them
14SUBST_CLASSES+= ti 14SUBST_CLASSES+= ti
15SUBST_STAGE.ti= post-configure 15SUBST_STAGE.ti= post-configure
16SUBST_MESSAGE.ti= Removing screen entries from the terminfo database. 16SUBST_MESSAGE.ti= Removing screen entries from the terminfo database.
17SUBST_FILES.ti= ${TERMINFO_SRC} 17SUBST_FILES.ti= ${TERMINFO_SRC}
18# see misc/screen/PLIST for these: 18# see misc/screen/PLIST for these:
19SUBST_SED.ti= -e '/^screen|/,/^$$/d' 19SUBST_SED.ti= -e '/^screen|/,/^$$/d'

cvs diff -r1.19 -r1.20 pkgsrc/devel/ncurses/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile.common 2013/05/10 00:36:30 1.19
+++ pkgsrc/devel/ncurses/Makefile.common 2013/10/04 10:46:25 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2013/05/10 00:36:30 riastradh Exp $ 1# $NetBSD: Makefile.common,v 1.20 2013/10/04 10:46:25 jperkin 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
@@ -24,26 +24,30 @@ CONFIGURE_ARGS+= --enable-bsdpad @@ -24,26 +24,30 @@ CONFIGURE_ARGS+= --enable-bsdpad
24CONFIGURE_ARGS+= --enable-overwrite 24CONFIGURE_ARGS+= --enable-overwrite
25CONFIGURE_ARGS+= --with-cxx-binding 25CONFIGURE_ARGS+= --with-cxx-binding
26CONFIGURE_ARGS+= --without-ada 26CONFIGURE_ARGS+= --without-ada
27CONFIGURE_ARGS+= --without-gpm 27CONFIGURE_ARGS+= --without-gpm
28CONFIGURE_ARGS+= --with-manpage-format=normal 28CONFIGURE_ARGS+= --with-manpage-format=normal
29CONFIGURE_ARGS+= --with-manpage-tbl 29CONFIGURE_ARGS+= --with-manpage-tbl
30CONFIGURE_ARGS+= --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR} 30CONFIGURE_ARGS+= --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
31CONFIGURE_ARGS+= --with-terminfo-dirs=${PREFIX}/${TERMINFODIR} 31CONFIGURE_ARGS+= --with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
32CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncurses 32CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncurses
33MAKE_JOBS_SAFE= no 33MAKE_JOBS_SAFE= no
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
 37.if ${OPSYS} == "Darwin"
 38CONFIGURE_ARGS+= --disable-mixed-case
 39.endif
 40
37.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 41.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
38TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses 42TOOL_DEPENDS+= ncurses-${NC_VERS}:../../devel/ncurses
39CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q} 43CONFIGURE_ENV+= BUILD_CC=${NATIVE_CC:Q}
40CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${LOCALBASE}/bin/tic 44CONFIGURE_ENV+= ac_cv_path_TIC_PATH=${LOCALBASE}/bin/tic
41.endif 45.endif
42 46
43.if !defined(TOOLS_TBL) 47.if !defined(TOOLS_TBL)
44# 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).
45# 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,
46# otherwise we get a circular dependency problem. 50# otherwise we get a circular dependency problem.
47# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk 51# Additionally, Interix is special, see ../../mk/curses.buildlink3.mk
48. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \ 52. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
49 ${OPSYS} == "Interix" 53 ${OPSYS} == "Interix"