5 files changed, 24 insertions, 57 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index f933adfaf4f3..2932c63f2be9 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -415,6 +415,7 @@
     SUBDIR += pwd_unmkdb
     SUBDIR += pwg
     SUBDIR += pwgen
+    SUBDIR += pwgen2
     SUBDIR += pwsafe
     SUBDIR += pyfind
     SUBDIR += qlogtools
diff --git a/sysutils/pwgen2/Makefile b/sysutils/pwgen2/Makefile
index d39d8e0c05c2..6966c3aadffa 100644
--- a/sysutils/pwgen2/Makefile
+++ b/sysutils/pwgen2/Makefile
@@ -1,24 +1,26 @@
-# 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
+PORTVERSION=	2.04
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.tricknology.org/ports/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	oddbjorn@tricknology.org
-COMMENT=	A simple password generator
+MAINTAINER=	andrey@hm.perm.ru
+COMMENT=	A small, powerful, GPL'ed password generator
 
+GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
+USE_PERL5_BUILD=yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-1
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+CONFLICTS=	pwgen-1*
+LATEST_LINK=	pwgen2
 
 MAN1=		pwgen.1
 PLIST_FILES=	bin/pwgen
diff --git a/sysutils/pwgen2/distinfo b/sysutils/pwgen2/distinfo
index 2242feed4d79..c92840df57a7 100644
--- a/sysutils/pwgen2/distinfo
+++ b/sysutils/pwgen2/distinfo
@@ -1,2 +1,2 @@
-MD5 (pwgen-1.15.tar.gz) = 311724e3ce09155694191563be5543e9
-SIZE (pwgen-1.15.tar.gz) = 14839
+MD5 (pwgen-2.04.tar.gz) = c6116603f89a65d1b6ea4bdce00106fb
+SIZE (pwgen-2.04.tar.gz) = 47276
diff --git a/sysutils/pwgen2/files/patch-aa b/sysutils/pwgen2/files/patch-aa
deleted file mode 100644
index 25108e8189e2..000000000000
--- a/sysutils/pwgen2/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/pwgen2/pkg-descr b/sysutils/pwgen2/pkg-descr
index b89d18336914..644c1dea4640 100644
--- a/sysutils/pwgen2/pkg-descr
+++ b/sysutils/pwgen2/pkg-descr
@@ -1,7 +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.
 
-- oddbjorn (oddbjorn@tricknology.org)
+WWW: http://sourceforge.net/projects/pwgen/