diff options
| author | Anders Nordby <anders@FreeBSD.org> | 2012-09-03 21:20:29 +0000 |
|---|---|---|
| committer | Anders Nordby <anders@FreeBSD.org> | 2012-09-03 21:20:29 +0000 |
| commit | eda40ae573660c2963df5bb7f16c99eb8718a8c3 (patch) | |
| tree | 953baf7891ec6cf6e0190c9e4c4722f5a95bd855 /www/varnish | |
| parent | 493b4b7a8a379c239f63d8e844a387bf4cf4c0fa (diff) | |
| download | ports-eda40ae573660c2963df5bb7f16c99eb8718a8c3.tar.gz ports-eda40ae573660c2963df5bb7f16c99eb8718a8c3.zip | |
Update to 3.0.3.
Notes
Notes:
svn path=/head/; revision=303622
Diffstat (limited to 'www/varnish')
| -rw-r--r-- | www/varnish/Makefile | 3 | ||||
| -rw-r--r-- | www/varnish/distinfo | 4 | ||||
| -rw-r--r-- | www/varnish/files/patch-bin-varnishadm-varnishadm.c | 15 | ||||
| -rw-r--r-- | www/varnish/files/patch-configure.ac | 32 |
4 files changed, 26 insertions, 28 deletions
diff --git a/www/varnish/Makefile b/www/varnish/Makefile index 42a6cc12b515..309359a5bf46 100644 --- a/www/varnish/Makefile +++ b/www/varnish/Makefile @@ -6,8 +6,7 @@ # PORTNAME= varnish -PORTVERSION= 3.0.2 -PORTREVISION= 1 +PORTVERSION= 3.0.3 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ diff --git a/www/varnish/distinfo b/www/varnish/distinfo index b831e97bf85c..56c0d779e89f 100644 --- a/www/varnish/distinfo +++ b/www/varnish/distinfo @@ -1,2 +1,2 @@ -SHA256 (varnish-3.0.2.tar.gz) = 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243 -SIZE (varnish-3.0.2.tar.gz) = 1977852 +SHA256 (varnish-3.0.3.tar.gz) = 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 +SIZE (varnish-3.0.3.tar.gz) = 2070020 diff --git a/www/varnish/files/patch-bin-varnishadm-varnishadm.c b/www/varnish/files/patch-bin-varnishadm-varnishadm.c deleted file mode 100644 index 8418753be206..000000000000 --- a/www/varnish/files/patch-bin-varnishadm-varnishadm.c +++ /dev/null @@ -1,15 +0,0 @@ ---- bin/varnishadm/varnishadm.c.orig 2011-08-29 10:45:24.000000000 +0200 -+++ bin/varnishadm/varnishadm.c 2011-08-30 23:33:47.000000000 +0200 -@@ -38,8 +38,12 @@ - #include <sys/socket.h> - - #ifdef HAVE_LIBEDIT -+#ifdef __FreeBSD__ -+#include <readline/readline.h> -+#else - #include <editline/readline.h> - #endif -+#endif - - #include "vcli.h" - #include "cli_common.h" diff --git a/www/varnish/files/patch-configure.ac b/www/varnish/files/patch-configure.ac index 63b59223d650..396d0e6d8523 100644 --- a/www/varnish/files/patch-configure.ac +++ b/www/varnish/files/patch-configure.ac @@ -1,28 +1,42 @@ ---- configure.ac.orig 2011-08-30 11:15:59.000000000 +0200 -+++ configure.ac 2011-08-31 13:43:24.000000000 +0200 -@@ -138,9 +138,22 @@ +--- configure.ac.orig 2012-08-20 11:20:40.000000000 +0200 ++++ configure.ac 2012-09-03 23:05:28.000000000 +0200 +@@ -147,17 +147,30 @@ AC_SUBST(PCRE_CFLAGS) AC_SUBST(PCRE_LIBS) -PKG_CHECK_MODULES([LIBEDIT], [libedit], - [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], -- [AC_MSG_WARN([libedit not found, disabling libedit support])]) +- [AC_CHECK_HEADERS([readline/readline.h]) +- AC_CHECK_HEADERS([edit/readline/readline.h]) +- AC_CHECK_LIB(edit, el_init, +- [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) +case $target in +*-*-freebsd*) + AC_CHECK_LIB(edit, el_init, + [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) -+ LIBEDIT_CFLAGS="" -+ LIBEDIT_LIBS="-lreadline" -+ ], ++ AC_DEFINE([HAVE_READLINE_READLINE_H], [1], [Define if we have readline.h]) + LIBEDIT_CFLAGS="" +- LIBEDIT_LIBS="-ledit ${CURSES_LIBS}" ++ LIBEDIT_LIBS="-lreadline ${CURSES_LIBS}" + ], +- [AC_MSG_WARN([libedit not found, disabling libedit support])], +- [${CURSES_LIBS}])]) + [AC_MSG_WARN([libedit not found, disabling libedit support])]) + ;; +*) + PKG_CHECK_MODULES([LIBEDIT], [libedit], + [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], -+ [AC_MSG_WARN([libedit not found, disabling libedit support])]) ++ [AC_CHECK_HEADERS([readline/readline.h]) ++ AC_CHECK_HEADERS([edit/readline/readline.h]) ++ AC_CHECK_LIB(edit, el_init, ++ [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) ++ LIBEDIT_CFLAGS="" ++ LIBEDIT_LIBS="-ledit ${CURSES_LIBS}" ++ ], ++ [AC_MSG_WARN([libedit not found, disabling libedit support])], ++ [${CURSES_LIBS}])]) + ;; +esac -+ # Checks for header files. AC_HEADER_STDC |