- Update from 1.7.9-jumbo-5 to 1.7.9-jumbo-7 [1]

- Support staging
- Minor fixes

maintainer timeout [1]

PR:		ports/180794, ports/185246 [1]
Submitted by:	Hung-Yi Chen, Royce Williams [1]

3 files changed, 19 insertions, 21 deletions

diff --git a/security/john/Makefile b/security/john/Makefile
index bebf70efd8e9..d5e59c98abf3 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	john
-DISTVERSION=	1.7.9-jumbo-5
+DISTVERSION=	1.7.9-jumbo-7
 CATEGORIES=	security
 MASTER_SITES=	http://www.openwall.com/john/g/ \
 		http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \
@@ -14,8 +14,9 @@ COMMENT=	Featureful Unix password cracker
 
 LICENSE=	GPLv2
 
+USES=		gmake shebangfix
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+SHEBANG_FILES=	run/*.pl
 BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
 # We prefer -jumbo (community-enhanced) versions instead of vanilla releases
@@ -37,7 +38,6 @@ PORTDOCS=	CHANGES CONFIG EXAMPLES EXTERNAL FAQ MODES OPTIONS README \
 OPTIONS_DEFINE=	OPENMP DOCS
 OPENMP_DESC=	Compile with OpenMP support
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -80,20 +80,15 @@ pre-build:
 	@${ECHO_CMD}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/run/john ${PREFIX}/bin
-	${LN} -sf john ${PREFIX}/bin/xtract
-	${LN} -sf john ${PREFIX}/bin/unshadow
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/run && ${INSTALL_DATA} *.??? [^j]*.conf ${DATADIR}
-	cd ${WRKSRC}/run && ${INSTALL_SCRIPT} *.?? mailer ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/run/john ${STAGEDIR}${PREFIX}/bin
+	${LN} -sf john ${STAGEDIR}${PREFIX}/bin/xtract
+	${LN} -sf john ${STAGEDIR}${PREFIX}/bin/unshadow
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC}/run && ${INSTALL_DATA} *.??? [^j]*.conf ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC}/run && ${INSTALL_SCRIPT} *.?? mailer ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/run/john.conf \
-		${PREFIX}/etc/john.conf.default
-.if !exists(${PREFIX}/etc/john.conf)
-	${INSTALL_DATA} ${WRKSRC}/run/john.conf ${PREFIX}/etc
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
-.endif
+		${STAGEDIR}${PREFIX}/etc/john.conf.default
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/security/john/distinfo b/security/john/distinfo
index bd1f21894ab4..23014c83b89d 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,2 +1,2 @@
-SHA256 (john-1.7.9-jumbo-5.tar.bz2) = 4007aec40d2fedb1ce3287c62f23f8a1a8b8029d22cd3cbc60bb1a42f56c1a7f
-SIZE (john-1.7.9-jumbo-5.tar.bz2) = 1214046
+SHA256 (john-1.7.9-jumbo-7.tar.bz2) = fa7e5a1a31e61d516a97318fac27758ca40b1a626f4dbf353ecece8a41f54d32
+SIZE (john-1.7.9-jumbo-7.tar.bz2) = 1595514
diff --git a/security/john/pkg-plist b/security/john/pkg-plist
index d710d692affa..fdcc2a0e1669 100644
--- a/security/john/pkg-plist
+++ b/security/john/pkg-plist
@@ -7,7 +7,7 @@ etc/john.conf.default
 %%DATADIR%%/all.chr
 %%DATADIR%%/alnum.chr
 %%DATADIR%%/alpha.chr
-%%DATADIR%%/cmpt_cp.pl
+%%DATADIR%%/cracf2john.py
 %%DATADIR%%/digits.chr
 %%DATADIR%%/dumb16.conf
 %%DATADIR%%/dumb32.conf
@@ -20,9 +20,12 @@ etc/john.conf.default
 %%DATADIR%%/mailer
 %%DATADIR%%/netntlm.pl
 %%DATADIR%%/netscreen.py
+%%DATADIR%%/odf2john.py
+%%DATADIR%%/pass_gen.pl
 %%DATADIR%%/password.lst
 %%DATADIR%%/radius2john.pl
-%%DATADIR%%/sap_prepare.pl
+%%DATADIR%%/sap2john.pl
 %%DATADIR%%/sha-dump.pl
 %%DATADIR%%/sha-test.pl
+%%DATADIR%%/sipdump2john.py
 @dirrm %%DATADIR%%