12 files changed, 159 insertions, 39 deletions

diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 291563b67414..a27567bb0da6 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gtkpod
-PORTVERSION=	0.88.2
+PORTVERSION=	0.94.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	david@dyn-ns.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI for Apple iPods using GTK2
 
 LIB_DEPENDS=	id3tag.2:${PORTSDIR}/audio/libid3tag
@@ -22,7 +22,7 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 
 USE_GMAKE=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
@@ -51,8 +51,6 @@ pre-configure:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|(libdir)/locale|(datadir)/locale|' \
 		${WRKSRC}/po/Makefile.in.in
-	@${REINPLACE_CMD} -e 's|PACKAGE|"gtkpod"|' \
-		${WRKSRC}/src/support.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index 89026e66366f..21d83116c409 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtkpod-0.88.2.tar.gz) = 12f492d215ee4c7fb55c491f7267deb1
-SIZE (gtkpod-0.88.2.tar.gz) = 850729
+MD5 (gtkpod-0.94.0.tar.gz) = c6be5d02ac35e554c3c038b8ef6da719
+SIZE (gtkpod-0.94.0.tar.gz) = 983815 
diff --git a/audio/gtkpod/files/patch-src__display_playlists.c b/audio/gtkpod/files/patch-src__display_playlists.c
new file mode 100644
index 000000000000..4abb9d3785ac
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__display_playlists.c
@@ -0,0 +1,25 @@
+--- src/display_playlists.c.orig	Tue Oct 18 22:20:51 2005
++++ src/display_playlists.c	Tue Oct 18 22:22:11 2005
+@@ -1142,6 +1142,11 @@
+                     (useful when quitting program) */
+ void pm_remove_playlist (Playlist *playlist, gboolean select)
+ {
++    GtkTreeModel *model;
++    gboolean have_iter = FALSE;
++    GtkTreeIter i;
++    GtkTreeSelection *ts = NULL;
++
+     gboolean pm_delete_playlist_fe (GtkTreeModel *model,
+ 					   GtkTreePath *path,
+ 					   GtkTreeIter *iter,
+@@ -1156,10 +1161,6 @@
+ 	    }
+ 	    return FALSE;
+ 	};
+-    GtkTreeModel *model;
+-    gboolean have_iter = FALSE;
+-    GtkTreeIter i;
+-    GtkTreeSelection *ts = NULL;
+ 
+   g_return_if_fail (playlist);
+   model = gtk_tree_view_get_model (playlist_treeview);
diff --git a/audio/gtkpod/files/patch-src__display_sorttabs.c b/audio/gtkpod/files/patch-src__display_sorttabs.c
new file mode 100644
index 000000000000..88d35ff0fe8d
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__display_sorttabs.c
@@ -0,0 +1,19 @@
+--- src/display_sorttabs.c.orig	Tue Oct 18 22:25:36 2005
++++ src/display_sorttabs.c	Tue Oct 18 22:26:45 2005
+@@ -2036,6 +2036,7 @@
+   gint i, n, inst;
+   GList *members;
+   SortTab *st;
++  T_item t_item;
+ 
+   inst = (guint32)data;
+   st = sorttab[inst];
+@@ -2093,7 +2094,7 @@
+ 	      g_return_if_fail (etr);
+ 	      g_return_if_fail (track->itdb);
+ 	      if (!itdb) itdb = track->itdb;
+-	      T_item t_item = ST_to_T (sorttab[inst]->current_category);
++	      t_item = ST_to_T (sorttab[inst]->current_category);
+ 	      if (t_item == T_YEAR)
+ 	      {
+ 		  gint nr = atoi (new_text);
diff --git a/audio/gtkpod/files/patch-src__file.c b/audio/gtkpod/files/patch-src__file.c
new file mode 100644
index 000000000000..e86100d1614a
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__file.c
@@ -0,0 +1,19 @@
+--- src/file.c.orig	Tue Oct 18 22:28:39 2005
++++ src/file.c	Tue Oct 18 22:29:14 2005
+@@ -929,6 +929,7 @@
+ void update_tracks (GList *selected_tracks)
+ {
+     GList *gl;
++    gchar *buf;
+ 
+     if (selected_tracks == NULL)
+     {
+@@ -941,7 +942,7 @@
+     {
+ 	Track *track = gl->data;
+ 	g_return_if_fail (track);
+-	gchar *buf = g_strdup_printf (_("Updating %s"),
++	buf = g_strdup_printf (_("Updating %s"),
+ 				      get_track_info (track, TRUE));
+ 	gtkpod_statusbar_message (buf);
+ 	g_free (buf);
diff --git a/audio/gtkpod/files/patch-src__itdb_itunes.c b/audio/gtkpod/files/patch-src__itdb_itunes.c
new file mode 100644
index 000000000000..530c63a485fb
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__itdb_itunes.c
@@ -0,0 +1,27 @@
+--- src/itdb_itunesdb.c.orig	Tue Oct 18 22:31:11 2005
++++ src/itdb_itunesdb.c	Tue Oct 18 22:32:56 2005
+@@ -477,9 +477,11 @@
+  * return value after use */
+ static struct playcount *playcount_get_next (FImport *fimp)
+ {
++    struct playcount *playcount;
++
+     g_return_val_if_fail (fimp, NULL);
+ 
+-    struct playcount *playcount = g_list_nth_data (fimp->playcounts, 0);
++    playcount = g_list_nth_data (fimp->playcounts, 0);
+ 
+     if (playcount)
+ 	fimp->playcounts = g_list_remove (fimp->playcounts, playcount);
+@@ -1779,9 +1781,10 @@
+ 	if (cmp_n_bytes_seek (cts, "mhsd", seek, 4))
+ 	{   /* We just check if it's actually a playlist mhsd (type=2)
+ 	       or not (type = 1, should not be...) */
++	    guint32 type;
+ 	    guint32 len = get32lint (cts, seek+8);
+ 	    CHECK_ERROR (fimp, FALSE);
+-	    guint32 type = get32lint (cts, seek+12);
++	    type = get32lint (cts, seek+12);
+ 	    CHECK_ERROR (fimp, FALSE);
+ 	    if (type != 2)
+ 	    {  /* this is not a playlist MHSD -> skip it */
diff --git a/audio/gtkpod/files/patch-src__itdb_playlist.c b/audio/gtkpod/files/patch-src__itdb_playlist.c
new file mode 100644
index 000000000000..e164872ae804
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__itdb_playlist.c
@@ -0,0 +1,13 @@
+--- src/itdb_playlist.c.orig	Tue Oct 18 22:33:58 2005
++++ src/itdb_playlist.c	Tue Oct 18 22:34:23 2005
+@@ -1184,8 +1184,9 @@
+ /* Return playlist at position @num in @itdb */
+ Itdb_Playlist *itdb_playlist_by_nr (Itdb_iTunesDB *itdb, guint32 num)
+ {
++    Itdb_Playlist *pl;
+     g_return_val_if_fail (itdb, NULL);
+-    Itdb_Playlist *pl = g_list_nth_data (itdb->playlists, num);
++    pl = g_list_nth_data (itdb->playlists, num);
+     g_return_val_if_fail (pl, NULL);
+     return pl;
+ }
diff --git a/audio/gtkpod/files/patch-src__misc.c b/audio/gtkpod/files/patch-src__misc.c
new file mode 100644
index 000000000000..467c3980572c
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__misc.c
@@ -0,0 +1,10 @@
+--- src/misc.c.orig	Tue Oct 18 22:37:32 2005
++++ src/misc.c	Tue Oct 18 22:37:48 2005
+@@ -347,6 +347,7 @@
+  * does not check prefs to see if the current prefs want gtkpod itself to
+  * mount the ipod drive, that should be checked before making this call.
+  */
++#include <sys/param.h>
+ #include <sys/mount.h>
+ #include <errno.h>
+ #include <stdio.h>
diff --git a/audio/gtkpod/files/patch-src__misc_track.c b/audio/gtkpod/files/patch-src__misc_track.c
new file mode 100644
index 000000000000..b92456b50fbb
--- /dev/null
+++ b/audio/gtkpod/files/patch-src__misc_track.c
@@ -0,0 +1,14 @@
+--- src/misc_track.c.orig	Tue Oct 18 22:38:54 2005
++++ src/misc_track.c	Tue Oct 18 22:39:25 2005
+@@ -544,9 +544,10 @@
+    illegal, "0" is returned. */
+ guint32 track_get_timestamp (Track *track, T_item t_item)
+ {
++    guint32 *ptr;
+     g_return_val_if_fail (track, 0);
+ 
+-    guint32 *ptr = track_get_timestamp_ptr (track, t_item);
++    ptr = track_get_timestamp_ptr (track, t_item);
+     if (ptr)  return *ptr;
+     else      return 0;
+ }
diff --git a/audio/gtkpod/files/patch-src_misc_conversion.c b/audio/gtkpod/files/patch-src_misc_conversion.c
index 2c5f6249a0a1..5c9203999fb7 100644
--- a/audio/gtkpod/files/patch-src_misc_conversion.c
+++ b/audio/gtkpod/files/patch-src_misc_conversion.c
@@ -1,13 +1,10 @@
---- src/misc_conversion.c.orig	Wed Mar 16 19:17:01 2005
-+++ src/misc_conversion.c	Wed Mar 16 19:17:50 2005
-@@ -143,8 +143,9 @@
+--- src/misc_conversion.c.orig	Thu Oct 13 18:45:35 2005
++++ src/misc_conversion.c	Thu Oct 13 18:46:50 2005
+@@ -265,6 +265,7 @@
  
      if (t)
      {
-+        size_t size;
++	size_t size;
  	localtime_r (&t, &tm);
--	size_t size = strftime (buf, PATH_MAX, format, &tm);
-+	size = strftime (buf, PATH_MAX, format, &tm);
+ 	size = strftime (buf, PATH_MAX, format, &tm);
  	buf[size] = 0;
- 	return g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-     }
diff --git a/audio/gtkpod/files/patch-src_prefs.c b/audio/gtkpod/files/patch-src_prefs.c
deleted file mode 100644
index 57c9a63f8f01..000000000000
--- a/audio/gtkpod/files/patch-src_prefs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/prefs.c.orig	Wed Mar 16 19:23:45 2005
-+++ src/prefs.c	Wed Mar 16 19:24:06 2005
-@@ -2655,7 +2655,7 @@
- 	gchar *str = g_hash_table_lookup (prefs_hash, key);
- 	if (str)
- 	{
--	    *value = atoll (str);
-+	    *value = atol (str);
- 	    return TRUE;
- 	}
-     }
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 870c2c47499c..ededbd10eef9 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -1,14 +1,9 @@
 bin/gtkpod
-share/locale/de/LC_MESSAGES/gtkpod.mo
-share/locale/fr/LC_MESSAGES/gtkpod.mo
-share/locale/it/LC_MESSAGES/gtkpod.mo
-share/locale/ja/LC_MESSAGES/gtkpod.mo
-share/locale/sv/LC_MESSAGES/gtkpod.mo
-%%DATADIR%%/scripts/sync-evocalendar.sh
-%%DATADIR%%/scripts/sync-evolution.sh
-%%DATADIR%%/scripts/sync-kaddressbook.sh
-%%DATADIR%%/scripts/sync-korganizer.sh
-%%DATADIR%%/scripts/sync-notes.sh
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODOandBUGS.txt
+%%DATADIR%%/gtkpod.glade
+%%DATADIR%%/gtkpod.gladep
 %%DATADIR%%/pixmaps/gtkpod-add-dirs.png
 %%DATADIR%%/pixmaps/gtkpod-add-files.png
 %%DATADIR%%/pixmaps/gtkpod-add-playlists.png
@@ -22,9 +17,23 @@ share/locale/sv/LC_MESSAGES/gtkpod.mo
 %%DATADIR%%/pixmaps/gtkpod-new-playlist.png
 %%DATADIR%%/pixmaps/gtkpod-read.png
 %%DATADIR%%/pixmaps/gtkpod-sync.png
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/TODOandBUGS.txt
+%%DATADIR%%/pixmaps/gtkpod.glade
+%%DATADIR%%/pixmaps/gtkpod.gladep
+%%DATADIR%%/scripts/mab2vcard
+%%DATADIR%%/scripts/sync-abook.sh
+%%DATADIR%%/scripts/sync-evocalendar.sh
+%%DATADIR%%/scripts/sync-evolution.sh
+%%DATADIR%%/scripts/sync-kaddressbook.sh
+%%DATADIR%%/scripts/sync-korganizer.sh
+%%DATADIR%%/scripts/sync-notes.sh
+%%DATADIR%%/scripts/sync-thunderbird.sh
+%%DATADIR%%/scripts/sync-webcalendar.sh
+share/locale/de/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/sv/LC_MESSAGES/gtkpod.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%DATADIR%%/pixmaps
 %%PORTDOCS%%@dirrm %%DATADIR%%/scripts