Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11964
Modified Files:
xmkmf-10.9.info xmkmf.info xmkmf.patch
Added Files:
xmkmf-compiler.patch
Log Message:
part of the .patch is for all platforms (has #ifdef controls), so apply it
unversially vs arch-specific part moved to separate .patch (minimizes diffs
among packages)
--- NEW FILE: xmkmf-compiler.patch ---
--- imake-1.0.2/imakemdep.h.orig 2011-07-20 15:39:57.000000000 -0400
+++ imake-1.0.2/imakemdep.h 2011-07-20 15:40:37.000000000 -0400
@@ -270,8 +270,8 @@
#if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
#if defined(__APPLE__)
-#define DEFAULT_CPP "/usr/bin/cpp"
-#define DEFAULT_CC "cc"
+#define DEFAULT_CPP "/usr/bin/llvm-cpp-4.2"
+#define DEFAULT_CC "/usr/bin/llvm-gcc-4.2"
#endif
#if defined(Lynx) || defined(__Lynx__)
#define DEFAULT_CC "gcc"
Index: xmkmf-10.9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/xmkmf-10.9.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmkmf-10.9.info 2 Jul 2013 17:25:10 -0000 1.3
+++ xmkmf-10.9.info 2 Jul 2013 17:36:27 -0000 1.4
@@ -4,7 +4,7 @@
Description: X11 legacy build tools
License: BSD
Maintainer: Dave Morrison <d...@finkproject.org>
-BuildDepends: pkgconfig, fink (>= 0.24.12)
+BuildDepends: pkgconfig, fink (>= 0.30.0)
Depends: gcc48-compiler
Distribution: 10.9
Source: mirror:sourceforge:fink/imake-%v.tar.bz2
@@ -12,13 +12,16 @@
Source-MD5: 02fea5a02ba2857c7d81820c8e8b8e6f
Source2-MD5: 5f62dd5545b782c74f6e4e70d0e6552c
PatchFile: %n.patch
-PatchFile-MD5: a27507bde4c01b10fa5500fd6848f755
+PatchFile-MD5: 3b545f4c727b37e41a8e861e42f65cd4
+PatchFile2: %n-compiler.patch
+PatchFile2-MD5: 16766a350d3aeba3959673c3c2759e9e
PatchScript: <<
#! /bin/sh -ev
perl -pi -e 's|/usr/local|/usr/X11|' ../xorg-cf-files-%v/site.def
+ cd ..
+ patch -p0 < %{PatchFile}
if [ "%m" == "x86_64" ] ; then
- cd ..
- sed 's|/usr/bin/llvm-cpp-4.2|%p/bin/cpp-fsf-4.8|g' < %{PatchFile} |sed
's|/usr/bin/llvm-gcc-4.2|%p/bin/gcc-fsf-4.8|g' | patch -p0
+ sed 's|/usr/bin/llvm-cpp-4.2|%p/bin/cpp-fsf-4.8|g' < %{PatchFile2} |sed
's|/usr/bin/llvm-gcc-4.2|%p/bin/gcc-fsf-4.8|g' | patch -p0
fi
<<
NoSetMAKEFLAGS: true
Index: xmkmf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/xmkmf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmkmf.patch 21 Jul 2011 00:14:26 -0000 1.2
+++ xmkmf.patch 2 Jul 2013 17:36:27 -0000 1.3
@@ -31,16 +31,3 @@
#if OSMajorVersion < 7
# define DarwinLocaleDefines -DX_LOCALE
#else
---- imake-1.0.2/imakemdep.h.orig 2011-07-20 15:39:57.000000000 -0400
-+++ imake-1.0.2/imakemdep.h 2011-07-20 15:40:37.000000000 -0400
-@@ -270,8 +270,8 @@
- #if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
-
- #if defined(__APPLE__)
--#define DEFAULT_CPP "/usr/bin/cpp"
--#define DEFAULT_CC "cc"
-+#define DEFAULT_CPP "/usr/bin/llvm-cpp-4.2"
-+#define DEFAULT_CC "/usr/bin/llvm-gcc-4.2"
- #endif
- #if defined(Lynx) || defined(__Lynx__)
- #define DEFAULT_CC "gcc"
Index: xmkmf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/xmkmf.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xmkmf.info 27 Jun 2013 19:59:42 -0000 1.8
+++ xmkmf.info 2 Jul 2013 17:36:27 -0000 1.9
@@ -1,24 +1,27 @@
Package: xmkmf
Version: 1.0.2
-Revision: 1104
+Revision: 1105
Description: X11 legacy build tools
License: BSD
Maintainer: Dave Morrison <d...@finkproject.org>
-BuildDepends: pkgconfig, fink (>= 0.24.12)
-Depends: llvm-gcc
+BuildDepends: pkgconfig, fink (>= 0.30.0)
+#Depends: llvm-gcc
Distribution: 10.7, 10.8
Source: mirror:sourceforge:fink/imake-%v.tar.bz2
Source2: mirror:sourceforge:fink/xorg-cf-files-%v.tar.bz2
Source-MD5: 02fea5a02ba2857c7d81820c8e8b8e6f
Source2-MD5: 5f62dd5545b782c74f6e4e70d0e6552c
PatchFile: %n.patch
-PatchFile-MD5: a27507bde4c01b10fa5500fd6848f755
+PatchFile-MD5: 3b545f4c727b37e41a8e861e42f65cd4
+PatchFile2: %n-compiler.patch
+PatchFile2-MD5: 16766a350d3aeba3959673c3c2759e9e
PatchScript: <<
#! /bin/sh -ev
perl -pi -e 's|/usr/local|/usr/X11|' ../xorg-cf-files-%v/site.def
+ cd ..
+ patch -p0 < %{PatchFile}
if [ "%m" == "x86_64" ] ; then
- cd ..
- patch -p0 < %{PatchFile}
+ patch -p0 < %{PatchFile2}
fi
<<
NoSetMAKEFLAGS: true
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
