jer 14/10/28 00:04:35
Modified: urlview-0.9-DESTDIR.patch include-fix.patch
no-trailing-newline.patch
Added: urlview-0.9-tinfo.patch
Log:
Fix building against sys-libs/ncurses[tinfo] (bug #526332).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-misc/urlview/files/urlview-0.9-DESTDIR.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch?r1=1.1&r2=1.2
Index: urlview-0.9-DESTDIR.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- urlview-0.9-DESTDIR.patch 12 Nov 2006 04:45:38 -0000 1.1
+++ urlview-0.9-DESTDIR.patch 28 Oct 2014 00:04:35 -0000 1.2
@@ -1,5 +1,16 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,6 +11,7 @@
+ CLEANFILES = *~ *.orig *.rej
+
+ install-data-local:
+- $(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1
++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
++ $(INSTALL_DATA) urlview.man ${DESTDIR}$(mandir)/man1/urlview.1
+
+ # how to create a target for uninstall-data-local???
+--- a/Makefile.in
++++ b/Makefile.in
@@ -318,7 +318,8 @@
1.2 net-misc/urlview/files/include-fix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/include-fix.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/include-fix.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/include-fix.patch?r1=1.1&r2=1.2
Index: include-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/urlview/files/include-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- include-fix.patch 26 Feb 2005 12:15:16 -0000 1.1
+++ include-fix.patch 28 Oct 2014 00:04:35 -0000 1.2
@@ -1,5 +1,5 @@
---- urlview.c.orig 2005-02-06 17:10:54.000000000 +0100
-+++ urlview.c 2005-02-06 17:57:06.998290062 +0100
+--- a/urlview.c
++++ b/urlview.c
@@ -40,6 +40,8 @@
#include <fcntl.h>
#include <sys/stat.h>
1.2 net-misc/urlview/files/no-trailing-newline.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch?r1=1.1&r2=1.2
Index: no-trailing-newline.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- no-trailing-newline.patch 20 Oct 2003 12:23:26 -0000 1.1
+++ no-trailing-newline.patch 28 Oct 2014 00:04:35 -0000 1.2
@@ -1,5 +1,5 @@
---- urlview.c 2000-07-04 11:14:30.000000000 +0100
-+++ urlview.no-trailing-newline.c 2003-09-06 11:07:02.000000000 +0100
+--- a/urlview.c
++++ b/urlview.no-trailing-newline.c
@@ -46,7 +46,7 @@
#include <rx/rxposix.h>
#endif
1.1 net-misc/urlview/files/urlview-0.9-tinfo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-tinfo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-tinfo.patch?rev=1.1&content-type=text/plain
Index: urlview-0.9-tinfo.patch
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,8 @@
dnl AM_CONFIG_HEADER(config.h)
AM_PROG_CC_STDC
CFLAGS="$CFLAGS -DURLVIEW -Dunix"
+
+PKG_CHECK_MODULES(ncurses,ncurses)
AC_ARG_WITH(slang, [ --with-slang[=DIR] use S-Lang instead of curses],
[AC_DEFINE(USE_SLANG)
if test $withval = yes -a -d ../slang; then
@@ -22,8 +24,7 @@
fi
LIBS="$LIBS -lslang -lm"
fi],
-
- [AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"], [LIBS="$LIBS
-lcurses"])
+ [LIBS="$LIBS $ncurses_LIBS"
AC_CHECK_FUNCS(curs_set)
AC_CHECK_HEADERS(ncurses.h)
AC_CHECK_HEADER(ncurses/curses.h, [CPPFLAGS="$CPPFLAGS
-I/usr/include/ncurses"])])
