diff options
| author | bapt <bapt@FreeBSD.org> | 2015-12-09 19:57:16 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-12-09 19:57:16 +0800 |
| commit | 6d3b3c16d8991dc840337a3f51015407867e86d5 (patch) | |
| tree | c598e664fea07ffff6ff6d2d86ae19c6c523afb0 | |
| parent | e38b23dca583b3fa0d54a9546c41c57ef1e78e8f (diff) | |
| download | freebsd-ports-gnome-6d3b3c16d8991dc840337a3f51015407867e86d5.tar.gz freebsd-ports-gnome-6d3b3c16d8991dc840337a3f51015407867e86d5.tar.zst freebsd-ports-gnome-6d3b3c16d8991dc840337a3f51015407867e86d5.zip | |
Install curses.h
the ncurses ports was specially configured for a while to not install the
curses.h header, expecting ports to use ncurses.h. How ever lots of ports are
still using curses.h instead of ncurses.h. Those ended up using curses.h from
base and other headers from the port. It worked by chances until now.
Modify this port to make sure curses.h is installed so the ports will use the
proper set of headers instead of mixing potentially incompatible ones.
While here modify ncurses*6-config to prevent it to expose -I arguments pointing
to a non existing directory
PR: 205155
Reported by: yamagi@yamagi.org
| -rw-r--r-- | devel/ncurses/Makefile | 5 | ||||
| -rw-r--r-- | devel/ncurses/pkg-plist | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index fb4cac6714e9..5e513c0d9f51 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -3,7 +3,7 @@ PORTNAME= ncurses PORTVERSION= 6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://invisible-mirror.net/archives/${PORTNAME}/ \ ftp://invisible-island.net/${PORTNAME}/ @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ --with-pkg-config=yes --enable-pc-files \ --includedir=${PREFIX}/include/ncurses \ --with-shared \ - --without-curses-h --with-termlib --program-prefix= \ + --with-termlib --program-prefix= \ --enable-rpath --disable-root-environ \ --with-manpage-format=gzip --srcdir=../ \ --without-manpage-renames \ @@ -94,6 +94,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,$$(INSTALL_PROG) ncurses-config,@INSTALL_SCRIPT@ ncurses-config,' ${WRKSRC}/misc/Makefile.in + @${REINPLACE_CMD} -e 's,/usr/include,${PREFIX}/include,g' ${WRKSRC}/misc/ncurses-config.in post-configure: cd ${.CURDIR} && \ diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist index b895b9431607..92fd175104ae 100644 --- a/devel/ncurses/pkg-plist +++ b/devel/ncurses/pkg-plist @@ -10,6 +10,7 @@ bin/infotocap bin/captoinfo bin/ncurses%%ABI_VER%%-config bin/ncursesw%%ABI_VER%%-config +include/ncurses/curses.h include/ncurses/cursesapp.h include/ncurses/cursesf.h include/ncurses/cursesm.h |