diff options
| author | Steve Wills <swills@FreeBSD.org> | 2020-09-09 17:35:41 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2020-09-09 17:35:41 +0000 |
| commit | fd074d0b1a70ae6d835adc348159af168c0038d6 (patch) | |
| tree | 731162e7da144ed4a419c19a71833ab71a03999d /databases | |
| parent | devel/folly: Remove BROKEN_FreeBSD_13 because it builds now on 13 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=548110
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/memcached/Makefile | 34 | ||||
| -rw-r--r-- | databases/memcached/distinfo | 6 |
2 files changed, 17 insertions, 23 deletions
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 72c85b8c5032..d16db0978b0e 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -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 cache system 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: diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo index 6d0ac8885b55..65c5a1896f09 100644 --- a/databases/memcached/distinfo +++ b/databases/memcached/distinfo @@ -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 |