diff --exclude CVS -urN ./Makefile ../gtkpod.new/Makefile
--- ./Makefile	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/Makefile	Mon Jul 23 22:08:50 2007
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2007/03/17 21:54:15 ckuethe Exp $
+# $OpenBSD: Makefile,v 1.20 2007/04/12 20:24:30 sturm Exp $
 
-COMMENT=	"library to access the contents of an iPod"
-DISTNAME=	libgpod-0.4.2
-SHARED_LIBS=	gpod	402.0
-CATEGORIES=	audio
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
+COMMENT=	"GTK+2 program to synchronize an Apple iPod"
+DISTNAME=	gtkpod-0.99.10
+CATEGORIES=	audio x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
-HOMEPAGE=	http://www.gtkpod.org/libgpod.html
+HOMEPAGE=	http://www.gtkpod.org/
 
 MAINTAINER=	Chris Kuethe <ckuethe@openbsd.org>
 
@@ -16,20 +15,26 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-USE_LIBTOOL=	Yes
+USE_X11=	Yes
 USE_GMAKE=	Yes
 
-MODULES=	gettext
+LIB_DEPENDS=	id3tag.>=2::audio/libid3tag \
+		gpod.>=502.0::audio/libgpod \
+		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
+		glade-2.0.>=0.4::devel/libglade2 \
+		mp4v2::audio/faad
 
-BUILD_DEPENDS=	:p5-XML-Parser-*:textproc/p5-XML-Parser
-LIB_DEPENDS=	glib-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \
-		gdk_pixbuf-2.0::x11/gtk+2
-WANTLIB=	m
+WANTLIB=	X11 Xau Xdmcp Xrender c cairo expat fontconfig freetype m \
+		pthread z \
+		xml2 glitz png glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+		pango-1.0 pangoft2-1.0 pangocairo-1.0 atk-1.0
 
+MODULES=	devel/gettext
+
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		CXXFLAGS="${CXXFLAGS} -ftrampolines" \
-		CFLAGS="${CFLAGS} -ftrampolines"
+# trampolines needed for display_playlists.c
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
+		CFLAGS="${CFLAGS} -ftrampolines" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --exclude CVS -urN ./distinfo ../gtkpod.new/distinfo
--- ./distinfo	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/distinfo	Mon Jul 23 21:45:29 2007
@@ -1,5 +1,5 @@
-MD5 (libgpod-0.4.2.tar.gz) = w8Ax3G8fbv9CJZjITyYhvQ==
-RMD160 (libgpod-0.4.2.tar.gz) = X2mgRVQSdx57wz6fTBmWRU2peS4=
-SHA1 (libgpod-0.4.2.tar.gz) = sq7OYqIGpbcDxQ5mJbFzIX8dZ6Y=
-SHA256 (libgpod-0.4.2.tar.gz) = 1bbJBHzUW5SbOfhXUn9G0t2fr4vLVSi3t2Zu7c25Xlw=
-SIZE (libgpod-0.4.2.tar.gz) = 768720
+MD5 (gtkpod-0.99.10.tar.gz) = y8LQNYWq9BkV4mx8g6rUEg==
+RMD160 (gtkpod-0.99.10.tar.gz) = maBqnluMrR48G0iiIClvF5bLqPY=
+SHA1 (gtkpod-0.99.10.tar.gz) = NQpRzk6Nrk65wvIkeZBE+qqY8+A=
+SHA256 (gtkpod-0.99.10.tar.gz) = zY7CJYqj53TvH3QxF93Ibn2JvD9A/ANJK3sIk/lmns4=
+SIZE (gtkpod-0.99.10.tar.gz) = 1068561
diff --exclude CVS -urN ./patches/patch-src_db-parse-context_c ../gtkpod.new/patches/patch-src_db-parse-context_c
--- ./patches/patch-src_db-parse-context_c	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/patches/patch-src_db-parse-context_c	Wed Dec 31 17:00:00 1969
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_db-parse-context_c,v 1.1.1.1 2006/01/20 06:23:51 jolan Exp $
---- src/db-parse-context.c.orig	Fri Jan  6 13:19:48 2006
-+++ src/db-parse-context.c	Fri Jan  6 13:20:05 2006
-@@ -23,9 +23,9 @@
-  */
- 
- 
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
--#include <sys/types.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>
diff --exclude CVS -urN ./patches/patch-src_file_convert_c ../gtkpod.new/patches/patch-src_file_convert_c
--- ./patches/patch-src_file_convert_c	Wed Dec 31 17:00:00 1969
+++ ../gtkpod.new/patches/patch-src_file_convert_c	Mon Jul 23 22:08:04 2007
@@ -0,0 +1,60 @@
+$OpenBSD$
+--- src/file_convert.c.orig	Mon Jul 23 21:55:51 2007
++++ src/file_convert.c	Mon Jul 23 22:07:27 2007
+@@ -215,8 +215,8 @@ struct _ConvTrack
+     gchar *errormessage;    /* error message if any                     */
+     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  pid;              /* PID of child doing the conversion        */
++    gint  Stderr;           /* 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   */
+@@ -645,6 +645,7 @@ static void conversion_prefs_changed (Conversion *conv
+     }
+ 
+     conv->max_threads_num = prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM);
++#ifdef _SC_NPROCESSORS_ONLN
+     if (conv->max_threads_num == 0)
+     {   /* set to maximum available number of processors */
+ 	conv->max_threads_num = sysconf (_SC_NPROCESSORS_ONLN);
+@@ -654,6 +655,10 @@ static void conversion_prefs_changed (Conversion *conv
+ 	    conv->max_threads_num = 1;
+ 	}
+     }
++#else
++    /* the biggest openbsd box i've seen has 8 cpus/cores */
++    conv->max_threads_num = 8;
++#endif
+ 
+     g_free (conv->template);
+     conv->template = prefs_get_string (FILE_CONVERT_TEMPLATE);
+@@ -2271,7 +2276,7 @@ static gboolean conversion_convert_track (Conversion *
+ 	{   /* start conversion */
+ 	    gchar **argv;
+ 	    GError *error = NULL;
+-	    GPid child_pid;
++	    gint child_pid;
+ 
+ 	    argv = build_argv_from_strings (ctr->conversion_cmd,
+ 					    "-a", ctr->artist,
+@@ -2296,7 +2301,7 @@ static gboolean conversion_convert_track (Conversion *
+ 				  &ctr->pid,    /* child's PID    */
+ 				  NULL,         /* child's stdin  */
+ 				  NULL,         /* child's stdout */
+-				  &ctr->stderr, /* child's stderr */
++				  &ctr->Stderr, /* child's stderr */
+ 				  &error);
+ 
+ 	    child_pid = ctr->pid;
+@@ -2322,7 +2327,7 @@ static gboolean conversion_convert_track (Conversion *
+ 		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->Stderr);
+ 		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 --exclude CVS -urN ./patches/patch-src_file_export_c ../gtkpod.new/patches/patch-src_file_export_c
--- ./patches/patch-src_file_export_c	Wed Dec 31 17:00:00 1969
+++ ../gtkpod.new/patches/patch-src_file_export_c	Wed Oct 18 12:02:13 2006
@@ -0,0 +1,32 @@
+$OpenBSD: patch-src_file_export_c,v 1.4 2006/10/18 18:02:13 ckuethe Exp $
+--- src/file_export.c.orig	Wed Oct 18 11:25:05 2006
++++ src/file_export.c	Wed Oct 18 11:24:15 2006
+@@ -43,6 +43,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -102,8 +103,11 @@ static gboolean
+ copy_file_fd_sync (FILE *from, FILE *to)
+ {
+     gboolean result = FALSE;
+-    gchar data[READ_WRITE_BLOCKSIZE];
++    char *data;
+ 
++    if ((data = malloc(READ_WRITE_BLOCKSIZE)) == NULL)
++	return FALSE;
++
+     if((from) && (to))
+     {
+ 	int read_bytes = 0, write_bytes = 0;
+@@ -140,6 +144,7 @@ copy_file_fd_sync (FILE *from, FILE *to)
+ 	    
+ 	} while(!(feof(from)));
+     }
++    free(data);
+     if (!result)
+ 	result = fsync (fileno (to));
+     return(result);
diff --exclude CVS -urN ./patches/patch-src_file_itunesdb_c ../gtkpod.new/patches/patch-src_file_itunesdb_c
--- ./patches/patch-src_file_itunesdb_c	Wed Dec 31 17:00:00 1969
+++ ../gtkpod.new/patches/patch-src_file_itunesdb_c	Mon Jul 23 21:48:43 2007
@@ -0,0 +1,92 @@
+$OpenBSD: patch-src_file_itunesdb_c,v 1.2 2007/03/17 21:55:40 ckuethe Exp $
+--- src/file_itunesdb.c.orig	Wed Jun 27 13:29:33 2007
++++ src/file_itunesdb.c	Mon Jul 23 21:46:36 2007
+@@ -563,7 +563,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
+     gp_itdb_add_extra_full (itdb);
+ 
+     eitdb = itdb->userdata;
+-    g_return_val_if_fail (eitdb, (release_widgets(), NULL));
++    g_return_val_if_fail (eitdb, (release_widgets(), (iTunesDB *)NULL));
+ 
+     eitdb->offline = offline;
+ 
+@@ -588,9 +588,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
+ 	Track *track = gl->data;
+    
+ 	ExtraTrackData *etr;
+-	g_return_val_if_fail (track, (release_widgets(), NULL));
++	g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
+ 	etr = track->userdata;
+-	g_return_val_if_fail (etr, (release_widgets(), NULL));
++	g_return_val_if_fail (etr, (release_widgets(), (iTunesDB *)NULL));
+ 	fill_in_extended_info (track, total, num);
+ 	gp_track_validate_entries (track);
+ 	/* properly set value for has_artwork */
+@@ -630,7 +630,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
+     while (extendeddeletion)
+     {
+ 	Track *track = extendeddeletion->data;
+-	g_return_val_if_fail (track, (release_widgets(), NULL));
++	g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
+ 	mark_track_for_deletion (itdb, track);
+ 	extendeddeletion = g_list_delete_link (extendeddeletion,
+ 					       extendeddeletion);
+@@ -654,15 +654,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
+ 	GHashTable *track_hash = g_hash_table_new (g_direct_hash,
+ 						   g_direct_equal);
+ 	Playlist *mpl = itdb_playlist_mpl (itdb);
+-	g_return_val_if_fail (mpl, (release_widgets(), NULL));
+-	g_return_val_if_fail (old_eitdb, (release_widgets(), NULL));
++	g_return_val_if_fail (mpl, (release_widgets(), (iTunesDB *)NULL));
++	g_return_val_if_fail (old_eitdb, (release_widgets(), (iTunesDB *)NULL));
+ 
+ 	/* add tracks from @old_itdb to new itdb */
+ 	for (gl=old_itdb->tracks; gl; gl=gl->next)
+ 	{
+ 	    Track *duptr, *addtr;
+ 	    Track *track = gl->data;
+-	    g_return_val_if_fail (track, (release_widgets(), NULL));
++	    g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
+ 	    duptr = itdb_track_duplicate (track);
+ 	    /* add to database -- if duplicate detection is on and the
+ 	       same track already exists in the database, the already
+@@ -681,15 +681,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
+ 	    GList *glm;
+ 	    Playlist *duppl;
+ 	    Playlist *pl = gl->next->data; /* skip MPL */
+-	    g_return_val_if_fail (pl, (release_widgets(), NULL));
++	    g_return_val_if_fail (pl, (release_widgets(), (iTunesDB *)NULL));
+ 	    duppl = itdb_playlist_duplicate (pl);
+ 	    /* switch members */
+ 	    for (glm=duppl->members; glm; glm=glm->next)
+ 	    {
+ 		Track *newtr;
+-		g_return_val_if_fail (glm->data, (release_widgets(), NULL));
++		g_return_val_if_fail (glm->data, (release_widgets(), (iTunesDB *)NULL));
+ 		newtr = g_hash_table_lookup (track_hash, glm->data);
+-		g_return_val_if_fail (newtr, (release_widgets(), NULL));
++		g_return_val_if_fail (newtr, (release_widgets(), (iTunesDB *)NULL));
+ 		glm->data = newtr;
+ 	    }
+ 	    /* if it's the podcasts list, don't add the list again if
+@@ -700,7 +700,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
+ 		Playlist *podcasts = itdb_playlist_podcasts (itdb);
+ 		for (glm=duppl->members; glm; glm=glm->next)
+ 		{
+-		    g_return_val_if_fail (glm->data, (release_widgets(), NULL));
++		    g_return_val_if_fail (glm->data, (release_widgets(), (iTunesDB *)NULL));
+ 		    itdb_playlist_add_track (podcasts, glm->data, -1);
+ 		}
+ 		itdb_playlist_free (duppl);
+@@ -779,9 +779,9 @@ iTunesDB *gp_merge_itdb (iTunesDB *old_itdb)
+     ExtraiTunesDBData *old_eitdb;
+     iTunesDB *new_itdb;
+ 
+-    g_return_val_if_fail (old_itdb, NULL);
++    g_return_val_if_fail (old_itdb, (iTunesDB *)NULL);
+     old_eitdb = old_itdb->userdata;
+-    g_return_val_if_fail (old_eitdb, NULL);
++    g_return_val_if_fail (old_eitdb, (iTunesDB *)NULL);
+ 
+     if (old_itdb->usertype & GP_ITDB_TYPE_LOCAL)
+     {
diff --exclude CVS -urN ./patches/patch-src_info_c ../gtkpod.new/patches/patch-src_info_c
--- ./patches/patch-src_info_c	Wed Dec 31 17:00:00 1969
+++ ../gtkpod.new/patches/patch-src_info_c	Mon Jul 23 21:48:43 2007
@@ -0,0 +1,41 @@
+$OpenBSD: patch-src_info_c,v 1.1 2006/10/15 22:44:35 ckuethe Exp $
+--- src/info.c.orig	Wed Jun 27 13:29:33 2007
++++ src/info.c	Mon Jul 23 21:46:18 2007
+@@ -579,14 +579,17 @@ gboolean ipod_connected (void)
+ 
+ /* we'll use statvfs to determine free space on the iPod where
+    available, df otherwise */
+-#ifdef HAVE_STATVFS
++#if 1
+ #include <sys/types.h>
+-#include <sys/statvfs.h>
++#include <sys/stat.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++
+ /* update space_ipod_free and space_ipod_used */
+ static void th_space_update (void)
+ {
+     gchar *mp=NULL;
+-    struct statvfs stat;
++    struct statfs sf;
+     int	status;
+ 
+     g_mutex_lock (space_mutex);
+@@ -598,13 +601,13 @@ static void th_space_update (void)
+     }
+     if (mp)
+     {
+-	status = statvfs (mp, &stat);
++	status = statfs (mp, &sf);
+ 	if (status != 0) {
+ 	    /* XXX: why would this fail - what to do here??? */
+ 	    goto done;
+ 	}
+-	space_ipod_free = (gdouble)stat.f_bavail * stat.f_frsize;
+-	space_ipod_used = ((gdouble)stat.f_blocks * stat.f_frsize) -
++	space_ipod_free = (gdouble)sf.f_bavail * sf.f_bsize;
++	space_ipod_used = ((gdouble)sf.f_blocks * sf.f_bsize) -
+ 	    space_ipod_free;
+ 	space_uptodate = TRUE;
+ 	
diff --exclude CVS -urN ./patches/patch-src_itdb_itunesdb_c ../gtkpod.new/patches/patch-src_itdb_itunesdb_c
--- ./patches/patch-src_itdb_itunesdb_c	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/patches/patch-src_itdb_itunesdb_c	Wed Dec 31 17:00:00 1969
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_itdb_itunesdb_c,v 1.4 2007/03/17 21:54:16 ckuethe Exp $
---- src/itdb_itunesdb.c.orig	Sun Jan 14 07:28:37 2007
-+++ src/itdb_itunesdb.c	Tue Mar 13 14:42:33 2007
-@@ -122,7 +122,6 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
--#include <sys/statvfs.h>
- #include <sys/types.h>
- #include <time.h>
- #include <unistd.h>
-@@ -5966,14 +5965,14 @@ static gboolean itdb_create_directories 
-     dirnum = info->musicdirs;
-     if (dirnum == 0)
-     {   /* do a guess */
--	struct statvfs stat;
--	if (statvfs (mp, &stat) != 0)
-+	struct stat sb;
-+	if (stat (mp, &sb) != 0)
- 	{   /* why should this fail !? */
- 	    dirnum = 20;
- 	}
- 	else
- 	{
--	    gdouble size = ((gdouble)stat.f_blocks * stat.f_frsize) / 1073741824;
-+	    gdouble size = ((gdouble)sb.st_blocks * sb.st_size) / 1073741824;
- 	    if (size < 20)  dirnum = 20;
- 	    else            dirnum = 50;
- 	}
diff --exclude CVS -urN ./patches/patch-src_mp4file_h ../gtkpod.new/patches/patch-src_mp4file_h
--- ./patches/patch-src_mp4file_h	Wed Dec 31 17:00:00 1969
+++ ../gtkpod.new/patches/patch-src_mp4file_h	Sat Mar 17 15:55:40 2007
@@ -0,0 +1,10 @@
+$OpenBSD: patch-src_mp4file_h,v 1.3 2007/03/17 21:55:40 ckuethe Exp $
+--- src/mp4file.h.orig	Thu Jun 22 08:24:35 2006
++++ src/mp4file.h	Thu Mar 15 08:42:22 2007
+@@ -35,4 +35,6 @@
+ gboolean mp4_write_file_info (gchar *filename, Track *track);
+ Track *mp4_get_file_info (gchar *name);
+ gboolean mp4_read_soundcheck (gchar *filename, Track *track);
++
++#define HAVE_GLIB_H 1
+ #endif
diff --exclude CVS -urN ./patches/patch-tests_Makefile_in ../gtkpod.new/patches/patch-tests_Makefile_in
--- ./patches/patch-tests_Makefile_in	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/patches/patch-tests_Makefile_in	Wed Dec 31 17:00:00 1969
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_Makefile_in,v 1.2 2007/03/17 21:54:16 ckuethe Exp $
---- tests/Makefile.in.orig	Mon Jan 15 08:46:06 2007
-+++ tests/Makefile.in	Tue Mar 13 14:49:11 2007
-@@ -94,8 +94,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -o $@
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-@@ -199,13 +198,13 @@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = -L$(top_builddir)/src @LDFLAGS@
- LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
- LIBGPOD_LIBS = @LIBGPOD_LIBS@
- LIBGPOD_SO_VERSION = @LIBGPOD_SO_VERSION@
- LIBGPOD_VERSION = @LIBGPOD_VERSION@
- LIBOBJS = @LIBOBJS@
--LIBS = $(LIBGPOD_LIBS) $(top_builddir)/src/libgpod.la
-+LIBS= $(top_builddir)/src/libgpod.la $(LIBGPOD_LIBS) $(LDFLAGS)
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
diff --exclude CVS -urN ./pkg/DESCR ../gtkpod.new/pkg/DESCR
--- ./pkg/DESCR	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/pkg/DESCR	Thu Dec 16 09:37:14 2004
@@ -1,3 +1,5 @@
-Libgpod is a shared library to access the contents of an iPod.  This
-library is based on code used in the gtkpod project.  It supports
-playlists, smart playlists, playcounts, ratings and podcasts.
+gtkpod is a platform independent GUI for Apple's iPod using GTK2.  It
+allows one to upload songs and playlists to your iPod.  It supports
+ID3 tag editing, multiple charsets for ID3 tags, detects duplicate
+songs, allows offline modification of the database with later
+synchronization, and more.
diff --exclude CVS -urN ./pkg/PFRAG.shared ../gtkpod.new/pkg/PFRAG.shared
--- ./pkg/PFRAG.shared	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/pkg/PFRAG.shared	Wed Dec 31 17:00:00 1969
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/01/20 06:23:51 jolan Exp $
-@lib lib/libgpod.so.${LIBgpod_VERSION}
diff --exclude CVS -urN ./pkg/PLIST ../gtkpod.new/pkg/PLIST
--- ./pkg/PLIST	Mon Jul 23 22:17:46 2007
+++ ../gtkpod.new/pkg/PLIST	Mon Jul 23 22:09:16 2007
@@ -1,41 +1,63 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/03/17 21:54:16 ckuethe Exp $
-%%SHARED%%
-include/gpod-1.0/
-include/gpod-1.0/gpod/
-include/gpod-1.0/gpod/itdb.h
-lib/libgpod.a
-lib/libgpod.la
-lib/pkgconfig/
-lib/pkgconfig/libgpod-1.0.pc
-share/gtk-doc/
-share/gtk-doc/html/
-share/gtk-doc/html/libgpod/
-share/gtk-doc/html/libgpod/ch01.html
-share/gtk-doc/html/libgpod/home.png
-share/gtk-doc/html/libgpod/index.html
-share/gtk-doc/html/libgpod/index.sgml
-share/gtk-doc/html/libgpod/itunesdb.html
-share/gtk-doc/html/libgpod/left.png
-share/gtk-doc/html/libgpod/libgpod-Artwork.html
-share/gtk-doc/html/libgpod/libgpod-Device.html
-share/gtk-doc/html/libgpod/libgpod-File-handling-functions.html
-share/gtk-doc/html/libgpod/libgpod-Low-level-functions.html
-share/gtk-doc/html/libgpod/libgpod-Photo-database.html
-share/gtk-doc/html/libgpod/libgpod-Playlists.html
-share/gtk-doc/html/libgpod/libgpod-Smart-Playlists.html
-share/gtk-doc/html/libgpod/libgpod-The-Itdb-iTunesDB-structure.html
-share/gtk-doc/html/libgpod/libgpod-Time-handling.html
-share/gtk-doc/html/libgpod/libgpod-Tracks.html
-share/gtk-doc/html/libgpod/libgpod.devhelp
-share/gtk-doc/html/libgpod/libgpod.devhelp2
-share/gtk-doc/html/libgpod/photodb.html
-share/gtk-doc/html/libgpod/right.png
-share/gtk-doc/html/libgpod/style.css
-share/gtk-doc/html/libgpod/up.png
-share/locale/de/LC_MESSAGES/libgpod.mo
-share/locale/es/LC_MESSAGES/libgpod.mo
-share/locale/fr/LC_MESSAGES/libgpod.mo
-share/locale/he/LC_MESSAGES/libgpod.mo
-share/locale/it/LC_MESSAGES/libgpod.mo
-share/locale/ja/LC_MESSAGES/libgpod.mo
-share/locale/sv/LC_MESSAGES/libgpod.mo
+@comment $OpenBSD: PLIST,v 1.4 2006/03/18 07:08:21 sturm Exp $
+bin/gtkpod
+share/applications/
+share/applications/gtkpod.desktop
+share/gtkpod/
+share/gtkpod/data/
+share/gtkpod/data/cdshine.png
+share/gtkpod/data/cdshine_main.png
+share/gtkpod/data/default-cover.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.png
+share/gtkpod/data/gtkpod-sync.png
+share/gtkpod/data/gtkpod.glade
+share/gtkpod/scripts/
+share/gtkpod/scripts/convert-flac2m4a.sh
+share/gtkpod/scripts/convert-flac2mp3.sh
+share/gtkpod/scripts/convert-m4a2mp3.sh
+share/gtkpod/scripts/convert-mp32m4a.sh
+share/gtkpod/scripts/convert-ogg2m4a.sh
+share/gtkpod/scripts/convert-ogg2mp3.sh
+share/gtkpod/scripts/convert-wav2m4a.sh
+share/gtkpod/scripts/convert-wav2mp3.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-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/gtkpod/scripts/sync-webcalendar.sh
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/gtkpod.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/gtkpod.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
+share/icons/hicolor/64x64/apps/gtkpod.png
+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/sv/LC_MESSAGES/gtkpod.mo
+share/nls/pl_PL.ISO_8859-2/
