[43262] trunk/dports/sysutils/john-devel

[blb at macports.org]

Revision: 43262
          http://trac.macports.org/changeset/43262
Author:   blb at macports.org
Date:     2008-12-07 14:17:44 -0800 (Sun, 07 Dec 2008)
Log Message:
-----------
sysutils/john-devel - version update to 1.7.3.1, clean how the paths are
set up (getting rid of the massive escaping), switch default x86 build to
the SSE2 one, and add a 64 bit variant

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

Added Paths:
-----------
    trunk/dports/sysutils/john-devel/files/
    trunk/dports/sysutils/john-devel/files/patch-params.h

Modified: trunk/dports/sysutils/john-devel/Portfile
===================================================================
--- trunk/dports/sysutils/john-devel/Portfile	2008-12-07 21:52:09 UTC (rev 43261)
+++ trunk/dports/sysutils/john-devel/Portfile	2008-12-07 22:17:44 UTC (rev 43262)
@@ -2,7 +2,7 @@
 
 PortSystem          1.0
 name                john-devel
-version             1.7.2
+version             1.7.3.1
 categories          sysutils security
 maintainers         nomaintainer
 description         Featureful Unix password cracker
@@ -29,33 +29,41 @@
                     ftp://ftp.ua.openwall.com/pub/projects/john/${version}/ \
                     ftp://ftp.cz.openwall.com/pub/projects/john/${version}/
 use_bzip2           yes
-checksums           md5 dc6a6c2a885110ccb5da4c1e2010cb07 \
-                    sha1 7cc994f9cbd1582b46cbdeb1d5f318891ea8b411 \
-                    rmd160 3754da88a98f1c120e28de1eb10b214bf7dd3baf
+checksums           md5     4a8de450ff332bd0c7cbc573eb5032d9 \
+                    sha1    45f6ed73f7ea82460f3a33d6452bd8c17bdf863d \
+                    rmd160  f6e01c72c068904fe9e49a0669a9cdf0dc745be2
 distname            john-${version}
 worksrcdir          ${distname}/src
 
+# Patch params.h since that avoids lots of messy escaping and quoting
+# issues
+patchfiles          patch-params.h
 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
-    }
+    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/params.h
 }
+
 use_configure       no
 
 platform powerpc {
     build.target    "clean macosx-ppc32"
 }
+
 platform i386 {
-    build.target    "clean macosx-x86-mmx"
+    build.target    "clean macosx-x86-sse2"
 }
-variant altivec conflicts i386 {
+
+variant altivec conflicts i386 description {Enable AltiVec support} {
     build.target    "clean macosx-ppc32-altivec"
 }
 
+variant use_64_bit conflicts altivec description {Enable 64bit support} {
+    if {[variant_isset powerpc]} {
+        build.target    "clean macosx-ppc64"
+    } else {
+        build.target    "clean macosx-x86-64"
+    }
+}
+
 destroot {
     xinstall -d ${destroot}${prefix}/bin
     file copy ${workpath}/${distname}/run ${destroot}${prefix}/share/john
@@ -71,3 +79,4 @@
     ui_msg  "You'll find the john files under ${prefix}/share/john/"
     ui_msg  ""
 }
+

Added: trunk/dports/sysutils/john-devel/files/patch-params.h
===================================================================
--- trunk/dports/sysutils/john-devel/files/patch-params.h	                        (rev 0)
+++ trunk/dports/sysutils/john-devel/files/patch-params.h	2008-12-07 22:17:44 UTC (rev 43262)
@@ -0,0 +1,21 @@
+--- params.h.orig	2008-07-13 15:38:46.000000000 -0600
++++ params.h	2008-12-07 15:13:46.000000000 -0700
+@@ -49,15 +49,15 @@
+  * notes above.
+  */
+ #ifndef JOHN_SYSTEMWIDE
+-#define JOHN_SYSTEMWIDE			0
++#define JOHN_SYSTEMWIDE			1
+ #endif
+ 
+ #if JOHN_SYSTEMWIDE
+ #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */
+-#define JOHN_SYSTEMWIDE_EXEC		"/usr/libexec/john"
++#define JOHN_SYSTEMWIDE_EXEC		"@@PREFIX@@/share/john"
+ #endif
+ #ifndef JOHN_SYSTEMWIDE_HOME
+-#define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
++#define JOHN_SYSTEMWIDE_HOME		"@@PREFIX@@/share/john"
+ #endif
+ #define JOHN_PRIVATE_HOME		"~/.john"
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081207/f20230dc/attachment.html>