5 files changed, 35 insertions, 24 deletions

diff --git a/converters/p5-Unicode-String/Makefile b/converters/p5-Unicode-String/Makefile
index d4443d03fd2f..b379af06e0ff 100644
--- a/converters/p5-Unicode-String/Makefile
+++ b/converters/p5-Unicode-String/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Unicode-String
-PORTVERSION=	2.06
+PORTVERSION=	2.07
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Unicode
@@ -15,11 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ilia@cgu.chel.su
 COMMENT=	These are experimental Perl5 modules to handle various Unicode issues
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Unicode::CharName.3 Unicode::String.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Unicode-String/distinfo b/converters/p5-Unicode-String/distinfo
index 15db56edebbf..05fa049e07b2 100644
--- a/converters/p5-Unicode-String/distinfo
+++ b/converters/p5-Unicode-String/distinfo
@@ -1 +1 @@
-MD5 (Unicode-String-2.06.tar.gz) = faa22a6d9fadd52451e0c7da0e5aa8f5
+MD5 (Unicode-String-2.07.tar.gz) = d3658d0d1adbf69361771244ac88b237
diff --git a/converters/p5-Unicode-String/files/patch-String.pm b/converters/p5-Unicode-String/files/patch-String.pm
new file mode 100644
index 000000000000..6f8c6f9d18f0
--- /dev/null
+++ b/converters/p5-Unicode-String/files/patch-String.pm
@@ -0,0 +1,12 @@
+--- String.pm~	Tue Mar 11 04:16:42 2003
++++ String.pm	Fri May  2 15:26:38 2003
+@@ -128,7 +128,8 @@
+     # This is different from perl's normal behaviour by not letting
+     # a U+0030  ("0") be false.
+     my $self = shift;
+-    $$self ? 1 : "";
++    my $a = $$self;
++    $a ? 1 : "";
+ }
+ 
+ 
diff --git a/converters/p5-Unicode-String/pkg-descr b/converters/p5-Unicode-String/pkg-descr
index 4dbca13dd85d..3d85f4ddcec0 100644
--- a/converters/p5-Unicode-String/pkg-descr
+++ b/converters/p5-Unicode-String/pkg-descr
@@ -1,16 +1,16 @@
-These are experimental modules to handle various Unicode issues.  They 
-were made before perl included native UTF8 support.                    
-                                                              
-The current set of modules are:                                        
-                                                       
-  Unicode::String   - represent strings of Unicode chars        
-  Unicode::CharName - look up character names                        
-  Unicode::Map8     - mapping tables towards 8-bit char sets         
-                                                  
+These are experimental modules to handle various Unicode issues.  They were
+made before perl included native UTF8 support.
+
+The current set of modules are:
+
+  Unicode::String   - represent strings of Unicode chars
+  Unicode::CharName - look up character names
+  Unicode::Map8     - mapping tables towards 8-bit char sets
+
 (the Unicode::Map8 module is distributed separately)
 
-COPYRIGHT 1997-2000 Gisle Aas. All rights reserved.                                                    
-This library is free software; you can redistribute it and/or modify    
-it under the same terms as Perl itself. 
+COPYRIGHT 1997-2000 Gisle Aas. All rights reserved.
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
 
 WWW: http://www.unicode.org/
diff --git a/converters/p5-Unicode-String/pkg-plist b/converters/p5-Unicode-String/pkg-plist
index 6d1e78a65302..7e271d3f1277 100644
--- a/converters/p5-Unicode-String/pkg-plist
+++ b/converters/p5-Unicode-String/pkg-plist
@@ -1,8 +1,8 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/CharName.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode/String.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/String/String.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/String/String.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/String/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/String
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/CharName.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Unicode/String.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true