From 69376523ffbab527fd767c5cc39cad8002502566 Mon Sep 17 00:00:00 2001 From: kili Date: Thu, 15 Dec 2011 21:53:25 +0000 Subject: [PATCH] - Make it at least startable (it was unusable after the removal of jdk-1.5, and nobody noticed/complained). - Remove MAINTAINER, because of inactivity. kind of ok@ all those people who find it still usefull (but didn't use it since the removal of jdk-1.5) --- databases/jxplorer/Makefile | 10 +++---- databases/jxplorer/patches/patch-jxplorer_sh | 30 +++++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/databases/jxplorer/Makefile b/databases/jxplorer/Makefile index 3c86598ac08..268dc8a66da 100644 --- a/databases/jxplorer/Makefile +++ b/databases/jxplorer/Makefile @@ -1,18 +1,16 @@ -# $OpenBSD: Makefile,v 1.11 2011/10/07 13:54:30 kurt Exp $ +# $OpenBSD: Makefile,v 1.12 2011/12/15 21:53:25 kili Exp $ COMMENT= standards compliant LDAP browser 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 - # 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 diff --git a/databases/jxplorer/patches/patch-jxplorer_sh b/databases/jxplorer/patches/patch-jxplorer_sh index 6ec6a98805f..5b2a1a5aca9 100644 --- a/databases/jxplorer/patches/patch-jxplorer_sh +++ b/databases/jxplorer/patches/patch-jxplorer_sh @@ -1,9 +1,9 @@ -$OpenBSD: patch-jxplorer_sh,v 1.1.1.1 2007/05/31 18:13:15 aanriot Exp $ +$OpenBSD: patch-jxplorer_sh,v 1.2 2011/12/15 21:53:26 kili 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.2 $ $Date: 2011/12/15 21:53:26 $ -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 2007/05/31 18:13:15 aanriot Exp $ - 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 2007/05/31 18:13:15 aanriot Exp $ ${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 2007/05/31 18:13:15 aanriot Exp $ 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.