Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24841/10.3/unstable/main/finkinfo/x11
Modified Files:
xfontpath.info xfontpath.patch
Log Message:
Move %p/etc/profile.d/xfontpath.* to %p/etc/xinitrc.d/20xfontpath.sh.
This change is needed for Leopard. Now xfontpath depends on xinitrc.
Index: xfontpath.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/xfontpath.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xfontpath.info 6 Apr 2006 23:23:11 -0000 1.5
+++ xfontpath.info 23 Feb 2008 16:00:47 -0000 1.6
@@ -1,8 +1,8 @@
Package: xfontpath
Version: 0.4
-Revision: 14
+Revision: 15
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,11 @@
<<
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.
<<
Homepage: http://hp.vector.co.jp/authors/VA008857/macosx/fink/
Index: xfontpath.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/xfontpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xfontpath.patch 6 Apr 2006 23:23:12 -0000 1.3
+++ xfontpath.patch 23 Feb 2008 16:00:47 -0000 1.4
@@ -1,30 +1,3 @@
-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
-
- 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
-
-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
-
--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
--
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
@@ -50,3 +23,17 @@
print FP "# This file was automaticaly generated by $0.\n";
print FP "# Don't edit!\n";
+diff -Naur xfontpath-0.4.orig/fink/Makefile.in xfontpath-0.4/fink/Makefile.in
+--- xfontpath-0.4.orig/fink/Makefile.in 2002-03-23 01:49:31.000000000
+0900
++++ xfontpath-0.4/fink/Makefile.in 2008-02-24 00:17:48.000000000 +0900
+@@ -203,8 +203,8 @@
+ $(scripts): Makefile
+
+ 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 xfontpath.sh
$(DESTDIR)$(sysconfdir)/xinitrc.d/20xfontpath.sh
+ # 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:
-------------------------------------------------------------------------
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
