aboutsummaryrefslogtreecommitdiffstats
path: root/www/mod_security
diff options
context:
space:
mode:
authoraraujo <araujo@FreeBSD.org>2009-08-11 20:26:49 +0800
committeraraujo <araujo@FreeBSD.org>2009-08-11 20:26:49 +0800
commiteec6c022722c4ad7d25b3b56e5e5fbcd9785f1da (patch)
treec9edf1fedc55f26cbd238afd9ca585b49f55a819 /www/mod_security
parent4b030266783803186fd926c6a1b654d10b7ae68b (diff)
downloadfreebsd-ports-gnome-eec6c022722c4ad7d25b3b56e5e5fbcd9785f1da.tar.gz
freebsd-ports-gnome-eec6c022722c4ad7d25b3b56e5e5fbcd9785f1da.tar.zst
freebsd-ports-gnome-eec6c022722c4ad7d25b3b56e5e5fbcd9785f1da.zip
- Fix a linker error when you use mlogc with pthread in osversion
less than 700000. Submitted by: Mel Flynn <mel.flynn+fbsd.questions@mailing.thruhere.net> (private mail)
Diffstat (limited to 'www/mod_security')
-rw-r--r--www/mod_security/Makefile3
-rw-r--r--www/mod_security/files/extra-patch-fix-6.x-link11
2 files changed, 14 insertions, 0 deletions
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index d1fc2775b029..61c3fc5b0d5c 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -47,6 +47,9 @@ OPTIONS= LUA "Embedded Lua language support" off \
SUB_FILES+= pkg-message.rules
.if defined(WITH_MLOGC)
PLIST_FILES+= bin/mlogc
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fix-6.x-link
+.endif
.endif
PLIST_DIRS+= ${APACHEETCDIR}/Includes/mod_security2/optional_rules
PLIST_DIRS+= ${APACHEETCDIR}/Includes/mod_security2
diff --git a/www/mod_security/files/extra-patch-fix-6.x-link b/www/mod_security/files/extra-patch-fix-6.x-link
new file mode 100644
index 000000000000..5347cadecc1a
--- /dev/null
+++ b/www/mod_security/files/extra-patch-fix-6.x-link
@@ -0,0 +1,11 @@
+--- mlogc-src/Makefile.in.orig 2008-09-02 23:10:36.000000000 +0000
++++ mlogc-src/Makefile.in 2009-08-09 20:24:50.000000000 +0000
+@@ -10,7 +10,7 @@
+ MLOGC_VERSION = `grep '^\#define *VERSION ' mlogc.c | sed 's/.*VERSION *"\([^"]*\)"/\1/'`
+
+ APR_FLAGS = @APR_CFLAGS@
+-APR_LIBS = @APR_LINK_LD@
++APR_LIBS = @APR_LINK_LD@ @APR_LIBS@
+
+ CURL_FLAGS = @CURL_CFLAGS@
+ CURL_LIBS = @CURL_LIBS@