- Make security/opencdk and security/libtasn1 dependencies

  optional, enabled by WITH_OPENCDK and WITH_LIBTASN1 knobs,
  respectively.  NOTE: several people reported that using
  external libtasn1 breaks (at least some) GnuTLS functionality,
  so using WITH_LIBTASN1 is NOT recommended for now.
- Remove patch-configure as it breaks proper shared library build
- Build include lzo library by default (noticed by KATO Tsuguru)
- Re-sort pkg-plist

PR:		57346
Submitted by:	Sergei Kolobov <sergei@kolobov.com> (maintainer)

3 files changed, 26 insertions, 25 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 2e17e55e8ae6..b62c379b6e2a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	0.8.10
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -17,9 +18,7 @@ MASTER_SITE_SUBDIR=	alpha/gnutls
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	GNU Transport Layer Security library
 
-LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		tasn1.2:${PORTSDIR}/security/libtasn1 \
-		opencdk.6:${PORTSDIR}/security/opencdk
+LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -27,6 +26,19 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-included-lzo
+
+.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.2)
+LIB_DEPENDS+=		tasn1.2:${PORTSDIR}/security/libtasn1
+.else
+CONFIGURE_ARGS+=	--with-included-libtasn1
+.endif
+
+.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.6)
+LIB_DEPENDS+=		opencdk.6:${PORTSDIR}/security/opencdk
+.else
+CONFIGURE_ARGS+=	--disable-openpgp-authentication
+.endif
 
 DOCS=		AUTHORS NEWS README THANKS doc/tex/*.ps
 EXAMPLES=	doc/examples/*.c
diff --git a/security/gnutls/files/patch-configure b/security/gnutls/files/patch-configure
deleted file mode 100644
index 1cbe489bc732..000000000000
--- a/security/gnutls/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Feb 27 21:25:22 2003
-+++ configure	Thu Feb 27 21:25:36 2003
-@@ -12529,6 +12529,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index dd8ce5e834ea..da6dd05f151f 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -1,21 +1,23 @@
 @comment $FreeBSD$
-bin/gnutls-serv
 bin/gnutls-cli
-bin/gnutls-srpcrypt
 bin/gnutls-cli-debug
+bin/gnutls-serv
+bin/gnutls-srpcrypt
 bin/libgnutls-config
 bin/libgnutls-extra-config
-include/gnutls/extra.h
 include/gnutls/compat4.h
-include/gnutls/openssl.h
+include/gnutls/extra.h
 include/gnutls/gnutls.h
+include/gnutls/openssl.h
 @dirrm include/gnutls
-lib/libgnutls.so.7
-lib/libgnutls.so
-lib/libgnutls.a
-lib/libgnutls-extra.so.7
-lib/libgnutls-extra.so
 lib/libgnutls-extra.a
+lib/libgnutls-extra.la
+lib/libgnutls-extra.so
+lib/libgnutls-extra.so.7
+lib/libgnutls.a
+lib/libgnutls.la
+lib/libgnutls.so
+lib/libgnutls.so.7
 share/aclocal/libgnutls.m4
 share/aclocal/libgnutls-extra.m4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS