aboutsummaryrefslogtreecommitdiffstats
path: root/databases/memcached
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2011-10-04 21:43:37 +0800
committerswills <swills@FreeBSD.org>2011-10-04 21:43:37 +0800
commit4daeb974d2646a62a6a634ef6a0e0cba0596c00c (patch)
tree14286ed8edc970bd6b58f74b34aadee2d6be6ad3 /databases/memcached
parent009dcd4bf722b2dec19a0adc3b492bfc9c40a0dc (diff)
downloadfreebsd-ports-gnome-4daeb974d2646a62a6a634ef6a0e0cba0596c00c.tar.gz
freebsd-ports-gnome-4daeb974d2646a62a6a634ef6a0e0cba0596c00c.tar.zst
freebsd-ports-gnome-4daeb974d2646a62a6a634ef6a0e0cba0596c00c.zip
- Fix issue with RC script [1]
- Fix build with SASL support enabled [2] PR: ports/161109 Reported by: Vedad KAJTAZ <vedad@kajtaz.net> [1] Reported by: Ben Tung <benpptung@tacol.biz> [2] Submitted by: dougb [1]
Diffstat (limited to 'databases/memcached')
-rw-r--r--databases/memcached/Makefile2
-rw-r--r--databases/memcached/files/memcached.in19
-rw-r--r--databases/memcached/files/patch-sasl_defs.c19
3 files changed, 33 insertions, 7 deletions
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 0ac72b4664ef..b8c1b88f6ff1 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -7,7 +7,7 @@
PORTNAME= memcached
PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_GENTOO}
diff --git a/databases/memcached/files/memcached.in b/databases/memcached/files/memcached.in
index 6ab6717d3216..dd1308018c7c 100644
--- a/databases/memcached/files/memcached.in
+++ b/databases/memcached/files/memcached.in
@@ -29,7 +29,7 @@ load_rc_config ${name}
if [ -n "$2" ]; then
profile="$2"
- if [ "x${memcached_profiles}" != "x" ]; then
+ if [ -n "${memcached_profiles}" ]; then
pidfile="${_piddir}/memcached.${profile}.pid"
eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}"
eval memcached_flags="\${memcached_${profile}_flags:-${memcached_flags}}"
@@ -72,12 +72,19 @@ fi
memcached_poststop()
{
- local file
+ if [ -n "${profile}" ]; then
+ [ -e "$pidfile" ] && unlink $pidfile
+ else
+ local file
- for file in ${_piddir}/* ; do
- case "$file" in *\*) continue ;; esac
- unlink $file
- done
+ for file in ${_piddir}/* ; do
+ case "$file" in
+ *\*)
+ continue ;;
+ esac
+ unlink $file
+ done
+ fi
}
: ${memcached_enable="NO"}
diff --git a/databases/memcached/files/patch-sasl_defs.c b/databases/memcached/files/patch-sasl_defs.c
new file mode 100644
index 000000000000..c6871b66b473
--- /dev/null
+++ b/databases/memcached/files/patch-sasl_defs.c
@@ -0,0 +1,19 @@
+--- sasl_defs.c.orig 2011-10-01 18:09:22.000000000 +0000
++++ sasl_defs.c 2011-10-01 18:10:33.000000000 +0000
+@@ -3,6 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sasl/saslplug.h>
+
+ #ifdef HAVE_SASL_CB_GETCONF
+ /* The locations we may search for a SASL config file if the user didn't
+@@ -141,7 +142,7 @@
+ { SASL_CB_SERVER_USERDB_CHECKPASS, sasl_server_userdb_checkpass, NULL },
+ #endif
+
+- { SASL_CB_LOG, sasl_log, NULL },
++ { SASL_CB_LOG, (sasl_callback_ft)sasl_log, NULL },
+
+ #ifdef HAVE_SASL_CB_GETCONF
+ { SASL_CB_GETCONF, sasl_getconf, NULL },