!
! New file (needed at least when built without pkgconfig):
! files/patch-bin__varnishadm__varnishadm.c
!
Index: Makefile
===================================================================
RCS file: /mirror/cvs/FreeBSD/r/pcvs/ports/www/varnish/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile	17 Feb 2011 10:32:10 -0000	1.41
+++ Makefile	18 Jun 2011 20:25:59 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	varnish
-PORTVERSION=	2.1.5
+PORTVERSION=	3.0.0
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
@@ -15,6 +15,8 @@ COMMENT=	The Varnish high-performance HT
 
 LICENSE=	BSD
 
+OPTIONS=	PKGCONFIG "Add pkg-config support." on
+
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
@@ -22,24 +24,46 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}
 CONFIGURE_ENV=	RST2MAN=true
 USE_LDCONFIG=	yes
-USE_GNOME=	pkgconfig
+WANT_GNOME=	yes
 
 MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
 		varnishncsa.1 varnishreplay.1 varnishsizes.1 \
 		varnishstat.1 varnishtest.1 varnishtop.1
-MAN7=		vcl.7
+MAN3=		vmod_std.3
+MAN7=		varnish-cli.7 vcl.7
+
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_PKGCONFIG)
+USE_GNOME=	pkgconfig
+PLIST_SUB+=	PKGCONFIG=""
+.else
+PLIST_SUB+=	PKGCONFIG="@comment "
+PCRE_CFLAGS!=pcre-config --cflags
+PCRE_LIBS!=pcre-config --libs
+CONFIGURE_ARGS+= PKG_CONFIG=${TRUE}
+CONFIGURE_ARGS+= PCRE_CFLAGS="${PCRE_CFLAGS}"
+CONFIGURE_ARGS+= PCRE_LIBS="${PCRE_LIBS}"
+CONFIGURE_ARGS+= LIBEDIT_CFLAGS=""
+CONFIGURE_ARGS+= LIBEDIT_LIBS="-lreadline"
+.endif
+
 .if ${OSVERSION} < 601000
 BROKEN=		does not compile
 .endif
 
 post-patch:
+.if !defined(WITHOUT_PKGCONFIG)
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
+.else
+	@${REINPLACE_CMD} -e 's|^pkgconfig_DATA =.*|pkgconfig_DATA =|' \
+		-e 's|^pkgconfigdir = .*|pkgconfigdir =|' \
+		${WRKSRC}/Makefile.in
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
Index: distinfo
===================================================================
RCS file: /mirror/cvs/FreeBSD/r/pcvs/ports/www/varnish/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo	17 Feb 2011 10:32:10 -0000	1.21
+++ distinfo	18 Jun 2011 20:25:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (varnish-2.1.5.tar.gz) = 2d8049be14ada035d0e3a54c2b519143af40d03d917763cf72d53d8188e5ef83
-SIZE (varnish-2.1.5.tar.gz) = 1530856
+SHA256 (varnish-3.0.0.tar.gz) = 30c4c931a50eab8e78a39a776b85cbb4d242f9ddb707e04e7876fb29f3a8a5eb
+SIZE (varnish-3.0.0.tar.gz) = 2013974
Index: pkg-plist
===================================================================
RCS file: /mirror/cvs/FreeBSD/r/pcvs/ports/www/varnish/pkg-plist,v
retrieving revision 1.14
diff -u -p -r1.14 pkg-plist
--- pkg-plist	27 Apr 2010 09:10:07 -0000	1.14
+++ pkg-plist	18 Jun 2011 20:25:59 -0000
@@ -8,30 +8,38 @@ bin/varnishstat
 bin/varnishtest
 bin/varnishtop
 etc/varnish/default.vcl
-include/varnish/shmlog.h
-include/varnish/shmlog_tags.h
-include/varnish/stat_field.h
-include/varnish/stats.h
 include/varnish/varnishapi.h
-lib/libvarnish.so.1
-lib/libvarnish.so
-lib/libvarnish.la
-lib/libvarnish.a
+include/varnish/vcli.h
+include/varnish/vsc.h
+include/varnish/vsc_all.h
+include/varnish/vsc_fields.h
+include/varnish/vsl.h
+include/varnish/vsl_tags.h
+include/varnish/vsm.h
+lib/varnish/libvarnishcompat.so
+lib/varnish/libvarnishcompat.la
+lib/varnish/libvarnishcompat.a
+lib/varnish/libvarnish.so
+lib/varnish/libvarnish.la
+lib/varnish/libvarnish.a
+lib/varnish/libvcl.so
+lib/varnish/libvcl.la
+lib/varnish/libvcl.a
+lib/varnish/libvgz.so
+lib/varnish/libvgz.la
+lib/varnish/libvgz.a
+lib/varnish/vmods/libvmod_std.so
+lib/varnish/vmods/libvmod_std.la
+lib/varnish/vmods/libvmod_std.a
 lib/libvarnishapi.so.1
 lib/libvarnishapi.so
 lib/libvarnishapi.la
 lib/libvarnishapi.a
-lib/libvarnishcompat.so.1
-lib/libvarnishcompat.so
-lib/libvarnishcompat.la
-lib/libvarnishcompat.a
-lib/libvcl.so.1
-lib/libvcl.so
-lib/libvcl.la
-lib/libvcl.a
-libdata/pkgconfig/varnishapi.pc
+%%PKGCONFIG%%libdata/pkgconfig/varnishapi.pc
 sbin/varnishd
 @exec [ -d %D/varnish ] || mkdir %D/varnish
 @dirrmtry varnish
+@dirrm lib/varnish/vmods
+@dirrm lib/varnish
 @dirrm include/varnish
 @dirrmtry etc/varnish
--- /dev/null	2011-06-18 20:25:20.000000000 +0000
+++ files/patch-bin__varnishadm__varnishadm.c	2011-06-18 20:06:42.000000000 +0000
@@ -0,0 +1,15 @@
+--- ./bin/varnishadm/varnishadm.c.orig	2011-02-21 14:53:48.000000000 +0000
++++ ./bin/varnishadm/varnishadm.c	2011-02-21 14:54:19.000000000 +0000
+@@ -41,8 +41,12 @@
+ #include <sys/socket.h>
+ 
+ #ifdef HAVE_LIBEDIT
++#ifdef __FreeBSD__
++#include <readline/readline.h>
++#else
+ #include <editline/readline.h>
+ #endif
++#endif
+ 
+ #include "cli.h"
+ #include "cli_common.h"