[pkgsrc/trunk]: pkgsrc/audio/gimmix make this build with intltool>=0.40

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f9531864481
branches:  trunk
changeset: 545299:6f9531864481
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Jul 30 10:57:25 2008 +0000

description:
make this build with intltool>=0.40

diffstat:

 audio/gimmix/Makefile         |   9 +--------
 audio/gimmix/distinfo         |   3 ++-
 audio/gimmix/patches/patch-aa |  20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 9 deletions(-)

diffs (58 lines):

diff -r fe01725e78d9 -r 6f9531864481 audio/gimmix/Makefile
--- a/audio/gimmix/Makefile     Wed Jul 30 10:54:20 2008 +0000
+++ b/audio/gimmix/Makefile     Wed Jul 30 10:57:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/24 06:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/07/30 10:57:25 drochner Exp $
 #
 
 DISTNAME=      gimmix-0.4.3
@@ -17,13 +17,6 @@
 USE_TOOLS+=    intltool msgfmt pkg-config
 USE_DIRS+=     xdg-1.1
 
-# XXX clean up bogus symlinks
-post-extract:
-.for f in intltool-extract.in intltool-merge.in intltool-update.in
-       ${RM} ${WRKSRC}/${f}
-       ${CP} ${TOOLS_PREFIX.intltool}/share/intltool/${f} ${WRKSRC}
-.endfor
-
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../audio/libmpd/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff -r fe01725e78d9 -r 6f9531864481 audio/gimmix/distinfo
--- a/audio/gimmix/distinfo     Wed Jul 30 10:54:20 2008 +0000
+++ b/audio/gimmix/distinfo     Wed Jul 30 10:57:25 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/05/09 16:58:32 drochner Exp $
+$NetBSD: distinfo,v 1.2 2008/07/30 10:57:25 drochner Exp $
 
 SHA1 (gimmix-0.4.3.tar.bz2) = fa3d3780ef5a2f2fa110b12383625f107436a0c7
 RMD160 (gimmix-0.4.3.tar.bz2) = 872a99cc874432d113a05a3f5feff2237bde9127
 Size (gimmix-0.4.3.tar.bz2) = 526910 bytes
+SHA1 (patch-aa) = 923de2b4fa12819b9ae632ea53f41aaa48334a08
diff -r fe01725e78d9 -r 6f9531864481 audio/gimmix/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/gimmix/patches/patch-aa     Wed Jul 30 10:57:25 2008 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2008/07/30 10:57:25 drochner Exp $
+
+--- configure.orig     2008-07-29 19:12:23.000000000 +0200
++++ configure
+@@ -3084,6 +3084,7 @@ echo "$as_me: error: Automake 1.5 or new
+     ;;
+ esac
+ 
++if false; then
+ if test -n "0.21"; then
+     { echo "$as_me:$LINENO: checking for intltool >= 0.21" >&5
+ echo $ECHO_N "checking for intltool >= 0.21... $ECHO_C" >&6; }
+@@ -3099,6 +3100,7 @@ echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION
+ echo "$as_me: error: Your intltool is too old.  You need intltool 0.21 or later." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++fi
+ 
+   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache 
$(top_srcdir)/po $< $@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache 
$(top_srcdir)/po $< $@'