4 files changed, 21 insertions, 5 deletions

diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 221f4f1e5a77..ed8843f1d620 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkpod
-PORTVERSION=	0.60
+PORTVERSION=	0.70
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,6 +17,15 @@ COMMENT=	GUI for Apple iPods using GTK2
 LIB_DEPENDS=	id3-3.8.2:${PORTSDIR}/audio/id3lib
 RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain
 
+.if defined(WITH_AAC)
+	LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mpeg4ip
+.else
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "To enable AAC support define the WITH_AAC knob."
+	@${ECHO_MSG}
+.endif
+
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 
@@ -38,6 +47,8 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/TODOandBUGS.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
index 9a5118123607..378334e09faf 100644
--- a/audio/gtkpod/distinfo
+++ b/audio/gtkpod/distinfo
@@ -1 +1 @@
-MD5 (gtkpod-0.60.tar.gz) = 4108e065a6865b98ae677b031426b945
+MD5 (gtkpod-0.70.tar.gz) = 496605746630db2e35b8b4d2577701ee
diff --git a/audio/gtkpod/pkg-descr b/audio/gtkpod/pkg-descr
index 0113cdd73fb3..11a181d17e8f 100644
--- a/audio/gtkpod/pkg-descr
+++ b/audio/gtkpod/pkg-descr
@@ -3,17 +3,20 @@ gtkpod is a graphical user interface to upload and manage songs to your iPod.
 It allows you to :
     * Read your existing iTunesDB (i.e. import the existing contents of 
       your iPod).
-    * Add mp3 files to the iPod. You can choose the charset the ID3 tags 
+    * Add mp3 and m4a (no-protected AAC) files (single files, directories or
+      existing playlists) to the iPod. You can choose the charset the ID3 tags 
       are encoded in from within gtkpod. The default is the charset currently 
       used by your locale setting.
     * When adding songs, gtkpod detects duplicates (option).
     * Remove songs from the iPod.
     * Create and modify playlists.
     * Modify ID3 tags -- changes are also updated in the original file (option)
+    * Refresh ID3 tags from file (if you've changed the tags in the original
+      file).
+    * Sync directories.
+    * Normalize the volume of your tracks (uses mp3gain)
     * Write the updated iTunesDB and added songs to your iPod.
     * Work offline and synchronize your new playlists / songs with the iPod
       at a later time
 
-Nota: you need a Windows iPod
-
 WWW: http://gtkpod.sourceforge.net
diff --git a/audio/gtkpod/pkg-plist b/audio/gtkpod/pkg-plist
index 357dc9cfa855..b47e2a55cb48 100644
--- a/audio/gtkpod/pkg-plist
+++ b/audio/gtkpod/pkg-plist
@@ -4,4 +4,6 @@ share/locale/fr/LC_MESSAGES/gtkpod.mo
 share/locale/it/LC_MESSAGES/gtkpod.mo
 share/locale/ja/LC_MESSAGES/gtkpod.mo
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/TODOandBUGS.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%