From 8d8306fa31394800a8b7975fe55896c07ddfc5bf Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sun, 28 Feb 2010 15:15:54 +0100
Subject: Maj jdk#6u18-2, ajout du lien plugin pour firefox

---
 base/jdk/.footprint |  4 ++++
 base/jdk/Pkgfile    | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'base')

diff --git a/base/jdk/.footprint b/base/jdk/.footprint
index 5df3c8dfa..5eba8d93f 100644
--- a/base/jdk/.footprint
+++ b/base/jdk/.footprint
@@ -1492,6 +1492,10 @@ drwxr-xr-x	root/root	opt/jdk/lib/visualvm/visualvm/update_tracking/
 -rw-r--r--	root/root	opt/jdk/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-tools.xml
 -rw-r--r--	root/root	opt/jdk/src.zip
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/firefox/
+drwxr-xr-x	root/root	usr/lib/firefox/plugins/
+lrwxrwxrwx	root/root	usr/lib/firefox/plugins/libnpjp2.so -> /opt/jdk/jre/lib/i386/libnpjp2.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile
index a500373d2..abdc1fa78 100644
--- a/base/jdk/Pkgfile
+++ b/base/jdk/Pkgfile
@@ -2,11 +2,10 @@
 # URL: http://java.sun.com/javase/downloads/index.jsp
 # Maintainer: NuTyX coreteam
 # Packager: thierryn1 at hispeed dot ch
-# Depends on:
 
 name=jdk
 version=6u18
-release=1
+release=2
 [ "`uname -m`" == "i686"   ] && _ARCH=i586
 [ "`uname -m`" == "x86_64"   ] && _ARCH=amd64
 
@@ -41,4 +40,11 @@ build() {
 	$PKG/usr/share/man/man1/
 	rm -r $PKG/opt/jdk/jre/man
 	rm -r $PKG/usr/share/man/ja*
+	# Installation du plugin
+	mkdir -p $PKG/usr/lib/firefox/plugins
+	if [ ${_ARCH} = "i586" ]; then
+		ln -s /opt/jdk/jre/lib/i386/libnpjp2.so $PKG/usr/lib/firefox/plugins
+	else
+		ln -s /opt/jdk/jre/lib/amd64/libnpjp2.so $PKG/usr/lib/firefox/plugins
+	fi
 }
-- 
cgit v1.2.3-70-g09d2


From f33ed4e94c19b186ffea7243615f265f76dbd148 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sun, 28 Feb 2010 15:16:47 +0100
Subject: Maj virtuoso#6.1.0-2

---
 base/virtuoso/.footprint | 1 -
 base/virtuoso/Pkgfile    | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'base')

diff --git a/base/virtuoso/.footprint b/base/virtuoso/.footprint
index 8ad599c9a..e53198295 100644
--- a/base/virtuoso/.footprint
+++ b/base/virtuoso/.footprint
@@ -1,7 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/inifile
--rwxr-xr-x	root/root	usr/bin/isql
 -rwxr-xr-x	root/root	usr/bin/isqlw
 -rwxr-xr-x	root/root	usr/bin/virt_mail
 -rwxr-xr-x	root/root	usr/bin/virtuoso-t
diff --git a/base/virtuoso/Pkgfile b/base/virtuoso/Pkgfile
index 8bd103933..1fdd91dfa 100755
--- a/base/virtuoso/Pkgfile
+++ b/base/virtuoso/Pkgfile
@@ -5,7 +5,7 @@
 
 name=virtuoso
 version=6.1.0
-release=1
+release=2
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-opensource-$version.tar.gz)
 build() {
 	cd $name-opensource-$version
@@ -17,5 +17,6 @@ build() {
     		    --disable-all-vads
 	make
 	make DESTDIR=$PKG install
+	rm -r $PKG/usr/bin/isql
 }
 
-- 
cgit v1.2.3-70-g09d2