diff options
| author | Anders Nordby <anders@FreeBSD.org> | 2013-09-04 21:03:18 +0000 |
|---|---|---|
| committer | Anders Nordby <anders@FreeBSD.org> | 2013-09-04 21:03:18 +0000 |
| commit | 9bcc463ef93c4b03b24e13ff92034e3c11fe5d90 (patch) | |
| tree | ba7a9e78f0730add34e92320842c9f95f9c8fc8d | |
| parent | Drop USE_GMAKE, it doesn't work and is not necessary (diff) | |
Update to 3.0.4.
| -rw-r--r-- | www/varnish/Makefile | 3 | ||||
| -rw-r--r-- | www/varnish/distinfo | 4 | ||||
| -rw-r--r-- | www/varnish/files/patch-configure.ac | 34 |
3 files changed, 13 insertions, 28 deletions
diff --git a/www/varnish/Makefile b/www/varnish/Makefile index 3405eb1ea8d7..fafe411862ab 100644 --- a/www/varnish/Makefile +++ b/www/varnish/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= varnish -PORTVERSION= 3.0.3 -PORTREVISION= 2 +PORTVERSION= 3.0.4 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ diff --git a/www/varnish/distinfo b/www/varnish/distinfo index 56c0d779e89f..5fea4bb940d1 100644 --- a/www/varnish/distinfo +++ b/www/varnish/distinfo @@ -1,2 +1,2 @@ -SHA256 (varnish-3.0.3.tar.gz) = 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 -SIZE (varnish-3.0.3.tar.gz) = 2070020 +SHA256 (varnish-3.0.4.tar.gz) = 4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79 +SIZE (varnish-3.0.4.tar.gz) = 2081361 diff --git a/www/varnish/files/patch-configure.ac b/www/varnish/files/patch-configure.ac index 396d0e6d8523..2f70bdd2028a 100644 --- a/www/varnish/files/patch-configure.ac +++ b/www/varnish/files/patch-configure.ac @@ -1,42 +1,28 @@ ---- 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 @@ +--- configure.ac.orig 2013-06-14 10:39:32.000000000 +0200 ++++ configure.ac 2013-09-04 22:58:56.000000000 +0200 +@@ -147,9 +147,22 @@ AC_SUBST(PCRE_CFLAGS) AC_SUBST(PCRE_LIBS) -PKG_CHECK_MODULES([LIBEDIT], [libedit], - [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], -- [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]) +- [AX_LIB_READLINE]) +case $target in +*-*-freebsd*) + AC_CHECK_LIB(edit, el_init, + [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) + AC_DEFINE([HAVE_READLINE_READLINE_H], [1], [Define if we have readline.h]) - LIBEDIT_CFLAGS="" -- LIBEDIT_LIBS="-ledit ${CURSES_LIBS}" ++ LIBEDIT_CFLAGS="" + 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_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}])]) ++ [AX_LIB_READLINE]) + ;; +esac - - # Checks for header files. - AC_HEADER_STDC + if test "$ac_cv_have_readline" = no; then + AC_MSG_ERROR([libedit or readline not found]) + fi |