aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deskutils/kdepim3/Makefile3
-rw-r--r--deskutils/kdepim4/Makefile3
-rw-r--r--deskutils/kdepim44/Makefile3
-rw-r--r--devel/baz/Makefile4
-rw-r--r--devel/bazaar/Makefile4
-rw-r--r--finance/qhacc/Makefile3
-rw-r--r--mail/balsa/Makefile3
-rw-r--r--mail/claws-mail-smime/Makefile3
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/sylpheed-claws-smime/Makefile3
-rw-r--r--mail/sylpheed-claws/Makefile2
-rw-r--r--mail/sylpheed/Makefile4
-rw-r--r--mail/sylpheed2-devel/Makefile4
-rw-r--r--mail/sylpheed2/Makefile4
-rw-r--r--mail/sylpheed3/Makefile4
-rw-r--r--net-im/centericq/Makefile4
-rw-r--r--security/gpa/Makefile2
-rw-r--r--security/gpgme/Makefile4
-rw-r--r--security/gpgme/distinfo6
-rw-r--r--security/gpgme/files/patch-assuan-Makefile.in27
-rw-r--r--security/gpgme/files/patch-assuan-assuan.h10
-rw-r--r--security/gpgme/files/patch-configure19
-rw-r--r--security/gpgme/files/patch-gpgme-ath-pthread-compat.c11
-rw-r--r--security/gpgme/pkg-plist6
-rw-r--r--security/pecl-gnupg/Makefile3
-rw-r--r--security/pinentry/Makefile4
-rw-r--r--security/seahorse/Makefile3
28 files changed, 83 insertions, 67 deletions
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 0a4e06a44c7d..dafd1e582022 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -15,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Personal Information Management tools for KDE
-LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \
mal:${PORTSDIR}/palm/libmal \
pisock:${PORTSDIR}/palm/pilot-link \
sasl2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 0a4e06a44c7d..dafd1e582022 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -15,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Personal Information Management tools for KDE
-LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \
mal:${PORTSDIR}/palm/libmal \
pisock:${PORTSDIR}/palm/pilot-link \
sasl2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 0a4e06a44c7d..dafd1e582022 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@@ -15,7 +16,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Personal Information Management tools for KDE
-LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \
mal:${PORTSDIR}/palm/libmal \
pisock:${PORTSDIR}/palm/pilot-link \
sasl2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index 7c8783286ad5..ad0dfb9e9efe 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bazaar
PORTVERSION= 1.4.2
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= devel
MASTER_SITES= http://bazaar.canonical.com/releases/src/
DISTNAME= bazaar_${PORTVERSION}
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
gtar:${PORTSDIR}/archivers/gtar
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= neon.25:${PORTSDIR}/www/neon \
- gpgme.15:${PORTSDIR}/security/gpgme
+ gpgme.17:${PORTSDIR}/security/gpgme
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/devel/bazaar/Makefile b/devel/bazaar/Makefile
index 7c8783286ad5..ad0dfb9e9efe 100644
--- a/devel/bazaar/Makefile
+++ b/devel/bazaar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bazaar
PORTVERSION= 1.4.2
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= devel
MASTER_SITES= http://bazaar.canonical.com/releases/src/
DISTNAME= bazaar_${PORTVERSION}
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
gtar:${PORTSDIR}/archivers/gtar
RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= neon.25:${PORTSDIR}/www/neon \
- gpgme.15:${PORTSDIR}/security/gpgme
+ gpgme.17:${PORTSDIR}/security/gpgme
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index b907a17423ed..0abd6f94c619 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qhacc
PORTVERSION= 3.5
+PORTREVISION= 1
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -57,7 +58,7 @@ PLIST_SUB+= SQLITE="@comment "
.endif
.if defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+= --enable-gpg
PLIST_SUB+= GPGME=""
.else
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index f8df07020a61..e86f45f928e0 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -8,6 +8,7 @@
PORTNAME= balsa
PORTVERSION= 2.3.13
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/
DISTNAME= balsa-${PORTVERSION}
@@ -51,7 +52,7 @@ OPTIONS= LDAP "Enable LDAP support" on \
.include <bsd.port.pre.mk>
.if defined(WITH_GPG)
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}/bin/gpgme-config
.endif
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 3bfec8573ae8..ec8ff5c14dda 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smime
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/
PKGNAMEPREFIX= sylpheed-claws-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX= sylpheed-claws-
MAINTAINER= c0rn@o2.pl
COMMENT= S/MIME plugin for sylpheed-claws
-LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
BUILD_DEPENDS= sylpheed-claws>=2.1.1:${PORTSDIR}/mail/sylpheed-claws
RUN_DEPENDS= sylpheed-claws>=2.1.1:${PORTSDIR}/mail/sylpheed-claws
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 5adab659e8fc..004bffaf3ccd 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sylpheed-claws
PORTVERSION= 2.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index e3af44d611b2..41c1ec86f058 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -107,7 +107,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.5.13
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
diff --git a/mail/sylpheed-claws-smime/Makefile b/mail/sylpheed-claws-smime/Makefile
index 3bfec8573ae8..ec8ff5c14dda 100644
--- a/mail/sylpheed-claws-smime/Makefile
+++ b/mail/sylpheed-claws-smime/Makefile
@@ -7,6 +7,7 @@
PORTNAME= smime
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://sylpheed-claws.net/downloads/plugins/
PKGNAMEPREFIX= sylpheed-claws-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX= sylpheed-claws-
MAINTAINER= c0rn@o2.pl
COMMENT= S/MIME plugin for sylpheed-claws
-LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
BUILD_DEPENDS= sylpheed-claws>=2.1.1:${PORTSDIR}/mail/sylpheed-claws
RUN_DEPENDS= sylpheed-claws>=2.1.1:${PORTSDIR}/mail/sylpheed-claws
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 5adab659e8fc..004bffaf3ccd 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sylpheed-claws
PORTVERSION= 2.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail news ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sylpheed-claws
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index c345c1a38a7b..a37c0c8b676f 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sylpheed
PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.good-day.net/sylpheed/v1.0/
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=--disable-imlib
CONFIGURE_ARGS+=--disable-gdk-pixbuf
.endif
.if defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
CONFIGURE_ARGS+=--enable-gpgme
.else
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index cc13df368d79..2409c18b876a 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sylpheed
PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.good-day.net/sylpheed/v2.2/ \
${MASTER_SITE_SOURCEFORGE}
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=--disable-ssl
.endif
.if defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
CONFIGURE_ARGS+=--enable-gpgme
.else
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 1e288339f955..15f4c61c1e61 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sylpheed
PORTVERSION= 2.2.7
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.good-day.net/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--disable-ssl
.endif
.if defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
CONFIGURE_ARGS+=--enable-gpgme
.else
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 1e288339f955..15f4c61c1e61 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sylpheed
PORTVERSION= 2.2.7
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.good-day.net/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--disable-ssl
.endif
.if defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
CONFIGURE_ARGS+=--enable-gpgme
.else
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index df065af7d3f1..25c11141a7cb 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -8,7 +8,7 @@
PORTNAME= centericq
PORTVERSION= 4.21.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im
MASTER_SITES= http://centericq.de/archive/source/releases/ \
http://thekonst.net/download/
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+= --disable-jabber
.if !defined(WITH_GPGME)
CONFIGURE_ARGS+= --without-gpgme
.else
-LIB_DEPENDS+= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}
.endif
.endif
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 139f8ab009cb..b6e76b690516 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gpa
PORTVERSION= 0.7.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= alpha/gpa
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index d377b13d5c60..52c99da52630 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gpgme
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gpgme
@@ -42,6 +41,7 @@ PLIST_SUB+= WITH_PTH='@comment '
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|EOF||g' ${WRKSRC}/assuan/assuan-errors.c
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT} \
${WRKSRC}/gpgme/Makefile.in \
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index e7c610c4e2e0..4ed9db0a3a6f 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpgme-1.0.3.tar.gz) = 4d33cbdf844fcee1c724e4cf2a32dd11
-SHA256 (gpgme-1.0.3.tar.gz) = 376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
-SIZE (gpgme-1.0.3.tar.gz) = 837866
+MD5 (gpgme-1.1.2.tar.gz) = c712ca39c3553573f15cd01e6edb8b68
+SHA256 (gpgme-1.1.2.tar.gz) = 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
+SIZE (gpgme-1.1.2.tar.gz) = 881432
diff --git a/security/gpgme/files/patch-assuan-Makefile.in b/security/gpgme/files/patch-assuan-Makefile.in
new file mode 100644
index 000000000000..bf43881aa660
--- /dev/null
+++ b/security/gpgme/files/patch-assuan-Makefile.in
@@ -0,0 +1,27 @@
+--- assuan/Makefile.in.orig Wed Sep 13 16:14:57 2006
++++ assuan/Makefile.in Wed Sep 13 16:15:11 2006
+@@ -74,7 +74,7 @@
+ assuan-listen.lo assuan-connect.lo assuan-client.lo \
+ assuan-pipe-server.lo assuan-socket-server.lo \
+ assuan-pipe-connect.lo assuan-socket-connect.lo \
+- assuan-socket.lo funopen.lo assuan-io.lo \
++ assuan-socket.lo assuan-io.lo \
+ assuan-domain-connect.lo assuan-domain-server.lo \
+ assuan-logging.lo
+ libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
+@@ -273,7 +273,6 @@
+ assuan-pipe-connect.c \
+ assuan-socket-connect.c \
+ assuan-socket.c \
+- funopen.c \
+ assuan-io.c \
+ assuan-domain-connect.c \
+ assuan-domain-server.c \
+@@ -348,7 +347,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket-server.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-util.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/funopen.Plo@am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/security/gpgme/files/patch-assuan-assuan.h b/security/gpgme/files/patch-assuan-assuan.h
new file mode 100644
index 000000000000..b34e4b5ea7cc
--- /dev/null
+++ b/security/gpgme/files/patch-assuan-assuan.h
@@ -0,0 +1,10 @@
+--- assuan/assuan.h.orig Wed Sep 13 15:55:53 2006
++++ assuan/assuan.h Wed Sep 13 15:56:59 2006
+@@ -23,6 +23,7 @@
+
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+
+
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
deleted file mode 100644
index f14d46e20fec..000000000000
--- a/security/gpgme/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig Tue Dec 28 12:35:39 2004
-+++ configure Mon Aug 8 16:26:11 2005
-@@ -19723,7 +19723,6 @@
- #define HAVE_PTH
- _ACEOF
-
-- CFLAGS="$CFLAGS $PTH_CFLAGS"
- fi
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-@@ -22575,7 +22574,7 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+eval "$as_ac_var=yes"
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
diff --git a/security/gpgme/files/patch-gpgme-ath-pthread-compat.c b/security/gpgme/files/patch-gpgme-ath-pthread-compat.c
deleted file mode 100644
index 7fec8e8c55aa..000000000000
--- a/security/gpgme/files/patch-gpgme-ath-pthread-compat.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpgme/ath-pth-compat.c.orig Tue Nov 1 10:25:41 2005
-+++ gpgme/ath-pth-compat.c Tue Nov 1 10:25:55 2005
-@@ -20,7 +20,7 @@
-
- #include <stdlib.h>
- #include <errno.h>
--#include <pth.h>
-+#include <pth/pth.h>
-
- #include "ath.h"
-
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index bb8b55eb6663..bf9c32badaa3 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -3,14 +3,14 @@ include/gpgme/gpgme.h
%%WITH_PTH%%lib/libgpgme-pth.a
%%WITH_PTH%%lib/libgpgme-pth.la
%%WITH_PTH%%lib/libgpgme-pth.so
-%%WITH_PTH%%lib/libgpgme-pth.so.15
+%%WITH_PTH%%lib/libgpgme-pth.so.17
lib/libgpgme-pthread.a
lib/libgpgme-pthread.la
lib/libgpgme-pthread.so
-lib/libgpgme-pthread.so.15
+lib/libgpgme-pthread.so.17
lib/libgpgme.a
lib/libgpgme.la
lib/libgpgme.so
-lib/libgpgme.so.15
+lib/libgpgme.so.17
share/aclocal/gpgme.m4
@dirrm include/gpgme
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index 2847e9bbf0d3..93d6cab420bc 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -16,7 +17,7 @@ DIST_SUBDIR= PECL
MAINTAINER= mnag@FreeBSD.org
COMMENT= A pecl wrapper around the gpgme library
-LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
USE_PHP= yes
USE_PHPEXT= yes
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index e9f72b27a534..24a1220199d2 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pinentry
PORTVERSION= 0.7.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= pinentry
@@ -16,7 +16,7 @@ MAINTAINER= lofi@freebsd.org
COMMENT?= A collection of simple PIN or passphrase entry dialogs
LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \
- ksba.15:${PORTSDIR}/security/libksba
+ ksba.17:${PORTSDIR}/security/libksba
CONFLICTS?= pinentry-[a-z]*-[0.9]*
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index fb742bb7d5e8..3819c0ea8041 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -8,6 +8,7 @@
PORTNAME= seahorse
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8
@@ -18,7 +19,7 @@ COMMENT= A front end for GnuPG
BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
RUN_DEPENDS= ${BUILD_DEPENDS}
-LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme
+LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme
USE_BZIP2= yes
USE_GETTEXT= yes