Date: Fri, 13 Dec 2019 13:24:16 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520032 - in head: Mk/Uses textproc/aspell www/lynx-current www/newsboat Message-ID: <201912131324.xBDDOGmG050799@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Dec 13 13:24:16 2019 New Revision: 520032 URL: https://svnweb.freebsd.org/changeset/ports/520032 Log: Provide a new macro NCURSES_IMPL This is necessary to deal with the reduction of the ncurses library from 2 implementation on one single implementation which would be only the widechar. Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D22794 Modified: head/Mk/Uses/ncurses.mk head/textproc/aspell/Makefile head/www/lynx-current/Makefile head/www/newsboat/Makefile Modified: head/Mk/Uses/ncurses.mk ============================================================================== --- head/Mk/Uses/ncurses.mk Fri Dec 13 13:23:58 2019 (r520031) +++ head/Mk/Uses/ncurses.mk Fri Dec 13 13:24:16 2019 (r520032) @@ -37,6 +37,9 @@ ncurses_ARGS= port .if ${ncurses_ARGS} == base NCURSESBASE= /usr NCURSESINC= ${NCURSESBASE}/include +.if !exists(/usr/lib/libncursesw.so) +NCURSES_IMPL= ncurses +.endif . if exists(${LOCALBASE}/lib/libncurses.so) _USES_sanity+= 400:check-depends-ncurses @@ -85,5 +88,6 @@ LDFLAGS+= -Wl,-rpath=${NCURSESRPATH} .endif NCURSESLIB= ${NCURSESBASE}/lib +NCURSES_IMPL?= ncursesw .endif Modified: head/textproc/aspell/Makefile ============================================================================== --- head/textproc/aspell/Makefile Fri Dec 13 13:23:58 2019 (r520031) +++ head/textproc/aspell/Makefile Fri Dec 13 13:24:16 2019 (r520032) @@ -20,7 +20,7 @@ OPTIONS_SUB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \ --enable-docdir=${DOCSDIR} \ - --enable-curses=ncursesw \ + --enable-curses=${NCURSES_IMPL} \ --enable-static USE_LDCONFIG= yes Modified: head/www/lynx-current/Makefile ============================================================================== --- head/www/lynx-current/Makefile Fri Dec 13 13:23:58 2019 (r520031) +++ head/www/lynx-current/Makefile Fri Dec 13 13:24:16 2019 (r520032) @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-zlib --libdir="${PREFIX}/etc" \ --enable-ipv6 \ --with-mime-libdir=${PREFIX}/etc \ ${ICONV_CONFIGURE_ARG} \ - --with-screen=ncursesw + --with-screen=${NCURSES_IMPL} CPE_VERSION= ${PORTVERSION:C/[pd].+//} CPE_UPDATE= ${PORTVERSION:E:C/[0-9]+//:S/p/pre./:S/d/dev./} Modified: head/www/newsboat/Makefile ============================================================================== --- head/www/newsboat/Makefile Fri Dec 13 13:23:58 2019 (r520031) +++ head/www/newsboat/Makefile Fri Dec 13 13:24:16 2019 (r520032) @@ -145,7 +145,7 @@ post-patch: @${REINPLACE_CMD} -e 's,fail "ncursesw",true,; s,fail "libcrypto",true,' \ -e 's,fail "libssl",true,' \ ${WRKSRC}/config.sh - @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto -lncursesw|;s|-Werror||' \ + @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto -l${NCURSES_IMPL}|;s|-Werror||' \ ${WRKSRC}/Makefile post-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912131324.xBDDOGmG050799>