aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED2
-rw-r--r--audio/gnump3d/Makefile2
-rw-r--r--converters/Makefile2
-rw-r--r--converters/p5-Encode-compat/Makefile2
-rw-r--r--converters/p5-Encode/Makefile2
-rw-r--r--databases/p5-Jifty-DBI/Makefile4
-rw-r--r--devel/Makefile2
-rw-r--r--devel/p5-Encode-compat/Makefile31
-rw-r--r--devel/p5-Encode-compat/distinfo3
-rw-r--r--devel/p5-Encode-compat/pkg-descr11
-rw-r--r--devel/p5-Encode-compat/pkg-plist9
-rw-r--r--devel/p5-Encode/Makefile35
-rw-r--r--devel/p5-Encode/distinfo3
-rw-r--r--devel/p5-Encode/pkg-descr7
-rw-r--r--devel/p5-Encode/pkg-plist68
-rw-r--r--devel/svk/Makefile4
-rw-r--r--finance/p5-Finance-TW-TSEQuote/Makefile2
-rw-r--r--www/bricolage/Makefile2
-rw-r--r--www/rt3/Makefile2
19 files changed, 14 insertions, 179 deletions
diff --git a/MOVED b/MOVED
index 00c869888fd6..4155d89c0da9 100644
--- a/MOVED
+++ b/MOVED
@@ -2297,3 +2297,5 @@ astro/boinc-setiathome-naparst|astro/boinc-setiathome-enhanced|2006-05-22|projec
audio/mutagen|audio/py-mutagen|2006-05-24|correctly rename python library
www/preferential-firefox|www/xpi-preferential|2006-05-25|Preferential is not limited to Firefox
x11/xfedor||2006-05-26|Has expired: old, old, old, unmaintained, no usable MASTER_SITES
+devel/p5-Encode|converters/p5-Encode|2006-05-27|Move to better category
+devel/p5-Encode-compat|converters/p5-Encode-compat|2006-05-27|Move to better category
diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile
index a6f423912541..0155567830af 100644
--- a/audio/gnump3d/Makefile
+++ b/audio/gnump3d/Makefile
@@ -39,7 +39,7 @@ CONFDIR= ${PREFIX}/etc/${PORTNAME}
IGNORE= needs at least perl 5.8. Do not use FreeBSD 4.x' system perl,\
it's outdated. Install lang/perl5.8 and issue 'use.perl port'
.elif ${PERL_LEVEL} < 500806
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/devel/p5-Encode
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Encode.pm:${PORTSDIR}/converters/p5-Encode
.endif
post-patch:
diff --git a/converters/Makefile b/converters/Makefile
index f61c8d3210a6..5f6016a57f22 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -50,6 +50,8 @@
SUBDIR += p5-Convert-UU
SUBDIR += p5-Convert-UUlib
SUBDIR += p5-Cstools
+ SUBDIR += p5-Encode
+ SUBDIR += p5-Encode-compat
SUBDIR += p5-JSON
SUBDIR += p5-MIME-Base32
SUBDIR += p5-MIME-Base64
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index 1ace7b4e4868..d85e57a1c880 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Encode-compat
PORTVERSION= 0.07
-CATEGORIES= devel perl5
+CATEGORIES= converters perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Encode
PKGNAMEPREFIX= p5-
diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index 639602c1da8b..801aad76e8b2 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Encode
PORTVERSION= 2.17
-CATEGORIES= devel perl5
+CATEGORIES= converters perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Encode
PKGNAMEPREFIX= p5-
diff --git a/databases/p5-Jifty-DBI/Makefile b/databases/p5-Jifty-DBI/Makefile
index bd774aa0e1f6..76416ba402c7 100644
--- a/databases/p5-Jifty-DBI/Makefile
+++ b/databases/p5-Jifty-DBI/Makefile
@@ -70,8 +70,8 @@ IGNORE= requires perl 5.8.3 or later. Install lang/perl5.8 and try again
.endif
.if ${PERL_LEVEL} < 500807
-BUILD_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/devel/p5-Encode
-RUN_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/devel/p5-Encode
+BUILD_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/converters/p5-Encode
+RUN_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/converters/p5-Encode
.endif
.include <bsd.port.post.mk>
diff --git a/devel/Makefile b/devel/Makefile
index 77aa75df1dba..763eaad6780f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -945,8 +945,6 @@
SUBDIR += p5-Devel-TraceCalls
SUBDIR += p5-Devel-ptkdb
SUBDIR += p5-Dialog
- SUBDIR += p5-Encode
- SUBDIR += p5-Encode-compat
SUBDIR += p5-Env-PS1
SUBDIR += p5-Errno
SUBDIR += p5-Event
diff --git a/devel/p5-Encode-compat/Makefile b/devel/p5-Encode-compat/Makefile
deleted file mode 100644
index 1ace7b4e4868..000000000000
--- a/devel/p5-Encode-compat/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: p5-Encode-compat
-# Date created: Mon April 14th, 2003
-# Whom: Erwin Lansing <erwin@lansing.dk>
-#
-# $FreeBSD$
-#
-
-PORTNAME= Encode-compat
-PORTVERSION= 0.07
-CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
-PKGNAMEPREFIX= p5-
-
-MAINTAINER= tobez@FreeBSD.org
-COMMENT= Compatibility interfaces for Encode.pm on Perl < 5.7.1
-
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-PERL_CONFIGURE= yes
-
-MAN3= Encode::compat.3 Encode::compat::Alias.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE= This program only support perl 5.6.1 or above
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/p5-Encode-compat/distinfo b/devel/p5-Encode-compat/distinfo
deleted file mode 100644
index 8294581e5cfc..000000000000
--- a/devel/p5-Encode-compat/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Encode-compat-0.07.tar.gz) = f5efdaeff1c726e2e0fb5f4ca3ef70aa
-SHA256 (Encode-compat-0.07.tar.gz) = 4436c2b168b7e11627a24c54c7e8ce56e25dbf368219b9298d96281d4b463420
-SIZE (Encode-compat-0.07.tar.gz) = 9070
diff --git a/devel/p5-Encode-compat/pkg-descr b/devel/p5-Encode-compat/pkg-descr
deleted file mode 100644
index a38351f12f20..000000000000
--- a/devel/p5-Encode-compat/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This module provide a compatibility layer for Encode.pm users
-on perl versions earlier than v5.7.1. It translates whatever
-call it receives into Text::Iconv, or (in the future)
-Unicode::MapUTF8 to perform the actual work.
-
-Currently, this module only support 5.6.1, and merely provides
-the three utility function above (encode(), decode() and from_to()),
-with a very kludgy FB_HTMLCREF fallback against latin-1 in from_to().
-
-
-WWW: http://search.cpan.org/dist/Encode-compat/
diff --git a/devel/p5-Encode-compat/pkg-plist b/devel/p5-Encode-compat/pkg-plist
deleted file mode 100644
index 4446e51ffef3..000000000000
--- a/devel/p5-Encode-compat/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/mach/auto/Encode/compat/.packlist
-%%SITE_PERL%%/Encode/compat.pm
-%%SITE_PERL%%/Encode/compat/5006001.pm
-%%SITE_PERL%%/Encode/compat/common.pm
-%%SITE_PERL%%/Encode/compat/Alias.pm
-@dirrm %%SITE_PERL%%/mach/auto/Encode/compat
-@dirrmtry %%SITE_PERL%%/mach/auto/Encode
-@dirrm %%SITE_PERL%%/Encode/compat
-@dirrmtry %%SITE_PERL%%/Encode
diff --git a/devel/p5-Encode/Makefile b/devel/p5-Encode/Makefile
deleted file mode 100644
index 639602c1da8b..000000000000
--- a/devel/p5-Encode/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for: p5-Encode
-# Date created: Jul 24, 2005
-# Whom: Rong-En Fan <rafan@infor.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= Encode
-PORTVERSION= 2.17
-CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Encode
-PKGNAMEPREFIX= p5-
-
-MAINTAINER= rafan@infor.org
-COMMENT= Provides interfaces between strings and the rest of the system
-
-PERL_CONFIGURE= yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500703
-IGNORE= requires Perl 5.7.3 or above
-.endif
-
-.if ${PERL_LEVEL} > 500800
-post-patch:
- ${PERL} -pi -e '$$_="" if $$.>=18 && $$.<=20' ${WRKSRC}/Makefile.PL
-.endif
-
-post-configure:
- @${FIND} ${WRKSRC}/ -name Makefile -exec \
- ${REINPLACE_CMD} -e 's,^CC =,CC ?=,' {} \;
-
-.include <bsd.port.post.mk>
diff --git a/devel/p5-Encode/distinfo b/devel/p5-Encode/distinfo
deleted file mode 100644
index b53e4ab9aaaa..000000000000
--- a/devel/p5-Encode/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Encode-2.17.tar.gz) = 1660aa3fea50362b42e56adb6f4b3f22
-SHA256 (Encode-2.17.tar.gz) = c8c374216377346de0a2fa17d415c0846cc56ce49c13d7d53d111ffa4f8087d3
-SIZE (Encode-2.17.tar.gz) = 1990076
diff --git a/devel/p5-Encode/pkg-descr b/devel/p5-Encode/pkg-descr
deleted file mode 100644
index a6f614c60a4e..000000000000
--- a/devel/p5-Encode/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The "Encode" module provides the interfaces between Perl's
-strings and the rest of the system. Perl strings are
-sequences of characters.
-
-See "perldoc Encode" for the rest of the story
-
-WWW: http://search.cpan.org/dist/Encode/
diff --git a/devel/p5-Encode/pkg-plist b/devel/p5-Encode/pkg-plist
deleted file mode 100644
index eff84d479004..000000000000
--- a/devel/p5-Encode/pkg-plist
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $FreeBSD$
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Alias.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/README.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/PerlIO.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Makefile_PL.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Changes.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Encoding.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/ConfigLocal_PM.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/encode.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Guess.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/_T.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Config.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Supported.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Encoder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/_PM.e2x
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CJKConstants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Byte.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/EBCDIC.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Symbol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/H2Z.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP/JIS7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode/UTF7.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR/2022_KR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header/ISO_2022_JP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN/HZ.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index cd13e3074260..2c2b19e7feb1 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -113,8 +113,8 @@ IGNORE= this program only support perl 5.8.0 or above
.endif
.if ${PERL_LEVEL} < 500807
-BUILD_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/devel/p5-Encode
-RUN_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/devel/p5-Encode
+BUILD_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/converters/p5-Encode
+RUN_DEPENDS+= p5-Encode>=2.10:${PORTSDIR}/converters/p5-Encode
.endif
pre-everything::
diff --git a/finance/p5-Finance-TW-TSEQuote/Makefile b/finance/p5-Finance-TW-TSEQuote/Makefile
index 022fa958d314..622b8e03037a 100644
--- a/finance/p5-Finance-TW-TSEQuote/Makefile
+++ b/finance/p5-Finance-TW-TSEQuote/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ijliao@FreeBSD.org
COMMENT= Check stock quotes from Taiwan Security Exchange
BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
- p5-Encode>=0:${PORTSDIR}/devel/p5-Encode \
+ p5-Encode>=0:${PORTSDIR}/converters/p5-Encode \
p5-URI>=0:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/bricolage/Makefile b/www/bricolage/Makefile
index 7a28718500d9..6db8ae6b43ff 100644
--- a/www/bricolage/Makefile
+++ b/www/bricolage/Makefile
@@ -92,7 +92,7 @@ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Templat
.if ${PERL_LEVEL} >= 500600 && ${PERL_LEVEL} < 500800
.if exists(${SITE_PERL}/Encode/compat.pm)
-BUILD_DEPENDS+= ${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/devel/p5-Encode-compat
+BUILD_DEPENDS+= ${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/converters/p5-Encode-compat
.endif
.endif
diff --git a/www/rt3/Makefile b/www/rt3/Makefile
index 37542a2e5988..2aa4c3d01028 100644
--- a/www/rt3/Makefile
+++ b/www/rt3/Makefile
@@ -156,7 +156,7 @@ IGNORE= This program only support perl 5.6.1 or above
.if ${PERL_LEVEL} < 500800
BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.if ${PERL_LEVEL} == 500601
-BUILD_DEPENDS+= ${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/devel/p5-Encode-compat \
+BUILD_DEPENDS+= ${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/converters/p5-Encode-compat \
${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv
.endif
.endif