[41440] trunk/dports/aqua/osx2x
nox at macports.org
nox at macports.org
Mon Nov 3 01:32:33 PST 2008
Revision: 41440
http://trac.macports.org/changeset/41440
Author: nox at macports.org
Date: 2008-11-03 01:32:31 -0800 (Mon, 03 Nov 2008)
Log Message:
-----------
osx2x:
* Depend on MacPorts' openssl.
* Do not build universally by default.
* Now works (closes #12489).
Modified Paths:
--------------
trunk/dports/aqua/osx2x/Portfile
Added Paths:
-----------
trunk/dports/aqua/osx2x/files/
trunk/dports/aqua/osx2x/files/patch-XXRemoteVNC.m.diff
trunk/dports/aqua/osx2x/files/patch-osx2x.xcodeproj.diff
Modified: trunk/dports/aqua/osx2x/Portfile
===================================================================
--- trunk/dports/aqua/osx2x/Portfile 2008-11-03 08:51:25 UTC (rev 41439)
+++ trunk/dports/aqua/osx2x/Portfile 2008-11-03 09:32:31 UTC (rev 41440)
@@ -6,6 +6,7 @@
name osx2x
version 2.4
+revision 1
set git_hash 3cc708236898ab789bb99a5fba7420ff76ede9f7
platforms darwin
maintainers nomaintainer
@@ -30,4 +31,28 @@
sha1 1014e0ac22b0c00b47dde2b0f7f44eaa676acc7e \
rmd160 cc2a63b9dbfd9485c039fc989bbab96e6cf919ac
-depends_lib lib:libX11.6:XFree86
+patchfiles patch-osx2x.xcodeproj.diff \
+ patch-XXRemoteVNC.m.diff
+
+post-patch {
+ reinplace s|@PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
+ reinplace s|@X11_PREFIX@|$x11prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
+}
+
+depends_lib lib:libX11:xorg \
+ port:openssl
+
+set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib $x11prefix/lib'"
+
+eval xcode.build.settings-append $library_search_path
+eval xcode.destroot.settings-append $library_search_path
+
+post-destroot {
+ xinstall -d $destroot/Applications/MacPorts
+ copy $worksrcpath/build/UninstalledProducts/osx2x.app $destroot/Applications/MacPorts/
+}
+
+variant universal {
+ eval xcode.build.settings-append "ARCHS='${configure.universal_archs}'"
+ eval xcode.destroot.settings-append "ARCHS='${configure.universal_archs}'"
+}
Added: trunk/dports/aqua/osx2x/files/patch-XXRemoteVNC.m.diff
===================================================================
--- trunk/dports/aqua/osx2x/files/patch-XXRemoteVNC.m.diff (rev 0)
+++ trunk/dports/aqua/osx2x/files/patch-XXRemoteVNC.m.diff 2008-11-03 09:32:31 UTC (rev 41440)
@@ -0,0 +1,46 @@
+--- XXRemoteVNC.m.orig 2008-11-03 10:02:51.000000000 +0100
++++ XXRemoteVNC.m 2008-11-03 10:12:24.000000000 +0100
+@@ -56,12 +56,12 @@
+ #import <openssl/des.h>
+
+ // XXX: This is a hack as the 10.2 SDK seems to have the wrong header files
+-#undef des_ecb_encrypt
+-#undef des_set_key_unchecked
++#undef DES_ecb_encrypt
++#undef DES_set_key_unchecked
+
+-//void des_ecb_encrypt(const_des_cblock *input,des_cblock *output,
+-// des_key_schedule *ks,int enc);
+-//void des_set_key_unchecked(const_des_cblock *key, des_key_schedule *schedule);
++//void DES_ecb_encrypt(const_DES_cblock *input,DES_cblock *output,
++// DES_key_schedule *ks,int enc);
++//void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule);
+
+ #import "keymap.h"
+
+@@ -247,7 +247,7 @@
+ [self recv:challenge length:16];
+
+ // vnc has a weird hacked DES which reverses bit ordering in the key
+- des_cblock key;
++ DES_cblock key;
+ memset(key, 0, 8);
+ int i, bit;
+ for(i = 0; i < 8; ++i) {
+@@ -260,11 +260,11 @@
+ key[i] |= (0x80>>bit);
+ }
+
+- des_key_schedule sched;
+- des_set_key_unchecked(&key, &sched);
+- des_cblock *c;
+- c = (des_cblock*)(challenge); des_ecb_encrypt(c, c, &sched, DES_ENCRYPT);
+- c = (des_cblock*)(challenge+8); des_ecb_encrypt(c, c, &sched, DES_ENCRYPT);
++ DES_key_schedule sched;
++ DES_set_key_unchecked(&key, &sched);
++ DES_cblock *c;
++ c = (DES_cblock*)(challenge); DES_ecb_encrypt(c, c, &sched, DES_ENCRYPT);
++ c = (DES_cblock*)(challenge+8); DES_ecb_encrypt(c, c, &sched, DES_ENCRYPT);
+
+ [self send:challenge length:16];
+
Added: trunk/dports/aqua/osx2x/files/patch-osx2x.xcodeproj.diff
===================================================================
--- trunk/dports/aqua/osx2x/files/patch-osx2x.xcodeproj.diff (rev 0)
+++ trunk/dports/aqua/osx2x/files/patch-osx2x.xcodeproj.diff 2008-11-03 09:32:31 UTC (rev 41440)
@@ -0,0 +1,43 @@
+--- osx2x.xcodeproj/project.pbxproj.orig 2008-11-03 00:06:42.000000000 +0100
++++ osx2x.xcodeproj/project.pbxproj 2008-11-03 09:50:00.000000000 +0100
+@@ -83,9 +83,9 @@
+ 8D4129760BFB6AC400396206 /* XXView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = XXView.m; sourceTree = "<group>"; };
+ 8D4129910BFB6B1800396206 /* xcode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xcode.c; sourceTree = "<group>"; };
+ 8D4129920BFB6B1800396206 /* xcode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = xcode.h; sourceTree = "<group>"; };
+- 8D41299C0BFB6B6500396206 /* libcrypto.0.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.0.9.dylib; path = /usr/lib/libcrypto.0.9.dylib; sourceTree = "<absolute>"; };
+- 8D41299E0BFB6B7F00396206 /* libssl.0.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.0.9.dylib; path = /usr/lib/libssl.0.9.dylib; sourceTree = "<absolute>"; };
+- 8D4129A40BFB6BCE00396206 /* libX11.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libX11.dylib; path = /usr/X11R6/lib/libX11.dylib; sourceTree = "<absolute>"; };
++ 8D41299C0BFB6B6500396206 /* libcrypto.0.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = @PREFIX@/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
++ 8D41299E0BFB6B7F00396206 /* libssl.0.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = @PREFIX@/lib/libssl.dylib; sourceTree = "<absolute>"; };
++ 8D4129A40BFB6BCE00396206 /* libX11.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libX11.dylib; path = @X11_PREFIX@/lib/libX11.dylib; sourceTree = "<absolute>"; };
+ 8D4129AA0BFB6C2000396206 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
+ 8D4129AE0BFB6C7600396206 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+ 8D5D33FC0BFB6E2E000F47D5 /* osx2x.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = osx2x.icns; sourceTree = SOURCE_ROOT; };
+@@ -367,19 +367,9 @@
+ C01FCF4C08A954540054247B /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- ARCHS = (
+- ppc,
+- i386,
+- );
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_MODEL_TUNING = G5;
+ INFOPLIST_FILE = Info.plist;
+- INSTALL_PATH = "$(HOME)/Applications";
+- LIBRARY_SEARCH_PATHS = (
+- "$(inherited)",
+- /usr/X11R6/lib,
+- /usr/X11/lib,
+- );
+ PRODUCT_NAME = osx2x;
+ WRAPPER_EXTENSION = app;
+ };
+@@ -406,7 +396,6 @@
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ PREBINDING = NO;
+- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ };
+ name = Release;
+ };
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081103/ad37d487/attachment.html>
More information about the macports-changes
mailing list