13 files changed, 4 insertions, 85 deletions

diff --git a/MOVED b/MOVED
index 537a933e267b..25d8fc988696 100644
--- a/MOVED
+++ b/MOVED
@@ -8618,3 +8618,5 @@ ports-mgmt/xps||2016-08-11|Has expired: Does not support pkg(8)
 cad/NASTRAN|cad/NASTRAN-95|2016-08-12|Rename to match PORTNAME and upstream name
 math/bamg||2016-08-14|No longer maintained upstream as is now part of freefem++
 www/pecl-APC||2016-08-15|No longer maintained upstream, and not working with PHP > 5.4
+textproc/libtext-wrapi18n-perl|textproc/p5-Text-WrapI18N|2016-08-15|Duplicate
+textproc/libtext-charwidth-perl|textproc/p5-Text-CharWidth|2016-08-15|Duplicate
diff --git a/textproc/Makefile b/textproc/Makefile
index b9a11eb3d08f..c866cb336a50 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -411,8 +411,6 @@
     SUBDIR += libsoldout
     SUBDIR += libsphinxclient
     SUBDIR += libstree
-    SUBDIR += libtext-charwidth-perl
-    SUBDIR += libtext-wrapi18n-perl
     SUBDIR += libtextcat
     SUBDIR += libtranslate
     SUBDIR += libtre
diff --git a/textproc/libtext-charwidth-perl/Makefile b/textproc/libtext-charwidth-perl/Makefile
deleted file mode 100644
index 5b1e79ea6a17..000000000000
--- a/textproc/libtext-charwidth-perl/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Meno Abels <meno.abels@adviser.com>
-# $FreeBSD$
-
-PORTNAME=	libtext-charwidth-perl
-PORTVERSION=	0.04
-PORTREVISION=	2
-CATEGORIES=	textproc perl5
-MASTER_SITES=	DEBIAN
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Documentation gettext tools
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USES=		perl5 tar:bz2
-USE_PERL5=	configure
-
-CONFLICTS_INSTALL=	p5-Text-CharWidth-[0-9]*
-
-post-extract:
-	@${MV} ${WRKSRC}.orig ${WRKSRC}
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Text/CharWidth/CharWidth.so
-
-.include <bsd.port.mk>
diff --git a/textproc/libtext-charwidth-perl/distinfo b/textproc/libtext-charwidth-perl/distinfo
deleted file mode 100644
index c28c6d15094a..000000000000
--- a/textproc/libtext-charwidth-perl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libtext-charwidth-perl_0.04.orig.tar.bz2) = 2990c13c3f4a5479d7dbc5a94b86c23798cf0dc7df54ffe54e065f072558b6ed
-SIZE (libtext-charwidth-perl_0.04.orig.tar.bz2) = 8327
diff --git a/textproc/libtext-charwidth-perl/pkg-descr b/textproc/libtext-charwidth-perl/pkg-descr
deleted file mode 100644
index c504ce77654f..000000000000
--- a/textproc/libtext-charwidth-perl/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a part of fakeroot project.
-Fakeroot runs a command in an environment were it appears to have
-root privileges for file manipulation, by setting LD_PRELOAD to a
-library with alternative versions of getuid(), stat(), etc. This
-is useful for allowing users to create archives (tar, ar, .deb .rpm
-etc.) with files in them with root permissions/ownership. Without
-fakeroot one would have to have root privileges to create the
-constituent files of the archives with the correct permissions and
-ownership, and then pack them up, or one would have to construct
-the archives directly, without using the archiver.
-
-WWW: http://freecode.com/projects/fakeroot
diff --git a/textproc/libtext-charwidth-perl/pkg-plist b/textproc/libtext-charwidth-perl/pkg-plist
deleted file mode 100644
index f14b247441f2..000000000000
--- a/textproc/libtext-charwidth-perl/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PERL5_MAN3%%/Text::CharWidth.3.gz
-%%SITE_ARCH%%/auto/Text/CharWidth/CharWidth.so
-%%SITE_ARCH%%/Text/CharWidth.pm
diff --git a/textproc/libtext-wrapi18n-perl/Makefile b/textproc/libtext-wrapi18n-perl/Makefile
deleted file mode 100644
index 91c15bbf98cb..000000000000
--- a/textproc/libtext-wrapi18n-perl/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Meno Abels <meno.abels@adviser.com>
-# $FreeBSD$
-
-PORTNAME=	libtext-wrapi18n-perl
-PORTVERSION=	0.06
-PORTREVISION=	1
-CATEGORIES=	textproc perl5
-MASTER_SITES=	DEBIAN
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Documentation gettext tools
-
-BUILD_DEPENDS=	libtext-charwidth-perl>=0:textproc/libtext-charwidth-perl
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USES=		perl5
-USE_PERL5=	configure
-
-post-extract:
-	@${MV} ${WRKSRC}.orig ${WRKSRC}
-
-.include <bsd.port.mk>
diff --git a/textproc/libtext-wrapi18n-perl/distinfo b/textproc/libtext-wrapi18n-perl/distinfo
deleted file mode 100644
index 78a2a9415d63..000000000000
--- a/textproc/libtext-wrapi18n-perl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libtext-wrapi18n-perl_0.06.orig.tar.gz) = 432c2a801efe9f12d631124c1163439eac4c99449ba13d80133c45ecacc627f5
-SIZE (libtext-wrapi18n-perl_0.06.orig.tar.gz) = 3797
diff --git a/textproc/libtext-wrapi18n-perl/pkg-descr b/textproc/libtext-wrapi18n-perl/pkg-descr
deleted file mode 100644
index e11b751b081d..000000000000
--- a/textproc/libtext-wrapi18n-perl/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This module is a substitution for Text::Wrap, supporting
-multibyte characters such as UTF-8, EUC-JP, and GB2312, fullwidth
-characters such as east Asian characters, combining characters
-such as diacritical marks and Thai, and languages which don't
-use whitespaces between words such as Chinese and Japanese.
-
-WWW: http://packages.debian.org/unstable/perl/libtext-wrapi18n-perl
diff --git a/textproc/libtext-wrapi18n-perl/pkg-plist b/textproc/libtext-wrapi18n-perl/pkg-plist
deleted file mode 100644
index d1a92fba11cb..000000000000
--- a/textproc/libtext-wrapi18n-perl/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%SITE_PERL%%/Text/WrapI18N.pm
-%%PERL5_MAN3%%/Text::WrapI18N.3.gz
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index aaa80bdd03d2..04623b0f8000 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -258,7 +258,7 @@ BUILD_DEPENDS+=	p5-Palm-PalmDoc>=0:palm/p5-Palm-PalmDoc
 
 .if ${PORT_OPTIONS:MPUBLISHSWF}
 BUILD_DEPENDS+=	p5-SWF-Builder>=0:graphics/p5-SWF-Builder \
-		libtext-wrapi18n-perl>=0:textproc/libtext-wrapi18n-perl
+		p5-Text-WrapI18N>=0:textproc/p5-Text-WrapI18N
 .endif
 
 .if ${PORT_OPTIONS:MSUBSCRDBI}
diff --git a/textproc/p5-Text-CharWidth/Makefile b/textproc/p5-Text-CharWidth/Makefile
index e4ae36a8ad46..c947a1586a67 100644
--- a/textproc/p5-Text-CharWidth/Makefile
+++ b/textproc/p5-Text-CharWidth/Makefile
@@ -14,6 +14,4 @@ COMMENT=	Get number of occupied columns of a string on terminal
 USES=		perl5
 USE_PERL5=	configure
 
-CONFLICTS_INSTALL=	libtext-charwidth-perl-[0-9]*
-
 .include <bsd.port.mk>
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 5e957982b482..b09f432eeab1 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Brings gettext translation tools to all kinds of docs
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-Term-ReadKey>=2.30:devel/p5-Term-ReadKey \
-		libtext-wrapi18n-perl>=0.06:textproc/libtext-wrapi18n-perl \
+		p5-Text-WrapI18N>=0.06:textproc/p5-Text-WrapI18N \
 		p5-SGMLSpm>=1.03:textproc/p5-SGMLSpm \
 		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
 		jade>=0:textproc/jade \