[56490] trunk/dports/aqua/launch

[toby at macports.org]

Revision: 56490
          http://trac.macports.org/changeset/56490
Author:   toby at macports.org
Date:     2009-08-28 13:59:59 -0700 (Fri, 28 Aug 2009)
Log Message:
-----------
#20865 (port 'launch' uses Jam, does not work in 10.6)

Modified Paths:
--------------
    trunk/dports/aqua/launch/Portfile

Added Paths:
-----------
    trunk/dports/aqua/launch/files/
    trunk/dports/aqua/launch/files/patch-main.c

Modified: trunk/dports/aqua/launch/Portfile
===================================================================
--- trunk/dports/aqua/launch/Portfile	2009-08-28 20:53:44 UTC (rev 56489)
+++ trunk/dports/aqua/launch/Portfile	2009-08-28 20:59:59 UTC (rev 56490)
@@ -4,7 +4,7 @@
 PortGroup       xcode 1.0
 
 name            launch
-version         1.0.1
+version         1.1
 categories      aqua
 maintainers     nomaintainer
 description     command-line launcher for Mac OS X in the spirit of open
@@ -19,14 +19,11 @@
 homepage        http://web.sabi.net/nriley/software/
 master_sites    ${homepage}
 
-checksums       md5 0c9f963701cdbe3272e2634cc3693b0d \
-                sha1 fe22ea94418db5243bff8302596f12bdd0cc5c9f \
-                rmd160 b118756cc60fe25f89a5f34417b68afe67eaf3f5
+checksums       md5 bcd5179d5b519248a717aa73f3819e00 \
+                sha1 000d6f1063f1b9091a8b10de90cfa778ed6a6ed1 \
+                rmd160 7eba376fdedd322ecfcc4d429bf608dcd1e79c34
 
-post-patch {
-    reinplace -E "/(MACOSX_DEPLOYMENT_TARGET|SDKROOT) =/d" \
-        ${worksrcpath}/${name}.pbproj/project.pbxproj
-}
+patchfiles      patch-main.c
 
 xcode.destroot.path ${prefix}/bin
 
@@ -39,14 +36,5 @@
     xinstall -m 0644 ${worksrcpath}/README ${destroot}${docdir}
 }
 
-variant universal {
-    post-patch {
-        reinplace -E "/OTHER_CFLAGS =/s|\"\"|\"${configure.universal_cflags}\"|" \
-            ${worksrcpath}/${name}.pbproj/project.pbxproj
-        reinplace -E "/OTHER_LDFLAGS =/s|\"\"|\"${configure.universal_ldflags}\"|" \
-            ${worksrcpath}/${name}.pbproj/project.pbxproj
-    }
-}
-
 livecheck.check none
 

Added: trunk/dports/aqua/launch/files/patch-main.c
===================================================================
--- trunk/dports/aqua/launch/files/patch-main.c	                        (rev 0)
+++ trunk/dports/aqua/launch/files/patch-main.c	2009-08-28 20:59:59 UTC (rev 56490)
@@ -0,0 +1,60 @@
+--- main.c.orig	2006-10-30 02:56:23.000000000 -0800
++++ main.c	2009-08-28 13:58:09.000000000 -0700
+@@ -147,7 +147,7 @@
+     len = strlen(errDesc) + 10 * sizeof(char);
+     str = (char *)malloc(len);
+     if (str != NULL)
+-        snprintf(str, len, "%s (%ld)", errDesc, err);
++        snprintf(str, len, "%s (%d)", errDesc, (int)err);
+     else
+         str = failedStr;
+     return str;
+@@ -580,7 +580,7 @@
+     if (bigSize == 0) {
+         if (littleSize == 0) {
+             printf("zero bytes on disk (zero bytes used)\n"); return;
+-        } else if (littleSize < 1024) printf("%lu bytes", littleSize);
++        } else if (littleSize < 1024) printf("%u bytes", (unsigned int)littleSize);
+         else {
+             UInt32 adjSize = littleSize >> 10;
+             if (adjSize < 1024) printf("%.1f KB", DFORMAT(littleSize));
+@@ -594,10 +594,10 @@
+             }
+         }
+     } else {
+-        if (bigSize < 256) printf("%lu GB", bigSize);
++        if (bigSize < 256) printf("%u GB", (unsigned int)bigSize);
+         else {
+             bigSize >>= 2;
+-            printf("%lu TB", bigSize);
++            printf("%u TB", (unsigned int)bigSize);
+         }
+     }
+     printf(" on disk (%llu bytes used)\n", logicalSize);
+@@ -616,7 +616,7 @@
+ 	switch (fscInfo.valence) {
+ 	case 0: printf("zero items\n"); break;
+ 	case 1: printf("1 item\n"); break;
+-	default: printf("%lu items\n", fscInfo.valence);
++	default: printf("%u items\n", (unsigned int)fscInfo.valence);
+ 	}
+     } else {
+         printSizes("data fork size", fscInfo.dataLogicalSize, fscInfo.dataPhysicalSize, true);
+@@ -735,7 +735,7 @@
+             printf("unknown (cputype %d, subtype %d)", fat[i].cputype, fat[i].cpusubtype);
+             continue;
+         }
+-        printf(arch->description);
++        printf("%s", arch->description);
+     }
+     printf("\n");
+ }
+@@ -880,7 +880,7 @@
+ 
+ 	if (version != NULL) {
+ 	    printf("\tversion: %s", utf8StringFromCFStringRef(version));
+-	    if (intVersion != 0) printf(" [0x%lx = %lu]", intVersion, intVersion);
++	    if (intVersion != 0) printf(" [0x%x = %u]", (unsigned int)intVersion, (unsigned int)intVersion);
+ 	    putchar('\n');
+ 	    CFRelease(version);
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090828/f6a4697f/attachment.html>