Change the way Perl modules are installed, update the default Perl to 5.18.

Before, we had:

  site_perl :           lib/perl5/site_perl/5.18
  site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
  perl_man3 :           lib/perl5/5.18/man/man3

Now we have:

  site_perl : lib/perl5/site_perl
  site_arch : lib/perl5/site_perl/mach/5.18
  perl_man3 : lib/perl5/site_perl/man/man3

Modules without any .so will be installed at the same place regardless of the
Perl version, minimizing the upgrade when the major Perl version is changed.
It uses a version dependent directory for modules with compiled bits.

As PERL_ARCH is no longer needed in plists, it has been removed from
PLIST_SUB.

The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
always removed, as is perllocal.pod.

The old site_perl and site_perl/arch directories have been kept in the
default Perl @INC for all Perl ports, and will be phased out as these old
Perl versions expire.

PR:		194969
Differential Revision:	https://reviews.freebsd.org/D1019
Exp-run by:	antoine
Reviewed by:	perl@
Approved by:	portmgr

38 files changed, 36 insertions, 40 deletions

diff --git a/chinese/oicq/Makefile b/chinese/oicq/Makefile
index 2339e24c9335..df6facb7b795 100644
--- a/chinese/oicq/Makefile
+++ b/chinese/oicq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	oicq
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	chinese net
 MASTER_SITES=	SF/perl-${PORTNAME}/perl-${PORTNAME}/Net-OICQ-${PORTVERSION}
 DISTNAME=	Net-OICQ-${PORTVERSION}
diff --git a/chinese/oicq/pkg-plist b/chinese/oicq/pkg-plist
index de7d3db2d765..5da9c6e49aaf 100644
--- a/chinese/oicq/pkg-plist
+++ b/chinese/oicq/pkg-plist
@@ -6,4 +6,3 @@ bin/qq-demo1
 %%SITE_PERL%%/Net/OICQ/Event.pm
 %%SITE_PERL%%/Net/OICQ/ServerEvent.pm
 %%SITE_PERL%%/Net/OICQ/TextConsole.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ/.packlist
diff --git a/chinese/p5-Date-Chinese/Makefile b/chinese/p5-Date-Chinese/Makefile
index 332a8341b679..78b1b63ddc4a 100644
--- a/chinese/p5-Date-Chinese/Makefile
+++ b/chinese/p5-Date-Chinese/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Date-Chinese
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RBOW
diff --git a/chinese/p5-Date-Chinese/pkg-plist b/chinese/p5-Date-Chinese/pkg-plist
index 2ad48f651be1..e2b9c62db65d 100644
--- a/chinese/p5-Date-Chinese/pkg-plist
+++ b/chinese/p5-Date-Chinese/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Date::Chinese.3.gz
 %%SITE_PERL%%/Date/Chinese.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese/.packlist
diff --git a/chinese/p5-Encode-CNMap/Makefile b/chinese/p5-Encode-CNMap/Makefile
index 905c617f2b6b..416c5196d07c 100644
--- a/chinese/p5-Encode-CNMap/Makefile
+++ b/chinese/p5-Encode-CNMap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-CNMap
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Encode-CNMap/pkg-plist b/chinese/p5-Encode-CNMap/pkg-plist
index f10f3a36fbe7..be85dd3c4789 100644
--- a/chinese/p5-Encode-CNMap/pkg-plist
+++ b/chinese/p5-Encode-CNMap/pkg-plist
@@ -1,11 +1,10 @@
 bin/cnmap
 bin/cnmapdir
 bin/cnmapwx
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap/cnmapwx.wdr
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap/cnmapwx_wdr.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/CNMap.so
+%%SITE_ARCH%%/Encode/CNMap.pm
+%%SITE_ARCH%%/Encode/CNMap/cnmapwx.wdr
+%%SITE_ARCH%%/Encode/CNMap/cnmapwx_wdr.pl
+%%SITE_ARCH%%/auto/Encode/CNMap/CNMap.so
 man/man1/cnmap.1.gz
 man/man1/cnmapdir.1.gz
 man/man1/cnmapwx.1.gz
diff --git a/chinese/p5-Encode-HanConvert/Makefile b/chinese/p5-Encode-HanConvert/Makefile
index 6d0aa5f1ec4d..97a935a71796 100644
--- a/chinese/p5-Encode-HanConvert/Makefile
+++ b/chinese/p5-Encode-HanConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-HanConvert
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index f1b14bd1b959..d8de4effe832 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -2,8 +2,7 @@ bin/b2g.pl
 bin/g2b.pl
 man/man1/b2g.pl.1.gz
 man/man1/g2b.pl.1.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm-orig
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/HanConvert.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/.packlist
+%%SITE_ARCH%%/Encode/HanConvert.pm
+%%SITE_ARCH%%/Encode/HanConvert/Perl.pm
+%%SITE_ARCH%%/Encode/HanConvert/Perl.pm-orig
+%%SITE_ARCH%%/auto/Encode/HanConvert/HanConvert.so
diff --git a/chinese/p5-Encode-HanExtra/Makefile b/chinese/p5-Encode-HanExtra/Makefile
index 02d7162fd3d7..271cecc31631 100644
--- a/chinese/p5-Encode-HanExtra/Makefile
+++ b/chinese/p5-Encode-HanExtra/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Encode-HanExtra
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Encode-HanExtra/pkg-plist b/chinese/p5-Encode-HanExtra/pkg-plist
index 58cbebdee063..ab64280b9254 100644
--- a/chinese/p5-Encode-HanExtra/pkg-plist
+++ b/chinese/p5-Encode-HanExtra/pkg-plist
@@ -1,8 +1,7 @@
 %%PERL5_MAN3%%/Encode::HanExtra.3.gz
 %%PERL5_MAN3%%/Encode::TW::Unisys::SOSI1.3.gz
 %%PERL5_MAN3%%/Encode::TW::Unisys::SOSI2.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanExtra.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI1.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI2.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/HanExtra.so
+%%SITE_ARCH%%/Encode/HanExtra.pm
+%%SITE_ARCH%%/Encode/TW/Unisys/SOSI1.pm
+%%SITE_ARCH%%/Encode/TW/Unisys/SOSI2.pm
+%%SITE_ARCH%%/auto/Encode/HanExtra/HanExtra.so
diff --git a/chinese/p5-Lingua-Han-PinYin/Makefile b/chinese/p5-Lingua-Han-PinYin/Makefile
index 75e183002ee7..46d4c88c3c84 100644
--- a/chinese/p5-Lingua-Han-PinYin/Makefile
+++ b/chinese/p5-Lingua-Han-PinYin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Han-PinYin
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-Han-PinYin/pkg-plist b/chinese/p5-Lingua-Han-PinYin/pkg-plist
index 0a20bf92c1d5..0ca99bf86611 100644
--- a/chinese/p5-Lingua-Han-PinYin/pkg-plist
+++ b/chinese/p5-Lingua-Han-PinYin/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Lingua::Han::PinYin.3.gz
 %%SITE_PERL%%/Lingua/Han/PinYin.pm
 %%SITE_PERL%%/Lingua/Han/PinYin/Mandarin.dat
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/PinYin/.packlist
diff --git a/chinese/p5-Lingua-Han-Utils/Makefile b/chinese/p5-Lingua-Han-Utils/Makefile
index acee801f42ae..27fe783743ce 100644
--- a/chinese/p5-Lingua-Han-Utils/Makefile
+++ b/chinese/p5-Lingua-Han-Utils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-Han-Utils
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-Han-Utils/pkg-plist b/chinese/p5-Lingua-Han-Utils/pkg-plist
index a7d8db3d75ce..9c895460e5ee 100644
--- a/chinese/p5-Lingua-Han-Utils/pkg-plist
+++ b/chinese/p5-Lingua-Han-Utils/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::Han::Utils.3.gz
 %%SITE_PERL%%/Lingua/Han/Utils.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/Utils/.packlist
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
index 71684ce9b2a3..21c51e425955 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-BPMFConvert
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist b/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
index cf0c95c79513..4480e318c8f8 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::BPMFConvert.3.gz
 %%SITE_PERL%%/Lingua/ZH/BPMFConvert.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/BPMFConvert/.packlist
diff --git a/chinese/p5-Lingua-ZH-HanDetect/Makefile b/chinese/p5-Lingua-ZH-HanDetect/Makefile
index 5cf467cb1608..1a3558c7ede3 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/Makefile
+++ b/chinese/p5-Lingua-ZH-HanDetect/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-HanDetect
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-HanDetect/pkg-plist b/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
index b4f1565e6efa..a12eeaa6e350 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
+++ b/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/ZH/HanDetect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/HanDetect/.packlist
 %%PERL5_MAN3%%/Lingua::ZH::HanDetect.3.gz
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index fa331e9495d3..e131bb481c64 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Keywords
 PORTVERSION=	0.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Keywords/pkg-plist b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
index c8f873995783..736f9e5404bf 100644
--- a/chinese/p5-Lingua-ZH-Keywords/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Keywords.3.gz
 %%SITE_PERL%%/Lingua/ZH/Keywords.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords/.packlist
diff --git a/chinese/p5-Lingua-ZH-Numbers/Makefile b/chinese/p5-Lingua-ZH-Numbers/Makefile
index b620b1b662e1..9faf4638d118 100644
--- a/chinese/p5-Lingua-ZH-Numbers/Makefile
+++ b/chinese/p5-Lingua-ZH-Numbers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Numbers
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Numbers/pkg-plist b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
index dce9e9ef7ff1..f9f60296949f 100644
--- a/chinese/p5-Lingua-ZH-Numbers/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
@@ -2,4 +2,3 @@
 %%PERL5_MAN3%%/Lingua::ZH::Numbers::Currency.3.gz
 %%SITE_PERL%%/Lingua/ZH/Numbers.pm
 %%SITE_PERL%%/Lingua/ZH/Numbers/Currency.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers/.packlist
diff --git a/chinese/p5-Lingua-ZH-Segment/Makefile b/chinese/p5-Lingua-ZH-Segment/Makefile
index 57cf0caa73e8..5b640bda69d5 100644
--- a/chinese/p5-Lingua-ZH-Segment/Makefile
+++ b/chinese/p5-Lingua-ZH-Segment/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Segment
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Lingua
diff --git a/chinese/p5-Lingua-ZH-Segment/pkg-plist b/chinese/p5-Lingua-ZH-Segment/pkg-plist
index ad15da83981e..da613ed665bd 100644
--- a/chinese/p5-Lingua-ZH-Segment/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Segment/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Segment.3.gz
 %%SITE_PERL%%/Lingua/ZH/Segment.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Segment/.packlist
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index d879bd15c96c..1a15dd921f22 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Summarize
 PORTVERSION=	0.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Summarize/pkg-plist b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
index 59370aa1e32d..acfd9510d308 100644
--- a/chinese/p5-Lingua-ZH-Summarize/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Summarize.3.gz
 %%SITE_PERL%%/Lingua/ZH/Summarize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize/.packlist
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index 8023a11f8633..b7aa156d49fe 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-TaBE
 PORTVERSION=	0.07
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-TaBE/pkg-plist b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
index 361c9d1beecf..17f0da3b6c88 100644
--- a/chinese/p5-Lingua-ZH-TaBE/pkg-plist
+++ b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
@@ -1,4 +1,3 @@
 %%PERL5_MAN3%%/Lingua::ZH::TaBE.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH/TaBE.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/TaBE.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/.packlist
+%%SITE_ARCH%%/Lingua/ZH/TaBE.pm
+%%SITE_ARCH%%/auto/Lingua/ZH/TaBE/TaBE.so
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 0cda9ad2acaf..5562e977b82a 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Toke
 PORTVERSION=	0.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Toke/pkg-plist b/chinese/p5-Lingua-ZH-Toke/pkg-plist
index 0769bbe8dde6..ed005a56ca8c 100644
--- a/chinese/p5-Lingua-ZH-Toke/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Toke/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Toke.3.gz
 %%SITE_PERL%%/Lingua/ZH/Toke.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke/.packlist
diff --git a/chinese/p5-Lingua-ZH-WordSegmenter/Makefile b/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
index 3ac1d4841f53..63009e8eb860 100644
--- a/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
+++ b/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-WordSegmenter
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist b/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
index 1d3db312e339..dd611bb34b3d 100644
--- a/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
+++ b/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Lingua/ZH/WordSegmenter.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/WordSegmenter/.packlist
 %%PERL5_MAN3%%/Lingua::ZH::WordSegmenter.3.gz
diff --git a/chinese/p5-Lingua-ZH-Wrap/Makefile b/chinese/p5-Lingua-ZH-Wrap/Makefile
index ca9dc52b7958..785c28e77e89 100644
--- a/chinese/p5-Lingua-ZH-Wrap/Makefile
+++ b/chinese/p5-Lingua-ZH-Wrap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Lingua-ZH-Wrap
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	chinese perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Lingua-ZH-Wrap/pkg-plist b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
index 52e4fcd7d17a..da8fb1122f4b 100644
--- a/chinese/p5-Lingua-ZH-Wrap/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Lingua::ZH::Wrap.3.gz
 %%SITE_PERL%%/Lingua/ZH/Wrap.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap/.packlist
diff --git a/chinese/p5-Text-Greeking-zh_TW/Makefile b/chinese/p5-Text-Greeking-zh_TW/Makefile
index ffb267bc2b2e..061833bc0837 100644
--- a/chinese/p5-Text-Greeking-zh_TW/Makefile
+++ b/chinese/p5-Text-Greeking-zh_TW/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Greeking-zh_TW
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	chinese textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-Text-Greeking-zh_TW/pkg-plist b/chinese/p5-Text-Greeking-zh_TW/pkg-plist
index fc43b1559ba1..bf1d703962d6 100644
--- a/chinese/p5-Text-Greeking-zh_TW/pkg-plist
+++ b/chinese/p5-Text-Greeking-zh_TW/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Text::Greeking::zh_TW.3.gz
 %%SITE_PERL%%/Text/Greeking/zh_TW.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking/zh_TW/.packlist
diff --git a/chinese/p5-cconv/Makefile b/chinese/p5-cconv/Makefile
index d6664493ac10..8b2874d2ee99 100644
--- a/chinese/p5-cconv/Makefile
+++ b/chinese/p5-cconv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cconv
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	chinese converters perl5
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	p5-
diff --git a/chinese/p5-cconv/pkg-plist b/chinese/p5-cconv/pkg-plist
index 4f797e3c5601..39349f3ae2c2 100644
--- a/chinese/p5-cconv/pkg-plist
+++ b/chinese/p5-cconv/pkg-plist
@@ -1,5 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/cconv.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cconv/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cconv/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/cconv/cconv.so
+%%SITE_ARCH%%/cconv.pm
+%%SITE_ARCH%%/auto/cconv/autosplit.ix
+%%SITE_ARCH%%/auto/cconv/cconv.so
 %%PERL5_MAN3%%/cconv.3.gz