diff options
| author | Steve Wills <swills@FreeBSD.org> | 2011-10-19 14:21:52 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2011-10-19 14:21:52 +0000 |
| commit | b7f41edd35b2d6c00c1d743c607964963b6ddc0c (patch) | |
| tree | 54684bfd5984351d6dadf63a854a562f4413929f /databases/memcached | |
| parent | - Update to 0.764 (diff) | |
- Update to 1.4.9
- Remove repcached patch and support
- Fix rc script for startup case [1]
PR: ports/161802 [1]
Submitted by: "Oleg A. Mamontov" <oleg@mamontov.net> [1]
Notes
Notes:
svn path=/head/; revision=283910
Diffstat (limited to 'databases/memcached')
| -rw-r--r-- | databases/memcached/Makefile | 15 | ||||
| -rw-r--r-- | databases/memcached/distinfo | 6 | ||||
| -rw-r--r-- | databases/memcached/files/memcached.in | 4 |
3 files changed, 7 insertions, 18 deletions
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index b8c1b88f6ff1..8ecc4f2fbb1e 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -6,8 +6,7 @@ # PORTNAME= memcached -PORTVERSION= 1.4.7 -PORTREVISION= 2 +PORTVERSION= 1.4.9 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_GENTOO} @@ -21,11 +20,11 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent CONFLICTS= memcached-1.2* USE_RC_SUBR= memcached +SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-libevent=${LOCALBASE} --program-prefix= -OPTIONS= REPCACHED "Enable data replication feature" off \ - SASL "Enable SASL support" off +OPTIONS= SASL "Enable SASL support" off MAN1= memcached.1 @@ -42,14 +41,6 @@ PORTDOCS= protocol.txt readme.txt CFLAGS+= -fstack-protector .endif -.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 -.endif - .if defined(WITH_SASL) && !defined(WITHOUT_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --enable-sasl diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo index 3c9ca4110345..3133f8133e6a 100644 --- a/databases/memcached/distinfo +++ b/databases/memcached/distinfo @@ -1,4 +1,2 @@ -SHA256 (memcached-1.4.7.tar.gz) = 925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6 -SIZE (memcached-1.4.7.tar.gz) = 307741 -SHA256 (repcached-2.3.1-1.4.7.patch.gz) = bcf4fa79eff5a8174669601a317718b4479650c3e9098da582d97ed6c3d3957c -SIZE (repcached-2.3.1-1.4.7.patch.gz) = 19123 +SHA256 (memcached-1.4.9.tar.gz) = 854a5fa6dfde478d1bb440498e378bd073f303d51bb82c611001eecdec9b4a79 +SIZE (memcached-1.4.9.tar.gz) = 311591 diff --git a/databases/memcached/files/memcached.in b/databases/memcached/files/memcached.in index dd1308018c7c..91040c81bfe5 100644 --- a/databases/memcached/files/memcached.in +++ b/databases/memcached/files/memcached.in @@ -34,7 +34,7 @@ if [ -n "$2" ]; then eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}" eval memcached_flags="\${memcached_${profile}_flags:-${memcached_flags}}" else - echo "$0: extra argument ignored" + echo "%%PREFIX%%/etc/rc.d/memcached%%RC_SUBR_SUFFIX%%: extra argument ignored" fi else if [ -n "${memcached_profiles}" -a -n "$1" ]; then @@ -60,7 +60,7 @@ else ;; esac echo "===> memcached profile: ${profile}" - if $0 $1 ${profile} ; then + if %%PREFIX%%/etc/rc.d/memcached%%RC_SUBR_SUFFIX%% $1 ${profile} ; then success="${profile} ${success:-}" else failed="${profile} (${retcode}) ${failed:-}" |