From 136facb65afa7275866b6a41521a043cd64d7dd3 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sat, 4 Nov 2006 08:08:15 +0000
Subject: [PATCH] Honour pkgname in devel/pcre while building with
 "WITH_UTF=yes"

PR:		ports/105116
Submitted by:	girgen
---
 devel/pcre-utf8/Makefile | 2 --
 devel/pcre/Makefile      | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devel/pcre-utf8/Makefile b/devel/pcre-utf8/Makefile
index 49b0fa0326c4..e240169097b4 100644
--- a/devel/pcre-utf8/Makefile
+++ b/devel/pcre-utf8/Makefile
@@ -5,10 +5,8 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-utf8
 MASTERDIR=	${.CURDIR}/../pcre
 
-CONFLICTS=	pcre-[0-9]*
 WITH_UTF8=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 4084665793f9..dd4523dd115c 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -27,6 +27,8 @@ PORTDOCS=	*
 .endif
 
 .if defined(WITH_UTF8)
+CONFLICTS=	pcre-[0-9]*
+PKGNAMESUFFIX=	-utf8
 CONFIGURE_ARGS+=--enable-utf8 \
 		--enable-unicode-properties
 .endif