summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Botero-Lowry <alexbl@FreeBSD.org>2006-10-07 21:55:23 +0000
committerAlexander Botero-Lowry <alexbl@FreeBSD.org>2006-10-07 21:55:23 +0000
commit39df885ea9808ce2e6b6a8cf2b28adf5cd152c28 (patch)
tree8aaa0fe1bde9f716c56391e23cfcc1c4d01183ee
parent- Mark as BROKEN for 4.x. (diff)
- Unbreak java bindings
Approved by: novel (mentor, implicit)
-rw-r--r--audio/java-xmms2/Makefile6
-rw-r--r--audio/java-xmms2/pkg-plist2
-rw-r--r--audio/xmms2/files/patch-src_clients_lib_java_misc.c10
3 files changed, 13 insertions, 5 deletions
diff --git a/audio/java-xmms2/Makefile b/audio/java-xmms2/Makefile
index 658480205860..045870f84694 100644
--- a/audio/java-xmms2/Makefile
+++ b/audio/java-xmms2/Makefile
@@ -18,8 +18,6 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
MASTERDIR= ${.CURDIR}/../xmms2
-BROKEN= Incorrect pkg-plist
-
USE_JAVA= yes
JAVA_VERSION= 1.4+
@@ -45,8 +43,8 @@ do-build:
do-install:
@cd ${WRKSRC} && ${INSTALL_DATA} src/clients/lib/java/xmms2java.jar \
- ${JAVALIBDIR}/xmms2java.jar
+ ${JAVAJARDIR}/xmms2java.jar
@cd ${WRKSRC} && ${INSTALL_DATA} src/clients/lib/java/libxmms2java.so \
- ${TARGETDIR}/lib/libxmms2java.so
+ ${PREFIX}/lib/libxmms2java.so
.include "${MASTERDIR}/Makefile"
diff --git a/audio/java-xmms2/pkg-plist b/audio/java-xmms2/pkg-plist
index 90ec6068fb06..fab61a0fc32d 100644
--- a/audio/java-xmms2/pkg-plist
+++ b/audio/java-xmms2/pkg-plist
@@ -1,2 +1,2 @@
lib/libxmms2java.so
-%%JAVALIBDIR%%/xmms2java.jar
+%%JAVAJARDIR%%/xmms2java.jar
diff --git a/audio/xmms2/files/patch-src_clients_lib_java_misc.c b/audio/xmms2/files/patch-src_clients_lib_java_misc.c
new file mode 100644
index 000000000000..7c2856a033b6
--- /dev/null
+++ b/audio/xmms2/files/patch-src_clients_lib_java_misc.c
@@ -0,0 +1,10 @@
+--- src/clients/lib/java/misc.c.orig Sat Oct 7 14:41:07 2006
++++ src/clients/lib/java/misc.c Sat Oct 7 14:41:16 2006
+@@ -15,6 +15,7 @@
+ */
+
+ #include <stdio.h>
++#include <sys/syslimits.h>
+ #include <xmmsclient/xmmsclient.h>
+ #include <xmms/xmms_defs.h>
+ #include <jni.h>