30 files changed, 42 insertions, 31 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 3b81f852e639..02a23abe614d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	apache22
 PORTVERSION=	2.2.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
diff --git a/www/awffull/Makefile b/www/awffull/Makefile
index a16497bef2e6..aef9b9466bba 100644
--- a/www/awffull/Makefile
+++ b/www/awffull/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	awffull
 PORTVERSION=	3.10.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	www
 MASTER_SITES=	http://www.stedee.id.au/files/
 
@@ -17,7 +17,7 @@ COMMENT=	AWFFull is a webserver log analysis tool forked from Webalizer
 BUILD_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		png15:${PORTSDIR}/graphics/png \
-		pcre.1:${PORTSDIR}/devel/pcre
+		pcre.3:${PORTSDIR}/devel/pcre
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS?=	ja-awffull-[0-9]*
diff --git a/www/bluefish-devel/Makefile b/www/bluefish-devel/Makefile
index 32194bfee7c4..5f66f6805f63 100644
--- a/www/bluefish-devel/Makefile
+++ b/www/bluefish-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bluefish
 PORTVERSION=	1.3.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-unstable-${PORTVERSION}
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Development release of port bluefish
 
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
 		aspell.16:${PORTSDIR}/textproc/aspell
 
 IGNORE=		the devel release are currently suspended, install www/bluefish, new release is 2.0
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 15840d26fb5e..f7602723ca31 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bluefish
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www editors
 MASTER_SITES=	http://www.bennewitz.com/bluefish/stable/source/ \
 		http://bluefish.mrball.net/stable/source/ \
@@ -17,7 +17,7 @@ MASTER_SITES=	http://www.bennewitz.com/bluefish/stable/source/ \
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	HTML editor designed for the experienced web designer
 
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
 		enchant.1:${PORTSDIR}/textproc/enchant \
 		gucharmap.7:${PORTSDIR}/deskutils/gucharmap
 
diff --git a/www/cas/Makefile b/www/cas/Makefile
index 96be4c27c46c..9adb2d83280a 100644
--- a/www/cas/Makefile
+++ b/www/cas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cas
 PORTVERSION=	3.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 MASTER_SITES=	http://cas.havoc.ru/download/
 
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 321d974df917..e17d4803993b 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	1.2.101
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION}
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index 404c8e58f616..532882033e50 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dansguardian
 PORTVERSION=	2.12.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index 51c6b2c40f2b..9c89802e80bf 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dansguardian
 PORTVERSION=	2.10.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 1fbda9e3ad5d..786d33e3eb59 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	epiphany-extensions
 PORTVERSION=	2.30.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of add-ons for the Epiphany web browser
 
 BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
 		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 
diff --git a/www/httest/Makefile b/www/httest/Makefile
index 9b64b3b4dd02..5b1a96b86c17 100644
--- a/www/httest/Makefile
+++ b/www/httest/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	httest
 PORTVERSION=	2.2.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION}
 
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index 9edebffc203e..f1781849e431 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hypermail
 PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www mail
 MASTER_SITES=	SF
 
@@ -15,7 +15,7 @@ MAINTAINER=	dan@langille.org
 COMMENT=	A program to generate a cross-referenced HTML mail archive
 
 LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm \
-		pcre.1:${PORTSDIR}/devel/pcre
+		pcre.3:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-htmldir=${PREFIX}/share/doc/hypermail \
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index e33ac73fb550..519a464ddde8 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kannel
 PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.org/download/${PORTVERSION}/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index a929ed567dc3..350a3da2fa4d 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	lighttpd
 PORTVERSION=	1.4.32
+PORTREVISION=	1
 CATEGORIES?=	www
 MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
@@ -18,7 +19,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 .endif
 
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 33fceb19aaf5..767796c9731c 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_security
 PORTVERSION=	2.6.6
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	SF/mod-security/modsecurity-apache/${PORTVERSION}
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ COMMENT=	An intrusion detection and prevention engine
 LICENSE=	AL2
 MAKE_JOBS_SAFE=	yes
 
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre \
 		apr-1:${PORTSDIR}/devel/apr1
 
 USE_APACHE=	22+
diff --git a/www/mod_security21/Makefile b/www/mod_security21/Makefile
index 9961104cb7f2..427c93d905d4 100644
--- a/www/mod_security21/Makefile
+++ b/www/mod_security21/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mod_security21
 PORTVERSION=	2.1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www security
 MASTER_SITES=	http://www.modsecurity.org/download/
 DISTNAME=	${PORTNAME:S/_//:S/21//}-apache_${PORTVERSION}
@@ -61,7 +61,7 @@ REINPLACE_ARGS=	-i ""
 .include <bsd.port.pre.mk>
 
 .if ${APACHE_VERSION} == 22
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 .endif
 
 post-patch:
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 2c5fb23f60a9..fd3601fa99ed 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index a1edca4d721c..5a912ace61cb 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
diff --git a/www/oops/Makefile b/www/oops/Makefile
index d5f88c40a9c0..8b45b710e0fa 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oops
 PORTVERSION=	${OOPSVERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	http://oops-cache.org/ \
 		ftp://kucha.ru/pub/misc/oops/
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	--with-PGSQL=${PREFIX}/pgsql
 .endif
 
 .if defined(WITH_PCRE)
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--with-regexp=pcre
 .endif
 
diff --git a/www/pecl-yaf/Makefile b/www/pecl-yaf/Makefile
index b9a8e6b48ed3..0a737eacc405 100644
--- a/www/pecl-yaf/Makefile
+++ b/www/pecl-yaf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	yaf
 PORTVERSION=	2.2.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/www/pound/Makefile b/www/pound/Makefile
index c7cdfb5ec655..9605962f3e2a 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pound
 PORTVERSION=	2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www net
 MASTER_SITES=	http://www.apsis.ch/pound/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--enable-msdav
 .endif
 
 .if !defined(WITHOUT_PCRE)
-LIB_DEPENDS+=		pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		pcre.3:${PORTSDIR}/devel/pcre
 CFLAGS+=		"-I${LOCALBASE}/include"
 CPPFLAGS+=		"-I${LOCALBASE}/include"
 LDFLAGS+=		"-L${LOCALBASE}/lib"
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 6c1690ba3467..b6a4c6b9ceb2 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	privoxy
 PORTVERSION=	3.0.19
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
 DISTNAME=	privoxy-${PORTVERSION}-stable-src
diff --git a/www/rejik/Makefile b/www/rejik/Makefile
index 0d01ba74e788..6c694c0ce35c 100644
--- a/www/rejik/Makefile
+++ b/www/rejik/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rejik
 PORTVERSION=	3.2.10
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.rejik.ru/download/ \
 		http://bio3k.softboard.ru/uploads/arch/
diff --git a/www/sams/Makefile b/www/sams/Makefile
index f12773bfe6b5..5be615c02485 100644
--- a/www/sams/Makefile
+++ b/www/sams/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sams
 DISTVERSION=	1.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://sams.perm.ru/download/ \
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index be753a4d499d..f80a22454f56 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	trafficserver
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
@@ -17,7 +18,7 @@ LICENSE=	AL2
 
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		pcre.1:${PORTSDIR}/devel/pcre
+		pcre.3:${PORTSDIR}/devel/pcre
 
 USE_AUTOTOOLS=	autoconf automake libtool
 USE_BZIP2=	yes
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 6d9fa0ac6965..6170c05a5b67 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	3.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile
index 18ea21b3ccbb..d1479ee7afb5 100644
--- a/www/varnish2/Makefile
+++ b/www/varnish2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	varnish
 PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 
@@ -11,7 +11,7 @@ COMMENT=	The Varnish high-performance HTTP accelerator
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
 
 LATEST_LINK=	varnish2
 CONFLICTS=	varnish-3.*
diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile
index 64c3a74981df..f68628308193 100644
--- a/www/vdr-plugin-live/Makefile
+++ b/www/vdr-plugin-live/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-live
 PORTVERSION=	0.2.0s20120325
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia
 MASTER_SITES=	http://live.vdr-developer.org/downloads/:release \
 		LOCAL/nox/:snapshot
diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile
index 4cf05a75f653..da3ed6937fe9 100644
--- a/www/xapian-omega/Makefile
+++ b/www/xapian-omega/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xapian-omega
 PORTVERSION=	1.2.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index 252755b141e0..eb8561ef472a 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xshttpd
 DISTVERSION=	3.7b25
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 		ftp://mud.stack.nl/pub/xs-httpd/release/
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index e5efeea845b6..c179c1627a80 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xshttpd
 DISTVERSION=	3.6g01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.stack.nl/pub/xs-httpd/release/ \
 		ftp://mud.stack.nl/pub/xs-httpd/release/