sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* remove incorrect utf8-patches

Browse source 
* fix 'make-port' target

Approved by:	maintainter (implicitly)
This commit is contained in:
Sergey Skvortsov 2008-06-16 13:50:18 +00:00
parent 23fad9812f
commit f2d6e45acb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=214955
3 changed files with 2 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
www/twiki/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= twiki PORTNAME= twiki
PORTVERSION= 4.2.0 PORTVERSION= 4.2.0
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= http://twiki.org/p/pub/Codev/Release/ \ MASTER_SITES= http://twiki.org/p/pub/Codev/Release/ \

2
www/twiki/bsd.twiki.mk
View file

@ -89,7 +89,7 @@ make-port:
echo '.include <bsd.port.mk>' >> Makefile &&\ echo '.include <bsd.port.mk>' >> Makefile &&\
wrksrc=`make -V WRKSRC` &&\ wrksrc=`make -V WRKSRC` &&\
make make-dist &&\ make make-dist &&\
mv work/*bz2 ${_DISTDIR}/ &&\ mv `make -V WRKDIR`/*bz2 ${_DISTDIR}/ &&\
make makesum create-plist &&\ make makesum create-plist &&\
page="$$wrksrc/data/TWiki/$$nnam.txt" &&\ page="$$wrksrc/data/TWiki/$$nnam.txt" &&\
if [ -e $$page ]; then \ if [ -e $$page ]; then \

97
www/twiki/files/patch-twikiutf8.diff
View file

@ -1,101 +1,4 @@
# From: http://dot-and-thing.blogspot.com/2008/03/twiki-utf8.html # From: http://dot-and-thing.blogspot.com/2008/03/twiki-utf8.html
diff -urE --exclude=data --exclude=pub twiki-4.2/lib/TWiki/UI/Edit.pm twiki/lib/TWiki/UI/Edit.pm
--- lib/TWiki/UI/Edit.pm 2008-01-22 06:18:55.000000000 +0300
+++ lib/TWiki/UI/Edit.pm 2008-03-12 10:39:49.000000000 +0300
@@ -13,6 +13,8 @@
use Assert;
use Error qw( :try );
+use Encode;
+
require TWiki;
require TWiki::UI;
require TWiki::OopsException;
@@ -239,7 +241,10 @@
$formTemplate = $form->{name} if $form;
}
- $text = $session->expandVariablesOnTopicCreation( $text, $user, $webName, $topic );
+ if ($TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/) {
+ $text = Encode::decode_utf8 ($text);
+ }
+ $text = $session->expandVariablesOnTopicCreation( $text, $user, $webName, $topic );
$tmpl =~ s/%NEWTOPIC%/1/;
} else {
$tmpl =~ s/%NEWTOPIC%//;
@@ -346,7 +351,12 @@
$tmpl =~ s/%FORMTEMPLATE%//go; # Clear if not being used
- return ( $text, $tmpl );
+ if ($TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/) {
+ $text = Encode::decode_utf8 ($text);
+ }
+
+
+ return ( $text, $tmpl );
}
sub finalize_edit {
diff -urE --exclude=data --exclude=pub twiki-4.2/lib/TWiki/UI/Save.pm twiki/lib/TWiki/UI/Save.pm
--- lib/TWiki/UI/Save.pm 2008-01-22 06:18:55.000000000 +0300
+++ lib/TWiki/UI/Save.pm 2008-03-11 17:19:56.000000000 +0300
@@ -37,6 +37,8 @@
use Error qw( :try );
use Assert;
+use Encode;
+
require TWiki;
require TWiki::UI;
require TWiki::Meta;
@@ -141,6 +143,9 @@
# Determine the new text
my $newText = $query->param( 'text' );
+ if ($TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/) {
+ $newText = Encode::decode_utf8 ($newText);
+ }
my $forceNewRev = $query->param( 'forcenewrevision' );
$saveOpts->{forcenewrevision} = $forceNewRev;
diff -urE --exclude=data --exclude=pub twiki-4.2/lib/TWiki/UI/View.pm twiki/lib/TWiki/UI/View.pm
--- lib/TWiki/UI/View.pm 2008-01-22 06:18:55.000000000 +0300
+++ lib/TWiki/UI/View.pm 2008-03-11 17:17:34.000000000 +0300
@@ -40,6 +40,8 @@
use CGI::Carp qw( fatalsToBrowser );
use CGI qw( -any ); # pretty basic, this
+use Encode;
+
require TWiki;
require TWiki::UI;
require TWiki::Sandbox;
@@ -99,7 +101,12 @@
require TWiki::Time;
( $currMeta, $currText ) = $store->readTopic
( $session->{user}, $webName, $topicName, undef );
- TWiki::UI::checkAccess( $session, $webName, $topicName,
+
+ if ($TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/) {
+ $currText = Encode::decode_utf8 ($currText);
+ }
+
+ TWiki::UI::checkAccess( $session, $webName, $topicName,
'VIEW', $session->{user}, $currText );
( $revdate, $revuser, $showRev ) = $currMeta->getRevisionInfo();
$revdate = TWiki::Time::formatTime( $revdate );
@@ -111,6 +118,10 @@
if( $rev < $showRev ) {
( $meta, $text ) = $store->readTopic
( $session->{user}, $webName, $topicName, $rev );
+
+ if ($TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/) {
+ $text = Encode::decode_utf8 ($text);
+ }
( $revdate, $revuser ) = $meta->getRevisionInfo();
$revdate = TWiki::Time::formatTime( $revdate );
diff -urE --exclude=data --exclude=pub twiki-4.2/lib/TWiki.pm twiki/lib/TWiki.pm diff -urE --exclude=data --exclude=pub twiki-4.2/lib/TWiki.pm twiki/lib/TWiki.pm
--- lib/TWiki.pm 2008-01-22 06:18:55.000000000 +0300 --- lib/TWiki.pm 2008-01-22 06:18:55.000000000 +0300
+++ lib/TWiki.pm 2008-03-11 18:28:34.000000000 +0300 +++ lib/TWiki.pm 2008-03-11 18:28:34.000000000 +0300