Index: branches/2018Q1/databases/memcached/Makefile =================================================================== --- branches/2018Q1/databases/memcached/Makefile (revision 459420) +++ branches/2018Q1/databases/memcached/Makefile (revision 459421) @@ -1,86 +1,87 @@ # Created by: Sean Chittenden # $FreeBSD$ PORTNAME= memcached PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO MAINTAINER= swills@FreeBSD.org COMMENT= High-performance distributed memory object cache system LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= memcached-1.2* USES= cpe shebangfix autoreconf SHEBANG_FILES= scripts/memcached-tool USE_RC_SUBR= memcached SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} USE_CSTD= c99 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libevent=${LOCALBASE} \ --program-prefix= \ --disable-coverage # Dtrace option disabled until it is fixed upstream OPTIONS_DEFINE= SASL DOCS DTRACE OPTIONS_DEFAULT= SASL DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_10+= DTRACE OPTIONS_EXCLUDE_i386= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= DTRACE DTRACE_DESC= Enable dtrace probes SASL_DESC= Enable SASL Authentication DOCS_BUILD_DEPENDS= xml2rfc:textproc/xml2rfc DOCS_CONFIGURE_ENABLE= docs DTRACE_CONFIGURE_ENABLE= dtrace SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_CONFIGURE_ENABLE= sasl SASL_CFLAGS= -I${LOCALBASE}/include SASL_CPPFLAGS+= ${CFLAGS} SASL_LDFLAGS= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes .include .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 .endif post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in protocol-binary-range.txt protocol-binary.txt protocol.txt \ readme.txt threads.txt ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor regression-test: test test: build ${MAKE} -C ${WRKSRC} test .include Index: branches/2018Q1/databases/memcached/files/memcached.in =================================================================== --- branches/2018Q1/databases/memcached/files/memcached.in (revision 459420) +++ branches/2018Q1/databases/memcached/files/memcached.in (revision 459421) @@ -1,113 +1,116 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: memcached # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to run memcached: # # memcached_enable (bool): Set it to "YES" to enable memcached. # Default is "NO". # memcached_flags (flags): Set extra flags here. More options in memcached(1) # Default is empty "". # memcached_user (user): Set user to run memcached. # Default is "nobody". +# memcached_group (group): Set group to run memcached. +# 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 name="memcached" rcvar=memcached_enable _piddir="/var/run/memcached" pidfile="${_piddir}/memcached.pid" : ${memcached_enable="NO"} : ${memcached_user="nobody"} +: ${memcached_group="nobody"} load_rc_config ${name} if [ -n "$2" ]; then profile="$2" if [ -n "${memcached_profiles}" ]; then pidfile="${_piddir}/memcached.${profile}.pid" eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}" eval memcached_user="\${memcached_${profile}_user:-${memcached_user}}" + eval memcached_group="\${memcached_${profile}_group:-${memcached_group}}" 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 else if [ -n "${memcached_profiles}" -a -n "$1" ]; then for profile in ${memcached_profiles}; do eval _enable="\${memcached_${profile}_enable}" case "${_enable:-${memcached_enable}}" in [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) continue ;; [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) ;; *) if test -z "$_enable"; then _var=memcached_enable else _var=memcached_"${profile}"_enable fi warn "Bad value" \ "'${_enable:-${memcached_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> memcached profile: ${profile}" if %%PREFIX%%/etc/rc.d/memcached%%RC_SUBR_SUFFIX%% $1 ${profile} ; then success="${profile} ${success:-}" else failed="${profile} (${retcode}) ${failed:-}" fi done exit 0 fi fi memcached_poststart() { if [ -n "$memcached_post_start" ]; then eval $memcached_post_start fi } memcached_poststop() { if [ -n "${profile}" ]; then [ -e "$pidfile" ] && unlink $pidfile else local file for file in ${_piddir}/* ; do case "$file" in *\*) continue ;; esac unlink $file done fi } command=%%PREFIX%%/bin/memcached -command_args="-d -u ${memcached_user} -P ${pidfile} " +command_args="-d -P ${pidfile} " -memcached_group=`id -gn $memcached_user` start_precmd="install -d -o $memcached_user -g $memcached_group -m 755 $_piddir" start_postcmd="${name}_poststart" stop_postcmd="${name}_poststop" run_rc_command "$1" Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 459420) +++ branches/2018Q1 (revision 459421) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r459420