Update to 2.1.0, from Quentin Garnier in PR 21780.

Also, add dependency on Perl instead of noting it in message, and use
REPLACE_PERL.
PHP frontend not included in this package.
Changes:
apg-2.1.0
    Some code cleanup.

apg-2.1.0b1
    Option [-E char_string] now works for pronounceable
    password generation too (see apg(1), apgd(8)).

apg-2.1.0b0
    Added new option [-e char_string] that allow to exclude some
    characters from password generation process.
    (works only for random password generation yet)

apg-2.1.0a0
    Added support for /dev/arandom for OpenBSD

apg-2.1.0a0
    Fixed some typing errors in the man pages
    System getopt() replaced with own apg_getopt().
    All calls of bcopy() and bzero() replaced with memcpy() and memset().
    Changed documentation.
    PRNG algorithm changed to use PID as an element of initial seed.
    Redesigned PHP frontend. Added support for German language.
    Implemented password quality ckeck based on filter. Now you can enforce
    APG to generate passwords that must contain numbers, special characters etc.
    Removed support for old style password generation mode definition.

apg-2.0.0final
    Changed PHP frontend to work with PHP safe-mode.
    Version numbers of apg, apgd, apgbfm, apgonline changed to 2.0.0final.

apg-2.0.0b1
    Fixed error that has forced user to set world-write privileges on
    Bloom-filter file. (Thanks to Mike Robbins)
    Fixed PHP frontend to clean-up generated HTML code.
    (Thanks to Mike Robbins)

apg-2.0.0b0
    Some code style fixes.
    Support for "special" symbol-set usage for password generation
    in pronounceable mode (S mode).
    Support for "resticted special" symbol-set usage for password generation
    in pronounceable mode (R mode).
    New style of hyphenated password output for pronounceable
    password generation mode.

apg-2.0.0a3
    Better error handling in apgbfm.
    Added -q option for apgbfm and apg (quiet mode).
    Added PHP frontend for APG.

apg-2.0.0a2
    Added support for SHA1 algorithm used for random numbers and hash
    generation.
    Hash function used in apgbfm changed to SHA1.
    Added info to APG_TIPS file.

apg-2.0.0a1 (not published)
    Finaly fixed some warnings during compilation process.
    Added support for OpenBSD.
    Added info to APG_TIPS file.

apg-2.0.0a0
    Added new algorithm (-b option) to check generated passwords
    quality (Bloom filter).
    Added utility apgbfm to manage Bloom filter.
    Some code style fixes.
    Added APG_TIPS file in documentation.

5 files changed, 23 insertions, 26 deletions

diff --git a/security/apg/MESSAGE b/security/apg/MESSAGE
deleted file mode 100644
index 0558e51b173..00000000000
--- a/security/apg/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:30 hubertf Exp $
-
-You will need perl to use ${PREFIX}/bin/apgcli
-
-===========================================================================
diff --git a/security/apg/Makefile b/security/apg/Makefile
index 2afc1d0759e..5fc3a57fed6 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/03/24 19:32:41 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/10 06:38:47 wiz Exp $
 #
 
-DISTNAME=	apg-1.2.13
+DISTNAME=	apg-2.1.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.adel.nursat.kz/apg/download/
 
@@ -11,11 +11,10 @@ COMMENT=	Tool set for random password generation
 
 MAKE_ENV+=	FLAGS="${CFLAGS}" INSTALL_PREFIX="${PREFIX}"
 
-post-patch:
-	${SED} "s|/usr/bin/perl|${LOCALBASE}/bin/perl|g"		\
-		${WRKSRC}/perl/apgcli.pl > ${WRKDIR}/apgcli.pl
+USE_PERL5=	YES
+REPLACE_PERL=	perl/apgcli.pl
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/apgcli.pl ${PREFIX}/bin/apgcli
+	${INSTALL_SCRIPT} ${WRKSRC}/perl/apgcli.pl ${PREFIX}/bin/apgcli
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/apg/PLIST b/security/apg/PLIST
index 111c93c33a2..e94477d477c 100644
--- a/security/apg/PLIST
+++ b/security/apg/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/10 06:38:47 wiz Exp $
 bin/apg
+bin/apgbfm
 bin/apgcli
 sbin/apgd
 man/man1/apg.1
+man/man1/apgbfm.1
 man/man8/apgd.8
diff --git a/security/apg/distinfo b/security/apg/distinfo
index 79875565aa2..09cbb3b0678 100644
--- a/security/apg/distinfo
+++ b/security/apg/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:29 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/06/10 06:38:47 wiz Exp $
 
-SHA1 (apg-1.2.13.tar.gz) = 0619957437e4804ef09a550602aa1655d2d0690f
-Size (apg-1.2.13.tar.gz) = 72243 bytes
-SHA1 (patch-aa) = 90b2a66305d361a650160e0b3fb7cd93632e2b46
+SHA1 (apg-2.1.0.tar.gz) = 415aeeae944c184bdc67ef36af9ea68c062c7cf9
+Size (apg-2.1.0.tar.gz) = 99202 bytes
+SHA1 (patch-aa) = d66d56ff653e66185a1af83d7b5330c1759e7573
diff --git a/security/apg/patches/patch-aa b/security/apg/patches/patch-aa
index 3daae35129c..8b46741710f 100644
--- a/security/apg/patches/patch-aa
+++ b/security/apg/patches/patch-aa
@@ -1,21 +1,23 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/05 23:21:03 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2003/06/10 06:38:48 wiz Exp $
 
---- Makefile.orig	Thu Feb 22 12:00:10 2001
+--- Makefile.orig	2002-09-13 10:10:49.000000000 +0200
 +++ Makefile
-@@ -1,10 +1,8 @@
+@@ -1,12 +1,10 @@
+ ##################################################################
  # You can modify CC variable if you have compiler other than GCC
  # But the code was designed and tested with GCC
 -CC = gcc
  
- # compilation flags
+ ##################################################################
+ # Compilation flags
  # You should comment the line below for AIX+native cc
 -FLAGS = -Wall
  
- # libraries
- LIBS = -lcrypt
-@@ -15,7 +13,6 @@
- CRYPTED_PASS = APG_USE_CRYPT
- 
+ ##################################################################
+ # Libraries
+@@ -37,7 +35,6 @@ USE_SHA = APG_DONOTUSE_SHA
+ ##################################################################
+ # Directories
  # Install dirs
 -INSTALL_PREFIX = /usr/local
  APG_BIN_DIR = /bin