Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Sep 2020 17:35:41 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548110 - head/databases/memcached
Message-ID:  <202009091735.089HZfdu036591@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Sep  9 17:35:41 2020
New Revision: 548110
URL: https://svnweb.freebsd.org/changeset/ports/548110

Log:
  databases/memcached: update to 1.6.7
  
  While here:
  
  * improve formatting
  * enable ssl where possible
  * limit dtrace to amd64 since it only seems to work there

Modified:
  head/databases/memcached/Makefile   (contents, props changed)
  head/databases/memcached/distinfo   (contents, props changed)

Modified: head/databases/memcached/Makefile
==============================================================================
--- head/databases/memcached/Makefile	Wed Sep  9 17:14:41 2020	(r548109)
+++ head/databases/memcached/Makefile	Wed Sep  9 17:35:41 2020	(r548110)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	memcached
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
 		GENTOO
@@ -13,15 +13,10 @@ COMMENT=	High-performance distributed memory object ca
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_mips=		fails to link: failed to merge target specific data of file /usr/lib/dtrace/drti.o
-BROKEN_mips64=		fails to link: failed to merge target specific data of file /usr/lib/dtrace/drti.o
-
 BUILD_DEPENDS=	as:devel/binutils
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-CONFLICTS=	memcached-1.2*
-
-USES=		cpe shebangfix autoreconf
+USES=		autoreconf cpe shebangfix
 SHEBANG_FILES=	scripts/memcached-tool
 
 USE_RC_SUBR=	memcached
@@ -29,26 +24,20 @@ SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 USE_CSTD=	c99
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
+CONFIGURE_ARGS=	--disable-coverage \
 		--program-prefix= \
-		--disable-coverage
+		--with-libevent=${LOCALBASE}
 
 # Dtrace option disabled until it is fixed upstream
-OPTIONS_DEFINE=		SASL DOCS DTRACE
-OPTIONS_DEFAULT=	SASL DTRACE
+OPTIONS_DEFINE=		DOCS SASL
+OPTIONS_DEFAULT=	SASL
+OPTIONS_DEFINE_amd64=	DTRACE
+OPTIONS_DEFAULT_amd64=	DTRACE
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-OPTIONS_EXCLUDE_i386=		DTRACE
-# ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
-OPTIONS_EXCLUDE_aarch64=	DTRACE
-OPTIONS_EXCLUDE_armv6=		DTRACE
-OPTIONS_EXCLUDE_armv7=		DTRACE
-# /tmp/conftest-4d18ad.s:2: Error: unknown pseudo-op: `.abiversion'
-OPTIONS_EXCLUDE_powerpc64=	DTRACE
-
 DTRACE_DESC=	Enable dtrace probes
 SASL_DESC=	Enable SASL Authentication
 
@@ -67,13 +56,18 @@ MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+CONFIGURE_ARGS+=	--enable-tls
+USES+=			ssl
+.endif
+
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
 # avoid triggering a bug in libdtrace, see illumos issue 6653
 .if ${PORT_OPTIONS:MDTRACE}
-CFLAGS+=		-no-integrated-as
+CFLAGS+=	-no-integrated-as
 .endif
 
 post-install:

Modified: head/databases/memcached/distinfo
==============================================================================
--- head/databases/memcached/distinfo	Wed Sep  9 17:14:41 2020	(r548109)
+++ head/databases/memcached/distinfo	Wed Sep  9 17:35:41 2020	(r548110)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594650320
-SHA256 (memcached-1.6.6.tar.gz) = 908f0eecfa559129c9e44edc46f02e73afe8faca355b4efc5c86d902fc3e32f7
-SIZE (memcached-1.6.6.tar.gz) = 543661
+TIMESTAMP = 1599671135
+SHA256 (memcached-1.6.7.tar.gz) = 7bbdac9b031d8cfca4a1207f28df598b90ee2e9b44667f7eabd0fe1a59ca5173
+SIZE (memcached-1.6.7.tar.gz) = 547791



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009091735.089HZfdu036591>