Replace pwgen 1 with pwgen 2. The latter is a continuation of the former

by a different author, with some serious bugs fixed.  We were pretty much
the only OS that still shipped pwgen 1, and for good reason: due to the
way it implements phoneme equivalence and the way it tracks the length of
the generated string, it only works correctly 16% of the time.  This was
not possible to fix without a major rewrite, which is precisely what the
author of pwgen 2 did.

Discussed with both maintainers and #bsdports.

8 files changed, 20 insertions, 95 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index cd135e2b0d2..bc10a84b950 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -710,7 +710,6 @@
     SUBDIR += pwd_unmkdb
     SUBDIR += pwg
     SUBDIR += pwgen
-    SUBDIR += pwgen2
     SUBDIR += pwsafe
     SUBDIR += py-XenAPI
     SUBDIR += py-bcfg2
diff --git a/sysutils/pwgen/Makefile b/sysutils/pwgen/Makefile
index 687671eb4f3..26f176bb899 100644
--- a/sysutils/pwgen/Makefile
+++ b/sysutils/pwgen/Makefile
@@ -1,23 +1,20 @@
-# New ports collection makefile for:	pwgen
-# Date created:		22 July 2000
-# Whom:			Oddbjorn Steffensen <oddbjorn@tricknology.org>
+# New ports collection makefile for:	pwgen2
+# Date created:		27 Aug 2005
+# Whom:			Andrew Khlebutin <andrey@hm.perm.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pwgen
-PORTVERSION=	1.15
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	2.06
 CATEGORIES=	sysutils
-MASTER_SITES=	http://people.rit.edu/rpsfa/distfiles/ \
-		http://ns.ael.ru/ports/distfiles/ \
-		http://www.gnu-darwin.org/distfiles/
+MASTER_SITES=	SF
 
-MAINTAINER=	oddbjorn@tricknology.org
-COMMENT=	A simple password generator
+MAINTAINER=	andrey@hm.perm.ru
+COMMENT=	A small, powerful, GPL'ed password generator
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-1
+GNU_CONFIGURE=	yes
+USE_PERL5_BUILD=yes
 
 MAN1=		pwgen.1
 PLIST_FILES=	bin/pwgen
diff --git a/sysutils/pwgen/distinfo b/sysutils/pwgen/distinfo
index 272292bccfd..00b145b3600 100644
--- a/sysutils/pwgen/distinfo
+++ b/sysutils/pwgen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pwgen-1.15.tar.gz) = fb50a42bf3bf9608f5d3e5b72a414e05df13ff1f03945549cb44fe454c81dbd4
-SIZE (pwgen-1.15.tar.gz) = 14839
+SHA256 (pwgen-2.06.tar.gz) = 61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
+SIZE (pwgen-2.06.tar.gz) = 30952
diff --git a/sysutils/pwgen/files/patch-aa b/sysutils/pwgen/files/patch-aa
deleted file mode 100644
index 25108e8189e..00000000000
--- a/sysutils/pwgen/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.orig	Tue Jan  4 22:54:58 2000
-+++ Makefile	Sun Jul  6 20:15:32 2003
-@@ -6,17 +6,17 @@
- OPTS	= -DALLBYOPTS -DRAND48 -DDEBIAN
- 
- # Standard items
--CC	= gcc
--CFLAGS	= -O3
--LD	= cc
--#LDFLAGS	= -g
-+CC	?= gcc
-+CFLAGS	+= ${CPPFLAGS}
-+LD	= ${CC}
- LIBS	= -lm
- INSTALL	= install -s
- INFLAGS	=
- 
- # Where to install
--DESTDIR	= /usr/local/bin
--MANDIR	= /usr/local/man/man1
-+PREFIX	?= /usr/local
-+DESTDIR	= ${PREFIX}/bin
-+MANDIR	= ${PREFIX}/man/man1
- 
- # End configuration section
- 
-@@ -27,10 +27,8 @@
- 	./pwgen 8 20
- 
- install: all
--	$(INSTALL) pwgen $(DESTDIR)
--	install pwgen.1 $(MANDIR)
--	chmod 555 $(DESTDIR)/pwgen
--	chmod 444 $(MANDIR)/pwgen.1
-+	${BSD_INSTALL_PROGRAM} pwgen $(DESTDIR)
-+	${BSD_INSTALL_MAN} pwgen.1 $(MANDIR)
- 
- spwgen:	spwgen.o
- 	$(LD) $(LDFLAGS) -o spwgen spwgen.o $(LIBS)
diff --git a/sysutils/pwgen/pkg-descr b/sysutils/pwgen/pkg-descr
index 6f25db93304..644c1dea464 100644
--- a/sysutils/pwgen/pkg-descr
+++ b/sysutils/pwgen/pkg-descr
@@ -1,5 +1,10 @@
-pwgen is a password generator.
+Pwgen is a small, powerful, GPL'ed password generator.
 
-It was originally posted to alt.sources in 1989 by Brandon S. Allbery.
-This version is pulled from Debian, which contains modifications by
-Olaf Titz.
+This   version   of   pwgen    was    written    by    Theodore    Ts'o
+<tytso@alum.mit.edu>. It is modelled after a program originally written
+by Brandon S. Allbery, and then later extensively modified by Olaf Titz,
+Jim Lynch, and others. It was  rewritten  from scratch by Theodore Ts'o
+because  the original program  was somewhat of a hack, and thus hard to 
+maintain, and because the licensing status of the program was unclear.
+
+WWW: http://sourceforge.net/projects/pwgen/
diff --git a/sysutils/pwgen2/Makefile b/sysutils/pwgen2/Makefile
deleted file mode 100644
index 56caba2a943..00000000000
--- a/sysutils/pwgen2/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	pwgen2
-# Date created:		27 Aug 2005
-# Whom:			Andrew Khlebutin <andrey@hm.perm.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pwgen
-PORTVERSION=	2.06
-CATEGORIES=	sysutils
-MASTER_SITES=	SF
-
-MAINTAINER=	andrey@hm.perm.ru
-COMMENT=	A small, powerful, GPL'ed password generator
-
-GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=yes
-
-CONFLICTS=	pwgen-1*
-LATEST_LINK=	pwgen2
-
-MAN1=		pwgen.1
-PLIST_FILES=	bin/pwgen
-
-.include <bsd.port.mk>
diff --git a/sysutils/pwgen2/distinfo b/sysutils/pwgen2/distinfo
deleted file mode 100644
index 00b145b3600..00000000000
--- a/sysutils/pwgen2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pwgen-2.06.tar.gz) = 61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
-SIZE (pwgen-2.06.tar.gz) = 30952
diff --git a/sysutils/pwgen2/pkg-descr b/sysutils/pwgen2/pkg-descr
deleted file mode 100644
index 644c1dea464..00000000000
--- a/sysutils/pwgen2/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Pwgen is a small, powerful, GPL'ed password generator.
-
-This   version   of   pwgen    was    written    by    Theodore    Ts'o
-<tytso@alum.mit.edu>. It is modelled after a program originally written
-by Brandon S. Allbery, and then later extensively modified by Olaf Titz,
-Jim Lynch, and others. It was  rewritten  from scratch by Theodore Ts'o
-because  the original program  was somewhat of a hack, and thus hard to 
-maintain, and because the licensing status of the program was unclear.
-
-WWW: http://sourceforge.net/projects/pwgen/