aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--security/gnupg-devel/Makefile57
-rw-r--r--security/gnupg-devel/distinfo3
-rw-r--r--security/gnupg-devel/files/patch-g10-openfile.c12
-rw-r--r--security/gnupg-devel/pkg-descr4
-rw-r--r--security/gnupg-devel/pkg-message19
-rw-r--r--security/gnupg-devel/pkg-plist17
-rw-r--r--security/gpgme/Makefile4
-rw-r--r--security/gpgme03/Makefile4
9 files changed, 5 insertions, 116 deletions
diff --git a/MOVED b/MOVED
index d3cc189df927..1495e9362f6b 100644
--- a/MOVED
+++ b/MOVED
@@ -2620,3 +2620,4 @@ audio/ac3dec||2006-12-14|Dead outside FreeBSD and replaced by liba52
net-p2p/mldonkey-sancho||2006-12-14|Removed due to developer's request
net/gmdns||2006-12-14|Dead, unmaintain and nothing use it
devel/stlport-icc||2006-12-20|Has expired: does not work with stlport 4.6.2
+security/gnupg-devel|security/gnupg|2006-12-21|gnupg-devel has been released as Gnupg 2.0
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
deleted file mode 100644
index 1e27165d8df3..000000000000
--- a/security/gnupg-devel/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for: newpg
-# Date created: 29 Jan 2003
-# Whom: michaelnottebrock@gmx.net
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnupg
-PORTVERSION= 1.9.22
-PORTREVISION= 2
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= alpha/gnupg
-PKGNAMESUFFIX= -devel
-
-MAINTAINER= lofi@freebsd.org
-COMMENT= Prerelease package of GnuPG extensions for GnuPG 2.0
-
-BUILD_DEPENDS= ${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
-LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \
- ksba.17:${PORTSDIR}/security/libksba \
- pth.20:${PORTSDIR}/devel/pth \
- usb-0.1:${PORTSDIR}/devel/libusb
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \
- dirmngr:${PORTSDIR}/security/dirmngr
-
-CONFLICTS= gnupg-2.*
-
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET=# empty
-USE_GMAKE= yes
-USE_ICONV= yes
-INSTALLS_SHLIB= yes
-INFO= gnupg
-
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/pth" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/pth"
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.endif
-
-pre-configure:
- ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
- ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
-
-post-install:
- ${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
deleted file mode 100644
index 63177230c1b1..000000000000
--- a/security/gnupg-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnupg-1.9.22.tar.bz2) = ccea28fbab26bcb01890f2687d71f900
-SHA256 (gnupg-1.9.22.tar.bz2) = 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
-SIZE (gnupg-1.9.22.tar.bz2) = 1908546
diff --git a/security/gnupg-devel/files/patch-g10-openfile.c b/security/gnupg-devel/files/patch-g10-openfile.c
deleted file mode 100644
index d9d1f657da16..000000000000
--- a/security/gnupg-devel/files/patch-g10-openfile.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- g10/openfile.c.orig Tue Nov 28 13:31:12 2006
-+++ g10/openfile.c Tue Nov 28 13:32:20 2006
-@@ -145,8 +145,8 @@
-
- s = _("Enter new filename");
-
-- n = strlen(s) + namelen + 10;
- defname = name && namelen? make_printable_string( name, namelen, 0): NULL;
-+ n = strlen(s) + (defname?strlen (defname):0) + 10;
- prompt = xmalloc(n);
- if( defname )
- sprintf(prompt, "%s [%s]: ", s, defname );
diff --git a/security/gnupg-devel/pkg-descr b/security/gnupg-devel/pkg-descr
deleted file mode 100644
index 4dc4acedecf7..000000000000
--- a/security/gnupg-devel/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This version of gnupg is a temporary project to work on GnuPG extensions. It
-will be merged into the regular GnuPG sources for a GnuPG 2.0 release.
-
-WWW: http://www.gnupg.org/aegypten2
diff --git a/security/gnupg-devel/pkg-message b/security/gnupg-devel/pkg-message
deleted file mode 100644
index 6dcdc858f1d8..000000000000
--- a/security/gnupg-devel/pkg-message
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-###############################################################################
- A T T E N T I O N
-
-In order to use gpg-agent, you need to install a pinentry dialog.
-
-The following ports of pinentry dialogs are available:
-
-security/pinentry-curses (ncurses based dialog)
-security/pinentry-gtk (GTK 1.2 based dialog)
-security/pinentry-gtk2 (GTK 2.x based dialog)
-security/pinentry-qt (QT based dialog)
-
-###############################################################################
-
-
-
diff --git a/security/gnupg-devel/pkg-plist b/security/gnupg-devel/pkg-plist
deleted file mode 100644
index cca8c422d879..000000000000
--- a/security/gnupg-devel/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/gpg-agent
-bin/gpg-connect-agent
-bin/gpgconf
-bin/gpgkey2ssh
-bin/gpgparsemail
-bin/gpgsm
-bin/gpgsm-gencert.sh
-bin/kbxutil
-bin/scdaemon
-bin/watchgnupg
-lib/gnupg/pcsc-wrapper
-libexec/gpg-preset-passphrase
-libexec/gpg-protect-tool
-sbin/addgnupghome
-share/gnupg/qualified.txt
-%%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo
-@dirrm lib/gnupg
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index d58e2d5525d0..f86ec5a1810b 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpgme
PORTVERSION= 1.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpgme
@@ -16,7 +16,7 @@ MAINTAINER= lofi@FreeBSD.org
COMMENT= A library to make access to GnuPG easier
BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1 \
- gpgsm:${PORTSDIR}/security/gnupg-devel
+ gpgsm:${PORTSDIR}/security/gnupg
LIB_DEPENDS= gpg-error.3:${PORTSDIR}/security/libgpg-error
USE_AUTOTOOLS= libtool:15
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 58334cbea63c..646409733869 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpgme
PORTVERSION= 0.3.16
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpgme
@@ -35,7 +35,7 @@ WITH_GPGSM= yes
.endif
.if defined(WITH_GPGSM)
-BUILD_DEPENDS+= gpgsm:${PORTSDIR}/security/gnupg-devel
+BUILD_DEPENDS+= gpgsm:${PORTSDIR}/security/gnupg
.else
CONFIGURE_ARGS+= --without-gpgsm
.endif