From dd70bb75614def1cc550a5656c160ef76f9f2316 Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Fri, 13 Jun 2008 23:01:36 +0000
Subject: [PATCH] restore ability to launch external applications get rid of a
 reference to opera's fake dir

---
 www/opera/Makefile                 |  4 ++--
 www/opera/patches/patch-install_sh | 32 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 www/opera/patches/patch-install_sh

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 4cbc31ffade..3e22270d7a1 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2008/06/12 19:04:10 sturm Exp $
+# $OpenBSD: Makefile,v 1.51 2008/06/13 23:01:36 sturm Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -7,7 +7,7 @@ COMMENT=	fast and customizable WWW browser
 V=		9.50
 OPERA_BUILD=	2042
 DISTNAME=	opera-$V.gcc295-static-qt3.i386
-PKGNAME=	opera-${V}
+PKGNAME=	opera-${V}p0
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.opera.com/
diff --git a/www/opera/patches/patch-install_sh b/www/opera/patches/patch-install_sh
new file mode 100644
index 00000000000..664a2327633
--- /dev/null
+++ b/www/opera/patches/patch-install_sh
@@ -0,0 +1,32 @@
+$OpenBSD: patch-install_sh,v 1.21 2008/06/13 23:01:36 sturm Exp $
+--- install.sh.orig	Wed Jun 11 23:11:27 2008
++++ install.sh	Sat Jun 14 00:54:10 2008
+@@ -870,7 +870,7 @@ generate_wrapper()
+     wrapper_contain="#!/bin/sh
+ 
+ # Required for Session Management
+-case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
++case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=${str_paramwrapper}/\$0;; esac
+ export OPERA_SCRIPT_PATH
+ 
+ # Location of the Opera binaries
+@@ -925,9 +925,6 @@ if test \"\${OPERA_DIR}\" = '' ; then
+   fi
+ fi
+ 
+-OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
+-export OPERA_LD_PRELOAD
+-
+ # Native Java enviroment
+ for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
+ do if test -f \"\$d/javapath.txt\"
+@@ -1060,9 +1057,6 @@ if test \"\${OPERA_JAVA_DIR}\"; then
+     export LD_LIBRARY_PATH OPERA_JAVA_DIR
+ fi
+ 
+-# Workarounds for the \"preloaded libXt\" problem.
+-LD_PRELOAD=\"libjvm.so:libawt.so:\${OPERA_LD_PRELOAD}\"
+-export LD_PRELOAD
+ # To disable the first workaround, comment the next line.
+ JAVA_WORKAROUND=\`\${OPERA_BINARYDIR}/works 2>/dev/null\`
+