[Midnightbsd-cvs] mports [22306] trunk/databases/memcached: memcached 1.4.34

[laffer1 at midnightbsd.org]

Revision: 22306
          http://svnweb.midnightbsd.org/mports/?rev=22306
Author:   laffer1
Date:     2017-02-22 07:44:38 -0500 (Wed, 22 Feb 2017)
Log Message:
-----------
memcached 1.4.34

Modified Paths:
--------------
    trunk/databases/memcached/Makefile
    trunk/databases/memcached/distinfo
    trunk/databases/memcached/files/patch-configure.ac
    trunk/databases/memcached/pkg-plist

Modified: trunk/databases/memcached/Makefile
===================================================================
--- trunk/databases/memcached/Makefile	2017-02-22 12:40:20 UTC (rev 22305)
+++ trunk/databases/memcached/Makefile	2017-02-22 12:44:38 UTC (rev 22306)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	memcached
-PORTVERSION=	1.4.33
+PORTVERSION=	1.4.34
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
 		GENTOO
@@ -12,13 +12,13 @@
 LICENSE=	bsd3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+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 DOCS
+OPTIONS_DEFAULT=	SASL
 
 DTRACE_DESC=	Enable dtrace probes
 SASL_DESC=	Enable SASL Authentication
@@ -26,8 +26,6 @@
 USE_RC_SUBR=	memcached
 SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
-MAKE_JOBS_UNSAFE=yes
-
 USES=		cpe shebangfix autoreconf:build
 USE_AUTOTOOLS=	aclocal
 SHEBANG_FILES=	scripts/memcached-tool
@@ -38,16 +36,19 @@
 		--program-prefix= \
 		--disable-coverage
 
-CFLAGS+=	-no-integrated-as
+DOCS_BUILD_DEPENDS=	xml2rfc:textproc/xml2rfc
+DOCS_CONFIGURE_ENABLE=	docs
 
 DTRACE_CONFIGURE_ENABLE=	dtrace
 
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+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
@@ -54,13 +55,13 @@
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
-.if ${PORT_OPTIONS:MDTRACE}
-BROKEN=			DTRACE broken with gcc/clang - reported upstream
-.endif
-
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${PREFIX}/bin
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${DOCSDIR}
+.for i in protocol-binary-range.txt protocol-binary.txt protocol.txt \
+		readme.txt threads.txt
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.endfor
 
 regression-test: test
 test: build

Modified: trunk/databases/memcached/distinfo
===================================================================
--- trunk/databases/memcached/distinfo	2017-02-22 12:40:20 UTC (rev 22305)
+++ trunk/databases/memcached/distinfo	2017-02-22 12:44:38 UTC (rev 22306)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478061979
-SHA256 (memcached-1.4.33.tar.gz) = 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d
-SIZE (memcached-1.4.33.tar.gz) = 389813
+TIMESTAMP = 1484151894
+SHA256 (memcached-1.4.34.tar.gz) = 5064c87f91a37d822dfeab8768490c55fe686a742f07f67c7121101e48d87c79
+SIZE (memcached-1.4.34.tar.gz) = 391131

Modified: trunk/databases/memcached/files/patch-configure.ac
===================================================================
--- trunk/databases/memcached/files/patch-configure.ac	2017-02-22 12:40:20 UTC (rev 22305)
+++ trunk/databases/memcached/files/patch-configure.ac	2017-02-22 12:44:38 UTC (rev 22306)
@@ -1,6 +1,16 @@
---- 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`

Modified: trunk/databases/memcached/pkg-plist
===================================================================
--- trunk/databases/memcached/pkg-plist	2017-02-22 12:40:20 UTC (rev 22305)
+++ trunk/databases/memcached/pkg-plist	2017-02-22 12:44:38 UTC (rev 22306)
@@ -2,3 +2,8 @@
 bin/memcached-tool
 include/memcached/protocol_binary.h
 man/man1/memcached.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/protocol-binary-range.txt
+%%PORTDOCS%%%%DOCSDIR%%/protocol-binary.txt
+%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/threads.txt