From owner-svn-ports-head@freebsd.org Fri Sep 13 09:19:02 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3B2E1EBC89; Fri, 13 Sep 2019 09:19:02 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46V97B0pgMz4NCC; Fri, 13 Sep 2019 09:19:02 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2BA14FCC; Fri, 13 Sep 2019 09:19:01 +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 x8D9J18f025998; Fri, 13 Sep 2019 09:19:01 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8D9J171025996; Fri, 13 Sep 2019 09:19:01 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201909130919.x8D9J171025996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 13 Sep 2019 09:19:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511918 - in head/misc/pinfo: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/misc/pinfo: . files X-SVN-Commit-Revision: 511918 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2019 09:19:02 -0000 Author: bapt Date: Fri Sep 13 09:19:01 2019 New Revision: 511918 URL: https://svnweb.freebsd.org/changeset/ports/511918 Log: Ensure the port is linked to libncursesw to properly support wildchar. While here make it use USES=ncurses to be able to properly choose between base ncurses and the port version PR: 240553 Reported by: Victor Sudakov Added: head/misc/pinfo/files/ head/misc/pinfo/files/patch-macros_curses.m4 (contents, props changed) Modified: head/misc/pinfo/Makefile Modified: head/misc/pinfo/Makefile ============================================================================== --- head/misc/pinfo/Makefile Fri Sep 13 09:15:12 2019 (r511917) +++ head/misc/pinfo/Makefile Fri Sep 13 09:19:01 2019 (r511918) @@ -3,7 +3,7 @@ PORTNAME= pinfo PORTVERSION= 0.6.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MASTER_SITES= GENTOO \ http://alioth.debian.org/frs/download.php/file/3351/ @@ -16,10 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= Fails to link: missing sbrk -USES= autoreconf gettext-tools libtool makeinfo ncurses tar:bzip2 +USES= autoreconf gettext-tools libtool localbase makeinfo ncurses tar:bzip2 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --with-curses=${NCURSESBASE} INFO= pinfo PLIST_FILES= bin/pinfo etc/pinforc man/man1/pinfo.1.gz Added: head/misc/pinfo/files/patch-macros_curses.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/pinfo/files/patch-macros_curses.m4 Fri Sep 13 09:19:01 2019 (r511918) @@ -0,0 +1,15 @@ +--- macros/curses.m4.orig 2006-03-09 19:44:48 UTC ++++ macros/curses.m4 +@@ -182,6 +182,12 @@ AC_DEFUN([AC_SEARCH_CURSES_H], [ + if test "x$curses_location" != "xfalse" + then + dnl check this particular location ++ AC_SEARCH_CURSES_FILE($curses_location/include, ncurses/ncurses.h, ++ -L$curses_location/lib -lncursesw, ++ -I$curses_location/include ) ++ AC_SEARCH_CURSES_FILE($curses_location/include, ncurses.h, ++ -L$curses_location/lib -lncursesw, ++ -I$curses_location/include ) + AC_SEARCH_CURSES_FILE($curses_location/include, ncursesw/ncurses.h, + -L$curses_location/lib -lncursesw, + -I$curses_location/include )