Fix self-references. Sort PLIST. Use @dirrm instead of rm -rf.

Bump revision.

2 files changed, 76 insertions, 64 deletions

diff --git a/security/crack/Makefile b/security/crack/Makefile
index ebb06cfd649..a40621944b1 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:01:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/14 11:59:39 joerg Exp $
 
 DISTNAME=	crack5.0
 PKGNAME=	crack-5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.cerias.purdue.edu/pub/tools/unix/pwdutils/crack \
 		ftp://ftp.netsw.org/system/tools/password/crack/crack/
@@ -15,6 +15,13 @@ WRKSRC=		${WRKDIR}/c50a
 
 INSTALLATION_DIRS=	sbin
 
+REPLACE_INTERPRETER+=	xdawg
+REPLACE.xdawg.old=	.*xdawg
+REPLACE.xdawg.new=	${PREFIX}/libexec/crack/xdawg
+REPLACE_FILES.xdawg=	dict/*/*
+
+CHECK_INTERPRETER_SKIP+=	share/crack/extra/Dictstats.pl
+
 pre-configure:
 	@${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
 
diff --git a/security/crack/PLIST b/security/crack/PLIST
index fda6a2d5214..d3088ad5dc9 100644
--- a/security/crack/PLIST
+++ b/security/crack/PLIST
@@ -1,33 +1,40 @@
-@comment $NetBSD: PLIST,v 1.5 2005/09/22 21:15:38 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/09/14 11:59:39 joerg Exp $
+libexec/crack/cracker
+libexec/crack/dawg
+libexec/crack/dictfilt
+libexec/crack/kickdict
+libexec/crack/xdawg
 sbin/Crack
 sbin/Reporter
+share/crack/conf/dictgrps.conf
 share/crack/conf/dictrun.conf
-share/crack/conf/rules.weird
-share/crack/conf/rules.suffix
-share/crack/conf/rules.prefix
-share/crack/conf/rules.perm1u
 share/crack/conf/globrule.conf
-share/crack/conf/dictgrps.conf
-share/crack/conf/rules.basic
 share/crack/conf/network.conf
+share/crack/conf/rules.basic
 share/crack/conf/rules.fast
+share/crack/conf/rules.perm1
+share/crack/conf/rules.perm1u
 share/crack/conf/rules.perm2
+share/crack/conf/rules.perm2u
 share/crack/conf/rules.perm3
+share/crack/conf/rules.perm3u
 share/crack/conf/rules.perm4
+share/crack/conf/rules.perm4u
 share/crack/conf/rules.perm5
+share/crack/conf/rules.perm5u
 share/crack/conf/rules.perm6
+share/crack/conf/rules.perm6u
 share/crack/conf/rules.perm7
-share/crack/conf/rules.perm1
-share/crack/conf/rules.perm2u
+share/crack/conf/rules.perm7u
+share/crack/conf/rules.prefix
 share/crack/conf/rules.prefixu
+share/crack/conf/rules.suffix
 share/crack/conf/rules.suffixu
-share/crack/conf/rules.perm3u
-share/crack/conf/rules.perm4u
-share/crack/conf/rules.perm5u
-share/crack/conf/rules.perm6u
-share/crack/conf/rules.perm7u
+share/crack/conf/rules.weird
+share/crack/dict/1/abbr.dwg
 share/crack/dict/1/assurnames.dwg
 share/crack/dict/1/asteroids.dwg
+share/crack/dict/1/bad_pws.dat.dwg
 share/crack/dict/1/biology.dwg
 share/crack/dict/1/cartoon.dwg
 share/crack/dict/1/chars.dwg
@@ -36,18 +43,22 @@ share/crack/dict/1/crl.words.dwg
 share/crack/dict/1/dosref.dwg
 share/crack/dict/1/family-names.dwg
 share/crack/dict/1/famous.dwg
+share/crack/dict/1/fast-names.dwg
 share/crack/dict/1/female-names.dwg
 share/crack/dict/1/given-names.dwg
 share/crack/dict/1/jargon.dwg
 share/crack/dict/1/junk.dwg
 share/crack/dict/1/lcarrol.dwg
 share/crack/dict/1/list.dwg
+share/crack/dict/1/male-names.dwg
 share/crack/dict/1/movies.dwg
-share/crack/dict/1/numbers.dwg
 share/crack/dict/1/myths-legends.dwg
 share/crack/dict/1/names.french.dwg
+share/crack/dict/1/numbers.dwg
 share/crack/dict/1/other-names.dwg
 share/crack/dict/1/oz.dwg
+share/crack/dict/1/paradise.lost.dwg
+share/crack/dict/1/phrases.dwg
 share/crack/dict/1/places.dwg
 share/crack/dict/1/python.dwg
 share/crack/dict/1/roget.words.dwg
@@ -56,12 +67,9 @@ share/crack/dict/1/sports.dwg
 share/crack/dict/1/trek.dwg
 share/crack/dict/1/unix.dict.dwg
 share/crack/dict/1/yiddish.dwg
-share/crack/dict/1/abbr.dwg
-share/crack/dict/1/phrases.dwg
-share/crack/dict/1/fast-names.dwg
-share/crack/dict/1/male-names.dwg
-share/crack/dict/1/paradise.lost.dwg
-share/crack/dict/1/bad_pws.dat.dwg
+share/crack/dict/2/antworth.dwg
+share/crack/dict/2/cis.dwg
+share/crack/dict/2/colleges.dwg
 share/crack/dict/2/congress.dwg
 share/crack/dict/2/dico.dwg
 share/crack/dict/2/domains.dwg
@@ -69,77 +77,74 @@ share/crack/dict/2/etc-hosts.dwg
 share/crack/dict/2/ethnologue.dwg
 share/crack/dict/2/kjbible.dwg
 share/crack/dict/2/shakespeare.dwg
+share/crack/dict/2/unabr.dict.dwg
 share/crack/dict/2/world.factbook.dwg
 share/crack/dict/2/zipcodes.dwg
-share/crack/dict/2/antworth.dwg
-share/crack/dict/2/colleges.dwg
-share/crack/dict/2/unabr.dict.dwg
-share/crack/dict/2/cis.dwg
+share/crack/dict/3/chinese.dwg
 share/crack/dict/3/danish.words.dwg
 share/crack/dict/3/germanl.dwg
 share/crack/dict/3/koran.dwg
+share/crack/dict/3/surnames.finnish.dwg
 share/crack/dict/3/words.dutch.dwg
 share/crack/dict/3/words.german.dwg
+share/crack/dict/3/words.italian.dwg
 share/crack/dict/3/words.japanese.dwg
 share/crack/dict/3/words.norwegian.dwg
 share/crack/dict/3/words.spanish.dwg
 share/crack/dict/3/words.swedish.dwg
-share/crack/dict/3/words.italian.dwg
-share/crack/dict/3/surnames.finnish.dwg
-share/crack/dict/3/chinese.dwg
 share/crack/extra/Crack6
-share/crack/extra/Makefile
 share/crack/extra/Crack7
-share/crack/extra/b64encode
+share/crack/extra/Dictstats.pl
+share/crack/extra/Makefile
 share/crack/extra/b64decode
+share/crack/extra/b64encode
 share/crack/extra/brute.c
-share/crack/extra/Dictstats.pl
 share/crack/run/dict/.dictmade
 share/crack/run/dict/1.dwg.gz
 share/crack/run/dict/2.dwg.gz
 share/crack/run/dict/3.dwg.gz
-share/crack/scripts/smartcat
-share/crack/scripts/trad2spf
-share/crack/scripts/dictcomp
-share/crack/scripts/pauser
-share/crack/scripts/mkgecosd
-share/crack/scripts/shadmrg.sv
-share/crack/scripts/smartcomp
+share/crack/scripts/binstamp
+share/crack/scripts/bsd2spf
+share/crack/scripts/bsdmail2spf
+share/crack/scripts/crack-rcp
+share/crack/scripts/crack-rsh
 share/crack/scripts/crack-sort
+share/crack/scripts/dictcomp
+share/crack/scripts/dicttidy
 share/crack/scripts/dodictgrp
-share/crack/scripts/nastygram
 share/crack/scripts/fbfilt
 share/crack/scripts/fbmerge
-share/crack/scripts/mkdictgrps
-share/crack/scripts/plaster
-share/crack/scripts/binstamp
-share/crack/scripts/dicttidy
 share/crack/scripts/mkcracker
+share/crack/scripts/mkdictgrps
+share/crack/scripts/mkgecosd
+share/crack/scripts/nastygram
 share/crack/scripts/netcrack
-share/crack/scripts/crack-rsh
-share/crack/scripts/crack-rcp
-share/crack/scripts/bsd2spf
+share/crack/scripts/pauser
+share/crack/scripts/plaster
+share/crack/scripts/shadmrg.sv
+share/crack/scripts/smartcat
+share/crack/scripts/smartcomp
+share/crack/scripts/trad2spf
 share/crack/scripts/tradmail2spf
-share/crack/scripts/bsdmail2spf
+share/doc/crack/LICENCE
+share/doc/crack/appendix,v4.1.txt
+share/doc/crack/credits,v5.0.txt
+share/doc/crack/dicts,v5.0.txt
 share/doc/crack/faq.txt
 share/doc/crack/fips181.txt
-share/doc/crack/dicts,v5.0.txt
-share/doc/crack/appendix,v4.1.txt
-share/doc/crack/usenet-article.txt
-share/doc/crack/threading.txt
 share/doc/crack/gui.txt
 share/doc/crack/humour.txt
-share/doc/crack/credits,v5.0.txt
 share/doc/crack/manual.html
 share/doc/crack/manual.txt
-share/doc/crack/LICENCE
-libexec/crack/dawg
-libexec/crack/xdawg
-libexec/crack/cracker
-libexec/crack/dictfilt
-libexec/crack/kickdict
-@unexec /bin/rm -rf %D/crack
-@unexec /bin/rm -rf %D/share/crack
-@unexec /bin/rm -rf %D/share/doc/crack
-@unexec /bin/rm -rf %D/share/libexec/crack
+share/doc/crack/threading.txt
+share/doc/crack/usenet-article.txt
+@dirrm share/doc/crack
+@dirrm share/crack/scripts
+@dirrm share/crack/run/dict
+@dirrm share/crack/run
+@dirrm share/crack/extra
+@dirrm share/crack/dict/3
+@dirrm share/crack/dict/2
+@dirrm share/crack/dict/1
+@dirrm share/crack/conf
 @dirrm libexec/crack