ports/57346: [MAINTAINER] security/gnutls: reduce port dependencies

[Sergei Kolobov]

>Number:         57346
>Category:       ports
>Synopsis:       [MAINTAINER] security/gnutls: reduce port dependencies
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 29 04:40:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Sep 14 12:09:20 MSD 2003
>Description:
- 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

Removed files:
- files/patch-configure

Fixes:	ports/57247 

Generated with FreeBSD Port Tools 0.26
>How-To-Repeat:
>Fix:

--- gnutls-0.8.10_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /FreeBSD/cvs/ports/security/gnutls/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile	26 Sep 2003 11:22:04 -0000	1.10
+++ Makefile	29 Sep 2003 10:44:59 -0000
@@ -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 @@
 MAINTAINER=	sergei at 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 @@
 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
Index: pkg-plist
===================================================================
RCS file: /FreeBSD/cvs/ports/security/gnutls/pkg-plist,v
retrieving revision 1.6
diff -u -u -r1.6 pkg-plist
--- pkg-plist	24 Sep 2003 09:06:54 -0000	1.6
+++ pkg-plist	29 Sep 2003 10:43:15 -0000
@@ -1,21 +1,23 @@
 @comment $FreeBSD: ports/security/gnutls/pkg-plist,v 1.6 2003/09/24 09:06:54 krion Exp $
-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
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure	27 Feb 2003 20:52:02 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/security/gnutls/files/patch-configure,v 1.1 2003/02/27 20:52:02 naddy Exp $
-
---- 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'
--- gnutls-0.8.10_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: