Index: databases/memcached/Makefile
===================================================================
--- databases/memcached/Makefile
+++ databases/memcached/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= memcached
-PORTVERSION= 1.4.20
-PORTREVISION= 2
+PORTVERSION= 1.4.21
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_GENTOO}
@@ -20,7 +19,7 @@
CONFLICTS= memcached-1.2*
# Dtrace option disabled until it is fixed upstream
-OPTIONS_DEFINE= SASL DOCS DTRACE
+OPTIONS_DEFINE= SASL DOCS DTRACE
OPTIONS_DEFAULT= SASL DOCS
DTRACE_DESC= Enable dtrace probes
@@ -34,12 +33,10 @@
USE_CSTD= c99
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --program-prefix= \
+CONFIGURE_ARGS= --with-libevent=${LOCALBASE} \
+ --program-prefix= \
--disable-coverage
-CFLAGS+= -fstack-protector \
- -I${LOCALBASE}/include
-
DTRACE_CONFIGURE_ENABLE= dtrace
SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
Index: databases/memcached/distinfo
===================================================================
--- databases/memcached/distinfo
+++ databases/memcached/distinfo
@@ -1,2 +1,2 @@
-SHA256 (memcached-1.4.20.tar.gz) = 25d121408eed0b1522308ff3520819b130f04ba0554c68a673af23a915a54018
-SIZE (memcached-1.4.20.tar.gz) = 337380
+SHA256 (memcached-1.4.21.tar.gz) = 301ebe41c686fa5c0a8e39cdf49a32f21fcc9357358792216dfb315d16260e8d
+SIZE (memcached-1.4.21.tar.gz) = 345892
Index: databases/memcached/files/patch-doc-local
===================================================================
--- databases/memcached/files/patch-doc-local
+++ /dev/null
@@ -1,104 +0,0 @@
---- doc/xml2rfc/reference.RFC.2119.xml.orig 2014-07-22 05:09:55.000000000 +0000
-+++ doc/xml2rfc/reference.RFC.2119.xml 2014-07-22 05:09:55.000000000 +0000
-@@ -0,0 +1,44 @@
-+
-+
-+
-+
-+
-+Key words for use in RFCs to Indicate Requirement Levels
-+
-+Harvard University
-+
-+
-+1350 Mass. Ave.
-+Cambridge
-+MA 02138
-+- +1 617 495 3864
-+sob@harvard.edu
-+
-+General
-+keyword
-+
-+
-+ In many standards track documents several words are used to signify
-+ the requirements in the specification. These words are often
-+ capitalized. This document defines these words as they should be
-+ interpreted in IETF documents. Authors who follow these guidelines
-+ should incorporate this phrase near the beginning of their document:
-+
-+
-+
-+ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
-+ NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
-+ "OPTIONAL" in this document are to be interpreted as described in
-+ RFC 2119.
-+
-+
-+ Note that the force of these words is modified by the requirement
-+ level of the document in which they are used.
-+
-+
-+
-+
-+
-+
-+
-+
---- doc/xml2rfc/rfc2629-noinc.xsl.orig 2014-07-22 05:09:15.000000000 +0000
-+++ doc/xml2rfc/rfc2629-noinc.xsl 2014-07-22 05:09:23.000000000 +0000
-@@ -47,9 +47,7 @@
-
-
-
-- http://xml.resource.org/public/rfc/
-
-- .xml
-
-
-
---- doc/protocol-binary.xml.orig 2013-12-07 08:37:04.000000000 +0000
-+++ doc/protocol-binary.xml 2014-07-22 15:02:07.000000000 +0000
-@@ -7,7 +7,7 @@
-
-
-
--
-+
-
- Memcache Binary Protocol
-
-@@ -1436,7 +1436,7 @@
-
-
-
--
-+
-
-
-
---- doc/protocol-binary-range.xml.orig 2013-12-07 08:37:04.000000000 +0000
-+++ doc/protocol-binary-range.xml 2014-07-22 15:02:01.000000000 +0000
-@@ -7,7 +7,7 @@
-
-
-
--
-+
-
-
-
-@@ -215,10 +215,10 @@
-
-
-
--
--
-+
-+
-
--
-+
-
-
-
Index: databases/memcached/files/patch-doc__Makefile.in
===================================================================
--- databases/memcached/files/patch-doc__Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- doc/Makefile.in.orig 2014-07-22 02:34:37.000000000 +0000
-+++ doc/Makefile.in 2014-07-22 02:35:43.000000000 +0000
-@@ -424,14 +424,21 @@
- uninstall-am uninstall-man uninstall-man1
-
-
--%.txt: %.full
-- @XML2RFC@ $< $@
-+protocol-binary.txt: $(.TARGET:R).full
-+ @XML2RFC@ -c @abs_builddir@ $(.TARGET:R).full $@
-+
-+protocol-binary-range.txt: $(.TARGET:R).full
-+ @XML2RFC@ -c @abs_builddir@ $(.TARGET:R).full $@
-
- %.chk: %.xml xml2rfc/rfc2629-refchk.xsl
- @XSLTPROC@ xml2rfc/rfc2629-refchk.xsl $< >$@
-
--%.full: %.xml xml2rfc/rfc2629-noinc.xsl
-- @XSLTPROC@ xml2rfc/rfc2629-noinc.xsl $< >$@
-+protocol-binary.full: $(.TARGET:R).xml xml2rfc/rfc2629-noinc.xsl
-+ @XSLTPROC@ --nonet xml2rfc/rfc2629-noinc.xsl $(.TARGET:R).xml > $@
-+
-+protocol-binary-range.full: $(.TARGET:R).xml xml2rfc/rfc2629-noinc.xsl
-+ @XSLTPROC@ --nonet xml2rfc/rfc2629-noinc.xsl $(.TARGET:R).xml > $@
-+
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.