diff -ruN --exclude=CVS /usr/ports/audio/gtkpod/Makefile /root/ports/gtkpod/Makefile
--- /usr/ports/audio/gtkpod/Makefile	Wed May 18 23:04:28 2005
+++ /root/ports/gtkpod/Makefile	Thu Oct 13 19:17:26 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkpod
-PORTVERSION=	0.88.2
+PORTVERSION=	0.94.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -51,8 +51,6 @@
 		${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 -ruN --exclude=CVS /usr/ports/audio/gtkpod/distinfo /root/ports/gtkpod/distinfo
--- /usr/ports/audio/gtkpod/distinfo	Wed May 18 23:04:28 2005
+++ /root/ports/gtkpod/distinfo	Thu Oct 13 19:17:26 2005
@@ -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 -ruN --exclude=CVS /usr/ports/audio/gtkpod/files/patch-src_misc.c /root/ports/gtkpod/files/patch-src_misc.c
--- /usr/ports/audio/gtkpod/files/patch-src_misc.c	Wed Dec 31 21:00:00 1969
+++ /root/ports/gtkpod/files/patch-src_misc.c	Thu Oct 13 19:29:14 2005
@@ -0,0 +1,10 @@
+--- src/misc.c.orig	Thu Oct 13 18:58:36 2005
++++ src/misc.c	Thu Oct 13 18:58:47 2005
+@@ -347,7 +347,6 @@
+  * 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/mount.h>
+ #include <errno.h>
+ #include <stdio.h>
+ 
diff -ruN --exclude=CVS /usr/ports/audio/gtkpod/files/patch-src_misc_conversion.c /root/ports/gtkpod/files/patch-src_misc_conversion.c
--- /usr/ports/audio/gtkpod/files/patch-src_misc_conversion.c	Wed Mar 16 21:28:18 2005
+++ /root/ports/gtkpod/files/patch-src_misc_conversion.c	Thu Oct 13 19:29:14 2005
@@ -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 -ruN --exclude=CVS /usr/ports/audio/gtkpod/files/patch-src_prefs.c /root/ports/gtkpod/files/patch-src_prefs.c
--- /usr/ports/audio/gtkpod/files/patch-src_prefs.c	Wed Mar 16 21:28:18 2005
+++ /root/ports/gtkpod/files/patch-src_prefs.c	Wed Dec 31 21:00:00 1969
@@ -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 -ruN --exclude=CVS /usr/ports/audio/gtkpod/pkg-plist /root/ports/gtkpod/pkg-plist
--- /usr/ports/audio/gtkpod/pkg-plist	Wed May 18 23:04:28 2005
+++ /root/ports/gtkpod/pkg-plist	Thu Oct 13 19:17:26 2005
@@ -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/gtkpod.glade
+%%DATADIR%%/gtkpod/gtkpod.gladep
 %%DATADIR%%/pixmaps/gtkpod-add-dirs.png
 %%DATADIR%%/pixmaps/gtkpod-add-files.png
 %%DATADIR%%/pixmaps/gtkpod-add-playlists.png
@@ -22,9 +17,23 @@
 %%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