ports/152140: [PATCH] databases/libmemcached: OPTIONize sasl2 dependency

[Renato Botelho]

>Number:         152140
>Category:       ports
>Synopsis:       [PATCH] databases/libmemcached: OPTIONize sasl2 dependency
>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:   Thu Nov 11 16:00:18 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Renato Botelho
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
FreeBSD.org
>Environment:
System: FreeBSD botelhor.bplab.local 9.0-CURRENT FreeBSD 9.0-CURRENT #3 r215031M: Tue Nov  9 17:26:27
>Description:
Today libmemcached port doesn't depend of sasl2, but, if cyrus-sasl2 is
installed on the system it add sasl symbols into the lib and don't link it
correctly.

The best solution i've found is to add an OPTION, so you can choose if you want
sasl2 support or not, and, if you choose yes, make sure it'll link library
correctly.

I bumped PORTREVISION because users that have sasl installed when libmemcached
was built have a broken version installed.

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

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

--- libmemcached-0.44_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/libmemcached/Makefile,v
retrieving revision 1.35
diff -u -u -r1.35 Makefile
--- Makefile	20 Oct 2010 03:53:23 -0000	1.35
+++ Makefile	11 Nov 2010 15:52:18 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmemcached
 PORTVERSION=	0.44
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://download.tangent.org/
 
@@ -20,8 +20,13 @@
 USE_GNOME=	gnomehack gnometarget pkgconfig
 CONFIGURE_ARGS=	--with-memcached=no --disable-libevent --without-libevent-prefix
 
+OPTIONS=	SASL "With (Cyrus) SASL2 support" off
+
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \
+			 -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \
 			${WRKSRC}/Makefile.in
 .if defined(NO_INSTALL_MANPAGES)
 	${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
@@ -125,4 +130,11 @@
 		memcached_version.3
 .endif
 
-.include <bsd.port.mk>
+.if defined(WITH_SASL)
+LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=	--with-libsasl2-prefix="${LOCALBASE}"
+.else
+CONFIGURE_ARGS+=	--disable-sasl
+.endif
+
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/libmemcached/distinfo,v
retrieving revision 1.27
diff -u -u -r1.27 distinfo
--- distinfo	20 Oct 2010 03:53:23 -0000	1.27
+++ distinfo	11 Nov 2010 15:52:18 -0000
@@ -1,3 +1,2 @@
-MD5 (libmemcached-0.44.tar.gz) = e6bd825c46fa080b550f90f9001cba8c
 SHA256 (libmemcached-0.44.tar.gz) = d3ffdfebd83aa06d8ac2762197a51e38115712b43bc3fac6a674734eb67ae7c5
 SIZE (libmemcached-0.44.tar.gz) = 740127
--- libmemcached-0.44_1.patch ends here ---

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