On Thu, Dec 22, 2011 at 07:06:14PM +0100, Sebastian Reitenbach wrote: > Maintainer timed out. I'd like to get this in. This time its inlined, the > only change is that I moved the -d parameter to daemon, instead of the > daemon_flags, similar to other changes done to other ports so that it always > daemonizes. > > is it OK?
OK for me. Slightly tested with devel/subversion on amd64. It seems to run fine: stats STAT pid 12951 STAT uptime 1314 STAT time 1324808489 STAT version 1.4.10 STAT libevent 1.4.14b-stable STAT pointer_size 64 STAT rusage_user 0.110000 STAT rusage_system 0.360000 STAT curr_connections 10 STAT total_connections 750 STAT connection_structures 13 STAT reserved_fds 20 STAT cmd_get 8112 STAT cmd_set 5508 STAT cmd_flush 0 STAT cmd_touch 0 STAT get_hits 2604 STAT get_misses 5508 STAT delete_misses 0 STAT delete_hits 0 STAT incr_misses 0 STAT incr_hits 0 STAT decr_misses 0 STAT decr_hits 0 STAT cas_misses 0 STAT cas_hits 0 STAT cas_badval 0 STAT touch_hits 0 STAT touch_misses 0 STAT auth_cmds 0 STAT auth_errors 0 STAT bytes_read 1485917 STAT bytes_written 497951 STAT limit_maxbytes 67108864 STAT accepting_conns 1 STAT listen_disabled_num 0 STAT threads 4 STAT conn_yields 0 STAT hash_power_level 16 STAT hash_bytes 524288 STAT hash_is_expanding 0 STAT expired_unfetched 0 STAT evicted_unfetched 0 STAT bytes 861008 STAT curr_items 4409 STAT total_items 5508 STAT evictions 0 STAT reclaimed 0 > ? memcached-1.4.10.diff > Index: Makefile > =================================================================== > RCS file: /cvs/ports/misc/memcached/Makefile,v > retrieving revision 1.15 > diff -u -r1.15 Makefile > --- Makefile 11 Jul 2011 12:13:03 -0000 1.15 > +++ Makefile 14 Nov 2011 09:33:08 -0000 > @@ -2,8 +2,7 @@ > > COMMENT= distributed memory object caching system > > -DISTNAME= memcached-1.4.5 > -REVISION= 0 > +DISTNAME = memcached-1.4.10 > CATEGORIES= misc > > HOMEPAGE= http://www.danga.com/memcached/ > Index: distinfo > =================================================================== > RCS file: /cvs/ports/misc/memcached/distinfo,v > retrieving revision 1.10 > diff -u -r1.10 distinfo > --- distinfo 14 Oct 2010 12:33:03 -0000 1.10 > +++ distinfo 14 Nov 2011 09:33:08 -0000 > @@ -1,5 +1,5 @@ > -MD5 (memcached-1.4.5.tar.gz) = WDRBol+Tc2BiQCTyiB5eqA== > -RMD160 (memcached-1.4.5.tar.gz) = wfU0+8WFoeoDO70S1vyUx3oIUDI= > -SHA1 (memcached-1.4.5.tar.gz) = x9ZRd2S4LSOuLedrVsJJQ0PFPwI= > -SHA256 (memcached-1.4.5.tar.gz) = > lXG0uFSE5Gs7EPB8y6d6H6l9YGYLMoWfmQ7/77MAX5E= > -SIZE (memcached-1.4.5.tar.gz) = 302516 > +MD5 (memcached-1.4.10.tar.gz) = jhgFTsXt/Zb33ofwJiIFKg== > +RMD160 (memcached-1.4.10.tar.gz) = Z/Rne6ZEsbFRUaaGWoN3lm/hlwY= > +SHA1 (memcached-1.4.10.tar.gz) = CuMA+Fi3Z6v4EgCdU+1YZHzrSYo= > +SHA256 (memcached-1.4.10.tar.gz) = > LMPeNBtWFGTaKfxdXipPrMD2qvwVHw4dlCKHBeB1j98= > +SIZE (memcached-1.4.10.tar.gz) = 311926 > Index: pkg/MESSAGE > =================================================================== > RCS file: /cvs/ports/misc/memcached/pkg/MESSAGE,v > retrieving revision 1.1 > diff -u -r1.1 MESSAGE > --- pkg/MESSAGE 7 Aug 2009 10:46:41 -0000 1.1 > +++ pkg/MESSAGE 14 Nov 2011 09:33:08 -0000 > @@ -1,13 +1,3 @@ > -To start memcached at boot time, add the following to /etc/rc.local: > - > -if [ -x ${PREFIX}/bin/memcached ]; then > - echo -n ' memcached' > - ${PREFIX}/bin/memcached -d \ > - -u _memcached -P /var/run/memcached.pid > -fi > - > -To see further configuration options, run "memcached -h". > - > Since memcached has no authentication mechanisms, it is designed for > internal use only, and should be firewalled accordingly. You may wish > to add a rule such as the following to /etc/pf.conf: > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/misc/memcached/pkg/PLIST,v > retrieving revision 1.5 > diff -u -r1.5 PLIST > --- pkg/PLIST 21 Apr 2010 12:23:37 -0000 1.5 > +++ pkg/PLIST 14 Nov 2011 09:33:08 -0000 > @@ -8,4 +8,4 @@ > share/doc/memcached/ > share/doc/memcached/protocol.txt > share/doc/memcached/readme.txt > -share/doc/memcached/threads.txt > +@rcscript ${RCDIR}/memcached > Index: pkg/memcached.rc > =================================================================== > RCS file: pkg/memcached.rc > diff -N pkg/memcached.rc > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/memcached.rc 14 Nov 2011 09:33:08 -0000 > @@ -0,0 +1,12 @@ > +#!/bin/sh > +# > +# $OpenBSD$ > + > +daemon="${TRUEPREFIX}/bin/memcached -d" > +daemon_flags="-u _memcached -P /var/run/memcached.pid" > + > +. /etc/rc.d/rc.subr > + > +rc_reload=NO > + > +rc_cmd $1
