- Update to 0.2.1

Added file(s):
- files/patch-build.xml

PR:		ports/100770
Submitted by:	Alexander Botero-Lowry (maintainer)

4 files changed, 29 insertions, 77 deletions

diff --git a/audio/x4x/Makefile b/audio/x4x/Makefile
index f17cff83f990..a24908052974 100644
--- a/audio/x4x/Makefile
+++ b/audio/x4x/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	x4x
-PORTVERSION=	0.1.2
+PORTVERSION=	0.2.1
 CATEGORIES=	audio java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	alex@foxybanana.com
 COMMENT=	X4X for XMMS2
@@ -24,8 +25,10 @@ BUILD_DEPENDS=	${JAVALIBDIR}/xmms2java.jar:${PORTSDIR}/audio/java-xmms2 \
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 USE_ANT=	yes
-MAKE_ARGS=	-DswtHome=$J{JAVALIBDIR} \
+MAKE_ARGS=	-DinstallDir=${JAVASHAREDIR}/X4X \
+		-DsharedDir=${JAVASHAREDIR}/X4X \
 		-Dprefix=${JAVASHAREDIR} \
+		-Dbinary=${PREFIX}/bin/x4x \
 		-Dswt=${JAVALIBDIR}/swt.jar \
 		-Dxmms2java=${JAVALIBDIR}/xmms2java.jar \
 		-Dlog4j=${JAVALIBDIR}/log4j.jar \
@@ -38,16 +41,6 @@ USE_BZIP2=	yes
 WRKSRC=	${WRKDIR}/X4X
 DATADIR=	${JAVASHAREDIR}/X4X
 
-do-run:
-	cd ${WRKSRC} && ant ${MAKE_ARGS} run
-
-pre-install:
-	${REINPLACE_CMD} -e \
-	's|$${prefix}/share/X4X/images|$${prefix}/X4X/images|g' \
-	${WRKSRC}/build.xml
-	${REINPLACE_CMD} -e 's|$${prefix}/bin/X4X|${PREFIX}/bin/X4X|g' \
-	${WRKSRC}/build.xml
-
 do-install:
 	@cd ${WRKSRC} && ant ${MAKE_ARGS} ${INSTALL_TARGET}
 
diff --git a/audio/x4x/distinfo b/audio/x4x/distinfo
index 77f7bd00484d..54bf69df5dc1 100644
--- a/audio/x4x/distinfo
+++ b/audio/x4x/distinfo
@@ -1,3 +1,3 @@
-MD5 (x4x-0.1.2.tar.bz2) = 7d481be72637b3647f5ce5cacc11ea1e
-SHA256 (x4x-0.1.2.tar.bz2) = bbd25a85e7196d12b47806cdf7bffd44c9d6f3caca3e9abd058f3939bbc1fdb8
-SIZE (x4x-0.1.2.tar.bz2) = 2563266
+MD5 (x4x-0.2.1-src.tar.bz2) = 795c981999bf304de0049fe3309fe99c
+SHA256 (x4x-0.2.1-src.tar.bz2) = 06379ac1f6f280495b72315b6fc4e9415aa185d269577dc98001aef9d4da38d0
+SIZE (x4x-0.2.1-src.tar.bz2) = 1513268
diff --git a/audio/x4x/files/patch-build.xml b/audio/x4x/files/patch-build.xml
new file mode 100644
index 000000000000..d4ec2b3c57be
--- /dev/null
+++ b/audio/x4x/files/patch-build.xml
@@ -0,0 +1,13 @@
+--- build.xml.orig	Mon Jul 24 04:13:49 2006
++++ build.xml	Mon Jul 24 04:14:10 2006
+@@ -124,9 +124,7 @@
+ 		<copy todir="${sharedDir}/images">
+ 			<fileset dir="images"/>
+ 		</copy>
+-		<copy todir="${installDir}/.xmms2">
+-			<fileset dir=".xmms2" excludes="**/settings.properties"/>
+-		</copy>
++
+ 		<copy todir="${installDir}/org/x4x/properties">
+ 			<fileset dir="src/org/x4x/properties"/>
+ 		</copy>
diff --git a/audio/x4x/pkg-plist b/audio/x4x/pkg-plist
index 2f00c60346a4..c5962470f34a 100644
--- a/audio/x4x/pkg-plist
+++ b/audio/x4x/pkg-plist
@@ -1,71 +1,17 @@
-bin/X4X
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/about16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/about32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/about48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/about64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/lists16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/lists32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/lists48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/lists64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/misc16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/misc32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/misc48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/misc64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/next16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/next32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/next48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/next64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/pause16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/pause32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/pause48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/pause64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/play16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/play32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/play48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/play64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/prev16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/prev32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/prev48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/prev64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/stop16x16.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/stop32x32.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/stop48x48.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/stop64x64.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayAbout.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayEQ.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayExit.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayHelp.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayIcon.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayLists.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayMovie.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayNext.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayPause.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayPlay.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayPrefs.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayPrev.png
-%%DATADIR%%/.xmms2/clients/x4x/images/icons/default/trayStop.png
-%%DATADIR%%/.xmms2/clients/x4x/styles/bigscreen.xml
-%%DATADIR%%/.xmms2/clients/x4x/styles/default.xml
-%%DATADIR%%/.xmms2/clients/x4x/styles/small.xml
+bin/x4x
 %%DATADIR%%/X4X.jar
 %%DATADIR%%/images/logo.ico
 %%DATADIR%%/images/logo.png
 %%DATADIR%%/images/logo.xpm
 %%DATADIR%%/libs/XWidgets.jar
 %%DATADIR%%/log4j.properties
-%%DATADIR%%/properties/lang/x4x.properties
-%%DATADIR%%/properties/lang/x4x_de.properties
-%%DATADIR%%/properties/lang/x4x_de_austrian.properties
-%%DATADIR%%/properties/lang/x4x_en.properties
-@dirrm %%DATADIR%%/.xmms2/clients/x4x/images/icons/default
-@dirrm %%DATADIR%%/.xmms2/clients/x4x/images/icons
-@dirrm %%DATADIR%%/.xmms2/clients/x4x/images
-@dirrm %%DATADIR%%/.xmms2/clients/x4x/styles
-@dirrm %%DATADIR%%/.xmms2/clients/x4x
-@dirrm %%DATADIR%%/.xmms2/clients
-@dirrm %%DATADIR%%/.xmms2
+%%DATADIR%%/org/x4x/properties/lang/x4x.properties
+%%DATADIR%%/org/x4x/properties/lang/x4x_de.properties
+%%DATADIR%%/org/x4x/properties/lang/x4x_en.properties
+@dirrm %%DATADIR%%/org/x4x/properties/lang
+@dirrm %%DATADIR%%/org/x4x/properties
+@dirrm %%DATADIR%%/org/x4x
+@dirrm %%DATADIR%%/org
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/libs
-@dirrm %%DATADIR%%/properties/lang
-@dirrm %%DATADIR%%/properties
 @dirrm %%DATADIR%%