From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 29 08:00:22 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B7A02359;
 Sun, 29 Dec 2013 08:00:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A34BB11C3;
 Sun, 29 Dec 2013 08:00:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBT80Mx7015129;
 Sun, 29 Dec 2013 08:00:22 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBT80MJc015128;
 Sun, 29 Dec 2013 08:00:22 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201312290800.rBT80MJc015128@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 29 Dec 2013 08:00:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337942 - head/news/cnews
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Dec 2013 08:00:22 -0000

Author: dinoex
Date: Sun Dec 29 08:00:22 2013
New Revision: 337942
URL: http://svnweb.freebsd.org/changeset/ports/337942

Log:
  - new options PGP2 PGPIN PGPGPG
  - do not default to security/pgp, which is broken on amd64

Modified:
  head/news/cnews/Makefile

Modified: head/news/cnews/Makefile
==============================================================================
--- head/news/cnews/Makefile	Sun Dec 29 05:59:02 2013	(r337941)
+++ head/news/cnews/Makefile	Sun Dec 29 08:00:22 2013	(r337942)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cnews
 PORTVERSION=	cr.g
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/c-news/ \
 		ftp://ftp.funet.fi/pub/unix/news/cnews/ \
@@ -68,7 +68,13 @@ PLIST_SUB+=	NEWSOV=${NEWSOV:S=^${VARBASE
 PLIST_SUB+=	NEWSCTL_FILES="${NEWSCTL_FILES}"
 
 OPTIONS_DEFINE=	SENDMAIL
+OPTIONS_DEFAULT=PGPGPG
+OPTIONS_SINGLE=	VERIFY
+OPTIONS_SINGLE_VERIFY=	PGP2 PGPIN PGPGPG
 SENDMAIL_DESC=	use sendmail instead of /bin/mail
+PGP2_DESC=	use pgp-2.6.3ia for control messages
+PGPIN_DESC=	use pgp-2.6.3in for control messages
+PGPGPG_DESC=	use pgpgpg for control messages
 
 VARBASE?=	/var
 NEWSBIN?=	${PREFIX}/libexec/cnews
@@ -97,6 +103,14 @@ pre-configure:
 		-e "s=/usr/local/bin=${PREFIX}/bin=" \
 		${WRKSRC}/${i}
 .endfor
+.if ${PORT_OPTIONS:MPGPIN}
+	${REINPLACE_CMD} -e "s|'/usr/local/bin/pgp'|'/usr/local/bin/pgpin'|" \
+		${WRKSRC}/${PGPVERIFY}
+.endif
+.if ${PORT_OPTIONS:MPGPGPG}
+	${REINPLACE_CMD} -e "s|'/usr/local/bin/pgp'|'/usr/local/bin/pgpgpg'|" \
+		${WRKSRC}/${PGPVERIFY}
+.endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libdbz/dbz.h ${STAGEDIR}${PREFIX}/include/