diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-09-30 09:21:12 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-09-30 09:21:12 +0000 |
| commit | d3586a3ed697dd189d2c1e5fbf3f37d50bc60b11 (patch) | |
| tree | 248e4a9aad3d989d6cc472863acc241bfa4ae67d | |
| parent | As previously advertised, delete ports that have (diff) | |
Remove optional dependencies and comments related to the removal of
security/pgp6
Notes
Notes:
svn path=/head/; revision=282656
| -rw-r--r-- | mail/exmh2/Makefile | 1 | ||||
| -rw-r--r-- | news/tin/Makefile | 7 | ||||
| -rw-r--r-- | security/p5-PGP-Sign/Makefile | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile index 93704040632e..808bbbe19302 100644 --- a/mail/exmh2/Makefile +++ b/mail/exmh2/Makefile @@ -46,7 +46,6 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail # security/gnupg # security/pgp # security/pgp5 -# security/pgp6 # mail/faces # audio/rplay diff --git a/news/tin/Makefile b/news/tin/Makefile index 27b20e679f5e..dc6f62bcdef2 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -34,8 +34,7 @@ USE_ICONV= yes GNU_CONFIGURE= yes TIN_EDITOR?= /usr/bin/ee -OPTIONS= GNUPG "Enable message signing via GnuPG (no PGP6)" On \ - PGP6 "Enable message signing via PGP6 (no GnuPG)" Off \ +OPTIONS= GNUPG "Enable message signing via GnuPG" On \ ISPELL "Enable spell checking via ispell" On \ METAMAIL "Enable MIME support via metamail" On \ CANLOCK "Enable Cancel-Lock key support via libcanlock" Off \ @@ -79,10 +78,6 @@ CONFIGURE_ARGS+= --enable-nntp-only RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg CONFIGURE_ARGS+= --with-gpg=${PREFIX}/bin/gpg \ --without-pgp --without-pgpk -.elifdef WITH_PGP6 -RUN_DEPENDS+= pgp:${PORTSDIR}/security/pgp6 -CONFIGURE_ARGS+= --with-pgp=${PREFIX}/bin/pgp \ - --without-pgpk --without-gpg .else CONFIGURE_ARGS+= --disable-pgp-gpg .endif diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile index c95239079167..c320ef61d233 100644 --- a/security/p5-PGP-Sign/Makefile +++ b/security/p5-PGP-Sign/Makefile @@ -26,7 +26,6 @@ MAN3= PGP::Sign.3 # 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 .ifndef DEFAULTPGP @@ -48,9 +47,6 @@ PGPS!= which pgps || ${ECHO} ${PREFIX}/bin/pgps .ifndef PGPV PGPV!= which pgpv || ${ECHO} ${PREFIX}/bin/pgpv .endif -.elif (${DEFAULTPGP} == PGP6) -RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp6 -PGPSTYLE?= PGP6 .ifndef PGP PGP!= which pgp || ${ECHO} ${PREFIX}/bin/pgp .endif |