From owner-svn-ports-head@FreeBSD.ORG Mon Sep 3 21:20:30 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E2707106566B; Mon, 3 Sep 2012 21:20:29 +0000 (UTC) (envelope-from anders@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CD2F98FC19; Mon, 3 Sep 2012 21:20:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q83LKTZ6045609; Mon, 3 Sep 2012 21:20:29 GMT (envelope-from anders@svn.freebsd.org) Received: (from anders@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q83LKT2c045605; Mon, 3 Sep 2012 21:20:29 GMT (envelope-from anders@svn.freebsd.org) Message-Id: <201209032120.q83LKT2c045605@svn.freebsd.org> From: Anders Nordby Date: Mon, 3 Sep 2012 21:20:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303622 - in head/www/varnish: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 03 Sep 2012 21:20:30 -0000 Author: anders Date: Mon Sep 3 21:20:29 2012 New Revision: 303622 URL: http://svn.freebsd.org/changeset/ports/303622 Log: Update to 3.0.3. Deleted: head/www/varnish/files/patch-bin-varnishadm-varnishadm.c 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 Mon Sep 3 21:16:00 2012 (r303621) +++ head/www/varnish/Makefile Mon Sep 3 21:20:29 2012 (r303622) @@ -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/ Modified: head/www/varnish/distinfo ============================================================================== --- head/www/varnish/distinfo Mon Sep 3 21:16:00 2012 (r303621) +++ head/www/varnish/distinfo Mon Sep 3 21:20:29 2012 (r303622) @@ -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 Modified: head/www/varnish/files/patch-configure.ac ============================================================================== --- head/www/varnish/files/patch-configure.ac Mon Sep 3 21:16:00 2012 (r303621) +++ head/www/varnish/files/patch-configure.ac Mon Sep 3 21:20:29 2012 (r303622) @@ -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