diff --exclude CVS -urN ./Makefile ../libgpod.new/Makefile
--- ./Makefile	Mon Jul 23 22:17:46 2007
+++ ../libgpod.new/Makefile	Sun Jul 22 13:04:51 2007
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.8 2007/03/17 21:54:15 ckuethe Exp $
 
 COMMENT=	"library to access the contents of an iPod"
-DISTNAME=	libgpod-0.4.2
-SHARED_LIBS=	gpod	402.0
+DISTNAME=	libgpod-0.5.2
+SHARED_LIBS=	gpod	502.0
 CATEGORIES=	audio
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
diff --exclude CVS -urN ./distinfo ../libgpod.new/distinfo
--- ./distinfo	Mon Jul 23 22:17:46 2007
+++ ../libgpod.new/distinfo	Sun Jul 22 13:05:02 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 (libgpod-0.5.2.tar.gz) = 5PjSp76VEiaCZ7++cS/pvg==
+RMD160 (libgpod-0.5.2.tar.gz) = ZZAyH2Z+NbXpAv3Wk+O5veqAr9c=
+SHA1 (libgpod-0.5.2.tar.gz) = /JsmhocQ3LJOdY170rxS7oUy4Ww=
+SHA256 (libgpod-0.5.2.tar.gz) = 8qQ5bdkq1VelOP/OiSAg2m7ZZ0VPECcxTScOIcVux5s=
+SIZE (libgpod-0.5.2.tar.gz) = 791704
diff --exclude CVS -urN ./patches/patch-src_itdb_itunesdb_c ../libgpod.new/patches/patch-src_itdb_itunesdb_c
--- ./patches/patch-src_itdb_itunesdb_c	Mon Jul 23 22:17:46 2007
+++ ../libgpod.new/patches/patch-src_itdb_itunesdb_c	Mon Jul 23 21:42:02 2007
@@ -1,7 +1,7 @@
 $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 @@
+--- src/itdb_itunesdb.c.orig	Fri Jun 22 23:10:26 2007
++++ src/itdb_itunesdb.c	Mon Jul 23 21:41:42 2007
+@@ -117,7 +117,6 @@
  #include <stdio.h>
  #include <string.h>
  #include <sys/stat.h>
@@ -9,7 +9,7 @@
  #include <sys/types.h>
  #include <time.h>
  #include <unistd.h>
-@@ -5966,14 +5965,14 @@ static gboolean itdb_create_directories 
+@@ -6647,14 +6646,14 @@ static gboolean itdb_create_directories (Itdb_Device *
      dirnum = info->musicdirs;
      if (dirnum == 0)
      {   /* do a guess */
diff --exclude CVS -urN ./patches/patch-tests_Makefile_in ../libgpod.new/patches/patch-tests_Makefile_in
--- ./patches/patch-tests_Makefile_in	Mon Jul 23 22:17:46 2007
+++ ../libgpod.new/patches/patch-tests_Makefile_in	Mon Jul 23 21:41:17 2007
@@ -1,17 +1,7 @@
 $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@
+--- tests/Makefile.in.orig	Mon Jul 23 21:39:19 2007
++++ tests/Makefile.in	Mon Jul 23 21:40:53 2007
+@@ -119,13 +119,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@
@@ -23,7 +13,17 @@
  LIBGPOD_VERSION = @LIBGPOD_VERSION@
  LIBOBJS = @LIBOBJS@
 -LIBS = $(LIBGPOD_LIBS) $(top_builddir)/src/libgpod.la
-+LIBS= $(top_builddir)/src/libgpod.la $(LIBGPOD_LIBS) $(LDFLAGS)
++LIBS = $(top_builddir)/src/libgpod.la $(LIBGPOD_LIBS) $(LDFLAGS)
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
+@@ -345,8 +345,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -o $@
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \