From owner-svn-ports-all@freebsd.org Wed Dec 9 11:57:17 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFD759D4DDA; Wed, 9 Dec 2015 11:57:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9489D12C4; Wed, 9 Dec 2015 11:57:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB9BvGhC054209; Wed, 9 Dec 2015 11:57:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB9BvG0X054207; Wed, 9 Dec 2015 11:57:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201512091157.tB9BvG0X054207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 9 Dec 2015 11:57:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403376 - head/devel/ncurses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2015 11:57:18 -0000 Author: bapt Date: Wed Dec 9 11:57:16 2015 New Revision: 403376 URL: https://svnweb.freebsd.org/changeset/ports/403376 Log: 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 Modified: head/devel/ncurses/Makefile head/devel/ncurses/pkg-plist Modified: head/devel/ncurses/Makefile ============================================================================== --- head/devel/ncurses/Makefile Wed Dec 9 11:57:01 2015 (r403375) +++ head/devel/ncurses/Makefile Wed Dec 9 11:57:16 2015 (r403376) @@ -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}/shar --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} && \ Modified: head/devel/ncurses/pkg-plist ============================================================================== --- head/devel/ncurses/pkg-plist Wed Dec 9 11:57:01 2015 (r403375) +++ head/devel/ncurses/pkg-plist Wed Dec 9 11:57:16 2015 (r403376) @@ -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