[72148] trunk/dports/devel/activewire

[ryandesign at macports.org]

Revision: 72148
          http://trac.macports.org/changeset/72148
Author:   ryandesign at macports.org
Date:     2010-10-04 20:55:22 -0700 (Mon, 04 Oct 2010)
Log Message:
-----------
activewire: fix build errors on 10.6; see #25949

Modified Paths:
--------------
    trunk/dports/devel/activewire/Portfile

Added Paths:
-----------
    trunk/dports/devel/activewire/files/
    trunk/dports/devel/activewire/files/patch-Shared-libCdsaCrypt-libCdsaCrypt.cpp.diff

Modified: trunk/dports/devel/activewire/Portfile
===================================================================
--- trunk/dports/devel/activewire/Portfile	2010-10-05 03:39:52 UTC (rev 72147)
+++ trunk/dports/devel/activewire/Portfile	2010-10-05 03:55:22 UTC (rev 72148)
@@ -31,8 +31,6 @@
 default_variants    +doc \
                     +dev
 
-# Doesn't build with 10.5
-macosx_deployment_target 10.5
 variant awdriver description {Install ActiveWire driver} {}
 variant awconfig description {Install awconfig utility} {}
 variant doc description {Install documentation} {}
@@ -40,11 +38,17 @@
 
 # variant realbasic description {Install REALbasic plugin} {}
 
+patchfiles          patch-Shared-libCdsaCrypt-libCdsaCrypt.cpp.diff
+
 pre-configure {
     foreach i {libaw awdriver awconfig} {
         reinplace "s|/usr/local|${prefix}|g" "${worksrcpath}/$i/$i.xcodeproj/project.pbxproj"
         reinplace "s|/usr/share/man/man1/|${prefix}/include|g" "${worksrcpath}/$i/$i.xcodeproj/project.pbxproj"
-        reinplace "s|MacOSX10.4u.sdk|MacOSX10.5.sdk|g" "${worksrcpath}/$i/$i.xcodeproj/project.pbxproj"
+        if {${configure.sdkroot} == ""} {
+            reinplace "\\|/Developer/SDKs/MacOSX10.4u.sdk|d" "${worksrcpath}/$i/$i.xcodeproj/project.pbxproj"
+        } else {
+            reinplace "s|/Developer/SDKs/MacOSX10.4u.sdk|${configure.sdkroot}|g" "${worksrcpath}/$i/$i.xcodeproj/project.pbxproj"
+        }
     }
 }
 

Added: trunk/dports/devel/activewire/files/patch-Shared-libCdsaCrypt-libCdsaCrypt.cpp.diff
===================================================================
--- trunk/dports/devel/activewire/files/patch-Shared-libCdsaCrypt-libCdsaCrypt.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/activewire/files/patch-Shared-libCdsaCrypt-libCdsaCrypt.cpp.diff	2010-10-05 03:55:22 UTC (rev 72148)
@@ -0,0 +1,59 @@
+--- Shared/libCdsaCrypt/libCdsaCrypt.cpp.orig	2006-11-12 12:07:56.000000000 -0600
++++ Shared/libCdsaCrypt/libCdsaCrypt.cpp	2010-10-04 22:30:27.000000000 -0500
+@@ -59,17 +59,17 @@
+ /*
+  * Standard app-level memory functions required by CDSA.
+  */
+-void * appMalloc (uint32 size, void *allocRef) {
++void * appMalloc (CSSM_SIZE size, void *allocRef) {
+ 	return( malloc(size) );
+ }
+ void appFree (void *mem_ptr, void *allocRef) {
+ 	free(mem_ptr);
+  	return;
+ }
+-void * appRealloc (void *ptr, uint32 size, void *allocRef) {
++void * appRealloc (void *ptr, CSSM_SIZE size, void *allocRef) {
+ 	return( realloc( ptr, size ) );
+ }
+-void * appCalloc (uint32 num, uint32 size, void *allocRef) {
++void * appCalloc (uint32 num, CSSM_SIZE size, void *allocRef) {
+ 	return( calloc( num, size ) );
+ }
+ static CSSM_API_MEMORY_FUNCS memFuncs = {
+@@ -545,7 +545,7 @@
+ 	CSSM_RETURN 	crtn;
+ 	CSSM_CC_HANDLE	ccHandle;
+ 	CSSM_DATA		remData = {0, NULL};
+-	uint32			bytesEncrypted;
++	CSSM_SIZE		bytesEncrypted;
+ 	
+ 	crtn = genCryptHandle(cspHandle, key, &ivCommon, &ccHandle);
+ 	if(crtn) {
+@@ -611,7 +611,7 @@
+ 	CSSM_RETURN 	crtn;
+ 	CSSM_CC_HANDLE	ccHandle;
+ 	CSSM_DATA		remData = {0, NULL};
+-	uint32			bytesDecrypted;
++	CSSM_SIZE		bytesDecrypted;
+ 	
+ 	crtn = genCryptHandle(cspHandle, key, &ivCommon, &ccHandle);
+ 	if(crtn) {
+@@ -719,7 +719,7 @@
+ 
+ 	/* 1. any more data to encrypt? */
+ 	if(plainText && plainText->Length) {
+-		uint32 bytesEncrypted;
++		CSSM_SIZE bytesEncrypted;
+ 		
+ 		crtn = CSSM_EncryptDataUpdate(ccHandle,
+ 			plainText,
+@@ -778,7 +778,7 @@
+ 
+ 	/* 1. any more data to decrypt? */
+ 	if(cipherText && cipherText->Length) {
+-		uint32 bytesDecrypted;
++		CSSM_SIZE bytesDecrypted;
+ 		
+ 		crtn = CSSM_DecryptDataUpdate(ccHandle,
+ 			cipherText,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101004/6ff723a3/attachment.html>