[Midnightbsd-cvs] mports [19667] trunk/databases/memcached: memcached 1.4.24

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 7 16:05:19 EDT 2015 

Revision: 19667
          http://svnweb.midnightbsd.org/mports/?rev=19667
Author:   laffer1
Date:     2015-08-07 16:05:09 -0400 (Fri, 07 Aug 2015)
Log Message:
-----------
memcached 1.4.24

Modified Paths:
--------------
    trunk/databases/memcached/Makefile
    trunk/databases/memcached/distinfo
    trunk/databases/memcached/files/memcached.in

Modified: trunk/databases/memcached/Makefile
===================================================================
--- trunk/databases/memcached/Makefile	2015-08-07 19:52:15 UTC (rev 19666)
+++ trunk/databases/memcached/Makefile	2015-08-07 20:05:09 UTC (rev 19667)
@@ -1,75 +1,78 @@
 # $MidnightBSD$
 
 PORTNAME=	memcached
-PORTVERSION=	1.4.17
+PORTVERSION=	1.4.24
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	http://www.memcached.org/files/ \
+		GOOGLE_CODE \
+		GENTOO
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	High-performance distributed memory object cache system
 
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
+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_DEFAULT=	SASL DOCS
+
+DTRACE_DESC=	Enable dtrace probes
+SASL_DESC=	Enable SASL Authentication
+
 USE_RC_SUBR=	memcached
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --program-prefix=
+SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
-OPTIONS=	REPCACHED	"Enable data replication feature"	off \
-		SASL		"Enable SASL support"			off
+MAKE_JOBS_UNSAFE=yes
 
-MAN1=		memcached.1
+USES=		cpe shebangfix autoreconf:build
+USE_AUTOTOOLS=	aclocal
+SHEBANG_FILES=	scripts/memcached-tool
 
-PLIST_FILES=	bin/memcached \
-		bin/memcached-tool \
-		include/memcached/protocol_binary.h
-PLIST_DIRS=	include/memcached /var/run/memcached
+USE_CSTD=	c99
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
+		--program-prefix= \
+		--disable-coverage
 
-PORTDOCS=	protocol.txt readme.txt
+DTRACE_CONFIGURE_ENABLE=	dtrace
 
+SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_CONFIGURE_ENABLE=	sasl
+SASL_CFLAGS=		-I${LOCALBASE}/include
+SASL_CPPFLAGS+=		${CFLAGS}
+SASL_LDFLAGS=		-L${LOCALBASE}/lib
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_REPCACHED)
-# WWW: http://repcached.lab.klab.org/
-PATCH_SITES+=		http://mdounin.ru/files/
-PATCH_DIST_STRIP+=	-p1
-PATCHFILES+=		repcached-2.3.1-${PORTVERSION}.patch.gz
-CONFIGURE_ARGS+=	--enable-replication
+.if ${ARCH} == amd64
+CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
-.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--enable-sasl
-CFLAGS+=		-I${LOCALBASE}/include
-CPPFLAGS=		${CFLAGS}
-LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-.else
-CONFIGURE_ARGS+=	--disable-sasl
+.if ${PORT_OPTIONS:MDTRACE}
+BROKEN=			DTRACE broken with gcc/clang - reported upstream
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS=	xml2rfc:${PORTSDIR}/textproc/xml2rfc
+.endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
-	@${MKDIR} -p /var/run/memcached
-	@${CHOWN} nobody:nobody /var/run/memcached
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in protocol-binary-range.xml protocol-binary.xml protocol.txt \
+		readme.txt threads.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .endif
 
-test:
+regression-test: test
+test: build
 	${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.post.mk>

Modified: trunk/databases/memcached/distinfo
===================================================================
--- trunk/databases/memcached/distinfo	2015-08-07 19:52:15 UTC (rev 19666)
+++ trunk/databases/memcached/distinfo	2015-08-07 20:05:09 UTC (rev 19667)
@@ -1,2 +1,2 @@
-SHA256 (memcached-1.4.17.tar.gz) = d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458
-SIZE (memcached-1.4.17.tar.gz) = 326970
+SHA256 (memcached-1.4.24.tar.gz) = 08a426c504ecf64633151eec1058584754d2f54e62e5ed2d6808559401617e55
+SIZE (memcached-1.4.24.tar.gz) = 354917

Modified: trunk/databases/memcached/files/memcached.in
===================================================================
--- trunk/databases/memcached/files/memcached.in	2015-08-07 19:52:15 UTC (rev 19666)
+++ trunk/databases/memcached/files/memcached.in	2015-08-07 20:05:09 UTC (rev 19667)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD: head/databases/memcached/files/memcached.in 340872 2014-01-24 00:14:07Z mat $
+# $FreeBSD: head/databases/memcached/files/memcached.in 390730 2015-06-27 20:42:04Z swills $
 #
 # PROVIDE: memcached
 # REQUIRE: LOGIN
@@ -16,6 +16,9 @@
 #				Default is "nobody".
 # memcached_profiles (str):     Set to "" by default.
 #                               Define your profiles here.
+# memcached_post_start (str):   Set extra commands that should be executed after memcached was successfully
+#                               started here.
+#                               Default is empty "".
 
 . /etc/rc.subr
 
@@ -33,6 +36,7 @@
 		pidfile="${_piddir}/memcached.${profile}.pid"
 		eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}"
 		eval memcached_flags="\${memcached_${profile}_flags:-${memcached_flags}}"
+		eval memcached_post_start="\${memcached_${profile}_post_start:-${memcached_post_start}}"
 	else
 		echo "%%PREFIX%%/etc/rc.d/memcached%%RC_SUBR_SUFFIX%%: extra argument ignored"
 	fi
@@ -70,6 +74,13 @@
 	fi
 fi
 
+memcached_poststart()
+{
+    if [ -n "$memcached_post_start" ]; then
+        eval $memcached_post_start
+    fi
+}
+
 memcached_poststop()
 {
 	if [ -n "${profile}" ]; then
@@ -94,6 +105,7 @@
 command_args="-d -u ${memcached_user} -P ${pidfile} "
 
 start_precmd="install -d -o $memcached_user -g $memcached_user -m 755 $_piddir"
+start_postcmd="${name}_poststart"
 stop_postcmd="${name}_poststop"
 
 run_rc_command "$1"

More information about the Midnightbsd-cvs mailing list