[arch-commits] Commit in openjdk6/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Thursday, November 25, 2010 @ 01:15:40
  Author: andyrtr
Revision: 100649

add tcsh profile file #21306; fix export in profile files for non-reparenting-wms ##21804

Added:
  openjdk6/trunk/openjdk6.profile.csh
Modified:
  openjdk6/trunk/PKGBUILD
  openjdk6/trunk/openjdk6.profile

----------------------+
 PKGBUILD             |    4 +++-
 openjdk6.profile     |    4 +---
 openjdk6.profile.csh |    6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-25 01:01:45 UTC (rev 100648)
+++ PKGBUILD	2010-11-25 06:15:40 UTC (rev 100649)
@@ -30,7 +30,8 @@
 	aatext_by_default.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
-	openjdk6.profile)
+	openjdk6.profile
+	openjdk6.profile.csh)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
 md5sums=('8cb71d69a74152b369d3929c5b5badfd'
          '0b36adbf67e4f261e1b827ed4be4f447'
@@ -179,6 +180,7 @@
   # set some variables
   install -m755 -d ${pkgdir}/etc/profile.d
   install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1
+  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh || return 1
   
   # install license
   install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE

Modified: openjdk6.profile
===================================================================
--- openjdk6.profile	2010-11-25 01:01:45 UTC (rev 100648)
+++ openjdk6.profile	2010-11-25 06:15:40 UTC (rev 100649)
@@ -1,8 +1,6 @@
-#export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
 export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
 export J2REDIR=$J2SDKDIR/jre
-#export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
 export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 # enable this for non-reparenting window managers
-#_JAVA_AWT_WM_NONREPARENTING=1
+#export _JAVA_AWT_WM_NONREPARENTING=1

Added: openjdk6.profile.csh
===================================================================
--- openjdk6.profile.csh	                        (rev 0)
+++ openjdk6.profile.csh	2010-11-25 06:15:40 UTC (rev 100649)
@@ -0,0 +1,6 @@
+setenv J2SDKDIR=/usr/lib/jvm/java-6-openjdk
+setenv J2REDIR=$J2SDKDIR/jre
+setenv JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
+# enable this for non-reparenting window managers
+#setenv _JAVA_AWT_WM_NONREPARENTING=1