[csw-devel] SF.net SVN: gar:[16919] csw/mgar/pkg/lang-java/389-console/trunk

[cgrzemba at users.sourceforge.net]

Revision: 16919
          http://gar.svn.sourceforge.net/gar/?rev=16919&view=rev
Author:   cgrzemba
Date:     2012-01-27 09:32:32 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk: add patch for java version check

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-26 16:26:40 UTC (rev 16918)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-27 09:32:32 UTC (rev 16919)
@@ -17,6 +17,8 @@
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
+PATCHFILES += 0001-add-java-version-check-in-389-console.patch
+
 PACKAGING_PLATFORMS = solaris10x
 
 PACKAGES = CSW389-console
@@ -51,7 +53,7 @@
 		-e 's+ at mcclangjar@+idm-console-mcc_en.jar+' \
 		-e 's+ at nmclfjar@+idm-console-nmclf.jar+' \
 		-e 's+ at nmclflangjar@+idm-console-nmclf_en.jar+' \
-		-e 's+ at themejar@+$(NAME).jar+' \
+		-e 's+ at themejar@+$(NAME)_en.jar+' \
 		-e 's+ at classdest@+$(datadir)/java+' \
 		-e 's+ at prefsdir@+389-console+' \
 		-e 's+ at libdir@+$(libdir)+' \

Added: csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch	2012-01-27 09:32:32 UTC (rev 16919)
@@ -0,0 +1,38 @@
+From 844773a46daf4618d6bdd233d3183d6ac3f247c8 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 27 Jan 2012 10:29:18 +0100
+Subject: [PATCH] add java version check in 389-console
+
+---
+ 389-console |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/389-console b/389-console
+index cd42ef3..8f06d30 100755
+--- a/389-console
++++ b/389-console
+@@ -25,6 +25,12 @@ then
+   echo "$0: The java program is not in your path, or is not executable.";
+   exit 1
+ fi
++VER=`$JAVA -version 2>&1 | grep version | cut -d. -f2`
++if [ $VER -lt 6 ]; then
++  echo "$0: The java program is not the right version. JDK 1.6 or newer is needed";
++  exit 1
++fi
++
+ 
+ CLASSDEST=@classdest@
+ 
+@@ -39,7 +45,7 @@ fi
+ #
+ # Launch the Console
+ #
+-java \
++$JAVA \
+     -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ \
+     -Djava.util.prefs.systemRoot="$HOME/. at prefsdir@" \
+     -Djava.util.prefs.userRoot="$HOME/. at prefsdir@" \
+-- 
+1.7.8.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.