From dc3189db63ac2d0616c41aedc6f8d6c99f76829f Mon Sep 17 00:00:00 2001
From: Greg Larkin <glarkin@FreeBSD.org>
Date: Thu, 22 Jul 2010 17:53:48 +0000
Subject: - Updated to 1.0.8. - Added explicit minimal version check for
 libgpg-error dependency. - Explicitly build static library, since the default
 changed to "off" with   this upstream version.

---
 security/libksba/Makefile                     |  6 +++--
 security/libksba/distinfo                     |  6 ++---
 security/libksba/files/patch-ltmain.sh        | 32 ---------------------------
 security/libksba/files/patch-src__asn1-func.c | 11 ---------
 4 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100644 security/libksba/files/patch-ltmain.sh
 delete mode 100644 security/libksba/files/patch-src__asn1-func.c

diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index e5b98442a1e6..3ff56fbcefe6 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libksba
-PORTVERSION=	1.0.7
+PORTVERSION=	1.0.8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,10 +13,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	KSBA is an X.509 Library
 
-LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error
+BUILD_DEPENDS+=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS+=	gpg-error.0:${PORTSDIR}/security/libgpg-error
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-static
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
 
diff --git a/security/libksba/distinfo b/security/libksba/distinfo
index 2b2a42b42c26..136922a25c7b 100644
--- a/security/libksba/distinfo
+++ b/security/libksba/distinfo
@@ -1,3 +1,3 @@
-MD5 (libksba-1.0.7.tar.bz2) = eebce521a90600369c33c5fa6b9bbbd8
-SHA256 (libksba-1.0.7.tar.bz2) = aab505de1c76d4681f47774579fd4d5845a019cc78b84fa897c02919095d2aae
-SIZE (libksba-1.0.7.tar.bz2) = 569854
+MD5 (libksba-1.0.8.tar.bz2) = 8acac0b3cbd0030dfc6d0f6a58c9b5b2
+SHA256 (libksba-1.0.8.tar.bz2) = 7f1d3a86943bebd03c5ad9ca281f3475e8b93ecbbf078beccfb7dc4e8f5c7ba0
+SIZE (libksba-1.0.8.tar.bz2) = 583545
diff --git a/security/libksba/files/patch-ltmain.sh b/security/libksba/files/patch-ltmain.sh
deleted file mode 100644
index 500ea3eff059..000000000000
--- a/security/libksba/files/patch-ltmain.sh
+++ /dev/null
@@ -1,32 +0,0 @@
---- ltmain.sh.orig	Wed Jul 17 17:15:35 2002
-+++ ltmain.sh	Wed Jul 17 17:17:15 2002
-@@ -1060,8 +1060,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue;
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=yes
- 	continue
- 	;;
- 
-@@ -4210,10 +4218,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/libksba/files/patch-src__asn1-func.c b/security/libksba/files/patch-src__asn1-func.c
deleted file mode 100644
index a10084675093..000000000000
--- a/security/libksba/files/patch-src__asn1-func.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/asn1-func.c.orig	2008-09-23 08:51:55.000000000 -0400
-+++ ./src/asn1-func.c	2008-09-23 08:51:59.000000000 -0400
-@@ -25,8 +25,6 @@
- #include <ctype.h>
- #include <assert.h>
- 
--#include <alloca.h>
--
- #include "util.h"
- #include "ksba.h"
- #include "asn1-func.h"
-- 
cgit v1.2.3