summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-10-20 16:49:30 +0200
committerJeroen Roovers <jer@gentoo.org>2016-10-20 16:49:49 +0200
commit1e87a7705c92a6e613e5cfba22f5af68aae4e263 (patch)
tree13672a82b7e700460e708f6e20da667b396d4906 /app-misc/cmatrix/files
parentnet-mail/cyrus-imapd: version bump to 2.5.10 (diff)
downloadgentoo-1e87a7705c92a6e613e5cfba22f5af68aae4e263.tar.gz
gentoo-1e87a7705c92a6e613e5cfba22f5af68aae4e263.tar.bz2
gentoo-1e87a7705c92a6e613e5cfba22f5af68aae4e263.zip
app-misc/cmatrix: Fix building against sys-libs/ncurses[tinfo]. Fix some horrible QA issues.
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-misc/cmatrix/files')
-rw-r--r--app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch b/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
new file mode 100644
index 000000000000..60720c7da8b9
--- /dev/null
+++ b/app-misc/cmatrix/files/cmatrix-1.2a-tinfo.patch
@@ -0,0 +1,33 @@
+--- a/configure.in
++++ b/configure.in
+@@ -8,9 +8,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+
+-dnl Checks for libraries.
+-dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncurses, main)
++PKG_PROG_PKG_CONFIG
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -26,18 +24,7 @@
+
+ AC_CHECK_HEADERS(curses.h ncurses.h)
+
+-CURSES_LIB_NAME=""
+-AC_CHECK_LIB(ncurses, tgetent, CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses)
+-
+-if eval "test x$CURSES_LIB_NAME = x"
+-then
+- AC_CHECK_LIB(curses, tgetent, CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses)
+-fi
+-
+-if eval "test x$CURSES_LIB_NAME = x"
+-then
+- AC_CHECK_LIB(termcap, tgetent, CURSES_LIB="-ltermcap" CURSES_LIB_NAME=termcap)
+-fi
++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS";CURSES_LIB_NAME=ncurses])
+
+ if eval "test x$CURSES_LIB_NAME = x"
+ then