Date: Thu, 4 Oct 2012 15:31:54 +0100 (BST) From: Jase Thew <jase@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172323: [PATCH] security/p5-Module-Signature : Add options to allow choice of gpg version Message-ID: <201210041431.q94EVs1c072179@freefall.freebsd.org> Resent-Message-ID: <201210041440.q94EeAw2072824@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172323
>Category: ports
>Synopsis: [PATCH] security/p5-Module-Signature : Add options to allow choice of gpg version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 04 14:40:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jase Thew
>Release: FreeBSD 9.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 9.0-STABLE FreeBSD 9.0-STABLE #6 r235139: Tue May 8 21:19:03 UTC 2012 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
security/p5-Module-Signature currently has a hardcoded dependency on security/gnupg1. The attached
patch modifies the port to add OPTIONS to allow the user to select whether to use security/gnupg1
or security/gnupg to satisfy the gpg dependency.
>How-To-Repeat:
>Fix:
--- p5-Module-Signature.patch begins here ---
commit 57c95647394101abe837fc3a5700a50874950e07
Author: Jase Thew <jase@FreeBSD.org>
Date: Thu Oct 4 14:06:16 2012 +0100
Add OPTIONS to allow selection of GPG version.
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index cb3759a..553da00 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Module-Signature
PORTVERSION= 0.68
+PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -15,8 +16,7 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Module signature file manipulation
BUILD_DEPENDS= p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
- p5-PAR-Dist>=0:${PORTSDIR}/devel/p5-PAR-Dist \
- ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
+ p5-PAR-Dist>=0:${PORTSDIR}/devel/p5-PAR-Dist
RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFIGURE_ENV= PERL_MM_USE_DEFAULT="yes"
@@ -25,8 +25,24 @@ PERL_CONFIGURE= yes
MAN1= cpansign.1
MAN3= Module::Signature.3
+OPTIONS_DEFAULT= GPG2
+OPTIONS_MULTI= GPG
+OPTIONS_MULTI_GPG= GPG1 GPG2
+GPG1_DESC= Use GnuPG version 1
+GPG2_DESC= Use GnuPG version 2
+
.include <bsd.port.pre.mk>
+.if ${PORT_OPTIONS:MGPG1}
+BUILD_DEPENDS+= ${LOCALBASE}/bin/gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS+= ${LOCALBASE}/bin/gpgv:${PORTSDIR}/security/gnupg1
+.endif
+
+.if ${PORT_OPTIONS:MGPG2}
+BUILD_DEPENDS+= ${LOCALBASE}/bin/gpgv2:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+= ${LOCALBASE}/bin/gpgv2:${PORTSDIR}/security/gnupg
+.endif
+
.if ${PERL_LEVEL} < 501000
BUILD_DEPENDS+= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
RUN_DEPENDS+= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
--- p5-Module-Signature.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210041431.q94EVs1c072179>