[MacPorts] #21616: john @1.7.0.2 breaks on macports 1.8.0 on Snow Leopard

[MacPorts]

#21616: john @1.7.0.2 breaks on macports 1.8.0 on Snow Leopard
---------------------------------+------------------------------------------
 Reporter:  atma@…               |       Owner:  macports-tickets@…                   
     Type:  defect               |      Status:  new                                  
 Priority:  Normal               |   Milestone:                                       
Component:  ports                |     Version:  1.8.0                                
 Keywords:  john the ripper      |        Port:  john                                 
---------------------------------+------------------------------------------

Comment(by atma@…):

 Hello,

 Apparently the patch does not apply:

 angel:john root# wget http://trac.macports.org/raw-attachment/ticket/21616
 /Portfile-john.diff
 --2009-09-26 20:18:31--  http://trac.macports.org/raw-
 attachment/ticket/21616/Portfile-john.diff
 Resolving trac.macports.org (trac.macports.org)... 17.254.17.55
 Connecting to trac.macports.org (trac.macports.org)|17.254.17.55|:80...
 connected.
 HTTP request sent, awaiting response... 200 OK
 Length: 2224 (2.2K) [text/x-diff]
 Saving to: `Portfile-john.diff'

 100%[==================================================================================================================================================================>]
 2,224       2.97K/s   in 0.7s

 2009-09-26 20:18:33 (2.97 KB/s) - `Portfile-john.diff' saved [2224/2224]

 angel:john root# patch -p0 < Portfile-john.diff
 patching file Portfile
 Reversed (or previously applied) patch detected!  Assume -R? [n] y
 Hunk #2 FAILED at 34.
 1 out of 2 hunks FAILED -- saving rejects to file Portfile.rej
 angel:john root# tail Portfile.rej
       build.target    "clean macosx-ppc32"
   }
 + platform i386 {
       build.target    "clean macosx-x86-mmx"
   }
 + variant altivec conflicts i386 {
 +     build.target    "clean macosx-ppc32-altivec"
   }

   destroot {
 angel:john root# pwd
 /opt/local/var/macports/sources/rsync.macports.org/release/ports/sysutils/john
 angel:john root# cat Portfile.rej
 ***************
 *** 35,66 ****
                       rmd160 9e75f5fd5561595ec2f3a1a290e85605234b8c41
   worksrcdir          ${distname}/src

 - use_parallel_build  no
 -
 - patchfiles          patch-src-Makefile.diff \
 -                     patch-john.diff
 -
   use_configure       no
 - build.args-append JOHN_SYSTEMWIDE=1
 JOHN_SYSTEMWIDE_EXEC=\"${prefix}/share/john\"
 JOHN_SYSTEMWIDE_HOME=\"${prefix}/share/john\"

 - platform powerpc {
       build.target    "clean macosx-ppc32"
   }
 -
 - variant altivec {
 -     build.target    "clean macosx-ppc32-altivec"
 - }
 -
 - platform darwin 9 {
       build.target    "clean macosx-x86-mmx"
   }
 -
 - platform darwin 10 {
 -         if {$build_arch == "x86_64"} {
 -                 build.target    "clean macosx-x86-64"
 -         } else {
 -               build.target    "clean macosx-x86-mmx"
 -       }
   }

   destroot {
 --- 34,58 ----
                       rmd160 9e75f5fd5561595ec2f3a1a290e85605234b8c41
   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

 + platform powerpc {
       build.target    "clean macosx-ppc32"
   }
 + platform i386 {
       build.target    "clean macosx-x86-mmx"
   }
 + variant altivec conflicts i386 {
 +     build.target    "clean macosx-ppc32-altivec"
   }

   destroot {
 angel:john root#

-- 
Ticket URL: <http://trac.macports.org/ticket/21616#comment:8>
MacPorts <http://www.macports.org/>
Ports system for Mac OS