Sat Aug 8 12:42:22 2020 UTC ()
john: install documentation

PKGREVISION++


(leot)
diff -r1.29 -r1.30 pkgsrc/security/john/Makefile
diff -r1.5 -r1.6 pkgsrc/security/john/PLIST
cvs diff -r1.29 -r1.30 pkgsrc/security/john/Makefile (expand / switch to unified diff)

--- pkgsrc/security/john/Makefile 2020/08/08 02:09:01 1.29
+++ pkgsrc/security/john/Makefile 2020/08/08 12:42:22 1.30
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1# $NetBSD: Makefile,v 1.29 2020/08/08 02:09:01 leot Exp $ 1# $NetBSD: Makefile,v 1.30 2020/08/08 12:42:22 leot Exp $
2# 2#
3 3
4DISTNAME= john-1.9.0 4DISTNAME= john-1.9.0
 5PKGREVISION= 1
5CATEGORIES= security textproc 6CATEGORIES= security textproc
6MASTER_SITES= http://www.openwall.com/john/k/ 7MASTER_SITES= http://www.openwall.com/john/k/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.openwall.com/john/ 11HOMEPAGE= https://www.openwall.com/john/
11COMMENT= Unix Password Cracker 12COMMENT= Unix Password Cracker
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14BUILD_DIRS= src 15BUILD_DIRS= src
15TEST_TARGET= check 16TEST_TARGET= check
16 17
 18USE_TOOLS+= gmake
 19
17.include "../../mk/compiler.mk" 20.include "../../mk/compiler.mk"
18.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
19 22
20.if ${OPSYS} == "SunOS" 23.if ${OPSYS} == "SunOS"
21JOHN_ARCH.i386= x86-any 24JOHN_ARCH.i386= x86-any
22JOHN_ARCH.sparc= sparc 25JOHN_ARCH.sparc= sparc
23JOHN_ARCH.sparc64= sparcv9 26JOHN_ARCH.sparc64= sparcv9
24JOHN_ARCH.x86_64= x86-64 27JOHN_ARCH.x86_64= x86-64
25JOHN_CC.gcc= gcc 28JOHN_CC.gcc= gcc
26JOHN_CC.sunpro= cc 29JOHN_CC.sunpro= cc
27BUILD_TARGET= solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}} 30BUILD_TARGET= solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}}
28.elif ${OPSYS} == "NetBSD" 31.elif ${OPSYS} == "NetBSD"
29. if ${MACHINE_ARCH} == "i386" 32. if ${MACHINE_ARCH} == "i386"
@@ -61,38 +64,42 @@ BUILD_TARGET= openbsd-ppc32 @@ -61,38 +64,42 @@ BUILD_TARGET= openbsd-ppc32
61. elif ${MACHINE_ARCH} == "powerpc64" 64. elif ${MACHINE_ARCH} == "powerpc64"
62BUILD_TARGET= openbsd-ppc64 65BUILD_TARGET= openbsd-ppc64
63. else 66. else
64BUILD_TARGET= generic 67BUILD_TARGET= generic
65. endif 68. endif
66.else 69.else
67BUILD_TARGET= generic 70BUILD_TARGET= generic
68.endif 71.endif
69 72
70# Avoid possible per-platform optimization 73# Avoid possible per-platform optimization
71MAKE_FLAGS+= OPT_NORMAL= 74MAKE_FLAGS+= OPT_NORMAL=
72MAKE_FLAGS+= OPT_INLINE= 75MAKE_FLAGS+= OPT_INLINE=
73 76
74INSTALLATION_DIRS= bin share/john 77INSTALLATION_DIRS= bin share/john share/doc/john
75 78
76SUBST_CLASSES+= fix-paths 79SUBST_CLASSES+= fix-paths
77SUBST_STAGE.fix-paths= pre-configure 80SUBST_STAGE.fix-paths= pre-configure
78SUBST_MESSAGE.fix-paths= Fixing hardcoded paths. 81SUBST_MESSAGE.fix-paths= Fixing hardcoded paths.
79SUBST_FILES.fix-paths= src/params.h 82SUBST_FILES.fix-paths= src/params.h
80SUBST_VARS.fix-paths= PREFIX 83SUBST_VARS.fix-paths= PREFIX
81 84
82do-install: 85do-install:
83 # programs and scripts 86 # programs and scripts
84 ${INSTALL_PROGRAM} ${WRKSRC}/run/john ${DESTDIR}${PREFIX}/bin 87 ${INSTALL_PROGRAM} ${WRKSRC}/run/john ${DESTDIR}${PREFIX}/bin
85 ${INSTALL_SCRIPT} ${WRKSRC}/run/mailer ${DESTDIR}${PREFIX}/bin 88 ${INSTALL_SCRIPT} ${WRKSRC}/run/mailer ${DESTDIR}${PREFIX}/bin
86 # configuration file 89 # configuration file
87 ${INSTALL_DATA} ${WRKSRC}/run/john.conf ${DESTDIR}${PREFIX}/share/john 90 ${INSTALL_DATA} ${WRKSRC}/run/john.conf ${DESTDIR}${PREFIX}/share/john
88 # symbolic links 91 # symbolic links
89.for i in unafs unique unshadow 92.for i in unafs unique unshadow
90 ${LN} -sf john ${DESTDIR}${PREFIX}/bin/${i} 93 ${LN} -sf john ${DESTDIR}${PREFIX}/bin/${i}
91.endfor 94.endfor
92 # data files 95 # data files
93.for i in alnum.chr alpha.chr ascii.chr digits.chr lm_ascii.chr lower.chr \ 96.for i in alnum.chr alpha.chr ascii.chr digits.chr lm_ascii.chr lower.chr \
94 lowernum.chr lowerspace.chr upper.chr uppernum.chr password.lst 97 lowernum.chr lowerspace.chr upper.chr uppernum.chr password.lst
95 ${INSTALL_DATA} ${WRKSRC}/run/${i} ${DESTDIR}${PREFIX}/share/john 98 ${INSTALL_DATA} ${WRKSRC}/run/${i} ${DESTDIR}${PREFIX}/share/john
96.endfor 99.endfor
 100 # documentation
 101.for i in CONFIG EXAMPLES FAQ MODES OPTIONS README RULES
 102 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/john
 103.endfor
97 104
98.include "../../mk/bsd.pkg.mk" 105.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/security/john/PLIST (expand / switch to unified diff)

--- pkgsrc/security/john/PLIST 2020/08/08 02:09:01 1.5
+++ pkgsrc/security/john/PLIST 2020/08/08 12:42:22 1.6
@@ -1,18 +1,25 @@ @@ -1,18 +1,25 @@
1@comment $NetBSD: PLIST,v 1.5 2020/08/08 02:09:01 leot Exp $ 1@comment $NetBSD: PLIST,v 1.6 2020/08/08 12:42:22 leot Exp $
2bin/john 2bin/john
3bin/mailer 3bin/mailer
4bin/unafs 4bin/unafs
5bin/unique 5bin/unique
6bin/unshadow 6bin/unshadow
 7share/doc/john/CONFIG
 8share/doc/john/EXAMPLES
 9share/doc/john/FAQ
 10share/doc/john/MODES
 11share/doc/john/OPTIONS
 12share/doc/john/README
 13share/doc/john/RULES
7share/john/alnum.chr 14share/john/alnum.chr
8share/john/alpha.chr 15share/john/alpha.chr
9share/john/ascii.chr 16share/john/ascii.chr
10share/john/digits.chr 17share/john/digits.chr
11share/john/john.conf 18share/john/john.conf
12share/john/lm_ascii.chr 19share/john/lm_ascii.chr
13share/john/lower.chr 20share/john/lower.chr
14share/john/lowernum.chr 21share/john/lowernum.chr
15share/john/lowerspace.chr 22share/john/lowerspace.chr
16share/john/password.lst 23share/john/password.lst
17share/john/upper.chr 24share/john/upper.chr
18share/john/uppernum.chr 25share/john/uppernum.chr