On Wed, Dec 14, 2011 at 10:53:29PM +0100, Matthias Kilian wrote:
> - Make it at least startable (it was unusable after the removal of
> jdk-1.5, and nobody noticed/complained).
>
> - Remove MAINTAINER, because of inactivity.
>
> We may as well just remove it from the tree. If there are real
> users, please speak up!
Forgot to add RUN_DEPENDS=java/javaPathHelper
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/jxplorer/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 7 Oct 2011 13:54:30 -0000 1.11
+++ Makefile 14 Dec 2011 22:12:51 -0000
@@ -5,14 +5,12 @@ COMMENT= standards compliant LDAP browse
V= 3.2
DISTNAME= JXv${V}deploy
PKGNAME= jxplorer-${V}
-REVISION= 7
+REVISION= 8
EXTRACT_SUFX= .zip
CATEGORIES= databases net
HOMEPAGE= http://www.pegacat.com/jxplorer/
-MAINTAINER= Alexandre Anriot <[email protected]>
-
# CA Open Source Licence v1.0
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@@ -24,14 +22,14 @@ WRKDIST= ${WRKDIR}/jxplorer
MODULES= java
MODJAVA_VER= 1.5+
-JAVA_HOME= ${LOCALBASE}/jdk-1.5.0
+
+RUN_DEPENDS= java/javaPathHelper
NO_BUILD= Yes
NO_REGRESS= Yes
do-configure:
@cp ${FILESDIR}/jxplorer ${WRKSRC}
- @perl -pi -e "s,%%JAVA_HOME%%,${JAVA_HOME}," ${WRKSRC}/jxplorer.sh
@perl -pi -e "s,%%PREFIX%%,${PREFIX}," \
${WRKSRC}/jxplorer \
${WRKSRC}/jxplorer.sh
Index: patches/patch-jxplorer_sh
===================================================================
RCS file: /cvs/ports/databases/jxplorer/patches/patch-jxplorer_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-jxplorer_sh
--- patches/patch-jxplorer_sh 31 May 2007 18:13:15 -0000 1.1.1.1
+++ patches/patch-jxplorer_sh 14 Dec 2011 22:12:51 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-jxplorer_sh,v 1.1.1.1 2007/05/31 18:13:15 aanriot Exp $
--- jxplorer.sh.orig Mon Feb 26 21:08:36 2007
-+++ jxplorer.sh Wed May 30 08:40:36 2007
-@@ -1,24 +1,19 @@
++++ jxplorer.sh Wed Dec 14 22:44:15 2011
+@@ -1,24 +1,18 @@
#!/bin/sh
- # OpenDirectory jxstart.sh $Revision: 1.1.1.1 $ $Date: 2007/05/31 18:13:15 $
+ # OpenDirectory jxstart.sh $Revision: 1.13 $ $Date: 2006/04/18 04:12:12 $
-if [ -x $JAVA_HOME/bin/java ]; then
- JAVA_LOC=$JAVA_HOME/bin/java
@@ -15,12 +15,14 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
- JAVA_LOC=/opt/ca/etrustdirectory/jre/bin/java
-elif [ -x /opt/CA/eTrustDirectory/jre/bin/java ]; then
- JAVA_LOC=/opt/CA/eTrustDirectory/jre/bin/java
-+if [ -x %%JAVA_HOME%%/bin/java ]; then
-+ JAVA_LOC=%%JAVA_HOME%%/bin/java
- else
- JAVA_LOC=java
- fi
+-else
+- JAVA_LOC=java
+-fi
++PATH=/bin:/usr/bin
++JAVA_HOME=$(%%PREFIX%%/bin/javaPathHelper -h jxplorer)
++JAVA_LOC=$(%%PREFIX%%/bin/javaPathHelper -c jxplorer)
++
+# use an absolute path instead of a relative one
+jars=%%PREFIX%%/share/jxplorer/jars
+
@@ -28,20 +30,20 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
${JAVA_LOC} -version >/dev/null 2>&1
if [ "$?" != "0" ] ; then
- OPTJX=/opt/jxplorer
-+ OPTJX=%%JAVA_HOME%%/bin/java
++ OPTJX=$JAVA_LOC
# $OPTJX MUST be the JXplorer install directory, or a link to it, and
contain the JRE
-@@ -29,7 +24,7 @@ if [ "$?" != "0" ] ; then
+@@ -29,7 +23,7 @@ if [ "$?" != "0" ] ; then
fi
cd $OPTJX
- JAVAV=/opt/jxplorer/jre/bin/java
-+ JAVAV=%%JAVA_HOME%%/bin/java
++ JAVAV=$JAVA_LOC
else
JAVAV=${JAVA_LOC}
fi
-@@ -38,14 +33,14 @@ echo "starting JXplorer..."
+@@ -38,14 +32,14 @@ echo "starting JXplorer..."
echo
FAIL=0
if [ "$1" = "console" ] ; then
@@ -59,7 +61,7 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
if [ "$?" != "0" ]; then
FAIL=1
-@@ -67,7 +62,7 @@ running this from. Make sure the DISPLAY environment v
+@@ -67,7 +61,7 @@ running this from. Make sure the DISPLAY environment v
Otherwise, ask your Unix Systems Administrator for more information on running
X Windows applications.
