Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10907/10.4-transitional/unstable/main/finkinfo/x11
Modified Files:
xfontpath.info xfontpath.patch
Log Message:
* Workaround NFS locking problem.
* Run xfontpath only if $DISPLAY = :0.0.
Index: xfontpath.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/xfontpath.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xfontpath.info 27 Apr 2005 03:26:59 -0000 1.1
+++ xfontpath.info 5 Apr 2006 16:51:54 -0000 1.2
@@ -1,6 +1,6 @@
Package: xfontpath
Version: 0.4
-Revision: 12
+Revision: 13
BuildDepends: x11-dev
Depends: x11
Source: http://hp.vector.co.jp/authors/VA008857/macosx/fink/%n-%v.tar.gz
Index: xfontpath.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/xfontpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xfontpath.patch 27 Apr 2005 03:26:59 -0000 1.1
+++ xfontpath.patch 5 Apr 2006 16:51:54 -0000 1.2
@@ -1,22 +1,50 @@
-diff -Naur xfontpath-0.4.old/fink/xfontpath.csh.in
xfontpath-0.4.new/fink/xfontpath.csh.in
---- xfontpath-0.4.old/fink/xfontpath.csh.in Fri Oct 5 22:13:33 2001
-+++ xfontpath-0.4.new/fink/xfontpath.csh.in Thu Feb 27 02:27:27 2003
-@@ -1,6 +1,6 @@
+diff -Naur xfontpath-0.4.orig/fink/xfontpath.csh.in
xfontpath-0.4/fink/xfontpath.csh.in
+--- xfontpath-0.4.orig/fink/xfontpath.csh.in Fri Oct 5 13:13:33 2001
++++ xfontpath-0.4/fink/xfontpath.csh.in Wed Apr 5 16:40:24 2006
+@@ -1,6 +1,8 @@
# xfontpath.csh
if ( -x @XFONTPATH@ && $?DISPLAY ) then
- @XFONTPATH@ enable >& /dev/null
-+ ( @XFONTPATH@ enable & ) >& /dev/null
++ if ( "x$DISPLAY" = x:0.0 ) then
++ ( @XFONTPATH@ enable & ) >& /dev/null
++ endif
endif
-diff -Naur xfontpath-0.4.old/fink/xfontpath.sh.in
xfontpath-0.4.new/fink/xfontpath.sh.in
---- xfontpath-0.4.old/fink/xfontpath.sh.in Fri Oct 5 22:13:34 2001
-+++ xfontpath-0.4.new/fink/xfontpath.sh.in Thu Feb 27 02:27:38 2003
+diff -Naur xfontpath-0.4.orig/fink/xfontpath.sh.in
xfontpath-0.4/fink/xfontpath.sh.in
+--- xfontpath-0.4.orig/fink/xfontpath.sh.in Fri Oct 5 13:13:34 2001
++++ xfontpath-0.4/fink/xfontpath.sh.in Wed Apr 5 16:07:43 2006
@@ -1,6 +1,6 @@
# xfontpath.sh
- if [ -x @XFONTPATH@ -a -n "$DISPLAY" ]; then
+-if [ -x @XFONTPATH@ -a -n "$DISPLAY" ]; then
- @XFONTPATH@ enable >/dev/null 2>&1
++if [ -x @XFONTPATH@ -a "x$DISPLAY" = x:0.0 ]; then
+ ( @XFONTPATH@ enable & ) >/dev/null 2>&1
fi
+diff -Naur xfontpath-0.4.orig/xfontpath.in xfontpath-0.4/xfontpath.in
+--- xfontpath-0.4.orig/xfontpath.in Sat Oct 6 09:09:17 2001
++++ xfontpath-0.4/xfontpath.in Wed Apr 5 15:36:19 2006
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++use POSIX qw(:errno_h);
+
+ $CONFFILE = '@CONFFILE@';
+ $FONTBASE = '@FONTBASE@';
+@@ -136,7 +137,14 @@
+ my ($newconf) = $CONFFILE . '.new';
+
+ open (FP, ">$newconf") or &dief ("can't open `%s'\n", $newconf);
+- flock (FP, 2) or &dief ("can't lock `%s'\n", $newconf);
++ if (!flock (FP, 2)) {
++ if ($! == EOPNOTSUPP || $! == ENOLCK) {
++ print STDERR "WARNING: No locking is available on this
filesystem.\n";
++ print STDERR "WARNING: Creating $newconf without
locking...\n";
++ } else {
++ &dief ("can't lock `%s'\n", $newconf);
++ }
++ }
+
+ print FP "# This file was automaticaly generated by $0.\n";
+ print FP "# Don't edit!\n";
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
