Upgrade to 0.99.12 to make it build on amd64.

Other changes:

gtkpod V0.99.12

NEW FEATURE: Import and management of photographs on ipods that support
them. Update of README to include photo management.

UPDATE: Application requires libgpod version 0.6.0 or higher.

UPDATE: Better icon theme specification compliance.

BUGFIX: Fixes to tomboy script. Thanks to Javier Kohen.

BUGFIX: Issues with display of track length. Inconsistent units used in
conjunction with libgpod (Jorg).

UPDATE: Cover art preview window either displays an album cover to its
full size or to a size consistent with the user's desktop.

UPDATE: Download of Album Art from the net feature modified to the ability
of dragging-and-dropping a .jpg image from a web browser. This has been
changed due to licensing concerns over album art. Drag and Drop section of
README updated accordingly (Paul).

BUGFIX: Issues on detecting changed local / podcast database. Thanks to
Mario Rossi.

BUGFIX: Issues addressed on Details Window.

BUGFIX: Crash avoided when auto-detecting an iTunes database that cannot
be read.

UPDATE: Display of error output of scripts (Jorg).

IMPROVEMENT: Configuring and Compilation support (Todd).

UPDATE: New scripts for flac, ogg, mp3, m4a, wav conversion to mp3 and
m4a. Thanks to Peter van de Does.

BUGFIX: Model number identified and written to ipod upon loading to ensure
libgpod can read the ipod's artwork.

UPDATE: Updates and bug fixes to gapless playback. Thanks to Michael
Tiffany.

BUGFIX: When Cover Art Display is widened, covers space out rather than
stretch.

BUGFIX: Fixed memory leaks in CoverArt Display and Details window. Thanks
to Daniele Forsi.

UPDATE: French translation. Thanks to Ã#ric Lassauge.

UPDATE: Italian translation. Thanks to Daniele Forsi.

UPDATE: Hebrew translation. Thanks to Assaf Gillat.

UPDATE: Swedish translation. Thanks to Stefan Asserhäll.

NEW FEATURE: Added Romanian translation support. Thanks to Alex Eftimie.

NEW FEATURE: Added Russian translation support. Thanks to Matvey Kozhev.

gtkpod V0.99.10

NEW FEATURE: on-the-fly conversion of WAV, FLAC and OGG (as well as MP3
and M4A). Thanks to Marc d[readlock], Simon Naunton and Peter Edwards!
Multi-threaded background conversion was added by Jorg Schuler.

NEW FEATURE: editing of TV show metadata and track media type. Thanks to
Mario Rossi.

NEW FEATURE: Display of Album Art. Thanks to P.G. Richardson.

NEW FEATURE: Download of Album Art from the net. Thanks to P.G.
Richardson.

NEW FEATURE: copy playlists and tracks from within the context menu
without DND can simplify life with many playlists. Thanks to Andrzej
Palejko for his patch.

NEW FEATURE: preliminary support for calculating gapless playback
information (lame encoded mp3 files only). Thanks to Michael Tiffany.

UPDATE: Smart playlists now support the following new fields: album
artist, tv show, last skipped, season number, skipcount and video kind.

IMPROVEMENT: Clicking on an item with the right mouse button will select
and open the context menu, which is the intended behavior. As a
consequence, the interface will remain blocked while the selection is
being updated and displayed.

BUGFIX: dragging tracks between two iPods would sometimes not actually
copy the file.

UPDATED: Italian translation (thanks to Daniele Forsi)

PACKAGING: Install a .desktop file and icons according to the
freedesktop.org specification.

5 files changed, 92 insertions, 39 deletions

diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index d06ff380ce7..5ec0d6ab102 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/12/26 14:02:35 smb Exp $
 #
 
-DISTNAME=	gtkpod-0.99.8
-PKGREVISION=	2
+DISTNAME=	gtkpod-0.99.12
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
-PATCHFILES=	gtkpod-0.99.8_libgpod-0.4.2.diff
-PATCH_SITES=	http://ftp.osuosl.org/pub/gentoo/distfiles/
-PATCH_DIST_STRIP=	-p1
+#PATCHFILES=	gtkpod-0.99.8_libgpod-0.4.2.diff
+#PATCH_SITES=	http://ftp.osuosl.org/pub/gentoo/distfiles/
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	smb@NetBSD.org
 HOMEPAGE=	http://www.gtkpod.org/
@@ -19,6 +18,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		intltool msgfmt perl:run pkg-config
+USE_TOOLS+=		gmake
 
 REPLACE_PERL+=		scripts/mab2vcard
 
@@ -35,6 +35,8 @@ DEPENDS+=		bash>=3.2.9:../../shells/bash
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
 BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.4.2
 
+USE_DIRS+=		xdg-1.4
+
 .include "options.mk"
 
 .include "../../audio/libgpod/buildlink3.mk"
@@ -44,6 +46,7 @@ BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.4.2
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/libgnomecanvasmm/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/gtkpod/PLIST b/audio/gtkpod/PLIST
index 1bfde18a317..bcb779e9432 100644
--- a/audio/gtkpod/PLIST
+++ b/audio/gtkpod/PLIST
@@ -1,44 +1,63 @@
-@comment $NetBSD: PLIST,v 1.3 2007/07/08 20:46:38 smb Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/12/26 14:02:35 smb Exp $
 bin/gtkpod
-share/gtkpod/gtkpod.glade
-share/gtkpod/gtkpod.gladep
-share/gtkpod/pixmaps/gtkpod-add-dirs.png
-share/gtkpod/pixmaps/gtkpod-add-files.png
-share/gtkpod/pixmaps/gtkpod-add-playlists.png
-share/gtkpod/pixmaps/gtkpod-icon-32.png
-share/gtkpod/pixmaps/gtkpod-icon-32x32-2.png
-share/gtkpod/pixmaps/gtkpod-icon-32x32.png
-share/gtkpod/pixmaps/gtkpod-icon-48.png
-share/gtkpod/pixmaps/gtkpod-icon-48x48.png
-share/gtkpod/pixmaps/gtkpod-icon-64x64.png
-share/gtkpod/pixmaps/gtkpod-logo.png
-share/gtkpod/pixmaps/gtkpod-new-playlist.png
-share/gtkpod/pixmaps/gtkpod-read.png
-share/gtkpod/pixmaps/gtkpod-sync.png
-share/gtkpod/pixmaps/gtkpod.glade
-share/gtkpod/pixmaps/gtkpod.gladep
+share/applications/gtkpod.desktop
+share/gtkpod/data/cdshine.png
+share/gtkpod/data/cdshine_main.png
+share/gtkpod/data/default-cover.png
+share/gtkpod/data/gphoto_album_menuitem-32.png
+share/gtkpod/data/gphoto_album_menuitem-48.png
+share/gtkpod/data/gphoto_images_menuitem-32.png
+share/gtkpod/data/gphoto_images_menuitem-48.png
+share/gtkpod/data/gphoto_playlist_icon-48.png
+share/gtkpod/data/gphoto_tools_menuitem-32.png
+share/gtkpod/data/gphoto_tools_menuitem-48.png
+share/gtkpod/data/gtkpod-add-dirs.png
+share/gtkpod/data/gtkpod-add-files.png
+share/gtkpod/data/gtkpod-add-playlists.png
+share/gtkpod/data/gtkpod-icon-32-2.png
+share/gtkpod/data/gtkpod-icon-32.png
+share/gtkpod/data/gtkpod-icon-48.png
+share/gtkpod/data/gtkpod-logo.png
+share/gtkpod/data/gtkpod-new-playlist.png
+share/gtkpod/data/gtkpod-read-16.png
+share/gtkpod/data/gtkpod-read.png
+share/gtkpod/data/gtkpod-sync.png
+share/gtkpod/data/gtkpod.glade
+share/gtkpod/data/tunes_playlist_icon-48.png
+share/gtkpod/scripts/convert-2m4a.sh
+share/gtkpod/scripts/convert-2mp3.sh
+share/gtkpod/scripts/gtkpod-convert-common.sh
+share/gtkpod/scripts/ldif2vcf.sh
 share/gtkpod/scripts/mab2vcard
 share/gtkpod/scripts/sync-abook.sh
 share/gtkpod/scripts/sync-evocalendar.sh
 share/gtkpod/scripts/sync-evolution.sh
 share/gtkpod/scripts/sync-kaddressbook.sh
-share/gtkpod/scripts/sync-korganizer.sh
-share/gtkpod/scripts/sync-notes.sh
-share/gtkpod/scripts/sync-thunderbird.sh
-share/gtkpod/scripts/sync-webcalendar.sh
-share/gtkpod/scripts/ldif2vcf.sh
 share/gtkpod/scripts/sync-knotes.sh
+share/gtkpod/scripts/sync-korganizer.sh
 share/gtkpod/scripts/sync-ldif.sh
+share/gtkpod/scripts/sync-notes.sh
 share/gtkpod/scripts/sync-palm-jppy.py
 share/gtkpod/scripts/sync-thunderbird-nano.sh
+share/gtkpod/scripts/sync-thunderbird.sh
 share/gtkpod/scripts/sync-tomboy.sh
-share/locale/es/LC_MESSAGES/gtkpod.mo
+share/gtkpod/scripts/sync-webcalendar.sh
+share/icons/hicolor/32x32/apps/gtkpod.png
+share/icons/hicolor/48x48/apps/gtkpod.png
+share/icons/hicolor/64x64/apps/gtkpod.png
+share/icons/hicolor/icon-theme.cache
 share/locale/de/LC_MESSAGES/gtkpod.mo
+share/locale/es/LC_MESSAGES/gtkpod.mo
 share/locale/fr/LC_MESSAGES/gtkpod.mo
 share/locale/he/LC_MESSAGES/gtkpod.mo
 share/locale/it/LC_MESSAGES/gtkpod.mo
 share/locale/ja/LC_MESSAGES/gtkpod.mo
+share/locale/ro/LC_MESSAGES/gtkpod.mo
+share/locale/ru/LC_MESSAGES/gtkpod.mo
 share/locale/sv/LC_MESSAGES/gtkpod.mo
+@dirrm share/icons/hicolor/64x64/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor
 @dirrm share/gtkpod/scripts
-@dirrm share/gtkpod/pixmaps
-@dirrm share/gtkpod
+@dirrm share/gtkpod/data
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index c758ba24a51..bc3865386ee 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.5 2007/07/08 20:46:38 smb Exp $
+$NetBSD: distinfo,v 1.6 2007/12/26 14:02:35 smb Exp $
 
-SHA1 (gtkpod-0.99.8.tar.gz) = 023b55bc3cd9efba9fc7aa016ae63538a98cf1cf
-RMD160 (gtkpod-0.99.8.tar.gz) = 6ad6305393d66f7a84cc11e475045c8137a20c80
-Size (gtkpod-0.99.8.tar.gz) = 1074007 bytes
+SHA1 (gtkpod-0.99.12.tar.gz) = ab7c03ee1a875fe2bab953d5805a2a4d65fcd669
+RMD160 (gtkpod-0.99.12.tar.gz) = de41d4ab3c907416e88e81fbc79ca1d82411c4c4
+Size (gtkpod-0.99.12.tar.gz) = 1218052 bytes
 SHA1 (gtkpod-0.99.8_libgpod-0.4.2.diff) = a5090b4597922cc81fc33efd9a3f7e1278b57708
 RMD160 (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2e8094b8eba3179279d1b91133df588833e9df3e
 Size (gtkpod-0.99.8_libgpod-0.4.2.diff) = 2580 bytes
-SHA1 (patch-bg) = 645e060a2f5c455b893d57cc008b4b134fafe799
-SHA1 (patch-bh) = 42505851b41578d927972f2be52aaa6e81bd356a
 SHA1 (patch-bi) = 664a807d14318fd205a89dacc3084212cc9c6d5e
+SHA1 (patch-bj) = ef43349f0dfd0c956edf8a1491769597e2867221
diff --git a/audio/gtkpod/patches/patch-bj b/audio/gtkpod/patches/patch-bj
new file mode 100644
index 00000000000..188033ad1c6
--- /dev/null
+++ b/audio/gtkpod/patches/patch-bj
@@ -0,0 +1,31 @@
+$NetBSD: patch-bj,v 1.1 2007/12/26 14:02:35 smb Exp $
+
+--- src/file_convert.c.orig	2007-12-25 00:38:17.000000000 -0500
++++ src/file_convert.c	2007-12-25 00:38:47.000000000 -0500
+@@ -216,7 +216,7 @@
+     gchar *fname_root;      /* filename root of converted file          */
+     gchar *fname_extension; /* filename extension of converted file     */
+     GPid  pid;              /* PID of child doing the conversion        */
+-    gint  stderr;           /* stderr of child doing the conversion     */
++    gint  Cstderr;          /* stderr of child doing the conversion     */
+     Track *track;           /* for reference, don't access inside threads! */
+     iTunesDB *itdb;         /* for reference, don't access inside threads! */
+     gint  threadnum;        /* number of thread working on this track   */
+@@ -2308,7 +2308,7 @@
+ 				  &ctr->pid,    /* child's PID    */
+ 				  NULL,         /* child's stdin  */
+ 				  NULL,         /* child's stdout */
+-				  &ctr->stderr, /* child's stderr */
++				  &ctr->Cstderr,/* child's stderr */
+ 				  &error);
+ 
+ 	    child_pid = ctr->pid;
+@@ -2334,7 +2334,7 @@
+ 		gint status;
+ 
+ 		/* set up i/o channel to main thread */
+-		ctr->gio_channel = g_io_channel_unix_new (ctr->stderr);
++		ctr->gio_channel = g_io_channel_unix_new (ctr->Cstderr);
+ 		g_io_channel_set_flags (ctr->gio_channel,
+ 					G_IO_FLAG_NONBLOCK, NULL);
+ 		g_io_channel_set_close_on_unref (ctr->gio_channel, TRUE);
diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007
index e1c42222142..83e4425cf74 100644
--- a/doc/CHANGES-2007
+++ b/doc/CHANGES-2007
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.2701 2007/12/25 10:55:29 veego Exp $
+$NetBSD: CHANGES-2007,v 1.2702 2007/12/26 14:02:34 smb Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -4905,3 +4905,4 @@ Changes to the packages collection and infrastructure in 2007:
 	Updated net/sdist to 1.7nb1 [obache 2007-12-24]
 	Updated net/netname to 1.7nb1 [obache 2007-12-24]
 	Updated games/pioneers to 0.11.3 [veego 2007-12-25]
+	Updated audio/gtkpd to 0.99.12 [smb 2007-12-26]