Remove devel/pcre-utf8 and enable UTF8 support in devel/pcre by

default.

Bump PORTREVISION on all dependent ports.

6 files changed, 9 insertions, 27 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 67b562996102..f70f13908e4c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1601,7 +1601,6 @@
     SUBDIR += pcl-cvs-emacs20
     SUBDIR += pcre
     SUBDIR += pcre++
-    SUBDIR += pcre-utf8
     SUBDIR += pcsc-lite
     SUBDIR += pdcurses
     SUBDIR += pear
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index c71cd4e564d3..1eb594d9ca81 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	aifad
 PORTVERSION=	1.0.27
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 
@@ -17,7 +18,7 @@ COMMENT=	Machine learning system
 BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \
 		${SA_DIR}/res/res.a:${PORTSDIR}/devel/ocaml-res \
 		${SA_DIR}/cfg/cfg.a:${PORTSDIR}/devel/ocaml-cfg
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre-utf8
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a01939a2c168..67f4b95d59f0 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	anjuta
 PORTVERSION=	1.2.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	anjuta
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated Development Environment for C and C++
 
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre-utf8
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf \
 		${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \
 		libtool:${PORTSDIR}/devel/libtool15
diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index b78ca86521a2..66a77a08da2d 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcre
 PORTVERSION=	5.11.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
@@ -15,7 +16,7 @@ DISTNAME=	pcre-ocaml-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre-utf8
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
diff --git a/devel/pcre-utf8/Makefile b/devel/pcre-utf8/Makefile
deleted file mode 100644
index e240169097b4..000000000000
--- a/devel/pcre-utf8/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# New ports collection makefile for:	pcre-utf8
-# Date created:				20.03.2005
-# Whom:					krion
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../pcre
-
-WITH_UTF8=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index ba305e3921ab..259dc6576f9d 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcre
 PORTVERSION=	7.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \
@@ -16,25 +17,17 @@ MASTER_SITE_SUBDIR=${PORTNAME}
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Perl Compatible Regular Expressions library
 
-CONFLICTS?=	pcre-utf8-[0-9]*
-
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man --enable-utf8 \
+		--enable-unicode-properties
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
-.if defined(WITH_UTF8)
-CONFLICTS=	pcre-[0-9]*
-PKGNAMESUFFIX=	-utf8
-CONFIGURE_ARGS+=--enable-utf8 \
-		--enable-unicode-properties
-.endif
-
 .if defined(WITH_LINK_SIZE)
 CONFIGURE_ARGS+=--with-link-size=${WITH_LINK_SIZE}
 .endif