Index: head/databases/memcached/Makefile
===================================================================
--- head/databases/memcached/Makefile	(revision 427790)
+++ head/databases/memcached/Makefile	(revision 427791)
@@ -1,76 +1,87 @@
 # Created by: Sean Chittenden <seanc@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	memcached
 PORTVERSION=	1.4.33
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
 		GENTOO
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	High-performance distributed memory object cache system
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libevent.so:devel/libevent2
 
 CONFLICTS=	memcached-1.2*
 
 # Dtrace option disabled until it is fixed upstream
 OPTIONS_DEFINE=		SASL DOCS DTRACE
-OPTIONS_DEFAULT=	SASL
+OPTIONS_DEFAULT=	SASL DTRACE
 
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+=	DTRACE
+.endif
+
+OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
+OPTIONS_EXCLUDE_FreeBSD_10+=	DTRACE
+OPTIONS_EXCLUDE+=		${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
+OPTIONS_EXCLUDE_i386=		DTRACE
+
 DTRACE_DESC=	Enable dtrace probes
 SASL_DESC=	Enable SASL Authentication
 
 USE_RC_SUBR=	memcached
 SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 USES=		cpe shebangfix autoreconf
 SHEBANG_FILES=	scripts/memcached-tool
 
 USE_CSTD=	c99
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
 		--program-prefix= \
 		--disable-coverage
 
 DOCS_BUILD_DEPENDS=	xml2rfc:textproc/xml2rfc
 DOCS_CONFIGURE_ENABLE=	docs
 
 DTRACE_CONFIGURE_ENABLE=	dtrace
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ENABLE=	sasl
 SASL_CFLAGS=		-I${LOCALBASE}/include
 SASL_CPPFLAGS+=		${CFLAGS}
 SASL_LDFLAGS=		-L${LOCALBASE}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
+# avoid triggering a bug in libdtrace, see illumos issue 6653
 .if ${PORT_OPTIONS:MDTRACE}
-BROKEN=			DTRACE broken with gcc/clang - reported upstream
+CFLAGS+=		-no-integrated-as
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in protocol-binary-range.txt protocol-binary.txt protocol.txt \
 		readme.txt threads.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 regression-test: test
 test: build
 	${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.post.mk>
Index: head/databases/memcached/files/patch-configure.ac
===================================================================
--- head/databases/memcached/files/patch-configure.ac	(revision 427790)
+++ head/databases/memcached/files/patch-configure.ac	(revision 427791)
@@ -1,11 +1,21 @@
---- configure.ac.orig	2015-06-27 18:28:54 UTC
+--- configure.ac.orig	2016-12-04 13:19:07 UTC
 +++ configure.ac
-@@ -581,7 +581,7 @@ then
+@@ -137,8 +137,7 @@ if test "x$enable_dtrace" = "xyes"; then
+   if test "x$DTRACE" != "xno"; then
+     AC_DEFINE([ENABLE_DTRACE],1,[Set to nonzero if you want to include DTRACE])
+     build_dtrace=yes
+-    # DTrace on MacOSX does not use -G option
+-    $DTRACE -G -o conftest.$$ -s memcached_dtrace.d 2>/dev/zero
++    /usr/bin/true
+     if test $? -eq 0
+     then
+         dtrace_instrument_obj=yes
+@@ -594,7 +593,7 @@ then
  elif test "$GCC" = "yes"
  then
    GCC_VERSION=`$CC -dumpversion`
 -  CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
 +  CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
    case $GCC_VERSION in
      4.4.*)
      CFLAGS="$CFLAGS -fno-strict-aliasing"