[23254] trunk/dports/sysutils/john

[source_changes at macosforge.org]

Revision: 23254
          http://trac.macosforge.org/projects/macports/changeset/23254
Author:   jann at macports.org
Date:     2007-03-27 23:26:08 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
Fixed john and john devel, fixes #11526

Modified Paths:
--------------
    trunk/dports/sysutils/john/Portfile
    trunk/dports/sysutils/john-devel/Portfile

Modified: trunk/dports/sysutils/john/Portfile
===================================================================
--- trunk/dports/sysutils/john/Portfile	2007-03-28 06:20:16 UTC (rev 23253)
+++ trunk/dports/sysutils/john/Portfile	2007-03-28 06:26:08 UTC (rev 23254)
@@ -34,9 +34,14 @@
                     rmd160 9e75f5fd5561595ec2f3a1a290e85605234b8c41
 worksrcdir          ${distname}/src
 
-post-patch  {
+post-patch {
+    if {[variant_isset powerpc]} {
     reinplace "s,CFLAGS =,CFLAGS = -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\",g" ${worksrcpath}/Makefile
     reinplace "s,CFLAGS=\",CFLAGS=\"-DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" ,g" ${worksrcpath}/Makefile
+    } else {
+        reinplace "s,CFLAGS =,CFLAGS = -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\"${prefix}/share/john\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\"${prefix}/share/john\\\\\\\",g" ${worksrcpath}/Makefile
+        reinplace "s,CFLAGS=\",CFLAGS=\"-DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\"${prefix}/share/john\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\"${prefix}/share/john\\\\\\\" ,g" ${worksrcpath}/Makefile
+    }
 }
 use_configure       no
 

Modified: trunk/dports/sysutils/john-devel/Portfile
===================================================================
--- trunk/dports/sysutils/john-devel/Portfile	2007-03-28 06:20:16 UTC (rev 23253)
+++ trunk/dports/sysutils/john-devel/Portfile	2007-03-28 06:26:08 UTC (rev 23254)
@@ -36,8 +36,13 @@
 worksrcdir          ${distname}/src
 
 post-patch {
+    if {[variant_isset powerpc]} {
     reinplace "s,CFLAGS =,CFLAGS = -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\",g" ${worksrcpath}/Makefile
     reinplace "s,CFLAGS=\",CFLAGS=\"-DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" ,g" ${worksrcpath}/Makefile
+    } else {
+        reinplace "s,CFLAGS =,CFLAGS = -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\"${prefix}/share/john\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\"${prefix}/share/john\\\\\\\",g" ${worksrcpath}/Makefile
+        reinplace "s,CFLAGS=\",CFLAGS=\"-DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\"${prefix}/share/john\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\"${prefix}/share/john\\\\\\\" ,g" ${worksrcpath}/Makefile
+    }
 }
 use_configure       no
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070327/5c834edc/attachment.html