Fix the port.

	- Remove extra spaces and newlines
	- Describe RESTRICTED more specifically
	- Generate PLIST on the fly
	- Prepare PKGMESSAGE to inform the users

	(Additional fixes by knu follow:)

	- Add MASTER_SITES.
	- Respect MAKE_IDEA that could be defined in /etc/make.conf
	- Make a bit more portlint friendly
	- Fix pkg-{comment,descr} to reflect the latest situation

gnupg-idea was repo-moved from gnupg-rsa, because now GnuPG has a
builtin RSA support. (GnuPG >= 1.03, after the RSA patent restriction
was lifted)

PR:		ports/22620
Submitted by:	Dirk Meyer <dirk.meyer@dinoex.sub.org> (MAINTAINER)

7 files changed, 48 insertions, 25 deletions

diff --git a/security/Makefile b/security/Makefile
index 6f11eb1e11ce..355bff570b47 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -27,7 +27,7 @@
     SUBDIR += fwtk
     SUBDIR += gag
     SUBDIR += gnupg
-    SUBDIR += gnupg-rsa
+    SUBDIR += gnupg-idea
     SUBDIR += gpa
     SUBDIR += gpasman
     SUBDIR += gtkportscan
diff --git a/security/gnupg-idea/Makefile b/security/gnupg-idea/Makefile
index bb6ae34b4699..5934f7d70536 100644
--- a/security/gnupg-idea/Makefile
+++ b/security/gnupg-idea/Makefile
@@ -1,24 +1,30 @@
-# New ports collection makefile for:	gnupg-rsa
-# Date created:		10 May, 2000 
+# New ports collection makefile for:	gnupg-idea
+# Date created:		10 May, 2000
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnupg-rsa
+PORTNAME=	gnupg-idea
 PORTVERSION=	1.0.1
-PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=   ftp://ftp.gnupg.org/pub/gcrypt/contrib/
+MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/%SUBDIR%/	\
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/gnupg/&,}
+MASTER_SITE_SUBDIR=	contrib
+DISTFILES=	${CONTRIB:S|$|.c|}
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
 
-RESTRICTED=	"Crypto; export-controlled"
 RUN_DEPENDS=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+
+RESTRICTED=	"IDEA is Patented in the USA and many European countries"
+
 NO_WRKSUBDIR=	yes
-DIST_SUBDIR=    ${PORTNAME}
 CFLAGS+=	-O2 -shared -fPIC -DIS_MODULE
 CFLAGS+=	-Wall -Wcast-align -Wshadow -Wstrict-prototypes
+PLIST=		${WRKDIR}/.PLIST.more
 
 .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
@@ -31,19 +37,18 @@ pre-fetch:
 
 .elif defined(USA_RESIDENT)
 
-.if ${USA_RESIDENT} == NO
-DISTFILES=	rsa.c idea.c
-CONTRIB=	rsa idea
+.if ${USA_RESIDENT} == NO || defined(MAKE_IDEA)
+CONTRIB=	idea rsa
 .else
-DISTFILES=	rsa.c
 CONTRIB=	rsa
 .endif
 
 .include <bsd.port.pre.mk>
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
+pre-extract:
+	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
+
+post-extract:
 .for i in ${DISTFILES}
 	@${CP} ${_DISTDIR}/${i} ${WRKSRC}/${i}
 .endfor
@@ -57,6 +62,7 @@ do-patch:
 do-build:
 .for i in ${CONTRIB}
 	${CC} ${CFLAGS} -o ${WRKSRC}/${i} ${WRKSRC}/${i}.c
+	${ECHO} "lib/gnupg/${i}" >>${PLIST}
 .endfor
 
 do-install:
diff --git a/security/gnupg-idea/distinfo b/security/gnupg-idea/distinfo
index 2ffeb85e35a5..24f09626affb 100644
--- a/security/gnupg-idea/distinfo
+++ b/security/gnupg-idea/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnupg-rsa/rsa.c) = d8b6f26df0e3e0ccd93c2d0589d8766f
-MD5 (gnupg-rsa/idea.c) = 7d0557459e0a41da099ddbd837d4bd40
+MD5 (gnupg-idea/rsa.c) = d8b6f26df0e3e0ccd93c2d0589d8766f
+MD5 (gnupg-idea/idea.c) = 7d0557459e0a41da099ddbd837d4bd40
diff --git a/security/gnupg-idea/pkg-comment b/security/gnupg-idea/pkg-comment
index c13a56e27bd3..081c6210a6ac 100644
--- a/security/gnupg-idea/pkg-comment
+++ b/security/gnupg-idea/pkg-comment
@@ -1 +1 @@
-Extensions gnupg: rsa idea
+IDEA extension module for gnupg (and RSA extension module for demonstration)
diff --git a/security/gnupg-idea/pkg-descr b/security/gnupg-idea/pkg-descr
index 0bade68856bc..9a37f623235f 100644
--- a/security/gnupg-idea/pkg-descr
+++ b/security/gnupg-idea/pkg-descr
@@ -1,11 +1,12 @@
-GNUPG is a complete and free replacement for PGP.
+GnuPG is a complete and free replacement for PGP.
 
-Because it does not use IDEA or RSA it can be used without any
-restrictions.  GNUPG is nearly in complicance with the OpenPGP draft.
+Because it does not use the patented IDEA algorithm, it can be used
+without any restrictions.  GnuPG is an RFC2440 (OpenPGP) compliant
+application.
 
-WWW: http://www.d.shuttle.de/isil/gnupg/
+WWW: http://www.gnupg.org/
 
-Here are modules to use the depricated encodings.
+Here are modules to use the deprecated (and patented) encodings.
 
 	- sign and check PGP2.x signaturs
 	- decode PGP2.x messages.
diff --git a/security/gnupg-idea/pkg-message b/security/gnupg-idea/pkg-message
new file mode 100644
index 000000000000..87c149392dba
--- /dev/null
+++ b/security/gnupg-idea/pkg-message
@@ -0,0 +1,18 @@
+
+---------------------------------------------------
+
+IDEA:
+	Patented in the USA and many european countries,
+	and a patent for Japan is pending.  The patent holder
+	Ascom grants a non-commerical license for no charge,
+	but the definition of non-commercial use is rather
+	strict.  You need to buy a license if you want to use
+	IDEA commercially.
+
+	See: http://www.media-crypt.com/pages/fidea.html
+
+RSA:	rsa is now included in gnupg >= 1.0.3
+	still included for demonstration.
+
+---------------------------------------------------
+
diff --git a/security/gnupg-idea/pkg-plist b/security/gnupg-idea/pkg-plist
index 4d2f562b026b..e69de29bb2d1 100644
--- a/security/gnupg-idea/pkg-plist
+++ b/security/gnupg-idea/pkg-plist
@@ -1,2 +0,0 @@
-lib/gnupg/rsa
-lib/gnupg/idea