ports/123737: [PATCH] security/gnutls: update to 2.2.3 and add WITHOUT_* knobs

[Naram Qashat]

>Number:         123737
>Category:       ports
>Synopsis:       [PATCH] security/gnutls: update to 2.2.3 and add WITHOUT_* knobs
>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:   Fri May 16 17:40:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 7.0-STABLE FreeBSD 7.0-STABLE #0: Fri Apr 18 02:36:09 EDT 2008
>Description:
- Update to 2.2.3
- Add WITHOUT_OPENCDK and WITHOUT_LIBTASN1 knobs to allow users to use the
  versions included with gnutls as opposed to the ones from the ports.

Port maintainer (novel at FreeBSD.org) is cc'd.

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

--- gnutls-2.2.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/gnutls/Makefile /kirby/shared/ports/gnutls/Makefile
--- /usr/ports/security/gnutls/Makefile	2008-03-28 03:34:01.000000000 -0400
+++ /kirby/shared/ports/gnutls/Makefile	2008-05-16 11:33:19.000000000 -0400
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	security net
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
-	ftp://ftp.gnutls.org/pub/gnutls/ \
-	${MASTER_SITE_GNUPG} \
-	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
-	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/
+		ftp://ftp.gnutls.org/pub/gnutls/ \
+		${MASTER_SITE_GNUPG} \
+		http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
+		ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/
 MASTER_SITE_SUBDIR=	alpha/gnutls
 
 MAINTAINER=	novel at FreeBSD.org
@@ -38,12 +38,17 @@
 MANCOMPRESSED=	no
 
 .include <bsd.port.pre.mk>
-.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.10)
+
+.if (defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.10)) && !defined(WITHOUT_OPENCDK)
 LIB_DEPENDS+=	opencdk.10:${PORTSDIR}/security/opencdk
+.else
+CONFIGURE_ARGS+=	--with-included-opencdk
 .endif
 
-.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)
+.if (defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.3)) && !defined(WITHOUT_LIBTASN1)
 LIB_DEPENDS+=	tasn1.3:${PORTSDIR}/security/libtasn1
+.else
+CONFIGURE_ARGS+=	--with-included-libtasn1
 .endif
 
 .if ${OSVERSION} < 600000
@@ -53,24 +58,27 @@
 
 .if defined(WITHOUT_CXX)
 CONFIGURE_ARGS+=	--disable-cxx
-PLIST_SUB+=		CXX="@comment "
+PLIST_SUB+=	CXX="@comment "
 .else
-PLIST_SUB+=		CXX=""
+PLIST_SUB+=	CXX=""
 .endif
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
+PLIST_SUB+=	NLS="@comment "
 .else
-USE_GETTEXT=		yes
-PLIST_SUB+=		NLS=""
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .endif
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=		AUTHORS NEWS README THANKS
+PORTDOCS=	AUTHORS NEWS README THANKS
 .endif
 EXAMPLES=	doc/examples/*.c
 
+pre-configure:
+	@${CHMOD} +x ${WRKSRC}/configure
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \
 		${WRKSRC}/lib/Makefile.in ${WRKSRC}/libextra/Makefile.in
diff -ruN --exclude=CVS /usr/ports/security/gnutls/distinfo /kirby/shared/ports/gnutls/distinfo
--- /usr/ports/security/gnutls/distinfo	2008-03-28 03:34:01.000000000 -0400
+++ /kirby/shared/ports/gnutls/distinfo	2008-05-16 11:31:12.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (gnutls-2.2.2.tar.bz2) = 90fb4b7c74d29bb6ee5bd8de85942f42
-SHA256 (gnutls-2.2.2.tar.bz2) = cbb0e76c28a8b8ee93d49e1fea4cb31549904d95cd8f488309126f7f5046d616
-SIZE (gnutls-2.2.2.tar.bz2) = 4923519
+MD5 (gnutls-2.2.3.tar.bz2) = 71d9b7ec32a2a67854940a8848c2b229
+SHA256 (gnutls-2.2.3.tar.bz2) = cc78e52e9afc3006e4d97bf1c4e232fa6253f8be15ee6ebb7272ce885213f34b
+SIZE (gnutls-2.2.3.tar.bz2) = 4920217
--- gnutls-2.2.3.patch ends here ---

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