[78589] trunk/dports/net/transmission

[ryandesign at macports.org]

Revision: 78589
          http://trac.macports.org/changeset/78589
Author:   ryandesign at macports.org
Date:     2011-05-13 02:07:42 -0700 (Fri, 13 May 2011)
Log Message:
-----------
transmission: fix patch failure when MacPorts prefix is not /opt/local; see #29020

Modified Paths:
--------------
    trunk/dports/net/transmission/Portfile
    trunk/dports/net/transmission/files/patch-xcodebuild.diff

Modified: trunk/dports/net/transmission/Portfile
===================================================================
--- trunk/dports/net/transmission/Portfile	2011-05-13 07:02:13 UTC (rev 78588)
+++ trunk/dports/net/transmission/Portfile	2011-05-13 09:07:42 UTC (rev 78589)
@@ -38,12 +38,12 @@
 xcode.configuration     Release
 
 pre-patch {
-    reinplace -E "s at third\\-party/(curl|libevent|openssl)/(include|lib)@${prefix}/\\2 at g" \
+    reinplace -E "s%third-party/(curl|libevent|openssl)/(include|lib)%@@PREFIX@@/\\2%g" \
         ${worksrcpath}/Transmission.xcodeproj/project.pbxproj
 }
 
 post-patch {
-    reinplace -E "s|@@PREFIX@@|${prefix}/lib|g" \
+    reinplace -E "s|@@PREFIX@@|${prefix}|g" \
         ${worksrcpath}/Transmission.xcodeproj/project.pbxproj
 }
 

Modified: trunk/dports/net/transmission/files/patch-xcodebuild.diff
===================================================================
--- trunk/dports/net/transmission/files/patch-xcodebuild.diff	2011-05-13 07:02:13 UTC (rev 78588)
+++ trunk/dports/net/transmission/files/patch-xcodebuild.diff	2011-05-13 09:07:42 UTC (rev 78589)
@@ -4,8 +4,8 @@
  		4D118E1808CB46B20033958F /* PrefsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PrefsController.h; path = macosx/PrefsController.h; sourceTree = "<group>"; };
  		4D118E1908CB46B20033958F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PrefsController.m; path = macosx/PrefsController.m; sourceTree = "<group>"; };
  		4D18389709DEC0030047D688 /* libtransmission.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtransmission.a; sourceTree = BUILT_PRODUCTS_DIR; };
--		4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.0.9.7.dylib; path = "/opt/local/lib/libcrypto.0.9.7.dylib"; sourceTree = "<group>"; };
-+		4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.0.9.7.dylib; path = "@@PREFIX@@/libcrypto.dylib"; sourceTree = "<group>"; };
+-		4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.0.9.7.dylib; path = "@@PREFIX@@/lib/libcrypto.0.9.7.dylib"; sourceTree = "<group>"; };
++		4D2617F709DECE3D00D08EFA /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = "@@PREFIX@@/lib/libcrypto.dylib"; sourceTree = "<group>"; };
  		4D2784360905709500687951 /* Transmission.icns */ = {isa = PBXFileReference; explicitFileType = image.icns; name = Transmission.icns; path = macosx/Images/Transmission.icns; sourceTree = "<group>"; };
  		4D364D9E091FBB2C00377D12 /* TorrentTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentTableView.h; path = macosx/TorrentTableView.h; sourceTree = "<group>"; };
  		4D364D9F091FBB2C00377D12 /* TorrentTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentTableView.m; path = macosx/TorrentTableView.m; sourceTree = "<group>"; };
@@ -57,7 +57,7 @@
 -			);
 -			runOnlyForDeploymentPostprocessing = 0;
 -			shellPath = /bin/bash;
--			shellScript = "if [ ! -e .//opt/local/include/event2/config.h -a ! ./third-party/macosx-libevent-config.h -ef .//opt/local/include/event2/config.h ]; then ln -s ../../../macosx-libevent-config.h .//opt/local/include/event2/config.h; fi\n\nif [ ! -e .//opt/local/include/event2/event-config.h -a ! ./third-party/macosx-libevent-event-config.h -ef .//opt/local/include/event2/event-config.h ]; then ln -s ../../../macosx-libevent-event-config.h .//opt/local/include/event2/event-config.h; fi";
+-			shellScript = "if [ ! -e ./@@PREFIX@@/include/event2/config.h -a ! ./third-party/macosx-libevent-config.h -ef ./@@PREFIX@@/include/event2/config.h ]; then ln -s ../../../macosx-libevent-config.h ./@@PREFIX@@/include/event2/config.h; fi\n\nif [ ! -e ./@@PREFIX@@/include/event2/event-config.h -a ! ./third-party/macosx-libevent-event-config.h -ef ./@@PREFIX@@/include/event2/event-config.h ]; then ln -s ../../../macosx-libevent-event-config.h ./@@PREFIX@@/include/event2/event-config.h; fi";
 -		};
  /* End PBXShellScriptBuildPhase section */
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110513/8db67bc6/attachment.html>