Date: Sat, 27 Aug 2011 23:56:21 GMT From: "Mikhail T." <m.tsatsenko@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160245: [PATCH] net/libvncserver optionsify gnutls and gcrypt support Message-ID: <201108272356.p7RNuLuo044088@red.freebsd.org> Resent-Message-ID: <201108280000.p7S00U1e005249@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160245
>Category: ports
>Synopsis: [PATCH] net/libvncserver optionsify gnutls and gcrypt support
>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: Sun Aug 28 00:00:29 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Mikhail T.
>Release: 8.2
>Organization:
>Environment:
FreeBSD red8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #0 r223806: Fri Aug 26 03:29:57 MSD 2011 root@red:/usr/obj/usr/src/sys/XGATE amd64
>Description:
- OPTIONSify gnutls and gcrypt support to prevent configure detect them itself
- Make portlint happy
>How-To-Repeat:
Install gnutls/gcrypt first, then libvncserver (it will be linked against gnutls/gcrypt without any actual dependency). So deinstalling gnutls/gcrypt will result in unusable libvncserver (tested by VBoxHeadless -n).
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/libvncserver/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 11 Aug 2011 19:19:47 -0000 1.14
+++ Makefile 27 Aug 2011 23:39:32 -0000
@@ -22,10 +22,29 @@
USE_GNOME= gnomehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS= "-I${LOCALBASE}/include"
+LDFLAGS= "-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --without-x
+OPTIONS= GNUTLS "Adds GnuTLS support" Off \
+ GCRYPT "Adds Libgcrypt support" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+= gnutls.0:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+= --with-gnutls
+.else
+CONFIGURE_ARGS+= --without-gnutls
+.endif
+
+.if defined(WITH_GCRYPT)
+LIB_DEPENDS+= gcrypt.0:${PORTSDIR}/security/libgcrypt
+CONFIGURE_ARGS+= --with-gcrypt
+.else
+CONFIGURE_ARGS+= --without-gcrypt
+.endif
+
post-patch:
@${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108272356.p7RNuLuo044088>