diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index 3511210c3ae1..b7c74a4cf1f3 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -1,68 +1,67 @@
 PORTNAME=	atunes
-PORTVERSION=	3.1.2
-PORTREVISION=	7
+DISTVERSION=	3.2.0
 CATEGORIES=	audio java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
+MASTER_SITES=	SF/${PORTNAME}/latest-builds \
+		SF/${PORTNAME}/${PORTNAME}/aTunes%20${DISTVERSION}
+DISTNAME=	${PORTNAME}-${DISTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-featured audio player and manager developed in Java
-WWW=		https://www.atunes.org/
+WWW=		https://sourceforge.net/projects/atunes/
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/license.txt
 
 USES=		java
+JAVA_VERSION=	8
+DESKTOP_ENTRIES=	"aTunes" \
+			"Audio player and manager" \
+			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+			"${PORTNAME}" \
+			"Audio;AudioVideo;Java;" \
+			true
+EXTRACT_AFTER_ARGS=	--exclude ant*.jar \
+			--exclude src \
+			--exclude win_tools \
+			--exclude *.dll \
+			--exclude *.exe \
+			--exclude *.so \
+			--no-same-owner --no-same-permissions
+NO_ARCH=	yes
 NO_BUILD=	yes
-SUB_FILES=	atunes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+SUB_FILES=	${PORTNAME}
+SUB_LIST=	JAVA=${JAVA}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+PLIST_SUB=	VER=${DISTVERSION}
 
 OPTIONS_DEFINE=		CDDA2WAV
-
+OPTIONS_DEFAULT=	CDDA2WAV FLAC LAME MPLAYER VORBIS
 OPTIONS_MULTI=		ENCODER ENGINE
-
-OPTIONS_MULTI_ENCODER=	LAME VORBIS FLAC
+OPTIONS_MULTI_ENCODER=	FLAC LAME VORBIS
 OPTIONS_MULTI_ENGINE=	MPLAYER XINE
 
-OPTIONS_DEFAULT=	MPLAYER CDDA2WAV LAME VORBIS
-
-MPLAYER_DESC=		Engine:  Use Mplayer
-XINE_DESC=		Engine:  Use Xine
 CDDA2WAV_DESC=		Ripper:  Enable cdrtools support
+FLAC_DESC=		Encoder: Enable FLAC encoder
 LAME_DESC=		Encoder: Enable lame MP3 encoder
+MPLAYER_DESC=		Engine:  Use Mplayer
 VORBIS_DESC=		Encoder: Enable vorbis OGG encoder
-FLAC_DESC=		Encoder: Enable FLAC encoder
+XINE_DESC=		Engine:  Use Xine
 
-MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
-XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 CDDA2WAV_RUN_DEPENDS=	cdda2wav:sysutils/cdrtools
+FLAC_RUN_DEPENDS=	flac:audio/flac
 LAME_RUN_DEPENDS=	lame:audio/lame
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
-FLAC_RUN_DEPENDS=	flac:audio/flac
-
-DESKTOP_ENTRIES="aTunes" \
-		"Audio player and manager" \
-		"${PREFIX}/share/pixmaps/atunes.png" \
-		"atunes" \
-		"Audio;AudioVideo;Java;" \
-		true
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 
 INSTALL_FILES=	aTunes.ico aTunes.jar splash.gif changelog.txt
 
-PIXMAPS=	atunes.png
-
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
-	${INSTALL_SCRIPT} ${WRKDIR}/atunes ${STAGEDIR}${PREFIX}/bin
-.for file in ${INSTALL_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}/${file}
-.endfor
-	@(cd ${WRKSRC} && ${FIND} lib -type f -name "*.jar" -exec ${INSTALL_DATA} {} \
-		${STAGEDIR}${DATADIR}/{} \;)
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} settings ${STAGEDIR}${DATADIR}/)
-.for file in ${PIXMAPS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/share/pixmaps
-.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${INSTALL_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${STAGEDIR}${DATADIR}/lib
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} settings ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/audio/atunes/distinfo b/audio/atunes/distinfo
index 4ec73e759595..68ff0e939a13 100644
--- a/audio/atunes/distinfo
+++ b/audio/atunes/distinfo
@@ -1,2 +1,3 @@
-SHA256 (atunes-3.1.2-bin.tar.gz) = fd6681f8d71c4b321e8615b1786403df579c8524d2da48d6bd3b3a412196e4ce
-SIZE (atunes-3.1.2-bin.tar.gz) = 30665524
+TIMESTAMP = 1783636363
+SHA256 (atunes-3.2.0-bin.tar.gz) = 1008dff0379f6bf87b989db8698c44c004fec3a15ea67c3f7bf7801a889e13c2
+SIZE (atunes-3.2.0-bin.tar.gz) = 29926500
diff --git a/audio/atunes/files/atunes.in b/audio/atunes/files/atunes.in
index 18bb592c7e6d..c7903ba82948 100644
--- a/audio/atunes/files/atunes.in
+++ b/audio/atunes/files/atunes.in
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-exec %%LOCALBASE%%/bin/java \
+exec %%JAVA%% \
     -Dsubstancelaf.windowRoundedCorners=false \
     -Dinsubstantial.looseTableCellRenderers=true -Djava.library.path=./ \
     -Xms128m -Xmx256m -splash:splash.gif \
     -cp aTunes.jar:lib/* net.sourceforge.atunes.Main "$@"
diff --git a/audio/atunes/pkg-plist b/audio/atunes/pkg-plist
index 6d7526ce1d50..0765bbd1b9c2 100644
--- a/audio/atunes/pkg-plist
+++ b/audio/atunes/pkg-plist
@@ -1,80 +1,80 @@
 bin/atunes
 %%DATADIR%%/aTunes.ico
 %%DATADIR%%/aTunes.jar
 %%DATADIR%%/changelog.txt
 %%DATADIR%%/lib/asm-4.0.jar
-%%DATADIR%%/lib/atunes-3.1.2.jar
+%%DATADIR%%/lib/atunes-%%VER%%.jar
 %%DATADIR%%/lib/commons-beanutils-1.8.3.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-io-2.4.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/guava-10.0.1.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.5.1.jar
 %%DATADIR%%/lib/joda-time-2.0.jar
 %%DATADIR%%/lib/jsr305-1.3.9.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/lastfm-java-0.1.2.jar
 %%DATADIR%%/lib/log4j-1.2.15.jar
-%%DATADIR%%/lib/lucene-core-3.0.2.jar
 %%DATADIR%%/lib/minlog-1.2.jar
 %%DATADIR%%/lib/objenesis-1.2.jar
 %%DATADIR%%/lib/reflectasm-1.07-shaded.jar
 %%DATADIR%%/lib/sanselan-0.97-incubator.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-7.2.1.jar
 %%DATADIR%%/lib/substance-swingx-7.2.1.jar
 %%DATADIR%%/lib/swingx-all-1.6.5.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%%/settings/atunes.colorschemes
 %%DATADIR%%/settings/ehcache-lastfm.xml
 %%DATADIR%%/settings/ehcache-lyrics.xml
 %%DATADIR%%/settings/ehcache-preferences.xml
 %%DATADIR%%/settings/log4j.properties
 %%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/javafx_beans.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/swing_beans.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