diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2019-09-13 09:19:01 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2019-09-13 09:19:01 +0000 |
commit | 0532235a8b0c59fb2dd0eb51d3fbe26e16f110cd (patch) | |
tree | f6291d615f3f329f0fabe5be2ab3cd9645d6da21 | |
parent | New port: x11-fonts/open-sans (diff) |
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@mpeks.tomsk.su>
Notes
Notes:
svn path=/head/; revision=511918
-rw-r--r-- | misc/pinfo/Makefile | 7 | ||||
-rw-r--r-- | misc/pinfo/files/patch-macros_curses.m4 | 15 |
2 files changed, 18 insertions, 4 deletions
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index 523f0a233e3d..546a7e31c9e3 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -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 diff --git a/misc/pinfo/files/patch-macros_curses.m4 b/misc/pinfo/files/patch-macros_curses.m4 new file mode 100644 index 000000000000..ab83a943c5ba --- /dev/null +++ b/misc/pinfo/files/patch-macros_curses.m4 @@ -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 ) |