SOURCES (AC-branch): mailcap - revert X11R7 paths for AC

[glen]

Author: glen                         Date: Tue Oct 23 00:00:11 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- revert X11R7 paths for AC

---- Files affected:
SOURCES:
   mailcap (1.9 -> 1.9.2.1) 

---- Diffs:

================================================================
Index: SOURCES/mailcap
diff -u SOURCES/mailcap:1.9 SOURCES/mailcap:1.9.2.1
--- SOURCES/mailcap:1.9	Sat Sep 15 18:56:46 2007
+++ SOURCES/mailcap	Tue Oct 23 02:00:06 2007
@@ -6,13 +6,13 @@
 # play is apparently a security hole
 #audio/*; /usr/bin/play %s
 audio/*; /usr/bin/mplayer -vc null -vo null %s; test=[ -z "$DISPLAY" ]
-audio/*; /usr/bin/xterm -name mplayer -e /usr/bin/mplayer -vc null -vo null %s & /bin/sleep 1; test=[ -n "$DISPLAY" ]
+audio/*; /usr/X11R6/bin/xterm -name mplayer -e /usr/bin/mplayer -vc null -vo null %s & /bin/sleep 1; test=[ -n "$DISPLAY" ]
 
 video/*; /usr/bin/mplayer -vc null -vo null %s; test=[ -z "$DISPLAY" ]
-video/*; /usr/bin/xterm -name mplayer -e /usr/bin/mplayer %s & /bin/sleep 1; test=[ -n "$DISPLAY" ]
+video/*; /usr/X11R6/bin/xterm -name mplayer -e /usr/bin/mplayer %s & /bin/sleep 1; test=[ -n "$DISPLAY" ]
 
 video/mpeg; /usr/bin/mplayer -vc null -vo null %s; test=[ -z "$DISPLAY" ]
-video/mpeg; /usr/bin/xterm -name mplayer -e /usr/bin/mplayer %s & /bin/sleep 1; test=[ -n "$DISPLAY" ]
+video/mpeg; /usr/X11R6/bin/xterm -name mplayer -e /usr/bin/mplayer %s & /bin/sleep 1; test=[ -n "$DISPLAY" ]
 
 application/pdf; /usr/bin/xpdf %s; test=[ -n "$DISPLAY" ]
 application/pdf; /usr/bin/pdftotext -layout -nopgbrk %s -; copiousoutput
@@ -22,7 +22,7 @@
 
 text/html; /usr/bin/htmlview %s; copiousoutput; test=[ -x /usr/bin/htmlview ]
 text/html; /usr/bin/elinks %s; nametemplate=%s.html; test=[ -z "$DISPLAY" ]
-text/html; /usr/bin/xterm -name xterm-elinks -e /usr/bin/elinks %s & /bin/sleep 1; nametemplate=%s.html; test=[ -n "$DISPLAY" ]
+text/html; /usr/X11R6/bin/xterm -name xterm-elinks -e /usr/bin/elinks %s & /bin/sleep 1; nametemplate=%s.html; test=[ -n "$DISPLAY" ]
 text/html; /usr/bin/elinks -dump %s; copiousoutput
 
 #text/x-patch; /usr/bin/colordiff.pl < %s | less -r
@@ -40,7 +40,7 @@
 
 application/vnd.sun.xml.writer; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
 	cd "$tmp"\; /usr/bin/soffice2html.pl %s\; \
-	{ /usr/bin/xterm -name xterm-elinks -e /usr/bin/elinks content.html\; \
+	{ /usr/X11R6/bin/xterm -name xterm-elinks -e /usr/bin/elinks content.html\; \
 	/bin/rm -rf "$tmp"\;} &; test=[ -n "$DISPLAY" ]
 
 application/vnd.sun.xml.writer; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
@@ -57,7 +57,7 @@
 
 application/msword; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
 	/usr/bin/wvHtml %s --targetdir="$tmp" page.html\; \
-	{ /usr/bin/xterm -name xterm-elinks -e /usr/bin/elinks "$tmp/page.html"\; \
+	{ /usr/X11R6/bin/xterm -name xterm-elinks -e /usr/bin/elinks "$tmp/page.html"\; \
 	/bin/rm -rf "$tmp"\;} &; test=[ -n "$DISPLAY" ]
 
 application/msword; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
@@ -74,7 +74,7 @@
 
 application/vnd.ms-excel; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
 	/usr/bin/xlhtml -a %s > "$tmp/page.html"\; \
-	{ /usr/bin/xterm -name xterm-elinks -e /usr/bin/elinks "$tmp/page.html"\; \
+	{ /usr/X11R6/bin/xterm -name xterm-elinks -e /usr/bin/elinks "$tmp/page.html"\; \
 	/bin/rm -rf "$tmp"\;} &; test=[ -n "$DISPLAY" ]
 
 application/vnd.ms-excel; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
@@ -91,7 +91,7 @@
 
 application/vnd.ms-powerpoint; tmp=`/bin/mktemp -d %s.XXXXXX`\; \
 	/usr/bin/ppthtml %s > "$tmp/page.html"\; \
-	{ /usr/bin/xterm -name xterm-elinks -e /usr/bin/elinks "$tmp/page.html"\; \
+	{ /usr/X11R6/bin/xterm -name xterm-elinks -e /usr/bin/elinks "$tmp/page.html"\; \
 	/bin/rm -rf "$tmp"\;} &; test=[ -n "$DISPLAY" ]
 
 application/vnd.ms-powerpoint; tmp=`/bin/mktemp %s.XXXXXX`\; \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mailcap?r1=1.9&r2=1.9.2.1&f=u