1 |
darkside 11/01/25 17:36:14 |
2 |
|
3 |
Added: htmlview-3.0.0-prefix.patch |
4 |
Log: |
5 |
Port changes from Gentoo Prefix, add prefix patch, add KEYWORDS, convert to EAPI3. Remove old version. |
6 |
|
7 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-client/htmlview/files/htmlview-3.0.0-prefix.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/htmlview/files/htmlview-3.0.0-prefix.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: htmlview-3.0.0-prefix.patch |
16 |
=================================================================== |
17 |
--- htmlview.orig 2007-10-01 20:46:02 +0200 |
18 |
+++ htmlview 2007-10-01 20:45:51 +0200 |
19 |
@@ -1,4 +1,4 @@ |
20 |
-#!/bin/bash |
21 |
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash |
22 |
# |
23 |
# Invoke HTML viewer |
24 |
# Usage: |
25 |
@@ -31,8 +31,8 @@ |
26 |
|
27 |
error_dialog() { |
28 |
echo "$1" |
29 |
- if [ -x /usr/bin/zenity ]; then |
30 |
- /usr/bin/zenity --error --text="$1" |
31 |
+ if [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/zenity ]; then |
32 |
+ "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/zenity --error --text="$1" |
33 |
else |
34 |
xmessage "$1" |
35 |
fi |
36 |
@@ -47,7 +47,7 @@ |
37 |
# Check if terminal exists |
38 |
if ! exists "$PREFTERM"; then |
39 |
error_dialog "ERROR: The terminal $PREFTERM does not exist. Please reconfigure." |
40 |
- [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties |
41 |
+ [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties ] && exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties |
42 |
exit 1 |
43 |
fi |
44 |
# Special case: w3m |
45 |
@@ -63,7 +63,7 @@ |
46 |
# Check if GUI browser exists |
47 |
if ! exists "$GCONF"; then |
48 |
error_dialog "ERROR: The browser $GCONF does not exist. Please reconfigure." |
49 |
- [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties |
50 |
+ [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties ] && exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties |
51 |
exit 1 |
52 |
fi |
53 |
# Special case: konqueror without arguments |
54 |
@@ -85,7 +85,7 @@ |
55 |
echo "$1" | grep -q "gnome-open" && INVALID="yes" |
56 |
if [ "$INVALID" == "yes" ]; then |
57 |
error_dialog "$1 is an invalid browser. Please reconfigure." |
58 |
- [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties |
59 |
+ [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties ] && exec "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/gnome-default-applications-properties |
60 |
exit 1 |
61 |
fi |
62 |
} |
63 |
@@ -118,16 +118,16 @@ |
64 |
|
65 |
# Fallback to old htmlview |
66 |
unset BROWSER CONSOLE TERMS_KDE TERMS_GNOME TERMS_GENERIC |
67 |
-[ -e /etc/htmlview.conf ] && source /etc/htmlview.conf |
68 |
+[ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/htmlview.conf ] && source "@GENTOO_PORTAGE_EPREFIX@"/etc/htmlview.conf |
69 |
[ -e ~/.htmlviewrc ] && source ~/.htmlviewrc |
70 |
|
71 |
TERMS_KDE="konsole kvt" |
72 |
-TERMS_GNOME="/usr/bin/gnome-terminal" |
73 |
-TERMS_GENERIC="/usr/bin/rxvt /usr/bin/xterm /usr/bin/Eterm /usr/bin/aterm /usr/bin/hanterm /usr/bin/kterm /usr/bin/mlterm /usr/bin/mrxvt /usr/bin/urxvt" |
74 |
-TTYBROWSERS="/usr/bin/links /usr/bin/lynx /usr/bin/w3m /usr/bin/elinks" |
75 |
+TERMS_GNOME="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gnome-terminal" |
76 |
+TERMS_GENERIC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/rxvt @GENTOO_PORTAGE_EPREFIX@/usr/bin/xterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/Eterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/aterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/hanterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/kterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/mlterm @GENTOO_PORTAGE_EPREFIX@/usr/bin/mrxvt @GENTOO_PORTAGE_EPREFIX@/usr/bin/urxvt" |
77 |
+TTYBROWSERS="@GENTOO_PORTAGE_EPREFIX@/usr/bin/links @GENTOO_PORTAGE_EPREFIX@/usr/bin/lynx @GENTOO_PORTAGE_EPREFIX@/usr/bin/w3m @GENTOO_PORTAGE_EPREFIX@/usr/bin/elinks" |
78 |
X11BROWSERS_KDE="konqueror kfmbrowser" |
79 |
-X11BROWSERS_GNOME="/usr/bin/mozilla /usr/bin/epiphany /usr/bin/galeon /usr/bin/kazehakase" |
80 |
-X11BROWSERS_GENERIC="/usr/bin/mozilla /usr/bin/netscape /usr/bin/firefox" |
81 |
+X11BROWSERS_GNOME="@GENTOO_PORTAGE_EPREFIX@/usr/bin/mozilla @GENTOO_PORTAGE_EPREFIX@/usr/bin/epiphany @GENTOO_PORTAGE_EPREFIX@/usr/bin/galeon @GENTOO_PORTAGE_EPREFIX@/usr/bin/kazehakase" |
82 |
+X11BROWSERS_GENERIC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/mozilla @GENTOO_PORTAGE_EPREFIX@/usr/bin/netscape @GENTOO_PORTAGE_EPREFIX@/usr/bin/firefox" |
83 |
|
84 |
if [ "x`pidof gnome-session`" != "x" ]; then |
85 |
X11BROWSERS="$GCONF $X11BROWSERS_GENERIC $X11BROWSERS_GNOME $X11BROWSERS_KDE" |