ports/171679: [PATCH] databases/memcached: update to 1.4.15, Unbreak CLANG build, OptionsNG'ify, lots more

[Kubilay Kocak]

>Number:         171679
>Category:       ports
>Synopsis:       [PATCH] databases/memcached: update to 1.4.15, Unbreak CLANG build, OptionsNG'ify, lots more
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 16 09:30:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Kubilay Kocak
>Release:        FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD freebsd-9-amd64 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Sat Jul  7 21:26:56 EST
>Description:
- Update to 1.4.15
- Remove ABI versions in LIB_DEPENDS
- Convert to OptionsNG, add DTRACE option
- Reorder OPTIONS/CONFIGURE sections
- GNU_CONFIGURE s/YES/yes
- Unbreak CLANG build (Add --disable-coverage)
- Add USE_CSTD=c99 for CLANG -pedantic error

See: http://llvm.org/bugs/show_bug.cgi?id=11556

- Mark DTRACE option BROKEN (and report upstream)
- Mark REPCACHED option BROKEN (and comment out other bits)
- Add --enable-64bit for ARCH=amd64
- Make test: target build first

==[QA]==

portlint: looks fine.
redports: https://redports.org/buildarchive/20120915131235-35309/
maketest: (gcc)

All tests successful.
Files=45, Tests=6814, 303 wallclock secs ( 0.97 usr  0.78 sys +  4.37 cusr  2.88 csys =  8.99 CPU)
Result: PASS

maketest: (clang)

All tests successful.
Files=45, Tests=6814, 305 wallclock secs ( 1.04 usr  0.62 sys +  4.57 cusr  2.67 csys =  8.90 CPU)
Result: PASS

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

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- memcached-1.4.15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/memcached/Makefile ./Makefile
--- /usr/ports/databases/memcached/Makefile	2012-09-03 00:54:21.000000000 +1000
+++ ./Makefile	2012-09-15 22:50:21.000000000 +1000
@@ -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,22 @@
 MAINTAINER=	swills at 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
 
 CONFLICTS=	memcached-1.2*
 
+OPTIONS_DEFINE=	DTRACE 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,16 +47,28 @@
 CFLAGS+=	-fstack-protector
 .endif
 
-.if defined(WITH_REPCACHED)
-PATCH_SITES+=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	swills
-PATCH_DIST_STRIP+=	-p1
-PATCHFILES+=		repcached-2.3.1-${PORTVERSION}.patch.gz
-CONFIGURE_ARGS+=	--enable-replication
+.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}
+BROKEN=			Need an updated repcached patch for ${PORTVERSION}
+#PATCH_SITES+=		${MASTER_SITE_LOCAL}
+#PATCH_SITE_SUBDIR=	swills
+#PATCH_DIST_STRIP+=	-p1
+#PATCHFILES+=		repcached-2.3.1-${PORTVERSION}.patch.gz
+#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 +91,7 @@
 .endfor
 .endif
 
-test:
+test: build
 	${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/databases/memcached/distinfo ./distinfo
--- /usr/ports/databases/memcached/distinfo	2012-09-06 15:16:51.000000000 +1000
+++ ./distinfo	2012-09-15 20:54:28.000000000 +1000
@@ -1,4 +1,2 @@
-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
--- memcached-1.4.15.patch ends here ---

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