[51969] trunk/dports/aqua/aquaterm
mcalhoun at macports.org
mcalhoun at macports.org
Sun Jun 7 11:36:09 PDT 2009
Revision: 51969
http://trac.macports.org/changeset/51969
Author: mcalhoun at macports.org
Date: 2009-06-07 11:36:08 -0700 (Sun, 07 Jun 2009)
Log Message:
-----------
aquaterm: Do not set MACOSX_DEPLOYMENT_TARGET and SDKROOT in project.pbxproj (allow xcode PortGroup to set them).
Merge patch-frameworks-dir.diff and patch-disable-universal.diff into new patchfile.
Fixes #19882.
Modified Paths:
--------------
trunk/dports/aqua/aquaterm/Portfile
Added Paths:
-----------
trunk/dports/aqua/aquaterm/files/patch-project.pbxproj.diff
Removed Paths:
-------------
trunk/dports/aqua/aquaterm/files/patch-disable-universal.diff
trunk/dports/aqua/aquaterm/files/patch-frameworks-dir.diff
Modified: trunk/dports/aqua/aquaterm/Portfile
===================================================================
--- trunk/dports/aqua/aquaterm/Portfile 2009-06-07 18:12:22 UTC (rev 51968)
+++ trunk/dports/aqua/aquaterm/Portfile 2009-06-07 18:36:08 UTC (rev 51969)
@@ -5,7 +5,7 @@
name aquaterm
version 1.0.1
-revision 4
+revision 5
categories aqua math science
maintainers mcalhoun openmaintainer
description AquaTerm is a viewer that displays vector graphics on Mac OS X
@@ -25,8 +25,9 @@
worksrcdir ${name}
-patchfiles patch-frameworks-dir.diff \
- patch-disable-universal.diff
+# Allow xcode PortGroup to set ARCHS (for universal builds), MACOSX_DEPLOYMENT_TARGET, and SDKROOT.
+# Modify INSTALL_PATH to ensure aquaterm is installed into FRAMEWORKS_DIR.
+patchfiles patch-project.pbxproj.diff
xcode.target AquaTerm
Deleted: trunk/dports/aqua/aquaterm/files/patch-disable-universal.diff
===================================================================
--- trunk/dports/aqua/aquaterm/files/patch-disable-universal.diff 2009-06-07 18:12:22 UTC (rev 51968)
+++ trunk/dports/aqua/aquaterm/files/patch-disable-universal.diff 2009-06-07 18:36:08 UTC (rev 51969)
@@ -1,90 +0,0 @@
---- AquaTerm.xcodeproj/project.pbxproj.orig 2008-11-16 20:16:34.000000000 +0100
-+++ AquaTerm.xcodeproj/project.pbxproj 2008-11-16 20:17:02.000000000 +0100
-@@ -740,10 +740,6 @@
- CB699C7E08953AAD00C4B248 /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- COPY_PHASE_STRIP = NO;
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
-@@ -780,10 +776,6 @@
- CB699C7F08953AAD00C4B248 /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- COPY_PHASE_STRIP = NO;
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
-@@ -816,10 +808,6 @@
- CB699C8008953AAD00C4B248 /* BuildStyle */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
- FRAMEWORK_VERSION = A;
-@@ -849,10 +837,6 @@
- CB699C8108953AAD00C4B248 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 1;
- FRAMEWORK_VERSION = A;
-@@ -882,10 +866,6 @@
- CB699C8308953AAD00C4B248 /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- BUILD_VARIANTS = normal;
- COPY_PHASE_STRIP = NO;
- DEPLOYMENT_POSTPROCESSING = NO;
-@@ -924,10 +904,6 @@
- CB699C8408953AAD00C4B248 /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- BUILD_VARIANTS = normal;
- COPY_PHASE_STRIP = NO;
- DEPLOYMENT_POSTPROCESSING = NO;
-@@ -963,10 +939,6 @@
- CB699C8508953AAD00C4B248 /* BuildStyle */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- BUILD_VARIANTS = normal;
- DEPLOYMENT_POSTPROCESSING = NO;
- FRAMEWORK_SEARCH_PATHS = /Volumes/Ior/Source/aquaterm/build;
-@@ -999,10 +971,6 @@
- CB699C8608953AAD00C4B248 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
-- ARCHS = (
-- ppc,
-- i386,
-- );
- BUILD_VARIANTS = normal;
- DEPLOYMENT_POSTPROCESSING = NO;
- FRAMEWORK_SEARCH_PATHS = /Volumes/Ior/Source/aquaterm/build;
Deleted: trunk/dports/aqua/aquaterm/files/patch-frameworks-dir.diff
===================================================================
--- trunk/dports/aqua/aquaterm/files/patch-frameworks-dir.diff 2009-06-07 18:12:22 UTC (rev 51968)
+++ trunk/dports/aqua/aquaterm/files/patch-frameworks-dir.diff 2009-06-07 18:36:08 UTC (rev 51969)
@@ -1,11 +0,0 @@
---- AquaTerm.xcodeproj/project.pbxproj.orig 2008-11-19 15:21:16.000000000 +0100
-+++ AquaTerm.xcodeproj/project.pbxproj 2008-11-19 15:28:51.000000000 +0100
-@@ -792,7 +792,7 @@
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
- INFOPLIST_FILE = "AquaTerm.framework-Info.plist";
-- INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-+ INSTALL_PATH = "$(FRAMEWORKS_DIR)";
- MACOSX_DEPLOYMENT_TARGET = 10.1;
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = (
Added: trunk/dports/aqua/aquaterm/files/patch-project.pbxproj.diff
===================================================================
--- trunk/dports/aqua/aquaterm/files/patch-project.pbxproj.diff (rev 0)
+++ trunk/dports/aqua/aquaterm/files/patch-project.pbxproj.diff 2009-06-07 18:36:08 UTC (rev 51969)
@@ -0,0 +1,185 @@
+--- AquaTerm.xcodeproj/project.pbxproj.orig 2009-06-07 13:57:22.000000000 -0400
++++ AquaTerm.xcodeproj/project.pbxproj 2009-06-07 13:59:06.000000000 -0400
+@@ -740,10 +740,6 @@
+ CB699C7E08953AAD00C4B248 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ COPY_PHASE_STRIP = NO;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+@@ -756,7 +752,6 @@
+ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ INFOPLIST_FILE = "AquaTerm.framework-Info.plist";
+ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OPTIMIZATION_CFLAGS = "-O0";
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+@@ -780,10 +775,6 @@
+ CB699C7F08953AAD00C4B248 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ COPY_PHASE_STRIP = NO;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+@@ -792,8 +783,7 @@
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ INFOPLIST_FILE = "AquaTerm.framework-Info.plist";
+- INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
++ INSTALL_PATH = "$(FRAMEWORKS_DIR)";
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+ "-framework",
+@@ -816,10 +806,6 @@
+ CB699C8008953AAD00C4B248 /* BuildStyle */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+@@ -827,7 +813,6 @@
+ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ INFOPLIST_FILE = "AquaTerm.framework-Info.plist";
+ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+ "-framework",
+@@ -849,10 +834,6 @@
+ CB699C8108953AAD00C4B248 /* Default */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+@@ -860,7 +841,6 @@
+ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ INFOPLIST_FILE = "AquaTerm.framework-Info.plist";
+ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+ "-framework",
+@@ -882,10 +862,6 @@
+ CB699C8308953AAD00C4B248 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ BUILD_VARIANTS = normal;
+ COPY_PHASE_STRIP = NO;
+ DEPLOYMENT_POSTPROCESSING = NO;
+@@ -900,7 +876,6 @@
+ INFOPLIST_FILE = "AquaTerm.app-Info.plist";
+ INSTALL_PATH = "$(USER_APPS_DIR)";
+ LIBRARY_SEARCH_PATHS = /tmp/AquaTerm.dst/usr/local/lib;
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OPTIMIZATION_CFLAGS = "-O0";
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+@@ -924,10 +899,6 @@
+ CB699C8408953AAD00C4B248 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ BUILD_VARIANTS = normal;
+ COPY_PHASE_STRIP = NO;
+ DEPLOYMENT_POSTPROCESSING = NO;
+@@ -940,7 +911,6 @@
+ INFOPLIST_FILE = "AquaTerm.app-Info.plist";
+ INSTALL_PATH = "$(USER_APPS_DIR)";
+ LIBRARY_SEARCH_PATHS = "";
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+ "-framework",
+@@ -963,10 +933,6 @@
+ CB699C8508953AAD00C4B248 /* BuildStyle */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ BUILD_VARIANTS = normal;
+ DEPLOYMENT_POSTPROCESSING = NO;
+ FRAMEWORK_SEARCH_PATHS = /Volumes/Ior/Source/aquaterm/build;
+@@ -977,7 +943,6 @@
+ INFOPLIST_FILE = "AquaTerm.app-Info.plist";
+ INSTALL_PATH = "$(USER_APPS_DIR)";
+ LIBRARY_SEARCH_PATHS = /tmp/AquaTerm.dst/usr/local/lib;
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+ "-framework",
+@@ -999,10 +964,6 @@
+ CB699C8608953AAD00C4B248 /* Default */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ BUILD_VARIANTS = normal;
+ DEPLOYMENT_POSTPROCESSING = NO;
+ FRAMEWORK_SEARCH_PATHS = /Volumes/Ior/Source/aquaterm/build;
+@@ -1013,7 +974,6 @@
+ INFOPLIST_FILE = "AquaTerm.app-Info.plist";
+ INSTALL_PATH = "$(USER_APPS_DIR)";
+ LIBRARY_SEARCH_PATHS = /tmp/AquaTerm.dst/usr/local/lib;
+- MACOSX_DEPLOYMENT_TARGET = 10.1;
+ OTHER_CFLAGS = "";
+ OTHER_LDFLAGS = (
+ "-framework",
+@@ -1109,28 +1069,24 @@
+ CB699C8D08953AAD00C4B248 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Development;
+ };
+ CB699C8E08953AAD00C4B248 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Deployment;
+ };
+ CB699C8F08953AAD00C4B248 /* BuildStyle */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = BuildStyle;
+ };
+ CB699C9008953AAD00C4B248 /* Default */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Default;
+ };
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090607/4b769535/attachment.html>
More information about the macports-changes
mailing list