3 files changed, 75 insertions, 23 deletions

diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index b147ef000edc..e77eb89aa6a6 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	atunes
-PORTVERSION=	2.1.0
+PORTVERSION=	3.0.3
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	A full-featured audio player and manager developed in Java
@@ -19,7 +19,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 SUB_FILES=	atunes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-SNAPSHOT
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=		CDDA2WAV
 
@@ -44,7 +44,7 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
 .if ${PORT_OPTIONS:MXINE}
-LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 .endif
 
 .if ${PORT_OPTIONS:MCDDA2WAV}
@@ -67,22 +67,23 @@ DESKTOP_ENTRIES="aTunes" \
 		"Audio player and manager" \
 		"${DATADIR}/aTunes.ico" \
 		"aTunes" \
-		"Application;;AudioVideo;Java;" \
-		false
+		"Audio;AudioVideo;Java;" \
+		true
 
-INSTALL_FILES=	aTunes.ico aTunes.jar license.txt
+INSTALL_FILES=	aTunes.ico aTunes.jar splash.gif changelog.txt
 
 PIXMAPS=	atunes.png
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/lib
-	${INSTALL_SCRIPT} ${WRKDIR}/atunes ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/atunes ${PREFIX}/bin
 .for file in ${INSTALL_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}/${file}
 .endfor
-	cd ${WRKSRC} && ${FIND} lib -type f -name "*.jar" -exec ${INSTALL_DATA} {} \
-		${DATADIR}/{} \;
+	@(cd ${WRKSRC} && ${FIND} lib -type f -name "*.jar" -exec ${INSTALL_DATA} {} \
+		${DATADIR}/{} \;)
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} settings ${DATADIR}/)
 	@${MKDIR} ${PREFIX}/share/pixmaps
 .for file in ${PIXMAPS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/pixmaps
diff --git a/audio/atunes/distinfo b/audio/atunes/distinfo
index 52641b18b599..a27dd6486a36 100644
--- a/audio/atunes/distinfo
+++ b/audio/atunes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (atunes_2.1.0.tar.gz) = ded152cad906fb31279a26ad64f6aeb1ebb388cfd2cf57b3873953edb6aade33
-SIZE (atunes_2.1.0.tar.gz) = 30632929
+SHA256 (atunes-3.0.3-bin.tar.gz) = c8beaf4df4affbb1559ee2273200742cabda7efe501b3452ed2d115af94d838d
+SIZE (atunes-3.0.3-bin.tar.gz) = 33422408
diff --git a/audio/atunes/pkg-plist b/audio/atunes/pkg-plist
index f643e7320b1f..59ed408da410 100644
--- a/audio/atunes/pkg-plist
+++ b/audio/atunes/pkg-plist
@@ -1,55 +1,106 @@
 bin/atunes
 %%DATADIR%%/aTunes.ico
 %%DATADIR%%/aTunes.jar
+%%DATADIR%%/changelog.txt
 %%DATADIR%%/lib/activation-1.1.jar
 %%DATADIR%%/lib/aopalliance-1.0.jar
-%%DATADIR%%/lib/atunes-2.1.0-SNAPSHOT.jar
+%%DATADIR%%/lib/asm-4.0.jar
+%%DATADIR%%/lib/atunes-3.0.3.jar
 %%DATADIR%%/lib/bcel-5.2.jar
 %%DATADIR%%/lib/classworlds-1.1-alpha-2.jar
+%%DATADIR%%/lib/commons-beanutils-1.8.3.jar
+%%DATADIR%%/lib/commons-codec-1.6.jar
 %%DATADIR%%/lib/commons-collections-3.1.jar
 %%DATADIR%%/lib/commons-io-1.5-custom.jar
 %%DATADIR%%/lib/commons-lang-2.5.jar
 %%DATADIR%%/lib/commons-logging-1.1.1.jar
 %%DATADIR%%/lib/ehcache-1.6.2.jar
 %%DATADIR%%/lib/filters-2.0.235.jar
-%%DATADIR%%/lib/gstreamer-java-1.4.jar
+%%DATADIR%%/lib/guava-10.0.1.jar
 %%DATADIR%%/lib/jakarta-regexp-1.4.jar
 %%DATADIR%%/lib/jaudiotagger-2.0.4-SNAPSHOT.jar
 %%DATADIR%%/lib/jcommon-1.0.15.jar
 %%DATADIR%%/lib/jericho-html-3.1.jar
 %%DATADIR%%/lib/jfreechart-1.0.12.jar
 %%DATADIR%%/lib/jintellitype-1.3.4.jar
-%%DATADIR%%/lib/jna-3.2.4.jar
+%%DATADIR%%/lib/jna-3.5.1.jar
 %%DATADIR%%/lib/joda-time-2.0.jar
+%%DATADIR%%/lib/jsr305-1.3.9.jar
 %%DATADIR%%/lib/junit-3.8.1.jar
 %%DATADIR%%/lib/jxgrabkey-1.0.jar
+%%DATADIR%%/lib/kryo-2.19.jar
+%%DATADIR%%/lib/laf-plugin-7.2.1.jar
+%%DATADIR%%/lib/laf-widget-7.2.1.jar
 %%DATADIR%%/lib/last.fm-bindings-0.1.0-SVN-20110814.jar
-%%DATADIR%%/lib/libxine-custom.jar
 %%DATADIR%%/lib/log4j-1.2.15.jar
 %%DATADIR%%/lib/lucene-core-3.0.2.jar
-%%DATADIR%%/lib/macosx-3.3.0-v3346.jar
 %%DATADIR%%/lib/mail-1.4.jar
 %%DATADIR%%/lib/maven-artifact-2.0.7.jar
 %%DATADIR%%/lib/maven-model-2.0.7.jar
 %%DATADIR%%/lib/maven-shared-jar-1.0.jar
+%%DATADIR%%/lib/minlog-1.2.jar
+%%DATADIR%%/lib/objenesis-1.2.jar
 %%DATADIR%%/lib/plexus-container-default-1.0-alpha-8.jar
 %%DATADIR%%/lib/plexus-digest-1.0.jar
 %%DATADIR%%/lib/plexus-utils-1.4.1.jar
 %%DATADIR%%/lib/plugin-system-1.11.jar
+%%DATADIR%%/lib/reflectasm-1.07-shaded.jar
+%%DATADIR%%/lib/sanselan-0.97-incubator.jar
 %%DATADIR%%/lib/spring-aop-3.0.6.RELEASE.jar
 %%DATADIR%%/lib/spring-asm-3.0.6.RELEASE.jar
 %%DATADIR%%/lib/spring-beans-3.0.6.RELEASE.jar
 %%DATADIR%%/lib/spring-context-3.0.6.RELEASE.jar
 %%DATADIR%%/lib/spring-core-3.0.6.RELEASE.jar
 %%DATADIR%%/lib/spring-expression-3.0.6.RELEASE.jar
-%%DATADIR%%/lib/substance-6.0.jar
-%%DATADIR%%/lib/substance-swingx-6.0.jar
-%%DATADIR%%/lib/swing-worker-1.1.jar
-%%DATADIR%%/lib/swingx-1.6.jar
-%%DATADIR%%/lib/trident-1.2.jar
+%%DATADIR%%/lib/substance-7.2.1.jar
+%%DATADIR%%/lib/substance-swingx-7.2.1.jar
+%%DATADIR%%/lib/swingx-action-1.6.3.jar
+%%DATADIR%%/lib/swingx-all-1.6.3.jar
+%%DATADIR%%/lib/swingx-autocomplete-1.6.3.jar
+%%DATADIR%%/lib/swingx-common-1.6.3.jar
+%%DATADIR%%/lib/swingx-core-1.6.3.jar
+%%DATADIR%%/lib/swingx-painters-1.6.3.jar
+%%DATADIR%%/lib/swingx-plaf-1.6.3.jar
+%%DATADIR%%/lib/trident-7.2.1-swing.jar
 %%DATADIR%%/lib/xpp3_min-1.1.4c.jar
 %%DATADIR%%/lib/xstream-1.3.1.jar
-%%DATADIR%%/license.txt
+%%DATADIR%%/settings/ehcache-lastfm.xml
+%%DATADIR%%/settings/ehcache-lyrics.xml
+%%DATADIR%%/settings/ehcache-preferences.xml
+%%DATADIR%%/settings/log4j.properties
+%%DATADIR%%/settings/preset_radios.xml
+%%DATADIR%%/settings/presets.properties
+%%DATADIR%%/settings/spring/actions.xml
+%%DATADIR%%/settings/spring/cdripper.xml
+%%DATADIR%%/settings/spring/columnsets.xml
+%%DATADIR%%/settings/spring/context.xml
+%%DATADIR%%/settings/spring/core.xml
+%%DATADIR%%/settings/spring/device.xml
+%%DATADIR%%/settings/spring/dialogs.xml
+%%DATADIR%%/settings/spring/genres.xml
+%%DATADIR%%/settings/spring/gui.dimensions.xml
+%%DATADIR%%/settings/spring/gui.icons.xml
+%%DATADIR%%/settings/spring/gui.player.xml
+%%DATADIR%%/settings/spring/gui.xml
+%%DATADIR%%/settings/spring/handlers.xml
+%%DATADIR%%/settings/spring/lookandfeel.xml
+%%DATADIR%%/settings/spring/navigator.xml
+%%DATADIR%%/settings/spring/os.xml
+%%DATADIR%%/settings/spring/patterns.xml
+%%DATADIR%%/settings/spring/player.xml
+%%DATADIR%%/settings/spring/playlist.xml
+%%DATADIR%%/settings/spring/process.xml
+%%DATADIR%%/settings/spring/repository.xml
+%%DATADIR%%/settings/spring/spring_beans.xml
+%%DATADIR%%/settings/spring/state.xml
+%%DATADIR%%/settings/spring/tasks.xml
+%%DATADIR%%/settings/spring/treecelldecorators.xml
+%%DATADIR%%/settings/spring/treegenerators.xml
+%%DATADIR%%/settings/spring/utils.xml
+%%DATADIR%%/settings/spring/webservices.xml
+%%DATADIR%%/splash.gif
 share/pixmaps/atunes.png
+@dirrm %%DATADIR%%/settings/spring
+@dirrm %%DATADIR%%/settings
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%