15919018 areca won't start; missing library/java/swt dependency s11-update
authorApril Chin <april.chin@oracle.com>
Wed, 27 Feb 2013 09:24:20 -0800
branchs11-update
changeset 2507 bdc001f3484f
parent 2506 ba463e5578fa
child 2510 09d60cb7ba56
15919018 areca won't start; missing library/java/swt dependency
components/areca/areca.p5m
components/areca/patches/01-areca_sh.patch
--- a/components/areca/areca.p5m	Fri Feb 22 10:11:06 2013 +0100
+++ b/components/areca/areca.p5m	Wed Feb 27 09:24:20 2013 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -39,7 +39,7 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/681
+    value=LSARC/2008/681
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license areca.copyright license=GPLv2
@@ -135,3 +135,6 @@
 # pkgdepend should have picked up the dependency on bash;
 # this explicit depend action can be removed if pkgdepend is fixed later
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/bash type=require
+
+# pkgdepend didn't pick up this dependency
+depend fmri=__TBD pkg.debug.depend.file=usr/share/lib/java/swt.jar type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/areca/patches/01-areca_sh.patch	Wed Feb 27 09:24:20 2013 -0800
@@ -0,0 +1,24 @@
+# This patch fixes a problem in which sometimes areca wouldn't
+# start, depending on your current working directory, due to
+# faulty setting of PROGRAM_DIR.
+# When updating to the new areca v5.2.16, this patch should
+# no longer be needed.
+diff -rupN areca-7.1-orig/areca.sh areca-7.1/areca.sh
+--- areca-7.1-orig/areca.sh	2009-04-20 01:44:14.000000000 -0700
++++ areca-7.1/areca.sh	2012-11-19 16:13:05.288917000 -0800
[email protected]@ -7,14 +7,7 @@
+ #Options
+ JAVADIR=/usr/java
+ 
+-#Getting Areca's directory
+-PROGRAM_DIR=`dirname "$0"`
+-#Solaris path
+-if [ -f ../../usr/bin/areca ]; then
+-	PROGRAM_DIR=../../usr/share/areca
+-fi
+-
+-PROGRAM_DIR=`cd "$PROGRAM_DIR"; pwd`
++PROGRAM_DIR=/usr/share/areca
+ cd "${PROGRAM_DIR}"
+ 
+ #Configured directories