aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorskv <skv@FreeBSD.org>2009-07-15 01:23:30 +0800
committerskv <skv@FreeBSD.org>2009-07-15 01:23:30 +0800
commit5da89bd4618703f2c787f1aa03233bcf369bd2cc (patch)
tree1e5cf9ccda1d12d511ec5dd4b736d874ca34e130 /databases
parent2448506d867b900946185286a235e27468866b8d (diff)
downloadfreebsd-ports-gnome-5da89bd4618703f2c787f1aa03233bcf369bd2cc.tar.gz
freebsd-ports-gnome-5da89bd4618703f2c787f1aa03233bcf369bd2cc.tar.zst
freebsd-ports-gnome-5da89bd4618703f2c787f1aa03233bcf369bd2cc.zip
Fix "patch" target: replace files/patch-configure with inline patch,
because "patch-configure" conflicts with repcached-2.2-1.2.8.patch
Diffstat (limited to 'databases')
-rw-r--r--databases/memcached/Makefile3
-rw-r--r--databases/memcached/files/patch-configure29
2 files changed, 3 insertions, 29 deletions
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 8331f7e26ae0..48c75769852e 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -44,6 +44,9 @@ CONFIGURE_ARGS+= --enable-replication --disable-threads
CONFIGURE_ARGS+= --enable-threads
.endif
+post-patch:
+ ${REINPLACE_CMD} -E -e 's!=(= "xyes")!\1!' ${WRKSRC}/configure
+
post-configure:
@${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile
diff --git a/databases/memcached/files/patch-configure b/databases/memcached/files/patch-configure
deleted file mode 100644
index 07cac4816fc2..000000000000
--- a/databases/memcached/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig 2009-04-11 04:03:08.000000000 -0300
-+++ configure 2009-04-25 13:06:44.000000000 -0300
-@@ -3807,7 +3807,7 @@
- enableval=$enable_dtrace;
- fi
-
--if test "x$enable_dtrace" == "xyes"; then
-+if test "x$enable_dtrace" = "xyes"; then
- # Extract the first word of "dtrace", so it can be a program name with args.
- set dummy dtrace; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -3880,7 +3880,7 @@
- enableval=$enable_64bit;
- fi
-
--if test "x$enable_64bit" == "xyes"
-+if test "x$enable_64bit" = "xyes"
- then
- org_cflags=$CFLAGS
- CFLAGS=-m64
-@@ -5842,7 +5842,7 @@
- enableval=$enable_threads;
- fi
-
--if test "x$enable_threads" == "xyes"; then
-+if test "x$enable_threads" = "xyes"; then
- { echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
- $as_echo_n "checking for library containing pthread_create... " >&6; }
- if test "${ac_cv_search_pthread_create+set}" = set; then