Wed Jul 30 10:57:25 2008 UTC ()
make this build with intltool>=0.40


(drochner)
diff -r1.3 -r1.4 pkgsrc/audio/gimmix/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/audio/gimmix/distinfo
diff -r0 -r1.1 pkgsrc/audio/gimmix/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/audio/gimmix/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/gimmix/Attic/Makefile 2008/06/24 06:50:09 1.3
+++ pkgsrc/audio/gimmix/Attic/Makefile 2008/07/30 10:57:25 1.4
@@ -1,32 +1,25 @@ @@ -1,32 +1,25 @@
1# $NetBSD: Makefile,v 1.3 2008/06/24 06:50:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2008/07/30 10:57:25 drochner Exp $
2# 2#
3 3
4DISTNAME= gimmix-0.4.3 4DISTNAME= gimmix-0.4.3
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= http://download.berlios.de/gimmix/ 6MASTER_SITES= http://download.berlios.de/gimmix/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gimmix.berlios.de/ 10HOMEPAGE= http://gimmix.berlios.de/
11COMMENT= Graphical Music player daemon (MPD) client 11COMMENT= Graphical Music player daemon (MPD) client
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= intltool msgfmt pkg-config 17USE_TOOLS+= intltool msgfmt pkg-config
18USE_DIRS+= xdg-1.1 18USE_DIRS+= xdg-1.1
19 19
20# XXX clean up bogus symlinks 
21post-extract: 
22.for f in intltool-extract.in intltool-merge.in intltool-update.in 
23 ${RM} ${WRKSRC}/${f} 
24 ${CP} ${TOOLS_PREFIX.intltool}/share/intltool/${f} ${WRKSRC} 
25.endfor 
26 
27.include "../../x11/gtk2/buildlink3.mk" 20.include "../../x11/gtk2/buildlink3.mk"
28.include "../../audio/libmpd/buildlink3.mk" 21.include "../../audio/libmpd/buildlink3.mk"
29.include "../../devel/libglade/buildlink3.mk" 22.include "../../devel/libglade/buildlink3.mk"
30.include "../../audio/taglib/buildlink3.mk" 23.include "../../audio/taglib/buildlink3.mk"
31.include "../../sysutils/desktop-file-utils/desktopdb.mk" 24.include "../../sysutils/desktop-file-utils/desktopdb.mk"
32.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/gimmix/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/gimmix/Attic/distinfo 2008/05/09 16:58:32 1.1.1.1
+++ pkgsrc/audio/gimmix/Attic/distinfo 2008/07/30 10:57:25 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/05/09 16:58:32 drochner Exp $ 1$NetBSD: distinfo,v 1.2 2008/07/30 10:57:25 drochner Exp $
2 2
3SHA1 (gimmix-0.4.3.tar.bz2) = fa3d3780ef5a2f2fa110b12383625f107436a0c7 3SHA1 (gimmix-0.4.3.tar.bz2) = fa3d3780ef5a2f2fa110b12383625f107436a0c7
4RMD160 (gimmix-0.4.3.tar.bz2) = 872a99cc874432d113a05a3f5feff2237bde9127 4RMD160 (gimmix-0.4.3.tar.bz2) = 872a99cc874432d113a05a3f5feff2237bde9127
5Size (gimmix-0.4.3.tar.bz2) = 526910 bytes 5Size (gimmix-0.4.3.tar.bz2) = 526910 bytes
 6SHA1 (patch-aa) = 923de2b4fa12819b9ae632ea53f41aaa48334a08
File Added: pkgsrc/audio/gimmix/patches/Attic/patch-aa
$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 $< $@'