Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/urlview/files: urlview-0.9-DESTDIR.patch urlview-0.9-tinfo.patch include-fix.patch no-trailing-newline.patch
Date: Tue, 28 Oct 2014 00:04:40
Message-Id: 20141028000435.465118E3E@oystercatcher.gentoo.org
1 jer 14/10/28 00:04:35
2
3 Modified: urlview-0.9-DESTDIR.patch include-fix.patch
4 no-trailing-newline.patch
5 Added: urlview-0.9-tinfo.patch
6 Log:
7 Fix building against sys-libs/ncurses[tinfo] (bug #526332).
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
10
11 Revision Changes Path
12 1.2 net-misc/urlview/files/urlview-0.9-DESTDIR.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch?rev=1.2&view=markup
15 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
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch?r1=1.1&r2=1.2
17
18 Index: urlview-0.9-DESTDIR.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/urlview/files/urlview-0.9-DESTDIR.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- urlview-0.9-DESTDIR.patch 12 Nov 2006 04:45:38 -0000 1.1
25 +++ urlview-0.9-DESTDIR.patch 28 Oct 2014 00:04:35 -0000 1.2
26 @@ -1,5 +1,16 @@
27 ---- Makefile.in
28 -+++ Makefile.in
29 +--- a/Makefile.am
30 ++++ b/Makefile.am
31 +@@ -11,6 +11,7 @@
32 + CLEANFILES = *~ *.orig *.rej
33 +
34 + install-data-local:
35 +- $(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1
36 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
37 ++ $(INSTALL_DATA) urlview.man ${DESTDIR}$(mandir)/man1/urlview.1
38 +
39 + # how to create a target for uninstall-data-local???
40 +--- a/Makefile.in
41 ++++ b/Makefile.in
42 @@ -318,7 +318,8 @@
43
44
45
46
47
48 1.2 net-misc/urlview/files/include-fix.patch
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/include-fix.patch?rev=1.2&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/include-fix.patch?rev=1.2&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/include-fix.patch?r1=1.1&r2=1.2
53
54 Index: include-fix.patch
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/net-misc/urlview/files/include-fix.patch,v
57 retrieving revision 1.1
58 retrieving revision 1.2
59 diff -u -r1.1 -r1.2
60 --- include-fix.patch 26 Feb 2005 12:15:16 -0000 1.1
61 +++ include-fix.patch 28 Oct 2014 00:04:35 -0000 1.2
62 @@ -1,5 +1,5 @@
63 ---- urlview.c.orig 2005-02-06 17:10:54.000000000 +0100
64 -+++ urlview.c 2005-02-06 17:57:06.998290062 +0100
65 +--- a/urlview.c
66 ++++ b/urlview.c
67 @@ -40,6 +40,8 @@
68 #include <fcntl.h>
69 #include <sys/stat.h>
70
71
72
73 1.2 net-misc/urlview/files/no-trailing-newline.patch
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch?rev=1.2&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch?rev=1.2&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch?r1=1.1&r2=1.2
78
79 Index: no-trailing-newline.patch
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/net-misc/urlview/files/no-trailing-newline.patch,v
82 retrieving revision 1.1
83 retrieving revision 1.2
84 diff -u -r1.1 -r1.2
85 --- no-trailing-newline.patch 20 Oct 2003 12:23:26 -0000 1.1
86 +++ no-trailing-newline.patch 28 Oct 2014 00:04:35 -0000 1.2
87 @@ -1,5 +1,5 @@
88 ---- urlview.c 2000-07-04 11:14:30.000000000 +0100
89 -+++ urlview.no-trailing-newline.c 2003-09-06 11:07:02.000000000 +0100
90 +--- a/urlview.c
91 ++++ b/urlview.no-trailing-newline.c
92 @@ -46,7 +46,7 @@
93 #include <rx/rxposix.h>
94 #endif
95
96
97
98 1.1 net-misc/urlview/files/urlview-0.9-tinfo.patch
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/urlview/files/urlview-0.9-tinfo.patch?rev=1.1&view=markup
101 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
102
103 Index: urlview-0.9-tinfo.patch
104 ===================================================================
105 --- a/configure.in
106 +++ b/configure.in
107 @@ -3,6 +3,8 @@
108 dnl AM_CONFIG_HEADER(config.h)
109 AM_PROG_CC_STDC
110 CFLAGS="$CFLAGS -DURLVIEW -Dunix"
111 +
112 +PKG_CHECK_MODULES(ncurses,ncurses)
113 AC_ARG_WITH(slang, [ --with-slang[=DIR] use S-Lang instead of curses],
114 [AC_DEFINE(USE_SLANG)
115 if test $withval = yes -a -d ../slang; then
116 @@ -22,8 +24,7 @@
117 fi
118 LIBS="$LIBS -lslang -lm"
119 fi],
120 -
121 - [AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"], [LIBS="$LIBS -lcurses"])
122 + [LIBS="$LIBS $ncurses_LIBS"
123 AC_CHECK_FUNCS(curs_set)
124 AC_CHECK_HEADERS(ncurses.h)
125 AC_CHECK_HEADER(ncurses/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"])])