From 2404e6412239045f505746e304ed0cad003061dd Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Fri, 3 Dec 2004 22:39:36 +0000
Subject: [PATCH] Update to 0.85.0

PR:		ports/74273
Submitted by:	David Le Brun (maintainer)
---
 audio/gtkpod/Makefile                   |  9 +++------
 audio/gtkpod/distinfo                   |  4 ++--
 audio/gtkpod/files/patch-src::mp4file.c | 12 ------------
 audio/gtkpod/pkg-plist                  | 22 ++++++++++++++++------
 4 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 audio/gtkpod/files/patch-src::mp4file.c

diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index f4c843c3f0c3..02a896666b76 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	gtkpod
-PORTVERSION=	0.80
-PORTREVISION=	4
+PORTVERSION=	0.85.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	david@dyn-ns.net
 COMMENT=	GUI for Apple iPods using GTK2
@@ -52,9 +50,8 @@ pre-configure:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|(libdir)/locale|(datadir)/locale|' \
 		${WRKSRC}/po/Makefile.in.in
-	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
-		${WRKSRC}/scripts/sync-kaddressbook.sh \
-		${WRKSRC}/scripts/sync-korganizer.sh
+	@${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 f98f9c147de9..7579b6536cf5 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtkpod-0.80-2.tar.gz) = 50cc19b1a535df4c37e588baa08bf3c4
-SIZE (gtkpod-0.80-2.tar.gz) = 673639
+MD5 (gtkpod-0.85.0.tar.gz) = ca870acf255dd240a02d387485940c3c
+SIZE (gtkpod-0.85.0.tar.gz) = 789161
diff --git a/audio/gtkpod/files/patch-src::mp4file.c b/audio/gtkpod/files/patch-src::mp4file.c
deleted file mode 100644
index 70356b63983c..000000000000
--- a/audio/gtkpod/files/patch-src::mp4file.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/mp4file.c.orig	Wed Jul 28 00:22:05 2004
-+++ src/mp4file.c	Wed Jul 28 00:22:50 2004
-@@ -108,7 +108,8 @@
- #define MP4V2_HAS_METADATA_BUG TRUE
- 
- #include <sys/types.h>
--#include <stdint.h>
-+#include <sys/param.h>
-+#include <inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- #include "mp4.h"
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 65cee2a9d509..62709046ef0a 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -3,12 +3,22 @@ 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/gtkpod/scripts/sync-kaddressbook.sh
-share/gtkpod/scripts/sync-korganizer.sh
-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/locale/sv/LC_MESSAGES/gtkpod.mo
+%%DATADIR%%/scripts/sync-kaddressbook.sh
+%%DATADIR%%/scripts/sync-korganizer.sh
+%%DATADIR%%/pixmaps/gtkpod-add-dirs.png
+%%DATADIR%%/pixmaps/gtkpod-add-files.png
+%%DATADIR%%/pixmaps/gtkpod-add-playlists.png
+%%DATADIR%%/pixmaps/gtkpod-icon-32.png
+%%DATADIR%%/pixmaps/gtkpod-icon-32x32-2.png
+%%DATADIR%%/pixmaps/gtkpod-icon-32x32.png
+%%DATADIR%%/pixmaps/gtkpod-icon-48.png
+%%DATADIR%%/pixmaps/gtkpod-icon-48x48.png
+%%DATADIR%%/pixmaps/gtkpod-icon-64x64.png
+%%DATADIR%%/pixmaps/gtkpod-logo.png
+%%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