From a27edb4f146a22961d393a6eeca35f74dc83a8e6 Mon Sep 17 00:00:00 2001
From: Johan van Selst <johans@FreeBSD.org>
Date: Fri, 4 Apr 2014 19:54:30 +0000
Subject: - Update to signing-party 1.1.6 - Disable pgpring due to too many
 porting issues

---
 security/signing-party/Makefile  | 13 ++++---------
 security/signing-party/distinfo  |  4 ++--
 security/signing-party/pkg-plist |  2 --
 3 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'security/signing-party')

diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index f6425443aeb7..e89f859310cf 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	signing-party
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/johans/signing-party/ \
 		${MASTER_SITE_DEBIAN}
@@ -28,8 +28,7 @@ CONFLICTS_INSTALL=sig2dot-[0-9]* springgraph-[0-9]*
 USES=		perl5 gmake shebangfix
 SHEBANG_FILES=	${SCRIPTS}
 
-BINS=		keyanalyze/keyanalyze keyanalyze/process_keys \
-		keyanalyze/pgpring/pgppubring
+BINS=		keyanalyze/keyanalyze keyanalyze/process_keys
 SCRIPTS=	caff/caff caff/pgp-clean caff/pgp-fixkey gpglist/gpglist \
 		gpgsigs/gpgsigs gpg-key2ps/gpg-key2ps \
 		gpg-mailkeys/gpg-mailkeys keylookup/keylookup \
@@ -46,15 +45,11 @@ post-patch:
 		${WRKSRC}/caff/caff
 	@${REINPLACE_CMD} -e 's|/usr/bin/pinentry-gtk-2|${LOCALBASE}/bin/pinentry-gtk-2|' \
 		${WRKSRC}/caff/README.gpg-agent
-	@${REINPLACE_CMD} -e 's|make|${GMAKE}|' \
-			-e 's|make pgpring|make|' \
+	@${REINPLACE_CMD} -e 's|[[:<:]]make|${GMAKE}|' \
+			-e '/^all/s|pgpring/pgpring||' \
 		${WRKSRC}/gpgwrap/Makefile \
 		${WRKSRC}/keyanalyze/Makefile
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/gpgwrap/src/Makefile
-	# Rename pgpring to pgppubring to avoid conflict with mail/mutt
-	@${REINPLACE_CMD} -e 's|pgpring|pgppubring|g' \
-		${WRKSRC}/keyanalyze/pgpring/Makefile.in
-	@cd ${WRKSRC}/keyanalyze/pgpring && ${MV} pgpring.1 pgppubring.1
 
 do-install:
 	@${INSTALL_PROGRAM} ${BINS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
diff --git a/security/signing-party/distinfo b/security/signing-party/distinfo
index 04bbd877523d..ba6c6069856d 100644
--- a/security/signing-party/distinfo
+++ b/security/signing-party/distinfo
@@ -1,2 +1,2 @@
-SHA256 (signing-party_1.1.5.orig.tar.gz) = af67052373996d8c34f9a4eb4822305c4d5f1dab6c807722f4b04fb5035c1363
-SIZE (signing-party_1.1.5.orig.tar.gz) = 230579
+SHA256 (signing-party_1.1.6.orig.tar.gz) = fbc28b28103d67c60a773c93cc683abbd0a6e429118686773f752b9acb32ae7c
+SIZE (signing-party_1.1.6.orig.tar.gz) = 220552
diff --git a/security/signing-party/pkg-plist b/security/signing-party/pkg-plist
index 9945d94d616a..76be6579f661 100644
--- a/security/signing-party/pkg-plist
+++ b/security/signing-party/pkg-plist
@@ -8,7 +8,6 @@ bin/keyanalyze
 bin/keylookup
 bin/pgp-clean
 bin/pgp-fixkey
-bin/pgppubring
 bin/process_keys
 bin/sig2dot
 bin/springgraph
@@ -22,7 +21,6 @@ man/man1/keyanalyze.1.gz
 man/man1/keylookup.1.gz
 man/man1/pgp-clean.1.gz
 man/man1/pgp-fixkey.1.gz
-man/man1/pgppubring.1.gz
 man/man1/process_keys.1.gz
 man/man1/sig2dot.1.gz
 man/man1/springgraph.1.gz
-- 
cgit v1.2.3