[73090] trunk/dports/aqua/Growl
elelay at macports.org
elelay at macports.org
Wed Nov 3 12:51:33 PDT 2010
Revision: 73090
http://trac.macports.org/changeset/73090
Author: elelay at macports.org
Date: 2010-11-03 12:51:30 -0700 (Wed, 03 Nov 2010)
Log Message:
-----------
fix #20966 - growl 1.1.4 failed to build on snow leopard
fix #18765 - Growl 1.1.4 build error
not too sure about universal builds
Modified Paths:
--------------
trunk/dports/aqua/Growl/Portfile
Added Paths:
-----------
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no-10.4sdk.diff
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no_separate_strip.diff
Removed Paths:
-------------
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff
trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff
trunk/dports/aqua/Growl/files/patch-Makefile.diff
Modified: trunk/dports/aqua/Growl/Portfile
===================================================================
--- trunk/dports/aqua/Growl/Portfile 2010-11-03 17:10:55 UTC (rev 73089)
+++ trunk/dports/aqua/Growl/Portfile 2010-11-03 19:51:30 UTC (rev 73090)
@@ -1,11 +1,11 @@
# $Id$
-PortSystem 1.0
+PortSystem 1.0
+PortGroup xcode 1.0
name Growl
-set base_version 1.1.4
+set base_version 1.1.6
version ${base_version}
-categories aqua
platforms darwin
maintainers boeyms openmaintainer
description global notification system for Mac OS X
@@ -16,28 +16,70 @@
homepage http://growl.info/
master_sites ${homepage}files/source/
-checksums md5 f497b5485f644e767482764da1813116 \
- sha1 33bf8a3b122072a6713657e577a84b7f0ef8f839 \
- rmd160 0052da5775ee1e8e4fe11316810ed6b87aa204ef
+
+checksums md5 ab0e668ae536257e9845b80b27d6a8e6 \
+ sha1 9700a04b995c7ce808c3f37a6a0556785de55a3a \
+ rmd160 e43f232073a58d077b0fe1bd772d4f257c2edc83
+
use_bzip2 yes
distname ${distname}-src
-# The following patch selection makes the source build for a single
-# architecture, rather than as universal binaries as the distributed source is
-# configured to do. This probably plays havoc with the MacPorts +universal
-# variant, so I'll need to think further about this.
-patchfiles patch-Growl.xcodeproj__project.pbxproj.${os.arch}.diff
-use_configure no
-build.target growl
-destroot.destdir PREFIX=${destroot}
+xcode.target Growl
+destroot.destdir DSTROOT=${worksrcpath}/build
+xcode.destroot.path /destroot
+post-patch {
+ reinplace "s|REVISION=.*|REVISION=116|g" ${worksrcpath}/generateHgRevision.sh
+}
+
+# install only Growl.prefPane
+post-destroot {
+ xinstall -d "${destroot}/Library/Preference Panes"
+ move ${worksrcpath}/build/destroot/Growl.prefPane "${destroot}/Library/Preference Panes"
+}
+
# The old behaviour of automatically installing the contributed extras in the
# source distribution has been disabled for now, as it is not apparent that
# every Growl user will want these. They should probably go into other ports,
# in any case.
-variant universal {
- patchfiles-delete \
- patch-Growl.xcodeproj__project.pbxproj.${os.arch}.diff
+platform darwin 10 {
+ # Common/Source/LoginItemAE.c uses Carbon so can't build x86_64
+ if {![variant_isset universal]} {
+ configure.build_arch i386
+ }
+
+ # the 10.4 SDK might not be installed, use the system's default
+ patchfiles-append patch-Growl.xcodeproj__project.pbxproj.no-10.4sdk.diff
}
+platform darwin 8 {
+ patchfiles-append patch-Growl.xcodeproj__project.pbxproj.no_separate_strip.diff
+}
+
+# this proc is overriden to remove the SYMROOT=build/ configuration
+# overwise, Extras/GrowlAction builds in Extras/GrowlAction/build instead of build
+proc xcode::get_build_args {args} {
+ global tcl_platform
+ global configure.universal_archs configure.build_arch macosx_deployment_target
+ global os.major os.arch
+ global developer_dir configure.sdkroot
+
+ set xcode_build_args "OBJROOT=build/"
+
+ # MACOSX_DEPLOYMENT_TARGET
+ append xcode_build_args " MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}"
+
+ # ARCHS
+ if {[variant_exists universal] && [variant_isset universal]} {
+ append xcode_build_args " ARCHS=\"${configure.universal_archs}\""
+ } else {
+ append xcode_build_args " ARCHS=${configure.build_arch}"
+ }
+
+ # SDKROOT
+ append xcode_build_args " SDKROOT=\"${configure.sdkroot}\""
+
+ return $xcode_build_args
+}
+
Deleted: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff 2010-11-03 17:10:55 UTC (rev 73089)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.i386.diff 2010-11-03 19:51:30 UTC (rev 73090)
@@ -1,10 +0,0 @@
---- Growl.xcodeproj/project.pbxproj 2007-06-28 09:19:56.000000000 +0000
-+++ Growl.xcodeproj/project.pbxproj.i386 2007-06-28 09:25:49.000000000 +0000
-@@ -3837,7 +3837,6 @@
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
-- ppc,
- i386,
- );
- DEAD_CODE_STRIPPING = YES;
Added: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no-10.4sdk.diff
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no-10.4sdk.diff (rev 0)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no-10.4sdk.diff 2010-11-03 19:51:30 UTC (rev 73090)
@@ -0,0 +1,39 @@
+--- Growl.xcodeproj/project.pbxproj.orig 2010-10-18 20:32:30.000000000 +0200
++++ Growl.xcodeproj/project.pbxproj 2010-10-18 20:39:12.000000000 +0200
+@@ -4166,6 +4166,7 @@
+ 95EE27920855AA6C0045DB39 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
++ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = NO;
+ DEAD_CODE_STRIPPING = NO;
+@@ -4193,7 +4194,6 @@
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.3;
+ PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ WARNING_CFLAGS = (
+ "-W",
+ "-Wall",
+@@ -4209,10 +4209,7 @@
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+- ARCHS = (
+- ppc,
+- i386,
+- );
++ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+ DEAD_CODE_STRIPPING = YES;
+ DEPLOYMENT_POSTPROCESSING = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+@@ -4238,8 +4235,6 @@
+ MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
+ MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
+ PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
+- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+- SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
+ SEPARATE_STRIP = YES;
+ WARNING_CFLAGS = (
+ "-W",
Added: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no_separate_strip.diff
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no_separate_strip.diff (rev 0)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.no_separate_strip.diff 2010-11-03 19:51:30 UTC (rev 73090)
@@ -0,0 +1,19 @@
+--- Growl.xcodeproj/project.pbxproj.old 2010-11-01 10:42:51.000000000 +0100
++++ Growl.xcodeproj/project.pbxproj 2010-11-01 10:45:03.000000000 +0100
+@@ -4199,6 +4197,7 @@
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DEBUGGING_SYMBOLS = full;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
++ GCC_ENABLE_SYMBOL_SEPARATION = NO;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+@@ -4221,7 +4220,7 @@
+ PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk;
+- SEPARATE_STRIP = YES;
++ SEPARATE_STRIP = NO;
+ STRIP_INSTALLED_PRODUCT = YES;
+ WARNING_CFLAGS = (
+ "-W",
Deleted: trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff 2010-11-03 17:10:55 UTC (rev 73089)
+++ trunk/dports/aqua/Growl/files/patch-Growl.xcodeproj__project.pbxproj.powerpc.diff 2010-11-03 19:51:30 UTC (rev 73090)
@@ -1,10 +0,0 @@
---- Growl.xcodeproj/project.pbxproj 2007-06-28 09:19:56.000000000 +0000
-+++ Growl.xcodeproj/project.pbxproj.powerpc 2007-06-28 09:22:55.000000000 +0000
-@@ -3838,7 +3838,6 @@
- ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- ppc,
-- i386,
- );
- DEAD_CODE_STRIPPING = YES;
- DEPLOYMENT_POSTPROCESSING = YES;
Deleted: trunk/dports/aqua/Growl/files/patch-Makefile.diff
===================================================================
--- trunk/dports/aqua/Growl/files/patch-Makefile.diff 2010-11-03 17:10:55 UTC (rev 73089)
+++ trunk/dports/aqua/Growl/files/patch-Makefile.diff 2010-11-03 19:51:30 UTC (rev 73090)
@@ -1,18 +0,0 @@
---- Makefile.orig 2007-05-24 22:00:30.000000000 +0000
-+++ Makefile 2007-05-28 23:07:52.000000000 +0000
-@@ -40,13 +40,13 @@
- install:
- killall GrowlHelperApp || true
- -$(RM) -rf $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE) $(FRAMEWORKS_DIR)/$(GROWL_FRAMEWORK)
-- $(CP) $(BUILD_DIR)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
-+ $(CP) $(BUILD_DIR)/$(CONFIGURATION)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
- open $(GROWL_HELPER_APP)
-
- install-growl:
- killall GrowlHelperApp || true
- -$(RM) -rf $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
-- $(CP) $(BUILD_DIR)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
-+ $(CP) $(BUILD_DIR)/$(CONFIGURATION)/$(GROWL_PREFPANE) $(PREFERENCEPANES_DIR)/$(GROWL_PREFPANE)
- open $(GROWL_HELPER_APP)
-
- headerdoc:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101103/6045c3f3/attachment.html>
More information about the macports-changes
mailing list