Date: Fri, 23 Nov 2012 15:55:30 +0000 (UTC) From: Jase Thew <jase@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307682 - head/security/p5-Module-Signature Message-ID: <201211231555.qANFtU07044998@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jase Date: Fri Nov 23 15:55:30 2012 New Revision: 307682 URL: http://svnweb.freebsd.org/changeset/ports/307682 Log: - Remove hardcoded dependency on security/gpg. Instead, add OPTIONS to allow choice of GnuPG version. PR: ports/172323 Approved by: jadawin (perl@) Feature safe: yes Modified: head/security/p5-Module-Signature/Makefile (contents, props changed) Modified: head/security/p5-Module-Signature/Makefile ============================================================================== --- head/security/p5-Module-Signature/Makefile Fri Nov 23 15:10:16 2012 (r307681) +++ head/security/p5-Module-Signature/Makefile Fri Nov 23 15:55:30 2012 (r307682) @@ -3,6 +3,7 @@ PORTNAME= Module-Signature PORTVERSION= 0.69 +PORTREVISION= 1 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,8 +12,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" @@ -21,8 +21,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211231555.qANFtU07044998>