6 files changed, 148 insertions, 143 deletions

diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
index e01eae65f180..cbeabb613909 100644
--- a/sysutils/linux-crashplan/Makefile
+++ b/sysutils/linux-crashplan/Makefile
@@ -1,17 +1,21 @@
 # Created by: William Grzybowski <wg@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	linux-crashplan
+PORTNAME=	crashplan
 DISTVERSION=	4.5.0
-CATEGORIES=	sysutils linux
+CATEGORIES=	sysutils java linux
 MASTER_SITES=	https://download.code42.com/installs/linux/install/CrashPlan/
+PKGNAMEPREFIX=	linux-
 DISTNAME=	CrashPlan_${DISTVERSION}_Linux
 
 MAINTAINER=	subtil@gmail.com
 COMMENT=	Backs up data to remote servers or hard drives
 
-RUN_DEPENDS=	linux-sun-jre17>=0:java/linux-sun-jre17 \
-		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
+
+USE_JAVA=	yes
+JAVA_OS=	linux
+JAVA_VERSION=	1.7+
 
 WRKSRC=		${WRKDIR}/crashplan-install
 
@@ -37,7 +41,7 @@ do-install:
 	${ECHO_CMD} > ${STAGEDIR}${CRASHDIR}/install.vars
 	${ECHO_CMD} "TARGETDIR=${CRASHDIR}" >> ${STAGEDIR}${CRASHDIR}/install.vars
 	${ECHO_CMD} "BINSDIR=${CRASHDIR}/bin" >> ${STAGEDIR}${CRASHDIR}/install.vars
-	${ECHO_CMD} "JAVACOMMON=${LOCALBASE}/linux-sun-jre1.7.0/bin/java" >> ${STAGEDIR}${CRASHDIR}/install.vars
+	${ECHO_CMD} "JAVA_COMMON=${JAVA}" >> ${STAGEDIR}${CRASHDIR}/install.vars
 	${CAT} ${WRKSRC}/install.defaults >> ${STAGEDIR}${CRASHDIR}/install.vars
 
 .include <bsd.port.mk>
diff --git a/sysutils/linux-crashplan/files/patch-CrashPlanDesktop b/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
deleted file mode 100644
index 5fb1028a87bc..000000000000
--- a/sysutils/linux-crashplan/files/patch-CrashPlanDesktop
+++ /dev/null
@@ -1,17 +0,0 @@
---- scripts/CrashPlanDesktop
-+++ scripts/CrashPlanDesktop
-@@ -5,9 +5,11 @@ SCRIPTDIR=$(dirname $SCRIPT)
- TARGETDIR="$SCRIPTDIR/.."
- export SWT_GTK3=0
- 
--. ${TARGETDIR}/install.vars
--. ${TARGETDIR}/bin/run.conf
-+. /usr/local/share/crashplan/install.vars
- 
- cd ${TARGETDIR}
- 
--${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
-+. bin/run.conf
-+${LOGDIR=/var/log/crashplan}
-+
-+${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${LOGDIR}/ui_output.log 2> ${LOGDIR}/ui_error.log &
diff --git a/sysutils/linux-crashplan/files/patch-scripts_CrashPlanDesktop b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanDesktop
new file mode 100644
index 000000000000..79fb91e7ac6d
--- /dev/null
+++ b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanDesktop
@@ -0,0 +1,20 @@
+--- scripts/CrashPlanDesktop.orig	2016-04-24 10:38:26 UTC
++++ scripts/CrashPlanDesktop
+@@ -5,12 +5,14 @@ SCRIPTDIR=$(dirname $SCRIPT)
+ TARGETDIR="$SCRIPTDIR/.."
+ export SWT_GTK3=0
+ 
+-. ${TARGETDIR}/install.vars
+-. ${TARGETDIR}/bin/run.conf
++. /usr/local/share/crashplan/install.vars
+ 
+ cd ${TARGETDIR}
+ 
+-if [ "_${VERSION_5_UI}" == "_true" ]; then
++. bin/run.conf
++${LOGDIR=/var/log/crashplan}
++
++${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${LOGDIR}/ui_output.log 2> ${LOGDIR}/ui_error.log &
+ 	${TARGETDIR}/electron/crashplan > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
+ else
+ 	${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
diff --git a/sysutils/linux-crashplan/files/patch-CrashPlanEngine b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanEngine
index 2281c379549b..3e12174457d5 100644
--- a/sysutils/linux-crashplan/files/patch-CrashPlanEngine
+++ b/sysutils/linux-crashplan/files/patch-scripts_CrashPlanEngine
@@ -1,4 +1,4 @@
---- scripts/CrashPlanEngine
+--- scripts/CrashPlanEngine.orig	2016-04-24 10:38:26 UTC
 +++ scripts/CrashPlanEngine
 @@ -11,7 +11,7 @@ standard_startup() {
  	
diff --git a/sysutils/linux-crashplan/pkg-message b/sysutils/linux-crashplan/pkg-message
index 6e7f6083f33f..bab3ee9879e4 100644
--- a/sysutils/linux-crashplan/pkg-message
+++ b/sysutils/linux-crashplan/pkg-message
@@ -5,4 +5,3 @@ setting up a headless CrashPlan server.
 
 On FreeBSD, the authentication token file can be found in
 /compat/linux/var/lib/CrashPlan/.ui_info
-
diff --git a/sysutils/linux-crashplan/pkg-plist b/sysutils/linux-crashplan/pkg-plist
index 9e0e384b674e..47466b63cb08 100644
--- a/sysutils/linux-crashplan/pkg-plist
+++ b/sysutils/linux-crashplan/pkg-plist
@@ -1,123 +1,122 @@
 bin/CrashPlanDesktop
-etc/rc.d/crashplan
-share/crashplan/app.asar
-share/crashplan/bin/CrashPlanEngine
-share/crashplan/bin/restartLinux.sh
-share/crashplan/bin/run.conf
-share/crashplan/bin/uninstall.sh
-share/crashplan/conf/custom_sample.properties
-share/crashplan/conf/default.service.xml
-share/crashplan/conf/service.log.xml
-share/crashplan/conf/ui.log.xml
-share/crashplan/conf/ui.properties
-share/crashplan/conf/upgradeui.log.xml
-share/crashplan/conf/upgradeui.properties
-share/crashplan/doc/readme.html
-share/crashplan/doc/readme.odt
-share/crashplan/doc/readme.pdf
-share/crashplan/doc/readme.rtf
-share/crashplan/install.vars
-share/crashplan/lang/txt.properties
-share/crashplan/lang/txt_de.properties
-share/crashplan/lang/txt_en_GB.properties
-share/crashplan/lang/txt_en_US.properties
-share/crashplan/lang/txt_es.properties
-share/crashplan/lang/txt_es_ES.properties
-share/crashplan/lang/txt_fr.properties
-share/crashplan/lang/txt_it.properties
-share/crashplan/lang/txt_ja.properties
-share/crashplan/lang/txt_ko.properties
-share/crashplan/lang/txt_nl.properties
-share/crashplan/lang/txt_no.properties
-share/crashplan/lang/txt_pt_BR.properties
-share/crashplan/lang/txt_sv.properties
-share/crashplan/lang/txt_th.properties
-share/crashplan/lang/txt_zh.properties
-share/crashplan/lang/txt_zh_TW.properties
-share/crashplan/lib/bcpkix-jdk15on.jar
-share/crashplan/lib/bcprov-jdk15on.jar
-share/crashplan/lib/c42_protolib_shared.jar
-share/crashplan/lib/com.backup42.desktop.jar
-share/crashplan/lib/comfyj-2.10.jar
-share/crashplan/lib/commons-beanutils-core.jar
-share/crashplan/lib/commons-cli-1.2.jar
-share/crashplan/lib/commons-codec.jar
-share/crashplan/lib/commons-collections.jar
-share/crashplan/lib/commons-io.jar
-share/crashplan/lib/commons-jxpath-1.1.jar
-share/crashplan/lib/commons-lang.jar
-share/crashplan/lib/commons-logging.jar
-share/crashplan/lib/ezmorph.jar
-share/crashplan/lib/gson.jar
-share/crashplan/lib/guava.jar
-share/crashplan/lib/javassist-3.20.0.jar
-share/crashplan/lib/jetty-continuation-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-http-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-io-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-security-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-server-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-servlet-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-servlets-9.2.9.v20150224.jar
-share/crashplan/lib/jetty-util-9.2.9.v20150224.jar
-share/crashplan/lib/jna-platform.jar
-share/crashplan/lib/jna.jar
-share/crashplan/lib/jniwrap.jar
-share/crashplan/lib/jniwrapper-macpack.jar
-share/crashplan/lib/jniwrapper-winpack.jar
-share/crashplan/lib/joda-time.jar
-share/crashplan/lib/json-lib.jar
-share/crashplan/lib/json.jar
-share/crashplan/lib/jtux.jar
-share/crashplan/lib/log4j-api.jar
-share/crashplan/lib/log4j-core.jar
-share/crashplan/lib/log4j-iostreams-2.3.jar
-share/crashplan/lib/log4j-jcl-2.1.jar
-share/crashplan/lib/log4j-slf4j-impl.jar
-share/crashplan/lib/miglayout15-swt.jar
-share/crashplan/lib/org.eclipse.core.commands_3.6.1.v20120814-150512.jar
-share/crashplan/lib/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar
-share/crashplan/lib/org.eclipse.jface_3.8.101.v20120817-083647.jar
-share/crashplan/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar
-share/crashplan/lib/protobuf-java.jar
-share/crashplan/lib/reflections-0.9.10.jar
-share/crashplan/lib/rhino.jar
-share/crashplan/lib/sbbi-upnplib.jar
-share/crashplan/lib/servlet-api-3.1.jar
-share/crashplan/lib/slf4j-api.jar
-share/crashplan/lib/sqlite-jdbc.jar
-share/crashplan/lib/swt-64.jar
-share/crashplan/lib/swt.jar
-share/crashplan/lib/tika-core-1.7.jar
-share/crashplan/lib/trove.jar
-share/crashplan/lib/twitter4j.jar
-share/crashplan/lib/websocket-api-9.2.9.v20150224.jar
-share/crashplan/lib/websocket-common-9.2.9.v20150224.jar
-share/crashplan/lib/websocket-server-9.2.9.v20150224.jar
-share/crashplan/lib/websocket-servlet-9.2.9.v20150224.jar
-share/crashplan/libjniwrap.so
-share/crashplan/libjniwrap64.so
-share/crashplan/libjtux.so
-share/crashplan/libjtux64.so
-share/crashplan/libmd5.so
-share/crashplan/libmd564.so
-share/crashplan/skin/icon_app_128x128.png
-share/crashplan/skin/icon_app_16x16.png
-share/crashplan/skin/icon_app_32x32.png
-share/crashplan/skin/icon_app_64x64.png
-share/crashplan/skin/logo_main.png
-share/crashplan/skin/skin.properties
-share/crashplan/skin/splash_default.png
-share/crashplan/skin/splash_plus.png
-share/crashplan/skin/window_bg.jpg
-share/crashplan/upgrade/start.bat
-share/crashplan/upgrade/start.sh
-share/crashplan/upgrade/startDesktop.bat
-share/crashplan/upgrade/startDesktop.sh
-share/crashplan/upgrade/startDesktopLinux.sh
-share/crashplan/upgrade/startDesktopSolaris.sh
-share/crashplan/upgrade/startFirst.sh
-share/crashplan/upgrade/startLinux.sh
-share/crashplan/upgrade/startSolaris.sh
+%%DATADIR%%/app.asar
+%%DATADIR%%/bin/CrashPlanEngine
+%%DATADIR%%/bin/restartLinux.sh
+%%DATADIR%%/bin/run.conf
+%%DATADIR%%/bin/uninstall.sh
+%%DATADIR%%/conf/custom_sample.properties
+%%DATADIR%%/conf/default.service.xml
+%%DATADIR%%/conf/service.log.xml
+%%DATADIR%%/conf/ui.log.xml
+%%DATADIR%%/conf/ui.properties
+%%DATADIR%%/conf/upgradeui.log.xml
+%%DATADIR%%/conf/upgradeui.properties
+%%DATADIR%%/doc/readme.html
+%%DATADIR%%/doc/readme.odt
+%%DATADIR%%/doc/readme.pdf
+%%DATADIR%%/doc/readme.rtf
+%%DATADIR%%/install.vars
+%%DATADIR%%/lang/txt.properties
+%%DATADIR%%/lang/txt_de.properties
+%%DATADIR%%/lang/txt_en_GB.properties
+%%DATADIR%%/lang/txt_en_US.properties
+%%DATADIR%%/lang/txt_es.properties
+%%DATADIR%%/lang/txt_es_ES.properties
+%%DATADIR%%/lang/txt_fr.properties
+%%DATADIR%%/lang/txt_it.properties
+%%DATADIR%%/lang/txt_ja.properties
+%%DATADIR%%/lang/txt_ko.properties
+%%DATADIR%%/lang/txt_nl.properties
+%%DATADIR%%/lang/txt_no.properties
+%%DATADIR%%/lang/txt_pt_BR.properties
+%%DATADIR%%/lang/txt_sv.properties
+%%DATADIR%%/lang/txt_th.properties
+%%DATADIR%%/lang/txt_zh.properties
+%%DATADIR%%/lang/txt_zh_TW.properties
+%%DATADIR%%/lib/bcpkix-jdk15on.jar
+%%DATADIR%%/lib/bcprov-jdk15on.jar
+%%DATADIR%%/lib/c42_protolib_shared.jar
+%%DATADIR%%/lib/com.backup42.desktop.jar
+%%DATADIR%%/lib/comfyj-2.10.jar
+%%DATADIR%%/lib/commons-beanutils-core.jar
+%%DATADIR%%/lib/commons-cli-1.2.jar
+%%DATADIR%%/lib/commons-codec.jar
+%%DATADIR%%/lib/commons-collections.jar
+%%DATADIR%%/lib/commons-io.jar
+%%DATADIR%%/lib/commons-jxpath-1.1.jar
+%%DATADIR%%/lib/commons-lang.jar
+%%DATADIR%%/lib/commons-logging.jar
+%%DATADIR%%/lib/ezmorph.jar
+%%DATADIR%%/lib/gson.jar
+%%DATADIR%%/lib/guava.jar
+%%DATADIR%%/lib/javassist-3.20.0.jar
+%%DATADIR%%/lib/jetty-continuation-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-http-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-io-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-security-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-server-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-servlet-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-servlets-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jetty-util-9.2.9.v20150224.jar
+%%DATADIR%%/lib/jna-platform.jar
+%%DATADIR%%/lib/jna.jar
+%%DATADIR%%/lib/jniwrap.jar
+%%DATADIR%%/lib/jniwrapper-macpack.jar
+%%DATADIR%%/lib/jniwrapper-winpack.jar
+%%DATADIR%%/lib/joda-time.jar
+%%DATADIR%%/lib/json-lib.jar
+%%DATADIR%%/lib/json.jar
+%%DATADIR%%/lib/jtux.jar
+%%DATADIR%%/lib/log4j-api.jar
+%%DATADIR%%/lib/log4j-core.jar
+%%DATADIR%%/lib/log4j-iostreams-2.3.jar
+%%DATADIR%%/lib/log4j-jcl-2.1.jar
+%%DATADIR%%/lib/log4j-slf4j-impl.jar
+%%DATADIR%%/lib/miglayout15-swt.jar
+%%DATADIR%%/lib/org.eclipse.core.commands_3.6.1.v20120814-150512.jar
+%%DATADIR%%/lib/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar
+%%DATADIR%%/lib/org.eclipse.jface_3.8.101.v20120817-083647.jar
+%%DATADIR%%/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar
+%%DATADIR%%/lib/protobuf-java.jar
+%%DATADIR%%/lib/reflections-0.9.10.jar
+%%DATADIR%%/lib/rhino.jar
+%%DATADIR%%/lib/sbbi-upnplib.jar
+%%DATADIR%%/lib/servlet-api-3.1.jar
+%%DATADIR%%/lib/slf4j-api.jar
+%%DATADIR%%/lib/sqlite-jdbc.jar
+%%DATADIR%%/lib/swt-64.jar
+%%DATADIR%%/lib/swt.jar
+%%DATADIR%%/lib/tika-core-1.7.jar
+%%DATADIR%%/lib/trove.jar
+%%DATADIR%%/lib/twitter4j.jar
+%%DATADIR%%/lib/websocket-api-9.2.9.v20150224.jar
+%%DATADIR%%/lib/websocket-common-9.2.9.v20150224.jar
+%%DATADIR%%/lib/websocket-server-9.2.9.v20150224.jar
+%%DATADIR%%/lib/websocket-servlet-9.2.9.v20150224.jar
+%%DATADIR%%/libjniwrap.so
+%%DATADIR%%/libjniwrap64.so
+%%DATADIR%%/libjtux.so
+%%DATADIR%%/libjtux64.so
+%%DATADIR%%/libmd5.so
+%%DATADIR%%/libmd564.so
+%%DATADIR%%/skin/icon_app_128x128.png
+%%DATADIR%%/skin/icon_app_16x16.png
+%%DATADIR%%/skin/icon_app_32x32.png
+%%DATADIR%%/skin/icon_app_64x64.png
+%%DATADIR%%/skin/logo_main.png
+%%DATADIR%%/skin/skin.properties
+%%DATADIR%%/skin/splash_default.png
+%%DATADIR%%/skin/splash_plus.png
+%%DATADIR%%/skin/window_bg.jpg
+%%DATADIR%%/upgrade/start.bat
+%%DATADIR%%/upgrade/start.sh
+%%DATADIR%%/upgrade/startDesktop.bat
+%%DATADIR%%/upgrade/startDesktop.sh
+%%DATADIR%%/upgrade/startDesktopLinux.sh
+%%DATADIR%%/upgrade/startDesktopSolaris.sh
+%%DATADIR%%/upgrade/startFirst.sh
+%%DATADIR%%/upgrade/startLinux.sh
+%%DATADIR%%/upgrade/startSolaris.sh
 @dir share/crashplan/log
 @dir share/crashplan/skin/custom
 @dir share/crashplan/upgrade/UpgradeUI