svn commit: r303622 - in head/www/varnish: . files

[Anders Nordby]

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