svn commit: r511918 - in head/misc/pinfo: . files

[Baptiste Daroussin]

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 <vas at mpeks.tomsk.su>

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 )