aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING13
-rw-r--r--deskutils/basket/Makefile3
-rw-r--r--deskutils/kdepim4/Makefile1
-rw-r--r--deskutils/kdepim44/Makefile2
-rw-r--r--deskutils/kdepimlibs4/Makefile1
-rw-r--r--devel/baz/Makefile4
-rw-r--r--devel/geany-plugin-pg/Makefile3
-rw-r--r--mail/anubis/Makefile2
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/claws-mail-pgp/Makefile2
-rw-r--r--mail/elmo-devel/Makefile4
-rw-r--r--mail/elmo/Makefile4
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/sylpheed/Makefile2
-rw-r--r--net-im/ayttm/Makefile4
-rw-r--r--net-im/centericq/Makefile4
-rw-r--r--net-im/centerim-devel/Makefile4
-rw-r--r--net-im/mcabber/Makefile4
-rw-r--r--net-p2p/retroshare/Makefile2
-rw-r--r--polish/ekg2/Makefile2
-rw-r--r--security/fwknop/Makefile1
-rw-r--r--security/gpa/Makefile1
-rw-r--r--security/gpgme/Makefile65
-rw-r--r--security/gpgme/distinfo8
-rw-r--r--security/gpgme/files/patch-src__engine-uiserver.c10
-rw-r--r--security/gpgme/pkg-plist4
-rw-r--r--security/openvas-libnasl/Makefile16
-rw-r--r--security/pecl-gnupg/Makefile3
-rw-r--r--security/py-pyme/Makefile4
-rw-r--r--security/ruby-gpgme/Makefile4
-rw-r--r--security/seahorse/Makefile2
-rw-r--r--sysutils/pacman/Makefile2
32 files changed, 94 insertions, 91 deletions
diff --git a/UPDATING b/UPDATING
index 3d82a3f693b6..e0d8a5e41a17 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,19 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20131020:
+ AFFECTS: users of security/gpgme
+ AUTHOR: jhale@FreeBSD.org
+
+ The library version of security/gpgme has changed, and PORTREVISION has
+ been bumped in all dependent ports. If you have external software that
+ depends on gpgme, this software needs to be recompiled.
+ To recompile all software dependent on gpgme, run:
+
+ # portmaster -r gpgme
+ or
+ # portupgrade -rf gpgme
+
20131008:
AFFECT: all users
AUTHOR: bapt@FreeBSD.org
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 924a39fe94a2..026ed59b82f3 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -3,6 +3,7 @@
PORTNAME= basket
PORTVERSION= 1.81
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= http://basket.kde.org/downloads/
@@ -11,7 +12,7 @@ COMMENT= Desktop organization tool
LICENSE= GPLv2
-LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
USE_BZIP2= yes
USE_XORG= xft xpm
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 91a90500df3c..db56ab5af4ae 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index bbcdcbfa6648..a1f4c3e0f404 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdepim
PORTVERSION= 4.4.11.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/kdepim-${PORTVERSION}/src
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index b64195fd3576..cb6b06335c1b 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index 9804c7c84646..0aa10fcb91d3 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -3,7 +3,7 @@
PORTNAME= baz
PORTVERSION= 1.4.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel
MASTER_SITES= http://bazaar-vcs.org/releases/src/obsolete/
DISTNAME= bazaar_${PORTVERSION}
@@ -16,7 +16,7 @@ BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/patch \
gtar:${PORTSDIR}/archivers/gtar
RUN_DEPENDS:= ${BUILD_DEPENDS}
LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 \
- gpgme.19:${PORTSDIR}/security/gpgme
+ libgpgme.so:${PORTSDIR}/security/gpgme
CONFLICTS= gd-2.*
diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile
index 80a9277db26c..75b7b6cfc793 100644
--- a/devel/geany-plugin-pg/Makefile
+++ b/devel/geany-plugin-pg/Makefile
@@ -2,12 +2,13 @@
PORTNAME= geany-plugin-pg
PORTVERSION= ${GEANY_VER}
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= makc@FreeBSD.org
COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC}
-LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
NO_STAGE= yes
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 7ed846089953..67e87eec7355 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -3,7 +3,7 @@
PORTNAME= anubis
PORTVERSION= 4.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index a9a9d1e8a055..508bdc9111d9 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -4,7 +4,7 @@
PORTNAME= balsa
PORTVERSION= 2.4.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail gnome
MASTER_SITES= http://pawsa.fedorapeople.org/balsa/
DISTNAME= balsa-${PORTVERSION}
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 5a5ac73811b4..b71740f91fb9 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pgp
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= PGP plugins for Claws Mail
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index a4cf44d472ac..c6ca963323e7 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elmo
PORTVERSION= 1.3.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= -devel
@@ -40,7 +40,7 @@ PLIST_SUB+= NLS="@comment "
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme
.else
pre-everything::
@${ECHO_CMD}
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index a45065cca4cd..5066ee382e32 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= elmo
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -34,7 +34,7 @@ NLS_USES= gettext
OPTIONS_SUB= yes
.if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme
.else
NO_STAGE= yes
pre-everything::
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 2f59aa7995fc..f6391d638048 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mutt
PORTVERSION= 1.5.21
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/ \
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 90674ab4ca86..a8ead679a247 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sylpheed
PORTVERSION= 3.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \
CRITICAL
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index e66fa9577e42..51c905fc54fb 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ayttm
PORTVERSION= 0.5.0.111
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im
MASTER_SITES= SF/ayttm/ayttm/${PORTVERSION:R}-${PORTVERSION:E}/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
@@ -13,7 +13,7 @@ COMMENT= A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
jasper.4:${PORTSDIR}/graphics/jasper \
- gpgme.19:${PORTSDIR}/security/gpgme \
+ libgpgme.so:${PORTSDIR}/security/gpgme \
pspell.16:${PORTSDIR}/textproc/aspell
OPTIONS_DEFINE= ESOUND AIM_TOC ICQ_TOC
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index fec52d178798..a099f6db9732 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -3,7 +3,7 @@
PORTNAME= centericq
PORTVERSION= 4.21.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= net-im
MASTER_SITES= http://thekonst.net/download/
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --disable-jabber
.endif
.if ${PORT_OPTIONS:MGPGME}
-LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-gpgme
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index e7ccfc7398e9..92ce5f309b1a 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= centerim
PORTVERSION= 4.22.10.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://www.centerim.org/download/mobshots/ \
ftp://ftp.centerim.org/mobshots/
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --disable-jabber
.if ! ${PORT_OPTIONS:MGPGME}
CONFIGURE_ARGS+= --without-gpgme
.else
-LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme
#CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}
CONFIGURE_ARGS+= --with-ssl
.endif
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 2140fb758405..298c2b21c6fb 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mcabber
PORTVERSION= 0.10.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ CENKES
@@ -36,7 +36,7 @@ NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGPGME}
-LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+=--enable-gpgme
.else
CONFIGURE_ARGS+=--disable-gpgme
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 7834de6aea24..8572f58da793 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -3,7 +3,7 @@
PORTNAME= retroshare
PORTVERSION= 0.5.4d
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 89edf53289ab..215532e3390b 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ekg2
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= polish net-im
MASTER_SITES= http://pl.ekg2.org/
diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile
index 2529e75e60f8..011e7c9ccd52 100644
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@@ -3,6 +3,7 @@
PORTNAME= fwknop
PORTVERSION= 2.5.1
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.cipherdyne.org/fwknop/download/
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 87dc1fc3318d..23f067ad63cd 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gpa
PORTVERSION= 0.9.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpa
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 309c75977075..428e339198dd 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gpgme
-PORTVERSION= 1.3.2
+PORTVERSION= 1.4.3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpgme
@@ -14,46 +14,45 @@ COMMENT= Library to make access to GnuPG easier
LICENSE= LGPL21
-LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \
- gpg-error.0:${PORTSDIR}/security/libgpg-error
-
-OPTIONS_DEFINE= DOCS UISERVER
-OPTIONS_SINGLE= GNUPG
-OPTIONS_SINGLE_GNUPG= GNUPG1 GNUPG2
-OPTIONS_DEFAULT= GNUPG2
-
-GNUPG1_DESC= Build gpgme library for GnuPG 1.x
-GNUPG2_DESC= Build gpgme library for GnuPG 2.x
-UISERVER_DESC= GnuPG UI server support
+LIB_DEPENDS= libassuan.so:${PORTSDIR}/security/libassuan \
+ libgpg-error.so:${PORTSDIR}/security/libgpg-error
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
-USE_GMAKE= yes
+USE_GNOME= ltverhack
+USES= gmake
USE_LDCONFIG= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gpgme \
--with-g13=no
INFO= gpgme
-PORTDOCS= AUTHORS ChangeLog COPYING COPYING.LESSER INSTALL \
- NEWS README THANKS TODO
+PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
-NO_STAGE= yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= DOCS UISERVER
+OPTIONS_SINGLE= GNUPG
+OPTIONS_SINGLE_GNUPG= GNUPG1 GNUPG2
+OPTIONS_DEFAULT= GNUPG2 UISERVER
-.if ${PORT_OPTIONS:MGNUPG1}
-BUILD_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1
-CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg \
- --with-gpgsm=no \
- --with-gpgconf=no
-.endif
+GNUPG1_DESC= Build gpgme library for GnuPG 1.x
+GNUPG1_BUILD_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
+GNUPG1_RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
+GNUPG1_CONFIGURE_ON= --with-gpg=${LOCALBASE}/bin/gpg \
+ --with-gpgconf=no \
+ --with-gpgsm=no
+
+GNUPG2_DESC= Build gpgme library for GnuPG 2.x
+GNUPG2_BUILD_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
+GNUPG2_RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
+GNUPG2_CONFIGURE_ON= --with-gpg=${LOCALBASE}/bin/gpg2 \
+ --with-gpgconf=${LOCALBASE}/bin/gpgconf
+
+UISERVER_DESC= GnuPG UI server support
+UISERVER_CONFIGURE_ENABLE= fd-passing
+
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGNUPG2}
-BUILD_DEPENDS+= gpg2:${PORTSDIR}/security/gnupg
-RUN_DEPENDS+= gpg2:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg2 \
- --with-gpgconf=${LOCALBASE}/bin/gpgconf
.if exists(${LOCALBASE}/bin/gpgsm)
CONFIGURE_ARGS+=--with-gpgsm=${LOCALBASE}/bin/gpgsm
.else
@@ -61,10 +60,6 @@ CONFIGURE_ARGS+=--with-gpgsm=no
.endif
.endif
-.if ${PORT_OPTIONS:MUISERVER}
-CONFIGURE_ARGS+=--enable-fd-passing
-.endif
-
verify: checksum
gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
@@ -78,9 +73,7 @@ post-patch:
${WRKSRC}/lang/cl/Makefile.in
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index b4604b81a73b..4be0035fd9cb 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gpgme-1.3.2.tar.bz2) = cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875
-SIZE (gpgme-1.3.2.tar.bz2) = 867738
-SHA256 (gpgme-1.3.2.tar.bz2.sig) = 719b5899d07671b0ac17e7d88131ca11fd9a8ce504720ce4c789b67ba15bf2b2
-SIZE (gpgme-1.3.2.tar.bz2.sig) = 287
+SHA256 (gpgme-1.4.3.tar.bz2) = 2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496
+SIZE (gpgme-1.4.3.tar.bz2) = 972497
+SHA256 (gpgme-1.4.3.tar.bz2.sig) = 5b8269678c1ec6a73ad56475f731c1247359167a921b1dc0ae3b1e8d38a9273c
+SIZE (gpgme-1.4.3.tar.bz2.sig) = 287
diff --git a/security/gpgme/files/patch-src__engine-uiserver.c b/security/gpgme/files/patch-src__engine-uiserver.c
deleted file mode 100644
index 69b18c1a2bf3..000000000000
--- a/security/gpgme/files/patch-src__engine-uiserver.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/engine-uiserver.c.orig 2012-05-03 20:50:11.000000000 -0400
-+++ ./src/engine-uiserver.c 2012-05-03 20:50:27.000000000 -0400
-@@ -49,7 +49,6 @@
- #include "data.h"
-
- #include "assuan.h"
--#include "status-table.h"
- #include "debug.h"
-
- #include "engine-backend.h"
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index 036252cddde9..f0623c6a78b8 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -6,11 +6,11 @@ lib/common-lisp/gpgme/gpgme.lisp
lib/libgpgme-pthread.a
lib/libgpgme-pthread.la
lib/libgpgme-pthread.so
-lib/libgpgme-pthread.so.19
+lib/libgpgme-pthread.so.11
lib/libgpgme.a
lib/libgpgme.la
lib/libgpgme.so
-lib/libgpgme.so.19
+lib/libgpgme.so.11
share/aclocal/gpgme.m4
@dirrm lib/common-lisp/gpgme
@dirrmtry lib/common-lisp
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index 30dff59a2b84..49f1ce883b2f 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -3,20 +3,20 @@
PORTNAME= openvas-libnasl
PORTVERSION= 2.0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/561/
MAINTAINER= ports@FreeBSD.org
COMMENT= NASL libraries for OpenVAS
-LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \
- gnutls.26:${PORTSDIR}/security/gnutls \
- gpg-error.0:${PORTSDIR}/security/libgpg-error \
- gpgme.19:${PORTSDIR}/security/gpgme \
- openvas.2:${PORTSDIR}/security/openvas-libraries \
- openvas_hg.2:${PORTSDIR}/security/openvas-libraries \
- tasn1.5:${PORTSDIR}/security/libtasn1
+LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+ libgnutls.so:${PORTSDIR}/security/gnutls \
+ libgpg-error.so:${PORTSDIR}/security/libgpg-error \
+ libgpgme.so:${PORTSDIR}/security/gpgme \
+ libopenvas.so.2:${PORTSDIR}/security/openvas-libraries \
+ libopenvas_hg.so.2:${PORTSDIR}/security/openvas-libraries \
+ libtasn1.so:${PORTSDIR}/security/libtasn1
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index d07940c51632..3b0618a80652 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnupg
PORTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -12,7 +13,7 @@ DIST_SUBDIR= PECL
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= PECL wrapper around the gpgme library
-LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --with-gnupg=${LOCALBASE}/include/gpgme
diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile
index ba40c6c7c5a1..ac907f96e4ac 100644
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pyme
PORTVERSION= 0.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= Python interface to GPGME library
BUILD_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13
-LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
USE_GMAKE= yes
USE_PYTHON= 2.5+
diff --git a/security/ruby-gpgme/Makefile b/security/ruby-gpgme/Makefile
index 20f62102c097..ad9a0dbf803d 100644
--- a/security/ruby-gpgme/Makefile
+++ b/security/ruby-gpgme/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gpgme
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security ruby
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ruby-gpgme
@@ -14,7 +14,7 @@ DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
COMMENT= A Ruby interface to GnuPG Made Easy (GPGME)
-LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 9b2d3eb44a8d..73ea886dbd0b 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seahorse
PORTVERSION= 2.32.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index ffe9fd498990..51b893431c86 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pacman
PORTVERSION= 4.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.archlinux.org/other/pacman/ \
http://mirror.amdmi3.ru/distfiles/