Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11-system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23568
Modified Files:
fix-apple-x11.info fix-apple-x11.patch
Log Message:
/usr/bin/cpp3 does not always exist. Do sed hack instead. Conflicts with xorg.
"xinitrc" ready.
Index: fix-apple-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11-system/fix-apple-x11.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fix-apple-x11.info 26 Oct 2004 12:21:48 -0000 1.4
+++ fix-apple-x11.info 8 Apr 2005 21:48:05 -0000 1.5
@@ -1,12 +1,12 @@
Package: fix-apple-x11
Version: 1.0
-Revision: 4
+Revision: 5
Depends: system-xfree86 (>= 2:4.3-2)
-Conflicts: system-xfree86 (>= 2:4.3.99), xfree86-shlibs, xfree86-rootless,
xfree86-rootless-threaded, xfree86, regina
+Conflicts: system-xfree86 (>= 2:4.3.99), xfree86-shlibs, xfree86-rootless,
xfree86-rootless-threaded, xfree86, xorg-shlibs, xorg, regina (<= 3.2-22)
Source:
http://www.opensource.apple.com/darwinsource/tarballs/other/X11ForMacOSXSource-%v.tar.gz
Source-MD5: 9e4b2a221e2df1b30a0bf1f92df49613
SourceDirectory: X11ForMacOSXSource-%v/xc
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p2
+PatchScript: sed 's|!PREFIX!|%p|g' <%a/%n.patch | patch -p2
CompileScript: make World
InstallScript: <<
make install DESTDIR=%d
Index: fix-apple-x11.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11-system/fix-apple-x11.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fix-apple-x11.patch 21 Jul 2004 18:45:09 -0000 1.2
+++ fix-apple-x11.patch 8 Apr 2005 21:48:05 -0000 1.3
@@ -38,29 +38,23 @@
#ifndef SharedLibXext
diff -Nru X11ForMacOSXSource-1.0.orig/xc/config/cf/darwin.cf
X11ForMacOSXSource-1.0/xc/config/cf/darwin.cf
--- X11ForMacOSXSource-1.0.orig/xc/config/cf/darwin.cf Sat Mar 15 06:32:13 2003
-+++ X11ForMacOSXSource-1.0/xc/config/cf/darwin.cf Wed Apr 14 22:19:27 2004
-@@ -121,8 +121,18 @@
++++ X11ForMacOSXSource-1.0/xc/config/cf/darwin.cf Sat Apr 9 05:24:23 2005
+@@ -121,8 +121,14 @@
#define MkdirHierCmd mkdir -p
--/* our cpp isn't in /lib/cpp and early versions don't like -undef */
--#define CppCmd /usr/bin/cpp
-+#define ConfigDir @PREFIX@/fix-apple-x11/lib/X11/config
-+/*
-+ * Our cpp isn't in /lib/cpp and early versions don't like -undef.
-+ * The default cpp-3.3 that ships with Panther inserts spurious #pragmas,
-+ * so we use the 3.1-based version.
-+ */
-+#if OSMajorVersion >= 7
-+# define CppCmd /usr/bin/cpp3
-+# define StandardCppOptions -traditional -D__GNUC__
-+#else
-+# define CppCmd /usr/bin/cpp
++#define ConfigDir !PREFIX!/fix-apple-x11/lib/X11/config
++/* The gcc 3.3 cpp that Apple ships inserts spurious #pragmas */
++#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/# *pragma /d' -e
'/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
+ /* our cpp isn't in /lib/cpp and early versions don't like -undef */
+ #define CppCmd /usr/bin/cpp
++#if (GccMajorVersion == 3) && (GccMinorVersion == 3) || (GccMajorVersion > 3)
++# define StandardCppOptions -traditional -D__GNUC__
+#endif
#if HasGcc3
# define RawCppCmd CppCmd -undef
#else
-@@ -157,16 +167,22 @@
+@@ -157,16 +163,22 @@
#define OptimizedCDebugFlags -g -Os
#define ByteOrder UNKNOWN_BYTE_ORDER
@@ -88,8 +82,8 @@
* Set this to NO to just build the client libs, which should work without
diff -Nru X11ForMacOSXSource-1.0.orig/xc/config/cf/host.def
X11ForMacOSXSource-1.0/xc/config/cf/host.def
--- X11ForMacOSXSource-1.0.orig/xc/config/cf/host.def Thu Jan 1 09:00:00 1970
-+++ X11ForMacOSXSource-1.0/xc/config/cf/host.def Fri Feb 27 02:49:52 2004
-@@ -0,0 +1,32 @@
++++ X11ForMacOSXSource-1.0/xc/config/cf/host.def Sat Apr 9 06:04:25 2005
+@@ -0,0 +1,34 @@
+#ifdef BeforeVendorCF
+
+#define BuildServersOnly YES /* fake */
@@ -102,13 +96,15 @@
+#define InstallEmptyHostDef
+#define NothingOutsideProjectRoot YES
+
-+#define ProjectRoot @PREFIX@/fix-apple-x11
++#define ProjectRoot FinkPrefix/fix-apple-x11
+#define XLocaleDir OriginalLibDir/locale
+#define X11perfcompLib OriginalLibDir/x11perfcomp
+
+/* our local facility */
++#define FinkPrefix !PREFIX!
+#define BuildCppScripts YES
+#define BuildCppScriptsOnly YES
++#define OriginalBinDir /usr/X11R6/bin
+#define OriginalLibDir /usr/X11R6/lib/X11
+#define RstartLibDir OriginalLibDir/rstart
+#define DontBuildFontLib YES
@@ -139,30 +135,26 @@
+lib/libX11.dylib
diff -Nru X11ForMacOSXSource-1.0.orig/xc/fix-apple-x11.csh
X11ForMacOSXSource-1.0/xc/fix-apple-x11.csh
--- X11ForMacOSXSource-1.0.orig/xc/fix-apple-x11.csh Thu Jan 1 09:00:00 1970
-+++ X11ForMacOSXSource-1.0/xc/fix-apple-x11.csh Thu Jul 1 23:56:28 2004
-@@ -0,0 +1,13 @@
++++ X11ForMacOSXSource-1.0/xc/fix-apple-x11.csh Sat Apr 9 06:14:32 2005
+@@ -0,0 +1,9 @@
+if ( ! $?finkinit_fix_apple_x11_enable ) then
+ set finkinit_fix_apple_x11_enable=YES
+endif
+switch ( $finkinit_fix_apple_x11_enable )
+case [Yy][Ee][Ss]:
-+ setenv PATH [EMAIL PROTECTED]@/fix-apple-x11/bin/prepend-path "$PATH"
@PREFIX@/fix-apple-x11/bin`
-+ if ( $?DYLD_LIBRARY_PATH ) then
-+ setenv DYLD_LIBRARY_PATH [EMAIL
PROTECTED]@/fix-apple-x11/bin/prepend-path "$DYLD_LIBRARY_PATH"
@PREFIX@/fix-apple-x11/lib`
-+ else
-+ setenv DYLD_LIBRARY_PATH @PREFIX@/fix-apple-x11/lib
-+ endif
++ setenv PATH "`!PREFIX!/fix-apple-x11/bin/prepend-path PATH
!PREFIX!/fix-apple-x11/bin`"
++ setenv DYLD_LIBRARY_PATH "`!PREFIX!/fix-apple-x11/bin/prepend-path
DYLD_LIBRARY_PATH !PREFIX!/fix-apple-x11/lib`"
+ breaksw
+endsw
diff -Nru X11ForMacOSXSource-1.0.orig/xc/fix-apple-x11.sh
X11ForMacOSXSource-1.0/xc/fix-apple-x11.sh
--- X11ForMacOSXSource-1.0.orig/xc/fix-apple-x11.sh Thu Jan 1 09:00:00 1970
-+++ X11ForMacOSXSource-1.0/xc/fix-apple-x11.sh Thu Jul 1 23:47:02 2004
++++ X11ForMacOSXSource-1.0/xc/fix-apple-x11.sh Sat Apr 9 06:14:27 2005
@@ -0,0 +1,8 @@
+: ${finkinit_fix_apple_x11_enable=YES}
+case "$finkinit_fix_apple_x11_enable" in
+[Yy][Ee][Ss])
-+ [EMAIL PROTECTED]@/fix-apple-x11/bin/prepend-path "$PATH"
@PREFIX@/fix-apple-x11/bin`
-+ [EMAIL PROTECTED]@/fix-apple-x11/bin/prepend-path "$DYLD_LIBRARY_PATH"
@PREFIX@/fix-apple-x11/lib`
++ PATH=`!PREFIX!/fix-apple-x11/bin/prepend-path PATH
!PREFIX!/fix-apple-x11/bin`
++ DYLD_LIBRARY_PATH=`!PREFIX!/fix-apple-x11/bin/prepend-path
DYLD_LIBRARY_PATH !PREFIX!/fix-apple-x11/lib`
+ export PATH DYLD_LIBRARY_PATH
+ ;;
+esac
@@ -259,45 +251,46 @@
* the LC_CTYPE locale name as used in the sample implementation from that
diff -Nru X11ForMacOSXSource-1.0.orig/xc/prepend-path
X11ForMacOSXSource-1.0/xc/prepend-path
--- X11ForMacOSXSource-1.0.orig/xc/prepend-path Thu Jan 1 09:00:00 1970
-+++ X11ForMacOSXSource-1.0/xc/prepend-path Fri Feb 27 02:39:43 2004
-@@ -0,0 +1,37 @@
-+#!/bin/sh
-+old="$1"
-+list="$2"
-+oldIFS="$IFS"
-+
-+IFS=":"
-+set x $list
-+shift
-+IFS="$oldIFS"
++++ X11ForMacOSXSource-1.0/xc/prepend-path Sat Apr 9 03:47:31 2005
+@@ -0,0 +1,38 @@
++#! /bin/sh
++# vim: set sw=4 ts=8 sts=4:
++#
++# Usage: prepend-path ENVNAME "/foo/bin:/white spaces in path/bin"
++#
++# $ VAR=/foo1/bin:/foo2/bin; export VAR
++# $ VAR=`prepend-path VAR "/bar1/bin:/foo1/bin:/bar2/bin"`
++# $ echo "$VAR"
++# /bar1/bin:/bar2/bin:/foo1/bin:/foo2/bin
++#
++# You can use or modify or redistribute or do anything to this script
++# as if it were in public domain, although Japan's laws do not admit
++# to disclaim one's copyright.
++#
++# Author: AIDA Shinra <[EMAIL PROTECTED]>
++#
++eval "result=\$$1"
++IFS=:
+
-+rlist=
-+case "$#" in
-+ 0)
-+ rlist=
-+ ;;
-+ *)
-+ rlist="$1"
-+ shift
-+ for p in "$@"; do
-+ rlist="$p:$rlist"
-+ done
++case x$2 in
++ x) echo "$result"; exit 0 ;;
+esac
++set x $2; shift
++rlist=$1; shift
++for p
++do
++ rlist=$p:$rlist
++done
+
-+IFS=":"
-+set x $rlist
-+shift
-+IFS="$oldIFS"
-+
-+new="$old"
-+for p in "$@"; do
-+ case "$new" in
-+ "") new="$p" ;;
-+ "$p"|"$p":*|*:"$p"|*:"$p":*) ;;
-+ *) new="$p:$new" ;;
++for p in $rlist
++do
++ case x$result in
++ x) result=$p ;;
++ x"$p"|x"$p":*|x*:"$p"|x*:"$p":*) ;;
++ x*) result=$p:$result ;;
+ esac
+done
-+echo "$new"
++echo "$result"
diff -Nru X11ForMacOSXSource-1.0.orig/xc/programs/Imakefile
X11ForMacOSXSource-1.0/xc/programs/Imakefile
--- X11ForMacOSXSource-1.0.orig/xc/programs/Imakefile Sat Mar 15 06:35:03 2003
+++ X11ForMacOSXSource-1.0/xc/programs/Imakefile Fri Feb 27 02:39:43 2004
@@ -394,8 +387,8 @@
+#endif
diff -Nru X11ForMacOSXSource-1.0.orig/xc/programs/xinit/Imakefile
X11ForMacOSXSource-1.0/xc/programs/xinit/Imakefile
--- X11ForMacOSXSource-1.0.orig/xc/programs/xinit/Imakefile Fri Mar 14
08:58:59 2003
-+++ X11ForMacOSXSource-1.0/xc/programs/xinit/Imakefile Fri Feb 27 02:39:43 2004
-@@ -26,9 +26,13 @@
++++ X11ForMacOSXSource-1.0/xc/programs/xinit/Imakefile Sat Apr 9 06:28:24 2005
+@@ -26,13 +26,26 @@
COOKIEDEFS = -DHAS_COOKIE_MAKER -DMK_COOKIE=MkCookieCmd
#endif
@@ -405,7 +398,83 @@
all:: startx $(SAMPLECONFIG)
ComplexProgramTarget_1(xinit,$(LOCAL_LIBRARIES),$(DEFFILE))
-+#endif
++#endif
++
++#ifdef FinkPrefix
++FINK_PREFIX = FinkPrefix
++ORIGINAL_BINDIR = OriginalBinDir
++xinitrc: sys-xinitrc-fink.in
++ sed
"s|@PREFIX@|$(FINK_PREFIX)|g;s|@XINITDIR@|$(XINITDIR)|g;s|@X_BINDIR@|$(ORIGINAL_BINDIR)|g"
$< > $@
++MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) -DBINDIR=$(ORIGINAL_BINDIR)
$(COOKIEDEFS))
++#else
MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR))
+ MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) -DBINDIR=$(BINDIR)
$(COOKIEDEFS))
++#endif
+
+ EXTRAMANDEFS=-D__xinitdir__=$(XINITDIR)
+
+diff -Nru X11ForMacOSXSource-1.0.orig/xc/programs/xinit/sys-xinitrc-fink.in
X11ForMacOSXSource-1.0/xc/programs/xinit/sys-xinitrc-fink.in
+--- X11ForMacOSXSource-1.0.orig/xc/programs/xinit/sys-xinitrc-fink.in Thu Jan
1 09:00:00 1970
++++ X11ForMacOSXSource-1.0/xc/programs/xinit/sys-xinitrc-fink.in Sat Apr
9 05:44:46 2005
+@@ -0,0 +1,59 @@
++#! /bin/sh
++# $Id$
++
++# This script works even after the Fink "xinitrc" package is removed.
++# Don't worry.
++
++if test -r "@PREFIX@/etc/xinitrc-override"; then
++ # If system administrator dislike xinitrc.d framework, create this file
++ . "@PREFIX@/etc/xinitrc-override"
++elif test -r "@PREFIX@/bin/xinitrc.sh"; then
++ . "@PREFIX@/bin/xinitrc.sh"
++else
++ # Xterm and a window manager may be used for trouble shooting.
++ # Run these programs carefully.
++
++ userresources=$HOME/.Xresources
++ usermodmap=$HOME/.Xmodmap
++ [EMAIL PROTECTED]@/.Xresources
++ [EMAIL PROTECTED]@/.Xmodmap
++ [EMAIL PROTECTED]@
++
++ # merge in defaults and keymaps
++
++ if test -f $sysresources; then
++ xrdb -merge $sysresources
++ fi
++
++ if test -f $sysmodmap; then
++ xmodmap $sysmodmap
++ fi
++
++ if test -f $userresources; then
++ xrdb -merge $userresources
++ fi
++
++ if test -f $usermodmap; then
++ xmodmap $usermodmap
++ fi
++
++ # start some nice programs
++
++ if test -x "$x_bindir/xterm"; then
++ termcmd="$x_bindir/xterm"
++ else
++ termcmd="xterm"
++ fi
++ $termcmd &
++
++ # start the window manager
++
++ if test -x "$x_bindir/quartz-wm"; then
++ sessionmgr="$x_bindir/quartz-wm"
++ elif test -x "$x_bindir/twm"; then
++ sessionmgr="$x_bindir/twm"
++ else
++ sessionmgr="twm"
++ fi
++ exec $sessionmgr
++fi
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
