From owner-svn-ports-head@FreeBSD.ORG Wed Sep 4 21:03:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 74D542ED; Wed, 4 Sep 2013 21:03:19 +0000 (UTC) (envelope-from anders@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 618C82594; Wed, 4 Sep 2013 21:03:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r84L3J5s053594; Wed, 4 Sep 2013 21:03:19 GMT (envelope-from anders@svn.freebsd.org) Received: (from anders@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r84L3IEf053591; Wed, 4 Sep 2013 21:03:18 GMT (envelope-from anders@svn.freebsd.org) Message-Id: <201309042103.r84L3IEf053591@svn.freebsd.org> From: Anders Nordby Date: Wed, 4 Sep 2013 21:03:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326323 - in head/www/varnish: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Sep 2013 21:03:19 -0000 Author: anders Date: Wed Sep 4 21:03:18 2013 New Revision: 326323 URL: http://svnweb.freebsd.org/changeset/ports/326323 Log: Update to 3.0.4. Modified: head/www/varnish/Makefile head/www/varnish/distinfo head/www/varnish/files/patch-configure.ac Modified: head/www/varnish/Makefile ============================================================================== --- head/www/varnish/Makefile Wed Sep 4 20:58:21 2013 (r326322) +++ head/www/varnish/Makefile Wed Sep 4 21:03:18 2013 (r326323) @@ -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/ Modified: head/www/varnish/distinfo ============================================================================== --- head/www/varnish/distinfo Wed Sep 4 20:58:21 2013 (r326322) +++ head/www/varnish/distinfo Wed Sep 4 21:03:18 2013 (r326323) @@ -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 Modified: head/www/varnish/files/patch-configure.ac ============================================================================== --- head/www/varnish/files/patch-configure.ac Wed Sep 4 20:58:21 2013 (r326322) +++ head/www/varnish/files/patch-configure.ac Wed Sep 4 21:03:18 2013 (r326323) @@ -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