1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00

Update to 3.0.4.

This commit is contained in:
Anders Nordby 2013-09-04 21:03:18 +00:00
parent 03cf175aec
commit 9bcc463ef9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=326323
3 changed files with 13 additions and 28 deletions

View File

@ -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/

View File

@ -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

View File

@ -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