Date: Mon, 24 Jul 2006 04:37:01 -0500 (CDT) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alex@foxybanana.com Subject: ports/100770: [PATCH] audio/x4x: update to 0.2.1 Message-ID: <200607240937.k6O9b1eS001899@Laptop.mine.box> Resent-Message-ID: <200607240940.k6O9eDt2005614@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100770
>Category: ports
>Synopsis: [PATCH] audio/x4x: update to 0.2.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 24 09:40:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alexander Botero-Lowry
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #1: Mon Jul 10 22:43:23 CDT 2006
>Description:
- Update to 0.2.1
Added file(s):
- files/patch-build.xml
Port maintainer (alex@foxybanana.com) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- x4x-0.2.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/x4x/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 18 Apr 2006 06:32:30 -0000 1.1
+++ Makefile 24 Jul 2006 09:35:14 -0000
@@ -5,10 +5,11 @@
# $FreeBSD: ports/audio/x4x/Makefile,v 1.1 2006/04/18 06:32:30 edwin Exp $
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 @@
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 @@
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}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/x4x/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 18 Apr 2006 06:32:30 -0000 1.1
+++ distinfo 24 Jul 2006 09:35:14 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/x4x/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 18 Apr 2006 06:32:30 -0000 1.1
+++ pkg-plist 24 Jul 2006 09:35:14 -0000
@@ -1,71 +1,16 @@
-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_de_austrian.properties
+%%DATADIR%%/org/x4x/properties/lang/x4x_en.properties
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%/libs
-@dirrm %%DATADIR%%/properties/lang
-@dirrm %%DATADIR%%/properties
+@dirrm %%DATADIR%%/org/x4x/properties/lang
+@dirrm %%DATADIR%%/org/x4x/properties
@dirrm %%DATADIR%%
Index: files/patch-build.xml
===================================================================
RCS file: files/patch-build.xml
diff -N files/patch-build.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-build.xml 24 Jul 2006 09:35:14 -0000
@@ -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>
--- x4x-0.2.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607240937.k6O9b1eS001899>