From owner-svn-ports-all@FreeBSD.ORG Wed Mar 5 15:46:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74B22BBF; Wed, 5 Mar 2014 15:46:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 60FE6A0B; Wed, 5 Mar 2014 15:46:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25FkeJR070063; Wed, 5 Mar 2014 15:46:40 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25Fkebm070062; Wed, 5 Mar 2014 15:46:40 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403051546.s25Fkebm070062@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 5 Mar 2014 15:46:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347117 - head/databases/memcached X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 15:46:40 -0000 Author: bapt Date: Wed Mar 5 15:46:39 2014 New Revision: 347117 URL: http://svnweb.freebsd.org/changeset/ports/347117 QAT: https://qat.redports.org/buildarchive/r347117/ Log: Enforce libevent2 in memcached libevent2 performs way better than libevent1 While here: - support stage - use options helpers Approved by: swills (maintainer) Modified: head/databases/memcached/Makefile Modified: head/databases/memcached/Makefile ============================================================================== --- head/databases/memcached/Makefile Wed Mar 5 15:42:56 2014 (r347116) +++ head/databases/memcached/Makefile Wed Mar 5 15:46:39 2014 (r347117) @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= swills@FreeBSD.org COMMENT= High-performance distributed memory object cache system -LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 TEST_DEPENDS= prove:${PORTSDIR}/lang/${PERL_PORT} \ git:${PORTSDIR}/devel/git @@ -19,7 +19,7 @@ TEST_DEPENDS= prove:${PORTSDIR}/lang/${P CONFLICTS= memcached-1.2* # Dtrace option disabled until it is fixed upstream -OPTIONS_DEFINE= SASL +OPTIONS_DEFINE= SASL DOCS DTRACE_DESC= Enable dtrace probes SASL_DESC= Enable SASL Authentication @@ -28,24 +28,30 @@ SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFF USE_CSTD= c99 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --program-prefix= \ +CONFIGURE_ARGS= --with-libevent=${LOCALBASE}/lib/event2 --program-prefix= \ --disable-coverage -MAN1= memcached.1 - PLIST_FILES= bin/memcached \ bin/memcached-tool \ - include/memcached/protocol_binary.h + include/memcached/protocol_binary.h \ + man/man1/memcached.1.gz PLIST_DIRS= include/memcached PORTDOCS= protocol.txt readme.txt -NO_STAGE= yes -.include +CFLAGS+= -fstack-protector \ + -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/event2/compat + +DTRACE_COFNIGURE_ENABLE= dtrace + +SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +SASL_CONFIGURE_ENABLE= sasl +SASL_CFLAGS= -I${LOCALBASE}/include +SASL_CPPFLAGS+= ${CFLAGS} +SASL_LDFLAGS= -L${LOCALBASE}/lib -.if ${OSVERSION} >= 800000 -CFLAGS+= -fstack-protector -.endif +.include .if ${ARCH} == amd64 CONFIGURE_ARGS+= --enable-64bit @@ -53,34 +59,21 @@ CONFIGURE_ARGS+= --enable-64bit .if ${PORT_OPTIONS:MDTRACE} BROKEN= DTRACE broken with gcc/clang - reported upstream -CONFIGURE_ARGS+= --enable-dtrace -.else -CONFIGURE_ARGS+= --disable-dtrace .endif -.if ${PORT_OPTIONS:MSASL} && !defined(WITHOUT_SASL) -LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --enable-sasl -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= ${CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --disable-sasl -.endif +post-patch: + @${REINPLACE_CMD} -e "s,-levent,-levent-2.0,g" ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" - @${MKDIR} ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif regression-test: test test: build