4 files changed, 47 insertions, 109 deletions

diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index 24defaf327a9..4f12016309ed 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	atunes
-PORTVERSION=	1.13.6
-PORTREVISION=	4
+PORTVERSION=	2.0.1
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
-DISTNAME=	aTunes_${PORTVERSION}
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	A full-featured audio player and manager developed in Java
@@ -20,7 +18,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 SUB_FILES=	atunes
 
-WRKSRC=		${WRKDIR}/aTunes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-SNAPSHOT
 
 OPTIONS=	MPLAYER "Engine:  Use Mplayer" on \
 		XINE "Engine:  Use Xine" off \
@@ -65,30 +63,22 @@ DESKTOP_ENTRIES="aTunes" \
 		"Audio player and manager" \
 		"${DATADIR}/aTunes.ico" \
 		"aTunes" \
-		"Application;Audio;AudioVideo;Java;" \
+		"Application;;AudioVideo;Java;" \
 		false
 
-INSTALL_FILES=	aTunes.ico aTunes.jar build.properties changelog.txt \
-		extendedLog.properties license.txt log4j.properties \
-		presets.properties shortcutSpec.xml
+INSTALL_FILES=	aTunes.ico aTunes.jar license.txt
 
-PIXMAPS=	atunes125.png
+PIXMAPS=	atunes.png
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/lib
-	@${MKDIR} ${DATADIR}/settings
-	@${MKDIR} ${DATADIR}/translations
 	${INSTALL_SCRIPT} ${WRKDIR}/atunes ${PREFIX}/bin
 .for file in ${INSTALL_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}/${file}
 .endfor
-	cd ${WRKSRC} && ${FIND} translations -type f -exec ${INSTALL_DATA} {} \
-		${DATADIR}/{} \;
 	cd ${WRKSRC} && ${FIND} lib -type f -name "*.jar" -exec ${INSTALL_DATA} {} \
 		${DATADIR}/{} \;
-	cd ${WRKSRC} && ${FIND} settings -type f -exec ${INSTALL_DATA} {} \
-		${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 7bf21d8616bd..be16f4b08def 100644
--- a/audio/atunes/distinfo
+++ b/audio/atunes/distinfo
@@ -1,3 +1,3 @@
-MD5 (aTunes_1.13.6.tar.gz) = cfe9ca69c8278e8e667baa1bf3069f84
-SHA256 (aTunes_1.13.6.tar.gz) = 4c6cec5431e91c120617a99bd701dfc8aa31f4fb5bcd79b32d4e99463d9d2621
-SIZE (aTunes_1.13.6.tar.gz) = 19390413
+MD5 (atunes-2.0.1.tar.gz) = 57437908d66d055f7a44888d3e11f27e
+SHA256 (atunes-2.0.1.tar.gz) = be624cbc782048b4b0d57e48704dad68319eb892690051bda6db243cb1c724c9
+SIZE (atunes-2.0.1.tar.gz) = 24621316
diff --git a/audio/atunes/files/atunes.in b/audio/atunes/files/atunes.in
index ffc1c995b44c..7dbe1b3e0948 100644
--- a/audio/atunes/files/atunes.in
+++ b/audio/atunes/files/atunes.in
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -cp aTunes.jar:lib/commons-io-1.5-SNAPSHOT.jar:lib/commons-lang-2.4.jar:lib/jcommon-1.0.12.jar:lib/jfreechart-1.0.9.jar:lib/jaudiotagger.jar:lib/log4j-1.2.13.jar:lib/commons-logging-1.1.jar:lib/antBuildNumber.jar:lib/substance.jar:lib/swingx.jar:lib/jhlabs.jar:lib/jericho-html-3.0.jar:lib/substance-swingx.jar:lib/jintellitype-1.3.1.jar:lib/xpp3_min-1.1.4c.jar:lib/xstream-1.3.1.jar:lib/jna.jar:lib/lucene-core-2.4.0.jar:lib/libxinejna.jar:lib/last.fm-bindings.jar:lib/JXGrabKey.jar net.sourceforge.atunes.Main "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -Djava.library.path=./ \
+             -Xms128m -Xmx1024m -cp aTunes.jar:lib/* net.sourceforge.atunes.Main "$@"
diff --git a/audio/atunes/pkg-plist b/audio/atunes/pkg-plist
index ac5b35b246d8..a2dded5af60b 100644
--- a/audio/atunes/pkg-plist
+++ b/audio/atunes/pkg-plist
@@ -1,99 +1,46 @@
 bin/atunes
 %%DATADIR%%/aTunes.ico
 %%DATADIR%%/aTunes.jar
-%%DATADIR%%/build.properties
-%%DATADIR%%/changelog.txt
-%%DATADIR%%/extendedLog.properties
-%%DATADIR%%/lib/JXGrabKey.jar
-%%DATADIR%%/lib/antBuildNumber.jar
-%%DATADIR%%/lib/commons-io-1.5-SNAPSHOT.jar
+%%DATADIR%%/license.txt
+%%DATADIR%%/lib/activation-1.1.jar
+%%DATADIR%%/lib/atunes-2.0.1-SNAPSHOT.jar
+%%DATADIR%%/lib/bcel-5.2.jar
+%%DATADIR%%/lib/classworlds-1.1-alpha-2.jar
+%%DATADIR%%/lib/commons-collections-3.1.jar
+%%DATADIR%%/lib/commons-io-1.5-custom.jar
 %%DATADIR%%/lib/commons-lang-2.4.jar
-%%DATADIR%%/lib/commons-logging-1.1.jar
-%%DATADIR%%/lib/commons-net-2.0.jar
-%%DATADIR%%/lib/jaudiotagger.jar
-%%DATADIR%%/lib/jcommon-1.0.12.jar
-%%DATADIR%%/lib/jericho-html-3.0.jar
-%%DATADIR%%/lib/jfreechart-1.0.9.jar
-%%DATADIR%%/lib/jhlabs.jar
-%%DATADIR%%/lib/jintellitype-1.3.1.jar
-%%DATADIR%%/lib/jna.jar
-%%DATADIR%%/lib/last.fm-bindings.jar
-%%DATADIR%%/lib/libxinejna.jar
-%%DATADIR%%/lib/log4j-1.2.13.jar
-%%DATADIR%%/lib/lucene-core-2.4.0.jar
-%%DATADIR%%/lib/substance-swingx.jar
-%%DATADIR%%/lib/substance.jar
-%%DATADIR%%/lib/swingx.jar
+%%DATADIR%%/lib/ehcache-1.6.2.jar
+%%DATADIR%%/lib/filters-2.0.235.jar
+%%DATADIR%%/lib/gstreamer-java-1.3.jar
+%%DATADIR%%/lib/jakarta-regexp-1.4.jar
+%%DATADIR%%/lib/jaudiotagger-2.0.3-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.3.jar
+%%DATADIR%%/lib/jna-3.2.4.jar
+%%DATADIR%%/lib/junit-3.8.1.jar
+%%DATADIR%%/lib/jxgrabkey-1.0.jar
+%%DATADIR%%/lib/lastfm-bindings-160-SVN.jar
+%%DATADIR%%/lib/libxine-custom.jar
+%%DATADIR%%/lib/log4j-1.2.15.jar
+%%DATADIR%%/lib/lucene-core-3.0.0.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/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/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/xpp3_min-1.1.4c.jar
 %%DATADIR%%/lib/xstream-1.3.1.jar
-%%DATADIR%%/license.txt
-%%DATADIR%%/log4j.properties
-%%DATADIR%%/presets.properties
-%%DATADIR%%/settings/extendedLog.properties
-%%DATADIR%%/settings/log4j.properties
-%%DATADIR%%/settings/preset_radios.xml
-%%DATADIR%%/settings/presets.properties
-%%DATADIR%%/settings/vlc.properties
-%%DATADIR%%/shortcutSpec.xml
-%%DATADIR%%/translations/MainBundle.properties
-%%DATADIR%%/translations/MainBundle_ar.properties
-%%DATADIR%%/translations/MainBundle_cs.properties
-%%DATADIR%%/translations/MainBundle_da.properties
-%%DATADIR%%/translations/MainBundle_de.properties
-%%DATADIR%%/translations/MainBundle_el.properties
-%%DATADIR%%/translations/MainBundle_en.properties
-%%DATADIR%%/translations/MainBundle_es.properties
-%%DATADIR%%/translations/MainBundle_fr.properties
-%%DATADIR%%/translations/MainBundle_gl.properties
-%%DATADIR%%/translations/MainBundle_hr.properties
-%%DATADIR%%/translations/MainBundle_hu.properties
-%%DATADIR%%/translations/MainBundle_it.properties
-%%DATADIR%%/translations/MainBundle_ja.properties
-%%DATADIR%%/translations/MainBundle_nl.properties
-%%DATADIR%%/translations/MainBundle_no.properties
-%%DATADIR%%/translations/MainBundle_pl.properties
-%%DATADIR%%/translations/MainBundle_pt.properties
-%%DATADIR%%/translations/MainBundle_pt_BR.properties
-%%DATADIR%%/translations/MainBundle_ru.properties
-%%DATADIR%%/translations/MainBundle_sk.properties
-%%DATADIR%%/translations/MainBundle_sv.properties
-%%DATADIR%%/translations/MainBundle_tr.properties
-%%DATADIR%%/translations/MainBundle_uk.properties
-%%DATADIR%%/translations/MainBundle_zh.properties
-%%DATADIR%%/translations/MainBundle_zh_TW.properties
-%%DATADIR%%/translations/PacksPanel_deu.xml
-%%DATADIR%%/translations/PacksPanel_fra.xml
-%%DATADIR%%/translations/PacksPanel_hrv.xml
-%%DATADIR%%/translations/PacksPanel_ita.xml
-%%DATADIR%%/translations/PacksPanel_spa.xml
-%%DATADIR%%/translations/flag_ar.png
-%%DATADIR%%/translations/flag_cs.png
-%%DATADIR%%/translations/flag_da.png
-%%DATADIR%%/translations/flag_de.png
-%%DATADIR%%/translations/flag_el.png
-%%DATADIR%%/translations/flag_en.png
-%%DATADIR%%/translations/flag_es.png
-%%DATADIR%%/translations/flag_fr.png
-%%DATADIR%%/translations/flag_gl.png
-%%DATADIR%%/translations/flag_hr.png
-%%DATADIR%%/translations/flag_hu.png
-%%DATADIR%%/translations/flag_it.png
-%%DATADIR%%/translations/flag_ja.png
-%%DATADIR%%/translations/flag_nl.png
-%%DATADIR%%/translations/flag_no.png
-%%DATADIR%%/translations/flag_pl.png
-%%DATADIR%%/translations/flag_pt.png
-%%DATADIR%%/translations/flag_pt_BR.png
-%%DATADIR%%/translations/flag_ru.png
-%%DATADIR%%/translations/flag_sk.png
-%%DATADIR%%/translations/flag_sv.png
-%%DATADIR%%/translations/flag_tr.png
-%%DATADIR%%/translations/flag_uk.png
-%%DATADIR%%/translations/flag_zh.png
-%%DATADIR%%/translations/flag_zh_TW.png
-share/pixmaps/atunes125.png
-@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/settings
+share/pixmaps/atunes.png
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%
 @dirrmtry share/applications