mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
databases/memcached: Update to 1.4.21
- Update to 1.4.21
- Remove doc patches (upstreamed)
- Remove unconditional CFLAGS because:
a) -fstack-protector is now a default
b) -I${LOCALBASE}/include casues SASL headers to be found even when
--disable-sasl is set (SASL option disabled). Removal of these flags
does not affect libevent header discovery
- While I'm here, whitespace alignment
Differential Revision: https://reviews.freebsd.org/D1284
Approved by: swills (maintainer)
This commit is contained in:
Kubilay Kocak
parent
2464e47eac
commit
215c7e652e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=374451
@ -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 @@ LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
|
||||
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 @@ SHEBANG_FILES= scripts/memcached-tool
|
||||
|
||||
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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 @@
|
||||
+<?xml version='1.0' encoding='UTF-8'?>
|
||||
+
|
||||
+<reference anchor='RFC2119'>
|
||||
+
|
||||
+<front>
|
||||
+<title abbrev='RFC Key Words'>Key words for use in RFCs to Indicate Requirement Levels</title>
|
||||
+<author initials='S.' surname='Bradner' fullname='Scott Bradner'>
|
||||
+<organization>Harvard University</organization>
|
||||
+<address>
|
||||
+<postal>
|
||||
+<street>1350 Mass. Ave.</street>
|
||||
+<street>Cambridge</street>
|
||||
+<street>MA 02138</street></postal>
|
||||
+<phone>- +1 617 495 3864</phone>
|
||||
+<email>sob@harvard.edu</email></address></author>
|
||||
+<date year='1997' month='March' />
|
||||
+<area>General</area>
|
||||
+<keyword>keyword</keyword>
|
||||
+<abstract>
|
||||
+<t>
|
||||
+ 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:
|
||||
+
|
||||
+<list>
|
||||
+<t>
|
||||
+ 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.
|
||||
+</t></list></t>
|
||||
+<t>
|
||||
+ Note that the force of these words is modified by the requirement
|
||||
+ level of the document in which they are used.
|
||||
+</t></abstract></front>
|
||||
+
|
||||
+<seriesInfo name='BCP' value='14' />
|
||||
+<seriesInfo name='RFC' value='2119' />
|
||||
+<format type='TXT' octets='4723' target='http://www.rfc-editor.org/rfc/rfc2119.txt' />
|
||||
+<format type='HTML' octets='17970' target='http://xml.resource.org/public/rfc/html/rfc2119.html' />
|
||||
+<format type='XML' octets='5777' target='http://xml.resource.org/public/rfc/xml/rfc2119.xml' />
|
||||
+</reference>
|
||||
--- 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 @@
|
||||
<xsl:value-of select='@src'/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
- <xsl:text>http://xml.resource.org/public/rfc/</xsl:text>
|
||||
<xsl:value-of select='@src'/>
|
||||
- <xsl:text>.xml</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:param>
|
||||
--- 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 @@
|
||||
<?rfc sortrefs="yes" ?>
|
||||
<?rfc compact="yes" ?>
|
||||
<?rfc subcompact="yes" ?>
|
||||
-<rfc category="info" docName="draft-stone-memcache-binary-01" ipr="none">
|
||||
+<rfc category="info" docName="draft-stone-memcache-binary-01" ipr="trust200902">
|
||||
<front>
|
||||
<title> Memcache Binary Protocol </title>
|
||||
|
||||
@@ -1436,7 +1436,7 @@
|
||||
</abstract>
|
||||
</front>
|
||||
</reference>
|
||||
- <dwdrfc-ref anchor="KEYWORDS" src='http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml'/>
|
||||
+ <dwdrfc-ref anchor="KEYWORDS" src='reference.RFC.2119.xml'/>
|
||||
</references>
|
||||
|
||||
<section anchor="acknowledgments" title="Acknowledgments">
|
||||
--- 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 @@
|
||||
<?rfc sortrefs="yes" ?>
|
||||
<?rfc compact="yes" ?>
|
||||
<?rfc subcompact="yes" ?>
|
||||
-<rfc category="info" docName="draft-stone-memcache-udp-01" ipr="none">
|
||||
+<rfc category="info" docName="draft-stone-memcache-udp-01" ipr="trust200902">
|
||||
|
||||
<front>
|
||||
|
||||
@@ -215,10 +215,10 @@
|
||||
|
||||
<back>
|
||||
<references title="Normative References">
|
||||
- <dwdrfc-ref anchor='UDP' src='http://xml.resource.org/public/rfc/bibxml/reference.RFC.0768.xml'/>
|
||||
- <dwdrfc-ref anchor='KEYWORDS' src='http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml'/>
|
||||
+ <dwdrfc-ref anchor='UDP' src='reference.RFC.0768.xml'/>
|
||||
+ <dwdrfc-ref anchor='KEYWORDS' src='reference.RFC.2119.xml'/>
|
||||
<!-- FIXME: Get a draft reference for the base document. -->
|
||||
- <dwdrfc-ref anchor='MEMCACHE' src='http://xml.resource.org/public/rfc/bibxml/reference.RFC.2119.xml'/>
|
||||
+ <dwdrfc-ref anchor='MEMCACHE' src='reference.RFC.2119.xml'/>
|
||||
</references>
|
||||
</back>
|
||||
|
||||
@ -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.
|
||||
Loading…
Reference in New Issue
Block a user