Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12398/10.3/stable/main/finkinfo/x11
Modified Files:
xinitrc.info xfontpath.info xfontpath.patch
Log Message:
Sync with unstable.
Index: xfontpath.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11/xfontpath.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xfontpath.info 28 Apr 2007 10:56:13 -0000 1.3
+++ xfontpath.info 18 May 2008 18:00:04 -0000 1.4
@@ -1,8 +1,8 @@
Package: xfontpath
Version: 0.4
-Revision: 14
+Revision: 16
BuildDepends: x11-dev
-Depends: x11
+Depends: x11, xinitrc
Source: http://hp.vector.co.jp/authors/VA008857/macosx/fink/%n-%v.tar.gz
Source-MD5: f0d7a4f376db063a29ff7368a79f0c19
Patch: %n.patch
@@ -16,8 +16,18 @@
<<
Description: X font path manager for fink
License: GPL
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
+
+ Since xfontpath (>= 0.4-15), %p/etc/profile.d/xfontpath.* have been moved
+ to %p/etc/xinitrc.d/20xfontpath.sh. This change is needed for Leopard.
+<<
+Descusage: <<
+ If you want to keep maintaining the font path manually, change your
~/.xinitrc
+ like this:
+
+ xinitrc_xfontpath_enable=NO
+ . %p/bin/xinitrc.sh
<<
Homepage: http://hp.vector.co.jp/authors/VA008857/macosx/fink/
Index: xinitrc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11/xinitrc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xinitrc.info 25 Mar 2006 19:18:40 -0000 1.1
+++ xinitrc.info 18 May 2008 18:00:04 -0000 1.2
@@ -1,11 +1,11 @@
-# Id: xinitrc.info.in,v 1.7 2005/03/30 01:26:29 shinra Exp
+# Id: xinitrc.info.in,v 1.2 2008/02/16 12:30:56 okayama Exp
Package: xinitrc
-Version: 1.0
+Version: 1.5
# Revision is always 1
Revision: 1
Description: Alternative X11 initialization script
-Source: http://www.j10n.org/files/%n-%v.tar.gz
-Source-MD5: aa5492a6db62da241b9e89ff495ce98e
+Source: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/%n-%v.tar.gz
+Source-MD5: 3bf8a01cfbdaed6e44bd30e18a32e194
#Type: nosource
#Patch: %n.patch
License: Public Domain
Index: xfontpath.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/x11/xfontpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xfontpath.patch 28 Apr 2007 10:56:13 -0000 1.2
+++ xfontpath.patch 18 May 2008 18:00:04 -0000 1.3
@@ -1,30 +1,50 @@
-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 2001-10-05 13:13:33.000000000
+0000
-+++ xfontpath-0.4/fink/xfontpath.csh.in 2006-04-06 23:18:00.000000000
+0000
-@@ -1,6 +1,8 @@
- # xfontpath.csh
+diff -Naur xfontpath-0.4.orig/README xfontpath-0.4/README
+--- xfontpath-0.4.orig/README 2002-01-26 14:53:49.000000000 +0000
++++ xfontpath-0.4/README 2008-02-27 14:54:49.000000000 +0000
+@@ -1,7 +1,13 @@
+ I wrote tiny script named `xfontpath', X font path manager for fink.
- if ( -x @XFONTPATH@ && $?DISPLAY ) then
-- @XFONTPATH@ enable >& /dev/null
-+ if ( "x$DISPLAY" == x:0.0 || "x$DISPLAY" == x:0 ) then
-+ ( @XFONTPATH@ enable & ) >& /dev/null
-+ endif
- endif
+ Font packages can register it's font path with this package and they are
reflect
+-ed to user's font path via etc/profile.d/xfontpath.*.
++ed to user's font path via FINK_PREFIX/etc/xinitrc.d/20xfontpath.sh.
++
++If you want to keep maintaining the font path manually, change your ~/.xinitrc
++like this:
++
++xinitrc_xfontpath_enable=NO
++. FINK_PREFIX/bin/xinitrc.sh
-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 2001-10-05 13:13:34.000000000
+0000
-+++ xfontpath-0.4/fink/xfontpath.sh.in 2006-04-06 23:21:13.000000000 +0000
-@@ -1,6 +1,7 @@
- # xfontpath.sh
+ Usage is not documented yet, but it is simple and easy like daemonic. To
install
+ or remove font path, do `xfontpath install/remove PATH...' and user can
reflect
+diff -Naur xfontpath-0.4.orig/fink/20xfontpath.sh
xfontpath-0.4/fink/20xfontpath.sh
+--- xfontpath-0.4.orig/fink/20xfontpath.sh 1970-01-01 00:00:00.000000000
+0000
++++ xfontpath-0.4/fink/20xfontpath.sh 2008-02-27 14:41:31.000000000 +0000
+@@ -0,0 +1,11 @@
++# If you don't want to load Fink fonts automatically, put
++# xinitrc_xfontpath_enable=NO in your .xinitrc
++: ${xinitrc_xfontpath_enable=YES}
++
++case "x$xinitrc_xfontpath_enable" in
++ x[Yy][Ee][Ss])
++ if [ -x "$fink_prefix/bin/xfontpath" ]; then
++ "$fink_prefix/bin/xfontpath" enable >/dev/null 2>&1
++ fi
++ ;;
++esac
+diff -Naur xfontpath-0.4.orig/fink/Makefile.in xfontpath-0.4/fink/Makefile.in
+--- xfontpath-0.4.orig/fink/Makefile.in 2002-03-22 16:49:31.000000000
+0000
++++ xfontpath-0.4/fink/Makefile.in 2008-02-27 14:37:44.000000000 +0000
+@@ -203,8 +203,8 @@
+ $(scripts): Makefile
--if [ -x @XFONTPATH@ -a -n "$DISPLAY" ]; then
-- @XFONTPATH@ enable >/dev/null 2>&1
-+if [ -x @XFONTPATH@ ]; then
-+ case $DISPLAY in
-+ :0|:0.0) ( @XFONTPATH@ enable & ) >/dev/null 2>&1;;
-+ esac
- fi
--
+ install-data-local: $(scripts)
+- install -d -m 755 $(DESTDIR)$(sysconfdir)/profile.d
+- install -c -m 755 $(scripts) $(DESTDIR)$(sysconfdir)/profile.d/
++ install -d -m 755 $(DESTDIR)$(sysconfdir)/xinitrc.d
++ install -c -m 755 20xfontpath.sh $(DESTDIR)$(sysconfdir)/xinitrc.d/
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff -Naur xfontpath-0.4.orig/xfontpath.in xfontpath-0.4/xfontpath.in
--- xfontpath-0.4.orig/xfontpath.in 2001-10-06 09:09:17.000000000 +0000
+++ xfontpath-0.4/xfontpath.in 2006-04-05 15:36:19.000000000 +0000
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
