Date: Mon, 17 Sep 2012 01:53:33 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304383 - head/databases/memcached Message-ID: <201209170153.q8H1rXi3025813@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Sep 17 01:53:33 2012 New Revision: 304383 URL: http://svn.freebsd.org/changeset/ports/304383 Log: - Update to 1.4.15 - Remove ABI versions in LIB_DEPENDS - Convert to OptionsNG, add DTRACE option, disabled for now - Reorder OPTIONS/CONFIGURE sections - GNU_CONFIGURE s/YES/yes - Unbreak CLANG build (Add --disable-coverage) - Add USE_CSTD=c99 for CLANG -pedantic error - Add --enable-64bit for ARCH=amd64 - Make test: target build first PR: ports/171679 Submitted by: Kubilay Kocak <koobs.freebsd@gmail.com> Modified: head/databases/memcached/Makefile head/databases/memcached/distinfo (contents, props changed) Modified: head/databases/memcached/Makefile ============================================================================== --- head/databases/memcached/Makefile Mon Sep 17 01:51:19 2012 (r304382) +++ head/databases/memcached/Makefile Mon Sep 17 01:53:33 2012 (r304383) @@ -6,7 +6,7 @@ # PORTNAME= memcached -PORTVERSION= 1.4.14 +PORTVERSION= 1.4.15 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_GENTOO} @@ -15,17 +15,26 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= swills@FreeBSD.org COMMENT= High-performance distributed memory object cache system -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent +LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent + +TEST_DEPENDS= prove:${PORTSDIR}/lang/${PERL_PORT} \ + git:${PORTSDIR}/devel/git CONFLICTS= memcached-1.2* +# Dtrace option disabled until it is fixed upstream +OPTIONS_DEFINE= REPCACHED SASL +DTRACE_DESC= Enable dtrace probes +REPCACHED_DESC= Enable data replication feature +SASL_DESC= Enable SASL Authentication + USE_RC_SUBR= memcached SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --program-prefix= -OPTIONS= REPCACHED "Enable data replication feature" off \ - SASL "Enable SASL support" off +USE_CSTD= c99 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --program-prefix= \ + --disable-coverage MAN1= memcached.1 @@ -42,7 +51,18 @@ PORTDOCS= protocol.txt readme.txt CFLAGS+= -fstack-protector .endif -.if defined(WITH_REPCACHED) +.if ${ARCH} == amd64 +CONFIGURE_ARGS+= --enable-64bit +.endif + +.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:MREPCACHED} PATCH_SITES+= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= swills PATCH_DIST_STRIP+= -p1 @@ -50,8 +70,8 @@ PATCHFILES+= repcached-2.3.1-${PORTVERS CONFIGURE_ARGS+= --enable-replication .endif -.if defined(WITH_SASL) && !defined(WITHOUT_SASL) -LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 +.if ${PORT_OPTIONS:MSASL} && !defined(WITHOUT_SASL) +LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --enable-sasl CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= ${CFLAGS} @@ -74,7 +94,8 @@ post-install: .endfor .endif -test: +regression-test: test +test: build ${MAKE} -C ${WRKSRC} test .include <bsd.port.post.mk> Modified: head/databases/memcached/distinfo ============================================================================== --- head/databases/memcached/distinfo Mon Sep 17 01:51:19 2012 (r304382) +++ head/databases/memcached/distinfo Mon Sep 17 01:53:33 2012 (r304383) @@ -1,4 +1,4 @@ -SHA256 (memcached-1.4.14.tar.gz) = f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef -SIZE (memcached-1.4.14.tar.gz) = 321262 -SHA256 (repcached-2.3.1-1.4.14.patch.gz) = 1c6ca0fcdae7749fe79273449fa9cdc02727deddf2d880e4a555c78130a48600 -SIZE (repcached-2.3.1-1.4.14.patch.gz) = 19846 +SHA256 (memcached-1.4.15.tar.gz) = 169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4 +SIZE (memcached-1.4.15.tar.gz) = 324451 +SHA256 (repcached-2.3.1-1.4.15.patch.gz) = e1dca82ace0be8e8fe64e1737276b6467abf7bf86b5c1e645835404770cfdbed +SIZE (repcached-2.3.1-1.4.15.patch.gz) = 19533
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209170153.q8H1rXi3025813>