Edd Barrett <[email protected]> writes:
> Update libassuan to latest version. Needed for gnupg2 update.
>
> (I would like to commit all of these gnupg related updates together, at
> the same time).
>
> OK?
ok jca@
In case you're interested, here's an updated diff that gets rid of the
gettext module.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libassuan/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 17 Sep 2013 11:10:01 -0000 1.14
+++ Makefile 4 Sep 2016 10:52:03 -0000
@@ -2,27 +2,26 @@
COMMENT= IPC library used by GnuPG and gpgme
-DISTNAME= libassuan-2.1.1
+DISTNAME= libassuan-2.4.3
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS += assuan 1.1 # 2.0
+SHARED_LIBS += assuan 2.0 # 7.3
CATEGORIES= security devel
# LGPLv3+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += gpg-error
+WANTLIB += gpg-error iconv intl
MASTER_SITES= ${MASTER_SITES_GNUPG:=libassuan/}
-MODULES= devel/gettext \
- textproc/intltool
+MODULES= textproc/intltool
LIB_DEPENDS= security/libgpg-error
CONFIGURE_STYLE=gnu
-CFLAGS+= -fPIC
+CFLAGS+= -fPIC -DEPROTO=ENOPROTOOPT
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libassuan/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 17 Sep 2013 11:10:02 -0000 1.8
+++ distinfo 4 Sep 2016 10:03:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (libassuan-2.1.1.tar.bz2) = I+LWd3m4jpDSn+HfaxVxCfHCpkfQ8bKg9Clbs8CyA50=
-SIZE (libassuan-2.1.1.tar.bz2) = 538155
+SHA256 (libassuan-2.4.3.tar.bz2) = IoQ6O9slb1m+SYQqvyTadnADVCk6Bm2CregTS7WqK3E=
+SIZE (libassuan-2.4.3.tar.bz2) = 559867
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/libassuan/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 17 Sep 2013 11:10:02 -0000 1.3
+++ patches/patch-configure 4 Sep 2016 10:03:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2013/09/17 11:10:02 ajacoutot Exp $
---- configure.orig Mon Jun 24 07:14:16 2013
-+++ configure Tue Sep 17 13:06:46 2013
-@@ -14355,11 +14355,12 @@ if ${assuan_cv_sys_so_peercred+:} false; then :
+--- configure.orig Thu Jul 14 09:11:48 2016
++++ configure Sat Sep 3 13:37:40 2016
+@@ -14645,11 +14645,12 @@ if ${assuan_cv_sys_so_peercred+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE