summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/squid31/Makefile3
-rw-r--r--www/squid31/files/patch-configure23
2 files changed, 25 insertions, 1 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 68e7247c0524..38423c1a2710 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -53,6 +53,7 @@
PORTNAME= squid
PORTVERSION= 3.1.${SQUID_STABLE_VER}
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
@@ -74,6 +75,7 @@ MASTER_SITE_SUBDIR= squid
DISTNAME= squid-3.1.${SQUID_STABLE_VER}
DIST_SUBDIR= squid3.1
+PATCHFILES=
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
http://www1.at.squid-cache.org/%SUBDIR%/ \
@@ -83,7 +85,6 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www1.jp.squid-cache.org/%SUBDIR%/ \
http://www2.tw.squid-cache.org/%SUBDIR%/
PATCH_SITE_SUBDIR= Versions/v3/3.1/changesets
-PATCHFILES=
MAINTAINER= tmseck@web.de
COMMENT= HTTP Caching Proxy
diff --git a/www/squid31/files/patch-configure b/www/squid31/files/patch-configure
new file mode 100644
index 000000000000..2452bff4e81c
--- /dev/null
+++ b/www/squid31/files/patch-configure
@@ -0,0 +1,23 @@
+Correct two configure tests that fail whenn g++ is used instead of gcc.
+--- configure.orig 2010-05-30 16:00:03.000000000 +0200
++++ configure 2010-05-30 16:00:33.000000000 +0200
+@@ -48547,7 +48547,10 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++#include <sys/types.h> /* for setresuid(2) on FreeBSD */
++#include <stdio.h> /* for perror(3) on FreeBSD */
+ #include <stdlib.h>
++#include <unistd.h> /* for setresuid(2) on FreeBSD */
+ int main(int argc, char **argv) {
+ if(setresuid(-1,-1,-1)) {
+ perror("setresuid:");
+@@ -48632,7 +48635,7 @@
+ int main(int argc, char **argv)
+ {
+ int size = 20;
+- char *str = malloc(size);
++ char *str = (char *)malloc(size);
+ memset(str, 'x', size);
+ strnstr(str, "fubar", size);
+ return 0;