View | Details | Raw Unified | Return to bug 198123 | Differences between
and this patch

Collapse All | Expand All

(-)textproc/intltool/Makefile (-12 / +1 lines)
Lines 4-9 Link Here
4
4
5
PORTNAME=	intltool
5
PORTNAME=	intltool
6
PORTVERSION=	0.50.2
6
PORTVERSION=	0.50.2
7
PORTREVISION=	1
7
CATEGORIES=	textproc gnome
8
CATEGORIES=	textproc gnome
8
MASTER_SITES=	http://launchpadlibrarian.net/94524169/
9
MASTER_SITES=	http://launchpadlibrarian.net/94524169/
9
DIST_SUBDIR=	gnome
10
DIST_SUBDIR=	gnome
Lines 16-32 RUN_DEPENDS= p5-XML-Parser>=0:${PORTSDIR Link Here
16
17
17
USES=		iconv gmake perl5
18
USES=		iconv gmake perl5
18
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
19
CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
20
21
CONFLICTS=	xml-i18n-tools-[0-9]*
22
23
post-patch:
24
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
25
		-E -e '/^mkinstalldirs[[:space:]]*=/s^/\.\.^^g'
26
27
post-install:
28
	${MKDIR} ${STAGEDIR}${PREFIX}/share/intltool/XML/Parser/Style
29
	${INSTALL_DATA} ${FILESDIR}/OrigTree.pm \
30
	    	${STAGEDIR}${PREFIX}/share/intltool/XML/Parser/Style
31
20
32
.include <bsd.port.mk>
21
.include <bsd.port.mk>
(-)textproc/intltool/files/OrigTree.pm (-91 lines)
Lines 1-91 Link Here
1
# $Id: OrigTree.pm,v 1.1 2003/11/26 15:18:28 kenneth Exp $
2
3
package XML::Parser::Style::OrigTree;
4
$XML::Parser::Built_In_Styles{OrigTree} = 1;
5
6
sub Init {
7
  my $expat = shift;
8
  $expat->{Lists} = [];
9
  $expat->{Curlist} = $expat->{OrigTree} = [];
10
}
11
12
sub Start {
13
  my $expat = shift;
14
  my $tag = shift;
15
  my $newlist = [ { @_ } ];
16
  push @{ $expat->{Lists} }, $expat->{Curlist};
17
  push @{ $expat->{Curlist} }, $tag => $newlist;
18
  $expat->{Curlist} = $newlist;
19
}
20
21
sub End {
22
  my $expat = shift;
23
  my $tag = shift;
24
  $expat->{Curlist} = pop @{ $expat->{Lists} };
25
}
26
27
sub Char {
28
  my $expat = shift;
29
  my $text = shift;
30
  my $clist = $expat->{Curlist};
31
  my $pos = $#$clist;
32
  
33
  if ($pos > 0 and $clist->[$pos - 1] eq '0') {
34
    $clist->[$pos] .= $expat->original_string();
35
  } else {
36
    push @$clist, 0 => $expat->original_string();
37
  }
38
}
39
40
sub Final {
41
  my $expat = shift;
42
  delete $expat->{Curlist};
43
  delete $expat->{Lists};
44
  $expat->{OrigTree};
45
}
46
47
1;
48
__END__
49
50
=head1 NAME
51
52
XML::Parser::Style::OrigTree
53
54
=head1 SYNOPSIS
55
56
  use XML::Parser;
57
  my $p = XML::Parser->new(Style => 'OrigTree');
58
  my $tree = $p->parsefile('foo.xml');
59
60
=head1 DESCRIPTION
61
62
This module is a variant of the XML::Parser's Tree style parser.  It
63
uses original_string, so that Entities are not converted.
64
65
When parsing a document, C<parse()> will return a parse tree for the
66
document. Each node in the tree
67
takes the form of a tag, content pair. Text nodes are represented with
68
a pseudo-tag of "0" and the string that is their content. For elements,
69
the content is an array reference. The first item in the array is a
70
(possibly empty) hash reference containing attributes. The remainder of
71
the array is a sequence of tag-content pairs representing the content
72
of the element.
73
74
So for example the result of parsing:
75
76
  <foo><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
77
78
would be:
79
             Tag   Content
80
  ==================================================================
81
  [foo, [{}, head, [{id => "a"}, 0, "Hello ",  em, [{}, 0, "there"]],
82
              bar, [         {}, 0, "Howdy",  ref, [{}]],
83
                0, "do"
84
        ]
85
  ]
86
87
The root document "foo", has 3 children: a "head" element, a "bar"
88
element and the text "do". After the empty attribute hash, these are
89
represented in it's contents by 3 tag-content pairs.
90
91
=cut
(-)textproc/intltool/files/patch-intltool.m4 (+12 lines)
Line 0 Link Here
1
--- intltool.m4.orig	2012-02-26 18:31:06 UTC
2
+++ intltool.m4
3
@@ -164,6 +164,9 @@ if test -z "$DATADIRNAME"; then
4
                        return _nl_msg_cat_cntr]])],
5
     [DATADIRNAME=share],
6
     [case $host in
7
+    *-*-dragonfly*|*-*-freebsd*)
8
+    [DATADIRNAME=share]
9
+    ;;
10
     *-*-solaris*)
11
     dnl On Solaris, if bind_textdomain_codeset is in libc,
12
     dnl GNU format message catalog is always supported,
(-)textproc/intltool/files/patch-intltoolize.in (+12 lines)
Line 0 Link Here
1
--- intltoolize.in.orig	2011-10-08 06:16:58 UTC
2
+++ intltoolize.in
3
@@ -233,7 +233,8 @@ exit $status
4
 # will be used to pull in the macro.
5
 m4dir=`cat "$configure" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
6
 if test -n "$m4dir"; then
7
-  rm -f $m4dir/intltool.m4
8
+  $mkdir -p $m4dir
9
+  $rm $m4dir/intltool.m4
10
   if test -n "$ln_s" && $ln_s $intltool_m4 $m4dir/intltool.m4; then :
11
   elif $cp $intltool_m4 $m4dir/intltool.m4; then :
12
   else
(-)textproc/intltool/pkg-plist (-1 lines)
Lines 5-11 bin/intltool-update Link Here
5
bin/intltoolize
5
bin/intltoolize
6
share/aclocal/intltool.m4
6
share/aclocal/intltool.m4
7
%%DATADIR%%/Makefile.in.in
7
%%DATADIR%%/Makefile.in.in
8
%%DATADIR%%/XML/Parser/Style/OrigTree.pm
9
man/man8/intltool-extract.8.gz
8
man/man8/intltool-extract.8.gz
10
man/man8/intltool-merge.8.gz
9
man/man8/intltool-merge.8.gz
11
man/man8/intltool-prepare.8.gz
10
man/man8/intltool-prepare.8.gz
(-)deskutils/nemo-extensions/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	nemo-extensions
4
PORTNAME=	nemo-extensions
5
PORTVERSION=	2.4.0
5
PORTVERSION=	2.4.0
6
PORTREVISION=	1
6
CATEGORIES=	deskutils gnome
7
CATEGORIES=	deskutils gnome
7
DIST_SUBDIR=	gnome3
8
DIST_SUBDIR=	gnome3
8
9
(-)deskutils/nemo-extensions/pkg-plist (-61 / +61 lines)
Lines 1-66 Link Here
1
bin/dropbox
1
bin/dropbox
2
bin/nemo-preview
2
bin/nemo-preview
3
lib/locale/an/LC_MESSAGES/nemo-preview.mo
4
lib/locale/ar/LC_MESSAGES/nemo-preview.mo
5
lib/locale/as/LC_MESSAGES/nemo-preview.mo
6
lib/locale/ast/LC_MESSAGES/nemo-preview.mo
7
lib/locale/be/LC_MESSAGES/nemo-preview.mo
8
lib/locale/bg/LC_MESSAGES/nemo-preview.mo
9
lib/locale/bn_IN/LC_MESSAGES/nemo-preview.mo
10
lib/locale/ca/LC_MESSAGES/nemo-preview.mo
11
lib/locale/ca@valencia/LC_MESSAGES/nemo-preview.mo
12
lib/locale/cs/LC_MESSAGES/nemo-preview.mo
13
lib/locale/da/LC_MESSAGES/nemo-preview.mo
14
lib/locale/de/LC_MESSAGES/nemo-preview.mo
15
lib/locale/el/LC_MESSAGES/nemo-preview.mo
16
lib/locale/en_GB/LC_MESSAGES/nemo-preview.mo
17
lib/locale/eo/LC_MESSAGES/nemo-preview.mo
18
lib/locale/es/LC_MESSAGES/nemo-preview.mo
19
lib/locale/et/LC_MESSAGES/nemo-preview.mo
20
lib/locale/eu/LC_MESSAGES/nemo-preview.mo
21
lib/locale/fa/LC_MESSAGES/nemo-preview.mo
22
lib/locale/fi/LC_MESSAGES/nemo-preview.mo
23
lib/locale/fr/LC_MESSAGES/nemo-preview.mo
24
lib/locale/fur/LC_MESSAGES/nemo-preview.mo
25
lib/locale/gl/LC_MESSAGES/nemo-preview.mo
26
lib/locale/gu/LC_MESSAGES/nemo-preview.mo
27
lib/locale/he/LC_MESSAGES/nemo-preview.mo
28
lib/locale/hi/LC_MESSAGES/nemo-preview.mo
29
lib/locale/hu/LC_MESSAGES/nemo-preview.mo
30
lib/locale/id/LC_MESSAGES/nemo-preview.mo
31
lib/locale/it/LC_MESSAGES/nemo-preview.mo
32
lib/locale/ja/LC_MESSAGES/nemo-preview.mo
33
lib/locale/kn/LC_MESSAGES/nemo-preview.mo
34
lib/locale/ko/LC_MESSAGES/nemo-preview.mo
35
lib/locale/lt/LC_MESSAGES/nemo-preview.mo
36
lib/locale/lv/LC_MESSAGES/nemo-preview.mo
37
lib/locale/ml/LC_MESSAGES/nemo-preview.mo
38
lib/locale/mr/LC_MESSAGES/nemo-preview.mo
39
lib/locale/nb/LC_MESSAGES/nemo-preview.mo
40
lib/locale/nl/LC_MESSAGES/nemo-preview.mo
41
lib/locale/or/LC_MESSAGES/nemo-preview.mo
42
lib/locale/pa/LC_MESSAGES/nemo-preview.mo
43
lib/locale/pl/LC_MESSAGES/nemo-preview.mo
44
lib/locale/pt/LC_MESSAGES/nemo-preview.mo
45
lib/locale/pt_BR/LC_MESSAGES/nemo-preview.mo
46
lib/locale/ru/LC_MESSAGES/nemo-preview.mo
47
lib/locale/sk/LC_MESSAGES/nemo-preview.mo
48
lib/locale/sl/LC_MESSAGES/nemo-preview.mo
49
lib/locale/sr/LC_MESSAGES/nemo-preview.mo
50
lib/locale/sr@latin/LC_MESSAGES/nemo-preview.mo
51
lib/locale/sv/LC_MESSAGES/nemo-preview.mo
52
lib/locale/ta/LC_MESSAGES/nemo-preview.mo
53
lib/locale/te/LC_MESSAGES/nemo-preview.mo
54
lib/locale/tg/LC_MESSAGES/nemo-preview.mo
55
lib/locale/th/LC_MESSAGES/nemo-preview.mo
56
lib/locale/tr/LC_MESSAGES/nemo-preview.mo
57
lib/locale/ug/LC_MESSAGES/nemo-preview.mo
58
lib/locale/uk/LC_MESSAGES/nemo-preview.mo
59
lib/locale/uz@cyrillic/LC_MESSAGES/nemo-preview.mo
60
lib/locale/vi/LC_MESSAGES/nemo-preview.mo
61
lib/locale/zh_CN/LC_MESSAGES/nemo-preview.mo
62
lib/locale/zh_HK/LC_MESSAGES/nemo-preview.mo
63
lib/locale/zh_TW/LC_MESSAGES/nemo-preview.mo
64
lib/nemo-preview/girepository-1.0/NemoPreview-1.0.typelib
3
lib/nemo-preview/girepository-1.0/NemoPreview-1.0.typelib
65
lib/nemo-preview/libnemo-preview-1.0.so
4
lib/nemo-preview/libnemo-preview-1.0.so
66
lib/nemo/extensions-3.0/libnemo-dropbox.a
5
lib/nemo/extensions-3.0/libnemo-dropbox.a
Lines 80-130 share/icons/hicolor/256x256/apps/dropbox Link Here
80
share/icons/hicolor/32x32/apps/dropbox.png
19
share/icons/hicolor/32x32/apps/dropbox.png
81
share/icons/hicolor/48x48/apps/dropbox.png
20
share/icons/hicolor/48x48/apps/dropbox.png
82
share/icons/hicolor/64x64/apps/dropbox.png
21
share/icons/hicolor/64x64/apps/dropbox.png
22
share/locale/an/LC_MESSAGES/nemo-preview.mo
23
share/locale/ar/LC_MESSAGES/nemo-preview.mo
83
share/locale/ar/LC_MESSAGES/nemo-share.mo
24
share/locale/ar/LC_MESSAGES/nemo-share.mo
25
share/locale/as/LC_MESSAGES/nemo-preview.mo
84
share/locale/as/LC_MESSAGES/nemo-share.mo
26
share/locale/as/LC_MESSAGES/nemo-share.mo
27
share/locale/ast/LC_MESSAGES/nemo-preview.mo
85
share/locale/ast/LC_MESSAGES/nemo-share.mo
28
share/locale/ast/LC_MESSAGES/nemo-share.mo
29
share/locale/be/LC_MESSAGES/nemo-preview.mo
30
share/locale/bg/LC_MESSAGES/nemo-preview.mo
31
share/locale/bn_IN/LC_MESSAGES/nemo-preview.mo
86
share/locale/bn_IN/LC_MESSAGES/nemo-share.mo
32
share/locale/bn_IN/LC_MESSAGES/nemo-share.mo
33
share/locale/ca/LC_MESSAGES/nemo-preview.mo
87
share/locale/ca/LC_MESSAGES/nemo-share.mo
34
share/locale/ca/LC_MESSAGES/nemo-share.mo
35
share/locale/ca@valencia/LC_MESSAGES/nemo-preview.mo
88
share/locale/ca@valencia/LC_MESSAGES/nemo-share.mo
36
share/locale/ca@valencia/LC_MESSAGES/nemo-share.mo
37
share/locale/cs/LC_MESSAGES/nemo-preview.mo
89
share/locale/cs/LC_MESSAGES/nemo-share.mo
38
share/locale/cs/LC_MESSAGES/nemo-share.mo
39
share/locale/da/LC_MESSAGES/nemo-preview.mo
90
share/locale/da/LC_MESSAGES/nemo-share.mo
40
share/locale/da/LC_MESSAGES/nemo-share.mo
41
share/locale/de/LC_MESSAGES/nemo-preview.mo
91
share/locale/de/LC_MESSAGES/nemo-share.mo
42
share/locale/de/LC_MESSAGES/nemo-share.mo
92
share/locale/dz/LC_MESSAGES/nemo-share.mo
43
share/locale/dz/LC_MESSAGES/nemo-share.mo
44
share/locale/el/LC_MESSAGES/nemo-preview.mo
93
share/locale/el/LC_MESSAGES/nemo-share.mo
45
share/locale/el/LC_MESSAGES/nemo-share.mo
46
share/locale/en_GB/LC_MESSAGES/nemo-preview.mo
94
share/locale/en_GB/LC_MESSAGES/nemo-share.mo
47
share/locale/en_GB/LC_MESSAGES/nemo-share.mo
48
share/locale/eo/LC_MESSAGES/nemo-preview.mo
95
share/locale/eo/LC_MESSAGES/nemo-share.mo
49
share/locale/eo/LC_MESSAGES/nemo-share.mo
50
share/locale/es/LC_MESSAGES/nemo-preview.mo
96
share/locale/es/LC_MESSAGES/nemo-share.mo
51
share/locale/es/LC_MESSAGES/nemo-share.mo
52
share/locale/et/LC_MESSAGES/nemo-preview.mo
97
share/locale/et/LC_MESSAGES/nemo-share.mo
53
share/locale/et/LC_MESSAGES/nemo-share.mo
54
share/locale/eu/LC_MESSAGES/nemo-preview.mo
98
share/locale/eu/LC_MESSAGES/nemo-share.mo
55
share/locale/eu/LC_MESSAGES/nemo-share.mo
56
share/locale/fa/LC_MESSAGES/nemo-preview.mo
57
share/locale/fi/LC_MESSAGES/nemo-preview.mo
99
share/locale/fi/LC_MESSAGES/nemo-share.mo
58
share/locale/fi/LC_MESSAGES/nemo-share.mo
59
share/locale/fr/LC_MESSAGES/nemo-preview.mo
100
share/locale/fr/LC_MESSAGES/nemo-share.mo
60
share/locale/fr/LC_MESSAGES/nemo-share.mo
61
share/locale/fur/LC_MESSAGES/nemo-preview.mo
62
share/locale/gl/LC_MESSAGES/nemo-preview.mo
101
share/locale/gl/LC_MESSAGES/nemo-share.mo
63
share/locale/gl/LC_MESSAGES/nemo-share.mo
64
share/locale/gu/LC_MESSAGES/nemo-preview.mo
102
share/locale/gu/LC_MESSAGES/nemo-share.mo
65
share/locale/gu/LC_MESSAGES/nemo-share.mo
66
share/locale/he/LC_MESSAGES/nemo-preview.mo
103
share/locale/he/LC_MESSAGES/nemo-share.mo
67
share/locale/he/LC_MESSAGES/nemo-share.mo
68
share/locale/hi/LC_MESSAGES/nemo-preview.mo
69
share/locale/hu/LC_MESSAGES/nemo-preview.mo
104
share/locale/hu/LC_MESSAGES/nemo-share.mo
70
share/locale/hu/LC_MESSAGES/nemo-share.mo
71
share/locale/id/LC_MESSAGES/nemo-preview.mo
105
share/locale/id/LC_MESSAGES/nemo-share.mo
72
share/locale/id/LC_MESSAGES/nemo-share.mo
73
share/locale/it/LC_MESSAGES/nemo-preview.mo
106
share/locale/it/LC_MESSAGES/nemo-share.mo
74
share/locale/it/LC_MESSAGES/nemo-share.mo
75
share/locale/ja/LC_MESSAGES/nemo-preview.mo
76
share/locale/kn/LC_MESSAGES/nemo-preview.mo
107
share/locale/kn/LC_MESSAGES/nemo-share.mo
77
share/locale/kn/LC_MESSAGES/nemo-share.mo
78
share/locale/ko/LC_MESSAGES/nemo-preview.mo
108
share/locale/ko/LC_MESSAGES/nemo-share.mo
79
share/locale/ko/LC_MESSAGES/nemo-share.mo
80
share/locale/lt/LC_MESSAGES/nemo-preview.mo
109
share/locale/lt/LC_MESSAGES/nemo-share.mo
81
share/locale/lt/LC_MESSAGES/nemo-share.mo
82
share/locale/lv/LC_MESSAGES/nemo-preview.mo
83
share/locale/ml/LC_MESSAGES/nemo-preview.mo
110
share/locale/ml/LC_MESSAGES/nemo-share.mo
84
share/locale/ml/LC_MESSAGES/nemo-share.mo
85
share/locale/mr/LC_MESSAGES/nemo-preview.mo
111
share/locale/mr/LC_MESSAGES/nemo-share.mo
86
share/locale/mr/LC_MESSAGES/nemo-share.mo
87
share/locale/nb/LC_MESSAGES/nemo-preview.mo
112
share/locale/nb/LC_MESSAGES/nemo-share.mo
88
share/locale/nb/LC_MESSAGES/nemo-share.mo
89
share/locale/nl/LC_MESSAGES/nemo-preview.mo
113
share/locale/oc/LC_MESSAGES/nemo-share.mo
90
share/locale/oc/LC_MESSAGES/nemo-share.mo
91
share/locale/or/LC_MESSAGES/nemo-preview.mo
92
share/locale/pa/LC_MESSAGES/nemo-preview.mo
114
share/locale/pa/LC_MESSAGES/nemo-share.mo
93
share/locale/pa/LC_MESSAGES/nemo-share.mo
94
share/locale/pl/LC_MESSAGES/nemo-preview.mo
115
share/locale/pl/LC_MESSAGES/nemo-share.mo
95
share/locale/pl/LC_MESSAGES/nemo-share.mo
96
share/locale/pt/LC_MESSAGES/nemo-preview.mo
116
share/locale/pt/LC_MESSAGES/nemo-share.mo
97
share/locale/pt/LC_MESSAGES/nemo-share.mo
98
share/locale/pt_BR/LC_MESSAGES/nemo-preview.mo
117
share/locale/pt_BR/LC_MESSAGES/nemo-share.mo
99
share/locale/pt_BR/LC_MESSAGES/nemo-share.mo
118
share/locale/ro/LC_MESSAGES/nemo-share.mo
100
share/locale/ro/LC_MESSAGES/nemo-share.mo
101
share/locale/ru/LC_MESSAGES/nemo-preview.mo
119
share/locale/ru/LC_MESSAGES/nemo-share.mo
102
share/locale/ru/LC_MESSAGES/nemo-share.mo
103
share/locale/sk/LC_MESSAGES/nemo-preview.mo
104
share/locale/sl/LC_MESSAGES/nemo-preview.mo
120
share/locale/sl/LC_MESSAGES/nemo-share.mo
105
share/locale/sl/LC_MESSAGES/nemo-share.mo
106
share/locale/sr/LC_MESSAGES/nemo-preview.mo
107
share/locale/sr@latin/LC_MESSAGES/nemo-preview.mo
108
share/locale/sv/LC_MESSAGES/nemo-preview.mo
121
share/locale/sv/LC_MESSAGES/nemo-share.mo
109
share/locale/sv/LC_MESSAGES/nemo-share.mo
110
share/locale/ta/LC_MESSAGES/nemo-preview.mo
122
share/locale/ta/LC_MESSAGES/nemo-share.mo
111
share/locale/ta/LC_MESSAGES/nemo-share.mo
112
share/locale/te/LC_MESSAGES/nemo-preview.mo
123
share/locale/te/LC_MESSAGES/nemo-share.mo
113
share/locale/te/LC_MESSAGES/nemo-share.mo
114
share/locale/tg/LC_MESSAGES/nemo-preview.mo
115
share/locale/th/LC_MESSAGES/nemo-preview.mo
116
share/locale/tr/LC_MESSAGES/nemo-preview.mo
117
share/locale/ug/LC_MESSAGES/nemo-preview.mo
118
share/locale/uk/LC_MESSAGES/nemo-preview.mo
124
share/locale/uk/LC_MESSAGES/nemo-share.mo
119
share/locale/uk/LC_MESSAGES/nemo-share.mo
120
share/locale/uz@cyrillic/LC_MESSAGES/nemo-preview.mo
121
share/locale/vi/LC_MESSAGES/nemo-preview.mo
125
share/locale/vi/LC_MESSAGES/nemo-share.mo
122
share/locale/vi/LC_MESSAGES/nemo-share.mo
123
share/locale/zh_CN/LC_MESSAGES/nemo-preview.mo
126
share/locale/zh_CN/LC_MESSAGES/nemo-share.mo
124
share/locale/zh_CN/LC_MESSAGES/nemo-share.mo
125
share/locale/zh_HK/LC_MESSAGES/nemo-preview.mo
127
share/locale/zh_HK/LC_MESSAGES/nemo-share.mo
126
share/locale/zh_HK/LC_MESSAGES/nemo-share.mo
127
share/locale/zh_TW/LC_MESSAGES/nemo-preview.mo
128
share/locale/zh_TW/LC_MESSAGES/nemo-share.mo
128
share/locale/zh_TW/LC_MESSAGES/nemo-share.mo
129
share/nemo-dropbox/emblems/emblem-dropbox-syncing.icon
129
share/nemo-dropbox/emblems/emblem-dropbox-syncing.icon
130
share/nemo-dropbox/emblems/emblem-dropbox-syncing.png
130
share/nemo-dropbox/emblems/emblem-dropbox-syncing.png

Return to bug 198123