From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 11 16:00:24 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87320106567A for ; Thu, 11 Nov 2010 16:00:24 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6C1AE8FC20 for ; Thu, 11 Nov 2010 16:00:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oABG0ILl077535 for ; Thu, 11 Nov 2010 16:00:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oABG0IbU077533; Thu, 11 Nov 2010 16:00:18 GMT (envelope-from gnats) Resent-Date: Thu, 11 Nov 2010 16:00:18 GMT Resent-Message-Id: <201011111600.oABG0IbU077533@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89267106566B for ; Thu, 11 Nov 2010 15:55:15 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3C8068FC1D for ; Thu, 11 Nov 2010 15:55:14 +0000 (UTC) Received: by vws20 with SMTP id 20so348382vws.13 for ; Thu, 11 Nov 2010 07:55:14 -0800 (PST) Received: by 10.220.195.4 with SMTP id ea4mr222968vcb.51.1289490913391; Thu, 11 Nov 2010 07:55:13 -0800 (PST) Received: from botelhor.bplab.local (189-19-84-134.dsl.telesp.net.br [189.19.84.134]) by mx.google.com with ESMTPS id s12sm777310vbp.4.2010.11.11.07.55.10 (version=SSLv3 cipher=RC4-MD5); Thu, 11 Nov 2010 07:55:12 -0800 (PST) Received: (qmail 72646 invoked by uid 1001); 11 Nov 2010 13:55:08 -0200 Message-Id: <20101111155508.72645.qmail@botelhor.bplab.local> Date: Thu, 11 Nov 2010 07:55:12 -0800 (PST) From: Renato Botelho Sender: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: vanilla@FreeBSD.org Subject: ports/152140: [PATCH] databases/libmemcached: OPTIONize sasl2 dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2010 16:00:24 -0000 >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@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 + 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 +.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 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: