Mon Jul 26 05:47:46 2010 UTC ()
ncurses does a bunch of sed magic at *install* time to adjust the
paths in include directives in the headers it installs. (I'm not going
to ask who thought this was a good idea...) Since this package
bypasses the ncurses install goo, we need to replicate at least some
of the behavior with SUBST in order to get working header files out.

Should fix PR 43435 and may also fix some problems with ncursesw and
tin that I've had reported to me.

PKGREVISION -> 4.


(dholland)
diff -r1.7 -r1.8 pkgsrc/devel/ncursesw/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/ncursesw/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ncursesw/Makefile 2010/06/21 14:49:00 1.7
+++ pkgsrc/devel/ncursesw/Makefile 2010/07/26 05:47:45 1.8
@@ -1,35 +1,42 @@ @@ -1,35 +1,42 @@
1# $NetBSD: Makefile,v 1.7 2010/06/21 14:49:00 tron Exp $ 1# $NetBSD: Makefile,v 1.8 2010/07/26 05:47:45 dholland Exp $
2 2
3.include "../../devel/ncurses/Makefile.common" 3.include "../../devel/ncurses/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/ncurses/ncursesw/} 5PKGNAME= ${DISTNAME:S/ncurses/ncursesw/}
6PKGREVISION= 3 6PKGREVISION= 4
7COMMENT= Wide character CRT screen handling and optimization package 7COMMENT= Wide character CRT screen handling and optimization package
8 8
9PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches 9PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches
10DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo
11 11
12CONFIGURE_ARGS+= --enable-widec 12CONFIGURE_ARGS+= --enable-widec
13 13
14INSTALLATION_DIRS+= include/ncursesw 14INSTALLATION_DIRS+= include/ncursesw
15INSTALLATION_DIRS+= lib 15INSTALLATION_DIRS+= lib
16 16
17BUILD_TARGET= libs 17BUILD_TARGET= libs
18 18
19.if ${OPSYS} == "SunOS" 19.if ${OPSYS} == "SunOS"
20CXXFLAGS+= -D_XPG5 20CXXFLAGS+= -D_XPG5
21.endif 21.endif
22 22
 23SUBST_CLASSES+= includes
 24SUBST_MESSAGE.includes= Fixing include paths for ncurses headers.
 25SUBST_STAGE.includes= post-build
 26SUBST_FILES.includes= include/curses.h
 27SUBST_SED.includes= -e 's,<ncurses_dll\.h>,<ncurses/ncurses_dll\.h>,' \
 28 -e 's,<unctrl\.h>,<ncurses/unctrl\.h>,'
 29
23do-install: 30do-install:
24 ${INSTALL_DATA} ${WRKSRC}/include/curses.h ${DESTDIR}${PREFIX}/include/ncursesw/ncurses.h 31 ${INSTALL_DATA} ${WRKSRC}/include/curses.h ${DESTDIR}${PREFIX}/include/ncursesw/ncurses.h
25 for LIB in form menu ncurses++ ncurses panel; do \ 32 for LIB in form menu ncurses++ ncurses panel; do \
26 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ 33 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
27 ${WRKSRC}/lib/lib$${LIB}w.la ${DESTDIR}${PREFIX}/lib; \ 34 ${WRKSRC}/lib/lib$${LIB}w.la ${DESTDIR}${PREFIX}/lib; \
28 done 35 done
29 36
30BUILDLINK_API_DEPENDS.ncurses+= ncurses-${NC_VERS}{,nb*} 37BUILDLINK_API_DEPENDS.ncurses+= ncurses-${NC_VERS}{,nb*}
31BUILDLINK_ABI_DEPENDS.ncurses+= ncurses-${NC_VERS}{,nb*} 38BUILDLINK_ABI_DEPENDS.ncurses+= ncurses-${NC_VERS}{,nb*}
32USE_NCURSES= yes 39USE_NCURSES= yes
33 40
34.include "../../devel/ncurses/buildlink3.mk" 41.include "../../devel/ncurses/buildlink3.mk"
35 42