Date: Tue, 4 Mar 2008 11:03:13 -0500 (EST) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: novel@FreeBSD.org Subject: ports/121357: [PATCH] security/gnutls: Respect if user doesn't want OpenCDK or TASN.1 from ports Message-ID: <20080304160313.4EC76C10D@kirby.cyberbotx.com> Resent-Message-ID: <200803041610.m24GA0Ev065934@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121357
>Category: ports
>Synopsis: [PATCH] security/gnutls: Respect if user doesn't want OpenCDK or TASN.1 from ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 04 16:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 6.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Wed Jan 23 16:14:04 EST 2008
>Description:
- Add WITHOUT_OPENCDK and WITHOUT_LIBTASN1 knobs to respect if the
user wishes to build gnutls with the included versions instead of
the ones from ports.
Port maintainer (novel@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
NOTE: Not only does this still invalidate PR ports/120519, but it
also superceeds ports/121260 (because the port was already
updated).
>How-To-Repeat:
>Fix:
--- gnutls-2.2.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/gnutls/Makefile /kirby/shared/ports/gnutls/Makefile
--- /usr/ports/security/gnutls/Makefile 2008-03-03 10:26:52.000000000 -0500
+++ /kirby/shared/ports/gnutls/Makefile 2008-03-04 10:59:56.000000000 -0500
@@ -9,10 +9,10 @@
PORTVERSION= 2.2.2
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@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,21 +58,21 @@
.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
--- gnutls-2.2.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080304160313.4EC76C10D>