ports/112270: [UPDATE] security/gnutls 1.6.1 -> 1.6.2

[Martin Matuska]

>Number:         112270
>Category:       ports
>Synopsis:       [UPDATE] security/gnutls 1.6.1 -> 1.6.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 30 11:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Suggested update for security/gnutls from 1.6.1 to 1.6.2

- added OPTIONS for libtasn1 and OpenCDK
- libtasn1 used from ports by default

Tested with portlint & tinderbox.

Tinderbox logs:
http://i386.vx.sk/logs/6.2-FreeBSD-i386/gnutls-1.6.2.log
http://amd64.vx.sk/logs/6.2-FreeBSD-amd64/gnutls-1.6.2.log

>How-To-Repeat:
>Fix:
Index: ports/security/gnutls/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/gnutls/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- ports/security/gnutls/Makefile	8 Mar 2007 14:12:07 -0000	1.49
+++ ports/security/gnutls/Makefile	30 Apr 2007 11:13:18 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTVERSION=	1.6.2
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 	ftp://ftp.gnutls.org/pub/gnutls/ \
@@ -39,13 +38,22 @@
 			--infodir="${PREFIX}/info" --mandir="${PREFIX}/man/"
 MANCOMPRESSED=	no
 
+OPTIONS=	LIBTASN1 "Use Libtasn1 from ports" on \
+		OPENCDK	"Use OpenCDK from ports" off
+
 .include <bsd.port.pre.mk>
-.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.9)
+.if defined(WITH_OPENCDK)
+CONFIGURE_ARGS+=	--with-libopencdk-prefix=${LOCALBASE}
 LIB_DEPENDS+=	opencdk.9:${PORTSDIR}/security/opencdk
+.else
+CONFIGURE_ARGS+=	--with-included-opencdk
 .endif
 
-.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
+.if defined(WITH_LIBTASN1)
+CONFIGURE_ARGS+=	--with-libtasn1-prefix=${LOCALBASE}
 LIB_DEPENDS+=	tasn1.3:${PORTSDIR}/security/libtasn1
+.else
+CONFIGURE_ARGS+=	--with-included-libtasn1
 .endif
 
 .if ${OSVERSION} < 600000
Index: ports/security/gnutls/distinfo
===================================================================
RCS file: /home/pcvs/ports/security/gnutls/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- ports/security/gnutls/distinfo	2 Jan 2007 08:52:38 -0000	1.21
+++ ports/security/gnutls/distinfo	30 Apr 2007 11:13:18 -0000
@@ -1,3 +1,3 @@
-MD5 (gnutls-1.6.1.tar.bz2) = fc3cc2509aa93e150cafd39619de7428
-SHA256 (gnutls-1.6.1.tar.bz2) = 7711a351913731db25e12b20bc6f51e488f28df9c2673efdfa6e35034884cb41
-SIZE (gnutls-1.6.1.tar.bz2) = 4226536
+MD5 (gnutls-1.6.2.tar.bz2) = 1b224e4de5ac5ab89a2e53c7af9cf6b0
+SHA256 (gnutls-1.6.2.tar.bz2) = b168c132b18b84c45be774cabd487fd58b613146f9c63aaa79def0a753ef1a95
+SIZE (gnutls-1.6.2.tar.bz2) = 4285763
Index: ports/security/gnutls/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/gnutls/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- ports/security/gnutls/pkg-plist	2 Jan 2007 08:52:38 -0000	1.17
+++ ports/security/gnutls/pkg-plist	30 Apr 2007 11:13:18 -0000
@@ -56,6 +56,7 @@
 %%EXAMPLESDIR%%/tcp.c
 %%NLS%%share/locale/en at boldquot/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/en at quot/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo
 @dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: