- Temporary work-around: call scons twice in the do-build phase. This should

resolve build issues with audio/x4x.
- bump PORTREVISION

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

1 files changed, 14 insertions, 1 deletions

diff --git a/audio/java-xmms2/Makefile b/audio/java-xmms2/Makefile
index 3193410bb8ca..b927818bfaac 100644
--- a/audio/java-xmms2/Makefile
+++ b/audio/java-xmms2/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 CATEGORIES=	audio java
 PKGNAMEPREFIX=	java-
 
@@ -24,10 +25,22 @@ INSTALLS_SHLIB=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
 SCONS_BUILDENV=	JAVA_HOME=${JAVA_HOME}
-SCONS_TARGET=	src/clients/lib/java/libxmms2java.so src/clients/lib/java/xmms2java.jar
+SCONS_TARGET=	src/clients/lib/java
 
 XMMS2_SLAVE=	java
 
+# Crazy workaround for a bug introduced sometime after DrDoolittle that
+# causes the java bindings to not be built completely on the first
+# run of scons.
+
+do-build:
+	@cd ${WRKSRC} && \
+	${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} ${SCONS_ENV} ${SCONS_ARGS} \
+	${SCONS_TARGET}
+	@cd ${WRKSRC} && \
+	${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} ${SCONS_ENV} ${SCONS_ARGS} \
+	${SCONS_TARGET}
+
 do-install:
 	@cd ${WRKSRC} && ${INSTALL_DATA} src/clients/lib/java/xmms2java.jar \
 	${JAVAJARDIR}/xmms2java.jar