Add two patches to textproc/intltool so it works better with USES=autoreconf

- Patch intltool.m4 so translations are always installed in
  PREFIX/share/locale instead of PREFIX/lib/locale (USE_GNOME=intlhack
  also does this for ports without USES=autoreconf)
- Patch intltoolize.in so it creates the directory where it will copy
  intltool.m4 into if it doesn't exist yet

Also remove old CONFIGURE_ARGS, CONFLICTS, post-patch and post-install
from Makefile and remove an old patch.

PR:		198123
Exp-run by:	antoine
Approved by:	gnome (kwm), portmgr (antoine)

7 files changed, 87 insertions, 165 deletions

diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile
index 8a0891724e9b..b5896d920fd4 100644
--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nemo-extensions
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 DIST_SUBDIR=	gnome3
 
diff --git a/deskutils/nemo-extensions/pkg-plist b/deskutils/nemo-extensions/pkg-plist
index 66da15d34f45..5a941763624d 100644
--- a/deskutils/nemo-extensions/pkg-plist
+++ b/deskutils/nemo-extensions/pkg-plist
@@ -1,66 +1,5 @@
 bin/dropbox
 bin/nemo-preview
-lib/locale/an/LC_MESSAGES/nemo-preview.mo
-lib/locale/ar/LC_MESSAGES/nemo-preview.mo
-lib/locale/as/LC_MESSAGES/nemo-preview.mo
-lib/locale/ast/LC_MESSAGES/nemo-preview.mo
-lib/locale/be/LC_MESSAGES/nemo-preview.mo
-lib/locale/bg/LC_MESSAGES/nemo-preview.mo
-lib/locale/bn_IN/LC_MESSAGES/nemo-preview.mo
-lib/locale/ca/LC_MESSAGES/nemo-preview.mo
-lib/locale/ca@valencia/LC_MESSAGES/nemo-preview.mo
-lib/locale/cs/LC_MESSAGES/nemo-preview.mo
-lib/locale/da/LC_MESSAGES/nemo-preview.mo
-lib/locale/de/LC_MESSAGES/nemo-preview.mo
-lib/locale/el/LC_MESSAGES/nemo-preview.mo
-lib/locale/en_GB/LC_MESSAGES/nemo-preview.mo
-lib/locale/eo/LC_MESSAGES/nemo-preview.mo
-lib/locale/es/LC_MESSAGES/nemo-preview.mo
-lib/locale/et/LC_MESSAGES/nemo-preview.mo
-lib/locale/eu/LC_MESSAGES/nemo-preview.mo
-lib/locale/fa/LC_MESSAGES/nemo-preview.mo
-lib/locale/fi/LC_MESSAGES/nemo-preview.mo
-lib/locale/fr/LC_MESSAGES/nemo-preview.mo
-lib/locale/fur/LC_MESSAGES/nemo-preview.mo
-lib/locale/gl/LC_MESSAGES/nemo-preview.mo
-lib/locale/gu/LC_MESSAGES/nemo-preview.mo
-lib/locale/he/LC_MESSAGES/nemo-preview.mo
-lib/locale/hi/LC_MESSAGES/nemo-preview.mo
-lib/locale/hu/LC_MESSAGES/nemo-preview.mo
-lib/locale/id/LC_MESSAGES/nemo-preview.mo
-lib/locale/it/LC_MESSAGES/nemo-preview.mo
-lib/locale/ja/LC_MESSAGES/nemo-preview.mo
-lib/locale/kn/LC_MESSAGES/nemo-preview.mo
-lib/locale/ko/LC_MESSAGES/nemo-preview.mo
-lib/locale/lt/LC_MESSAGES/nemo-preview.mo
-lib/locale/lv/LC_MESSAGES/nemo-preview.mo
-lib/locale/ml/LC_MESSAGES/nemo-preview.mo
-lib/locale/mr/LC_MESSAGES/nemo-preview.mo
-lib/locale/nb/LC_MESSAGES/nemo-preview.mo
-lib/locale/nl/LC_MESSAGES/nemo-preview.mo
-lib/locale/or/LC_MESSAGES/nemo-preview.mo
-lib/locale/pa/LC_MESSAGES/nemo-preview.mo
-lib/locale/pl/LC_MESSAGES/nemo-preview.mo
-lib/locale/pt/LC_MESSAGES/nemo-preview.mo
-lib/locale/pt_BR/LC_MESSAGES/nemo-preview.mo
-lib/locale/ru/LC_MESSAGES/nemo-preview.mo
-lib/locale/sk/LC_MESSAGES/nemo-preview.mo
-lib/locale/sl/LC_MESSAGES/nemo-preview.mo
-lib/locale/sr/LC_MESSAGES/nemo-preview.mo
-lib/locale/sr@latin/LC_MESSAGES/nemo-preview.mo
-lib/locale/sv/LC_MESSAGES/nemo-preview.mo
-lib/locale/ta/LC_MESSAGES/nemo-preview.mo
-lib/locale/te/LC_MESSAGES/nemo-preview.mo
-lib/locale/tg/LC_MESSAGES/nemo-preview.mo
-lib/locale/th/LC_MESSAGES/nemo-preview.mo
-lib/locale/tr/LC_MESSAGES/nemo-preview.mo
-lib/locale/ug/LC_MESSAGES/nemo-preview.mo
-lib/locale/uk/LC_MESSAGES/nemo-preview.mo
-lib/locale/uz@cyrillic/LC_MESSAGES/nemo-preview.mo
-lib/locale/vi/LC_MESSAGES/nemo-preview.mo
-lib/locale/zh_CN/LC_MESSAGES/nemo-preview.mo
-lib/locale/zh_HK/LC_MESSAGES/nemo-preview.mo
-lib/locale/zh_TW/LC_MESSAGES/nemo-preview.mo
 lib/nemo-preview/girepository-1.0/NemoPreview-1.0.typelib
 lib/nemo-preview/libnemo-preview-1.0.so
 lib/nemo/extensions-3.0/libnemo-dropbox.a
@@ -80,51 +19,112 @@ share/icons/hicolor/256x256/apps/dropbox.png
 share/icons/hicolor/32x32/apps/dropbox.png
 share/icons/hicolor/48x48/apps/dropbox.png
 share/icons/hicolor/64x64/apps/dropbox.png
+share/locale/an/LC_MESSAGES/nemo-preview.mo
+share/locale/ar/LC_MESSAGES/nemo-preview.mo
 share/locale/ar/LC_MESSAGES/nemo-share.mo
+share/locale/as/LC_MESSAGES/nemo-preview.mo
 share/locale/as/LC_MESSAGES/nemo-share.mo
+share/locale/ast/LC_MESSAGES/nemo-preview.mo
 share/locale/ast/LC_MESSAGES/nemo-share.mo
+share/locale/be/LC_MESSAGES/nemo-preview.mo
+share/locale/bg/LC_MESSAGES/nemo-preview.mo
+share/locale/bn_IN/LC_MESSAGES/nemo-preview.mo
 share/locale/bn_IN/LC_MESSAGES/nemo-share.mo
+share/locale/ca/LC_MESSAGES/nemo-preview.mo
 share/locale/ca/LC_MESSAGES/nemo-share.mo
+share/locale/ca@valencia/LC_MESSAGES/nemo-preview.mo
 share/locale/ca@valencia/LC_MESSAGES/nemo-share.mo
+share/locale/cs/LC_MESSAGES/nemo-preview.mo
 share/locale/cs/LC_MESSAGES/nemo-share.mo
+share/locale/da/LC_MESSAGES/nemo-preview.mo
 share/locale/da/LC_MESSAGES/nemo-share.mo
+share/locale/de/LC_MESSAGES/nemo-preview.mo
 share/locale/de/LC_MESSAGES/nemo-share.mo
 share/locale/dz/LC_MESSAGES/nemo-share.mo
+share/locale/el/LC_MESSAGES/nemo-preview.mo
 share/locale/el/LC_MESSAGES/nemo-share.mo
+share/locale/en_GB/LC_MESSAGES/nemo-preview.mo
 share/locale/en_GB/LC_MESSAGES/nemo-share.mo
+share/locale/eo/LC_MESSAGES/nemo-preview.mo
 share/locale/eo/LC_MESSAGES/nemo-share.mo
+share/locale/es/LC_MESSAGES/nemo-preview.mo
 share/locale/es/LC_MESSAGES/nemo-share.mo
+share/locale/et/LC_MESSAGES/nemo-preview.mo
 share/locale/et/LC_MESSAGES/nemo-share.mo
+share/locale/eu/LC_MESSAGES/nemo-preview.mo
 share/locale/eu/LC_MESSAGES/nemo-share.mo
+share/locale/fa/LC_MESSAGES/nemo-preview.mo
+share/locale/fi/LC_MESSAGES/nemo-preview.mo
 share/locale/fi/LC_MESSAGES/nemo-share.mo
+share/locale/fr/LC_MESSAGES/nemo-preview.mo
 share/locale/fr/LC_MESSAGES/nemo-share.mo
+share/locale/fur/LC_MESSAGES/nemo-preview.mo
+share/locale/gl/LC_MESSAGES/nemo-preview.mo
 share/locale/gl/LC_MESSAGES/nemo-share.mo
+share/locale/gu/LC_MESSAGES/nemo-preview.mo
 share/locale/gu/LC_MESSAGES/nemo-share.mo
+share/locale/he/LC_MESSAGES/nemo-preview.mo
 share/locale/he/LC_MESSAGES/nemo-share.mo
+share/locale/hi/LC_MESSAGES/nemo-preview.mo
+share/locale/hu/LC_MESSAGES/nemo-preview.mo
 share/locale/hu/LC_MESSAGES/nemo-share.mo
+share/locale/id/LC_MESSAGES/nemo-preview.mo
 share/locale/id/LC_MESSAGES/nemo-share.mo
+share/locale/it/LC_MESSAGES/nemo-preview.mo
 share/locale/it/LC_MESSAGES/nemo-share.mo
+share/locale/ja/LC_MESSAGES/nemo-preview.mo
+share/locale/kn/LC_MESSAGES/nemo-preview.mo
 share/locale/kn/LC_MESSAGES/nemo-share.mo
+share/locale/ko/LC_MESSAGES/nemo-preview.mo
 share/locale/ko/LC_MESSAGES/nemo-share.mo
+share/locale/lt/LC_MESSAGES/nemo-preview.mo
 share/locale/lt/LC_MESSAGES/nemo-share.mo
+share/locale/lv/LC_MESSAGES/nemo-preview.mo
+share/locale/ml/LC_MESSAGES/nemo-preview.mo
 share/locale/ml/LC_MESSAGES/nemo-share.mo
+share/locale/mr/LC_MESSAGES/nemo-preview.mo
 share/locale/mr/LC_MESSAGES/nemo-share.mo
+share/locale/nb/LC_MESSAGES/nemo-preview.mo
 share/locale/nb/LC_MESSAGES/nemo-share.mo
+share/locale/nl/LC_MESSAGES/nemo-preview.mo
 share/locale/oc/LC_MESSAGES/nemo-share.mo
+share/locale/or/LC_MESSAGES/nemo-preview.mo
+share/locale/pa/LC_MESSAGES/nemo-preview.mo
 share/locale/pa/LC_MESSAGES/nemo-share.mo
+share/locale/pl/LC_MESSAGES/nemo-preview.mo
 share/locale/pl/LC_MESSAGES/nemo-share.mo
+share/locale/pt/LC_MESSAGES/nemo-preview.mo
 share/locale/pt/LC_MESSAGES/nemo-share.mo
+share/locale/pt_BR/LC_MESSAGES/nemo-preview.mo
 share/locale/pt_BR/LC_MESSAGES/nemo-share.mo
 share/locale/ro/LC_MESSAGES/nemo-share.mo
+share/locale/ru/LC_MESSAGES/nemo-preview.mo
 share/locale/ru/LC_MESSAGES/nemo-share.mo
+share/locale/sk/LC_MESSAGES/nemo-preview.mo
+share/locale/sl/LC_MESSAGES/nemo-preview.mo
 share/locale/sl/LC_MESSAGES/nemo-share.mo
+share/locale/sr/LC_MESSAGES/nemo-preview.mo
+share/locale/sr@latin/LC_MESSAGES/nemo-preview.mo
+share/locale/sv/LC_MESSAGES/nemo-preview.mo
 share/locale/sv/LC_MESSAGES/nemo-share.mo
+share/locale/ta/LC_MESSAGES/nemo-preview.mo
 share/locale/ta/LC_MESSAGES/nemo-share.mo
+share/locale/te/LC_MESSAGES/nemo-preview.mo
 share/locale/te/LC_MESSAGES/nemo-share.mo
+share/locale/tg/LC_MESSAGES/nemo-preview.mo
+share/locale/th/LC_MESSAGES/nemo-preview.mo
+share/locale/tr/LC_MESSAGES/nemo-preview.mo
+share/locale/ug/LC_MESSAGES/nemo-preview.mo
+share/locale/uk/LC_MESSAGES/nemo-preview.mo
 share/locale/uk/LC_MESSAGES/nemo-share.mo
+share/locale/uz@cyrillic/LC_MESSAGES/nemo-preview.mo
+share/locale/vi/LC_MESSAGES/nemo-preview.mo
 share/locale/vi/LC_MESSAGES/nemo-share.mo
+share/locale/zh_CN/LC_MESSAGES/nemo-preview.mo
 share/locale/zh_CN/LC_MESSAGES/nemo-share.mo
+share/locale/zh_HK/LC_MESSAGES/nemo-preview.mo
 share/locale/zh_HK/LC_MESSAGES/nemo-share.mo
+share/locale/zh_TW/LC_MESSAGES/nemo-preview.mo
 share/locale/zh_TW/LC_MESSAGES/nemo-share.mo
 share/nemo-dropbox/emblems/emblem-dropbox-syncing.icon
 share/nemo-dropbox/emblems/emblem-dropbox-syncing.png
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 9f5ff2041ae3..9e7df41a4aca 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	intltool
 PORTVERSION=	0.50.2
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://launchpadlibrarian.net/94524169/
 DIST_SUBDIR=	gnome
@@ -16,17 +17,5 @@ RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USES=		iconv gmake perl5
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
-
-CONFLICTS=	xml-i18n-tools-[0-9]*
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
-		-E -e '/^mkinstalldirs[[:space:]]*=/s^/\.\.^^g'
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/intltool/XML/Parser/Style
-	${INSTALL_DATA} ${FILESDIR}/OrigTree.pm \
-	    	${STAGEDIR}${PREFIX}/share/intltool/XML/Parser/Style
 
 .include <bsd.port.mk>
diff --git a/textproc/intltool/files/OrigTree.pm b/textproc/intltool/files/OrigTree.pm
deleted file mode 100644
index 020400cfa35c..000000000000
--- a/textproc/intltool/files/OrigTree.pm
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id: OrigTree.pm,v 1.1 2003/11/26 15:18:28 kenneth Exp $
-
-package XML::Parser::Style::OrigTree;
-$XML::Parser::Built_In_Styles{OrigTree} = 1;
-
-sub Init {
-  my $expat = shift;
-  $expat->{Lists} = [];
-  $expat->{Curlist} = $expat->{OrigTree} = [];
-}
-
-sub Start {
-  my $expat = shift;
-  my $tag = shift;
-  my $newlist = [ { @_ } ];
-  push @{ $expat->{Lists} }, $expat->{Curlist};
-  push @{ $expat->{Curlist} }, $tag => $newlist;
-  $expat->{Curlist} = $newlist;
-}
-
-sub End {
-  my $expat = shift;
-  my $tag = shift;
-  $expat->{Curlist} = pop @{ $expat->{Lists} };
-}
-
-sub Char {
-  my $expat = shift;
-  my $text = shift;
-  my $clist = $expat->{Curlist};
-  my $pos = $#$clist;
-  
-  if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-    $clist->[$pos] .= $expat->original_string();
-  } else {
-    push @$clist, 0 => $expat->original_string();
-  }
-}
-
-sub Final {
-  my $expat = shift;
-  delete $expat->{Curlist};
-  delete $expat->{Lists};
-  $expat->{OrigTree};
-}
-
-1;
-__END__
-
-=head1 NAME
-
-XML::Parser::Style::OrigTree
-
-=head1 SYNOPSIS
-
-  use XML::Parser;
-  my $p = XML::Parser->new(Style => 'OrigTree');
-  my $tree = $p->parsefile('foo.xml');
-
-=head1 DESCRIPTION
-
-This module is a variant of the XML::Parser's Tree style parser.  It
-uses original_string, so that Entities are not converted.
-
-When parsing a document, C<parse()> will return a parse tree for the
-document. Each node in the tree
-takes the form of a tag, content pair. Text nodes are represented with
-a pseudo-tag of "0" and the string that is their content. For elements,
-the content is an array reference. The first item in the array is a
-(possibly empty) hash reference containing attributes. The remainder of
-the array is a sequence of tag-content pairs representing the content
-of the element.
-
-So for example the result of parsing:
-
-  <foo><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
-
-would be:
-             Tag   Content
-  ==================================================================
-  [foo, [{}, head, [{id => "a"}, 0, "Hello ",  em, [{}, 0, "there"]],
-              bar, [         {}, 0, "Howdy",  ref, [{}]],
-                0, "do"
-        ]
-  ]
-
-The root document "foo", has 3 children: a "head" element, a "bar"
-element and the text "do". After the empty attribute hash, these are
-represented in it's contents by 3 tag-content pairs.
-
-=cut
diff --git a/textproc/intltool/files/patch-intltool.m4 b/textproc/intltool/files/patch-intltool.m4
new file mode 100644
index 000000000000..8df20c4a7201
--- /dev/null
+++ b/textproc/intltool/files/patch-intltool.m4
@@ -0,0 +1,12 @@
+--- intltool.m4.orig	2012-02-26 18:31:06 UTC
++++ intltool.m4
+@@ -164,6 +164,9 @@ if test -z "$DATADIRNAME"; then
+                        return _nl_msg_cat_cntr]])],
+     [DATADIRNAME=share],
+     [case $host in
++    *-*-dragonfly*|*-*-freebsd*)
++    [DATADIRNAME=share]
++    ;;
+     *-*-solaris*)
+     dnl On Solaris, if bind_textdomain_codeset is in libc,
+     dnl GNU format message catalog is always supported,
diff --git a/textproc/intltool/files/patch-intltoolize.in b/textproc/intltool/files/patch-intltoolize.in
new file mode 100644
index 000000000000..d0910da1f8c0
--- /dev/null
+++ b/textproc/intltool/files/patch-intltoolize.in
@@ -0,0 +1,12 @@
+--- intltoolize.in.orig	2011-10-08 06:16:58 UTC
++++ intltoolize.in
+@@ -233,7 +233,8 @@ exit $status
+ # will be used to pull in the macro.
+ 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`
+ if test -n "$m4dir"; then
+-  rm -f $m4dir/intltool.m4
++  $mkdir -p $m4dir
++  $rm $m4dir/intltool.m4
+   if test -n "$ln_s" && $ln_s $intltool_m4 $m4dir/intltool.m4; then :
+   elif $cp $intltool_m4 $m4dir/intltool.m4; then :
+   else
diff --git a/textproc/intltool/pkg-plist b/textproc/intltool/pkg-plist
index a98fa295581a..6b753ed85f84 100644
--- a/textproc/intltool/pkg-plist
+++ b/textproc/intltool/pkg-plist
@@ -5,7 +5,6 @@ bin/intltool-update
 bin/intltoolize
 share/aclocal/intltool.m4
 %%DATADIR%%/Makefile.in.in
-%%DATADIR%%/XML/Parser/Style/OrigTree.pm
 man/man8/intltool-extract.8.gz
 man/man8/intltool-merge.8.gz
 man/man8/intltool-prepare.8.gz