[74885] trunk/dports/x11/xplanet

[jmr at macports.org]

Revision: 74885
          http://trac.macports.org/changeset/74885
Author:   jmr at macports.org
Date:     2011-01-05 12:40:22 -0800 (Wed, 05 Jan 2011)
Log Message:
-----------
xplanet: fix aqua variant on case-sensitive systems (#27871), restrict that variant to 32-bit archs, and fix build_arch/universal support

Modified Paths:
--------------
    trunk/dports/x11/xplanet/Portfile

Added Paths:
-----------
    trunk/dports/x11/xplanet/files/
    trunk/dports/x11/xplanet/files/case-sensitive-quicktime.diff
    trunk/dports/x11/xplanet/files/objc-flags.diff

Modified: trunk/dports/x11/xplanet/Portfile
===================================================================
--- trunk/dports/x11/xplanet/Portfile	2011-01-05 19:09:31 UTC (rev 74884)
+++ trunk/dports/x11/xplanet/Portfile	2011-01-05 20:40:22 UTC (rev 74885)
@@ -20,6 +20,8 @@
 checksums			sha1    c3810c303af8f0cb40520112d9cd1f24fa8b42b5 \
 					rmd160  06c5031ea702bca9cc6ed5ad8c81454a223f508e
 
+depends_build \
+	port:pkgconfig
 depends_lib \
 	port:xorg-libXScrnSaver \
 	port:fontconfig \
@@ -27,6 +29,11 @@
 	port:jpeg \
 	port:tiff
 
+patchfiles			case-sensitive-quicktime.diff \
+				objc-flags.diff
+
+use_autoreconf		yes
+
 configure.args		--with-x --with-xscreensaver --without-gif \
 					--with-jpeg --with-png --with-tiff \
 					--without-freetype --without-pango --without-pnm \
@@ -57,6 +64,7 @@
 }
 
 variant aqua description "Use aqua instead of X11" {
+	supported_archs	i386 ppc
 	depends_lib-delete	port:xorg-libXScrnSaver
 	configure.args-delete	--with-x --with-xscreensaver
 	configure.args-append	--without-x --with-aqua

Added: trunk/dports/x11/xplanet/files/case-sensitive-quicktime.diff
===================================================================
--- trunk/dports/x11/xplanet/files/case-sensitive-quicktime.diff	                        (rev 0)
+++ trunk/dports/x11/xplanet/files/case-sensitive-quicktime.diff	2011-01-05 20:40:22 UTC (rev 74885)
@@ -0,0 +1,44 @@
+--- acinclude.m4.orig	2006-03-26 15:59:57.000000000 +1100
++++ acinclude.m4	2011-01-06 06:52:44.000000000 +1100
+@@ -291,7 +291,7 @@
+ AC_DEFUN([AC_USE_MACAQUA],
+ [
+ AC_ARG_WITH(aqua,AC_HELP_STRING([--with-aqua],[For Mac OS X Aqua (NO)]))
+-AC_ARG_WITH(quicktime,AC_HELP_STRING([--with-quicktime],[On Aqua, use Quicktime library to read/write image files (YES)]))
++AC_ARG_WITH(quicktime,AC_HELP_STRING([--with-quicktime],[On Aqua, use QuickTime library to read/write image files (YES)]))
+ 
+ have_quicktime='no'
+ if test "$with_aqua" = yes; then
+@@ -299,8 +299,8 @@
+   AC_DEFINE(HAVE_AQUA,,Define for Mac OS X)
+   if test "$with_quicktime" != no; then
+     have_quicktime='yes'
+-    AQUA_LIBS="-framework Quicktime"
+-    AC_DEFINE(HAVE_QUICKTIME,,Define if you have Quicktime)
++    AQUA_LIBS="-framework QuickTime"
++    AC_DEFINE(HAVE_QUICKTIME,,Define if you have QuickTime)
+   fi
+   AQUA_LIBS="$AQUA_LIBS -framework IOKit -framework Carbon -framework Cocoa -bind_at_load"
+   AC_SUBST(AQUA_LIBS)
+--- src/libimage/WriteImageQT.cpp.orig	2006-03-26 16:03:20.000000000 +1100
++++ src/libimage/WriteImageQT.cpp	2011-01-06 06:58:07.000000000 +1100
+@@ -5,7 +5,7 @@
+ #include <sstream>
+ using namespace std;
+ 
+-#include <Quicktime/Quicktime.h>
++#include <QuickTime/QuickTime.h>
+ 
+ #include "xpUtil.h"
+ 
+--- src/printVersion.cpp.orig	2006-03-26 16:03:20.000000000 +1100
++++ src/printVersion.cpp	2011-01-06 06:59:08.000000000 +1100
+@@ -26,7 +26,7 @@ printVersion()
+ #ifdef HAVE_AQUA
+     cout << "\tMac OS X";
+ # ifdef HAVE_QUICKTIME
+-    cout << " (with Quicktime)";
++    cout << " (with QuickTime)";
+ # endif
+     cout << endl;
+ #endif

Added: trunk/dports/x11/xplanet/files/objc-flags.diff
===================================================================
--- trunk/dports/x11/xplanet/files/objc-flags.diff	                        (rev 0)
+++ trunk/dports/x11/xplanet/files/objc-flags.diff	2011-01-05 20:40:22 UTC (rev 74885)
@@ -0,0 +1,13 @@
+--- acinclude.m4.orig	2011-01-06 07:28:06.000000000 +1100
++++ acinclude.m4	2011-01-06 07:27:25.000000000 +1100
+@@ -305,8 +305,8 @@
+   AQUA_LIBS="$AQUA_LIBS -framework IOKit -framework Carbon -framework Cocoa -bind_at_load"
+   AC_SUBST(AQUA_LIBS)
+ 
+-  OBJC="gcc"
+-  OBJCFLAGS="-Wno-import"
++  AC_REQUIRE([AC_PROG_OBJC])
++  OBJCFLAGS+=" -Wno-import"
+   AC_SUBST(OBJC)
+   AC_SUBST(OBJCFLAGS)
+ fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110105/cd1d1088/attachment.html>