Date: Sat, 10 Jun 2000 04:26:30 -0500 (EST) From: Don Croyle <croyle@gelemna.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/19171: Update to security/p5-PGP-Sign port Message-ID: <200006100926.EAA18328@gelemna.org>
next in thread | raw e-mail | index | archive | help
>Number: 19171
>Category: ports
>Synopsis: Update to security/p5-PGP-Sign port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 10 02:30:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Don Croyle
>Release: FreeBSD 4.0-STABLE i386
>Organization:
>Environment:
>Description:
Now that we have a pgp6 port, update the p5-PGP-Sign port to be able
to make use of it.
While I didn't object at the time, the USE/WITH variable name change
created some potential for confusion since only one would ever be
used. I've taken this opportunity to rewrite the default pgp
selection logic to use DEFAULTPGP in place of the various WITH
variables.
BTW, when I updated my Maintainer line addresses last month I forgot
to ask that my entry in the contributers list be updated as well.
--- doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml.orig Fri Jun 9 16:05:35 2000
+++ doc/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml Sat Jun 10 04:22:27 2000
@@ -2079,7 +2079,7 @@
</listitem>
<listitem>
- <para>Don Croyle <email>croyle@gelemna.ft-wayne.in.us</email></para>
+ <para>Don Croyle <email>croyle@gelemna.org</email></para>
</listitem>
<listitem>
>How-To-Repeat:
>Fix:
Apply this patch:
diff -ruN p5-PGP-Sign.old/Makefile p5-PGP-Sign/Makefile
--- p5-PGP-Sign.old/Makefile Sun May 21 06:52:05 2000
+++ p5-PGP-Sign/Makefile Sat Jun 10 04:05:57 2000
@@ -19,45 +19,56 @@
MAN3= PGP::Sign.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-# You can either define one of these on the command line or accept the
-# default (WITH_PGP2). You can also predefine the values for PGP (or
-# PGPS and PGPV) and PGPSTYLE if you don't like what this makefile
-# would assign.
-# WITH_PGP2 - use PGP 2.6.* or a reasonable facsimile thereof
-# WITH_PGP5 - use PGP 5 or a work-alike
-# WITH_GPG - use Gnu Privacy Guard
+# If DEFAULTPGP isn't defined, it gets set to PGP2. If you don't like
+# the values that this process assigns to PGP (or PGPV and PGPS) and
+# PGPSTYLE, they can be predefined.
+#
+# Currently useful values for DEFAULTPGP are:
+# PGP2 - PGP 2.6.* or a reasonable facsimile thereof
+# PGP5 - PGP 5 or a work-alike
+# PGP6 - PGP 6.5 (effectively the same as PGP2)
+# GPG - Gnu Privacy Guard
-.if !defined(WITH_PGP5) && !defined(WITH_GPG)
-WITH_PGP2?= yes
+.ifndef DEFAULTPGP
+DEFAULTPGP= PGP2
+.endif
+
+.if (${DEFAULTPGP} == PGP2 )
RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp
+PGPSTYLE?= PGP2
.ifndef PGP
PGP!= which pgp || ${ECHO} ${PREFIX}/bin/pgp
.endif
-PGPSTYLE?= PGP2
-.else
-.ifdef WITH_PGP5
+.elif (${DEFAULTPGP} == PGP5 )
RUN_DEPENDS= pgps:${PORTSDIR}/security/pgp5
+PGPSTYLE?= PGP5
.ifndef PGPS
PGPS!= which pgps || ${ECHO} ${PREFIX}/bin/pgps
.endif
.ifndef PGPV
PGPV!= which pgpv || ${ECHO} ${PREFIX}/bin/pgpv
.endif
-PGPSTYLE?= PGP5
+.elif (${DEFAULTPGP} == PGP6)
+RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp6
+PGPSTYLE?= PGP6
+.ifndef PGP
+PGP!= which pgp || ${ECHO} ${PREFIX}/bin/pgp
.endif
-.ifdef WITH_GPG
+.elif (${DEFAULTPGP} == GPG)
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
+PGPSTYLE?= GPG
.ifndef PGP
PGP!= which gpg || ${ECHO} ${PREFIX}/bin/gpg
.endif
-PGPSTYLE?= GPG
-.endif
+.else
+.error Unsupported DEFAULTPGP value. See the Makefile for a list of acceptable values.
.endif
.ifdef PGP
-PGPS= ${PGP}
-PGPV= ${PGP}
+PGPS?= ${PGP}
+PGPV?= ${PGP}
.endif
+
CONFIG_ARGS= PGPS=${PGPS} PGPV=${PGPV} PGPSTYLE=${PGPSTYLE}
do-configure:
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200006100926.EAA18328>