Changeset 66272


Ignore:
Timestamp:
Apr 8, 2010, 6:03:51 AM (7 years ago)
Author:
ryandesign@…
Message:

john:

  • update to 1.7.3.4
  • turn off parallel build which fails and causes errors like #21616
  • use a patchfile to patch params.h instead of complicated CFLAGS reinplaces
  • overhaul how the build.target is selected, now based on build_arch
  • simplify destroot phase by using worksrcpath variable
Location:
trunk/dports/sysutils/john
Files:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/john/Portfile

    r66271 r66272  
    33PortSystem          1.0
    44name                john
    5 version             1.7.0.2
     5version             1.7.3.4
    66categories          sysutils security
    77maintainers         nomaintainer
     
    3030                    ftp://ftp.cz.openwall.com/pub/projects/john/${version}/
    3131use_bzip2           yes
    32 checksums           md5 0a87dca1f149493fc087ea8a8b6ae5d5 \
    33                     sha1 bc6895c986d65f502366cf93c91f88ba865572b6 \
    34                     rmd160 9e75f5fd5561595ec2f3a1a290e85605234b8c41
    35 worksrcdir          ${distname}/src
    3632
     33checksums           md5     2f2310c49961c3edea6f92b8dcd45ff4 \
     34                    sha1    3919cac037360512e6d72d04d72d492ee9673ded \
     35                    rmd160  a3a27c24eb71af8797bc02621ed02a8c9edd6b1d
     36
     37patchfiles          patch-src-Makefile.diff \
     38                    patch-src-params.h.diff
    3739post-patch {
    38     if {[variant_isset powerpc]} {
    39     reinplace "s,CFLAGS =,CFLAGS = -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\",g" ${worksrcpath}/Makefile
    40     reinplace "s,CFLAGS=\",CFLAGS=\"-DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\\\\\\\"${prefix}/share/john\\\\\\\\\\\\\" ,g" ${worksrcpath}/Makefile
    41     } else {
    42         reinplace "s,CFLAGS =,CFLAGS = -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\"${prefix}/share/john\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\"${prefix}/share/john\\\\\\\",g" ${worksrcpath}/Makefile
    43         reinplace "s,CFLAGS=\",CFLAGS=\"-DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\\\\\"${prefix}/share/john\\\\\\\" -DJOHN_SYSTEMWIDE_HOME=\\\\\\\"${prefix}/share/john\\\\\\\" ,g" ${worksrcpath}/Makefile
    44     }
     40    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/params.h
    4541}
     42
    4643use_configure       no
    4744
    48 platform powerpc {
    49     build.target    "clean macosx-ppc32"
    50 }
    51 platform i386 {
    52     build.target    "clean macosx-x86-mmx"
    53 }
    54 variant altivec conflicts i386 {
    55     build.target    "clean macosx-ppc32-altivec"
     45use_parallel_build  no
     46
     47build.dir           ${worksrcpath}/src
     48build.args          CC=${configure.cc}
     49build.target        clean
     50switch ${configure.build_arch} {
     51    i386 {
     52        build.target-append macosx-x86-sse2
     53    }
     54    x86_64 {
     55        # x86_64 is only supported on Leopard and up
     56        if {${os.major} >= 9} {
     57            build.target-append macosx-x86-64
     58        } else {
     59            configure.build_arch i386
     60            build.target-append macosx-x86-sse2
     61        }
     62    }
     63    ppc {
     64        # Use altivec if available
     65        if {[exec sysctl -n hw.vectorunit] == 1} {
     66            build.target-append macosx-ppc32-altivec
     67        } else {
     68            build.target-append macosx-ppc32
     69        }
     70    }
     71    ppc64 {
     72        build.target-append macosx-ppc64
     73    }
    5674}
    5775
    5876destroot {
    59     xinstall -d ${destroot}${prefix}/bin
    60     file copy ${workpath}/${distname}/run ${destroot}${prefix}/share/john
     77    file copy ${worksrcpath}/run ${destroot}${prefix}/share/john
    6178    system "chmod -R a+rx ${destroot}${prefix}/share/john"
    6279    system "ln -s ${prefix}/share/john/john ${destroot}${prefix}/bin/john"
    6380    xinstall -d ${destroot}${prefix}/share/doc
    64     file copy ${workpath}/${distname}/doc ${destroot}${prefix}/share/doc/john
     81    file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/john
    6582    system "chmod -R a+rx ${destroot}${prefix}/share/doc/john"
    6683}
Note: See TracChangeset for help on using the changeset viewer.