Update to 1.1.3

5 files changed, 27 insertions, 21 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index aa378ac5aa2d..06dd9343c276 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpgme
-PORTVERSION=	1.1.2
-PORTREVISION=	4
+PORTVERSION=	1.1.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -47,6 +46,8 @@ post-patch:
 					${WRKSRC}/${CONFIGURE_SCRIPT} \
 					${WRKSRC}/gpgme/Makefile.in \
 					${WRKSRC}/gpgme/gpgme-config.in
+	@${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \
+					${WRKSRC}/lang/cl/Makefile.in
 .if defined(WITH_PTH)
 .if ${OSVERSION} < 503100 || defined(PTHREAD_LIBS) && ${PTHREAD_LIBS} != "-pthread"
 	@${REINPLACE_CMD} -e 's|t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la|t_thread1_LDADD = ../../gpgme/libgpgme-pthread.la -lpthread|g' \
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 4ed9db0a3a6f..98322b329e18 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpgme-1.1.2.tar.gz) = c712ca39c3553573f15cd01e6edb8b68
-SHA256 (gpgme-1.1.2.tar.gz) = 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
-SIZE (gpgme-1.1.2.tar.gz) = 881432
+MD5 (gpgme-1.1.3.tar.gz) = cfb1f709b1ebfed51dc4e5045c2d25a8
+SHA256 (gpgme-1.1.3.tar.gz) = ecdec0b5c941a97ae812a9daa30c02b4dcce495bf0b2f6d5c2e4d245fbdac623
+SIZE (gpgme-1.1.3.tar.gz) = 918658
diff --git a/security/gpgme/files/patch-assuan-Makefile.in b/security/gpgme/files/patch-assuan-Makefile.in
index bf43881aa660..206f27cc1e9a 100644
--- a/security/gpgme/files/patch-assuan-Makefile.in
+++ b/security/gpgme/files/patch-assuan-Makefile.in
@@ -1,25 +1,25 @@
---- assuan/Makefile.in.orig	Wed Sep 13 16:14:57 2006
-+++ assuan/Makefile.in	Wed Sep 13 16:15:11 2006
+--- assuan/Makefile.in.orig	Mon Jan 29 21:16:58 2007
++++ assuan/Makefile.in	Tue Feb  6 17:51:48 2007
 @@ -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
+ 	assuan-pipe-connect.lo assuan-socket-connect.lo assuan-uds.lo \
+-	funopen.lo assuan-io.lo assuan-logging.lo assuan-socket.lo
++	assuan-io.lo assuan-logging.lo assuan-socket.lo
  libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
-@@ -273,7 +273,6 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -274,7 +274,6 @@
  	assuan-pipe-connect.c \
  	assuan-socket-connect.c  \
- 	assuan-socket.c \
+ 	assuan-uds.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@
+ 	assuan-logging.c \
+ 	assuan-socket.c
+@@ -347,7 +346,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-uds.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@
  
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
index f598d67c9dbf..0e6bf759748d 100644
--- a/security/gpgme/files/patch-configure
+++ b/security/gpgme/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.old	Thu Sep 14 00:02:14 2006
-+++ configure	Thu Sep 14 00:02:58 2006
-@@ -23349,7 +23349,7 @@
+--- configure.orig	Tue Feb  6 17:52:35 2007
++++ configure	Tue Feb  6 17:53:24 2007
+@@ -23622,7 +23622,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index bf9c32badaa3..3aa8cf6a2f26 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -4,6 +4,9 @@ include/gpgme/gpgme.h
 %%WITH_PTH%%lib/libgpgme-pth.la
 %%WITH_PTH%%lib/libgpgme-pth.so
 %%WITH_PTH%%lib/libgpgme-pth.so.17
+lib/common-lisp/gpgme/gpgme-package.lisp
+lib/common-lisp/gpgme/gpgme.asd
+lib/common-lisp/gpgme/gpgme.lisp
 lib/libgpgme-pthread.a
 lib/libgpgme-pthread.la
 lib/libgpgme-pthread.so
@@ -14,3 +17,5 @@ lib/libgpgme.so
 lib/libgpgme.so.17
 share/aclocal/gpgme.m4
 @dirrm include/gpgme
+@dirrm lib/common-lisp/gpgme
+@dirrmtry lib/common-lisp