[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

WIP: Opera 5.05TP1



The attached diff will update the Opera port to 5.05TP1 ("technology
preview").  It works as well as Opera 5.0.  In fact, I think a
display bug has been fixed.  I also don't see any zombies with
asynchronous DNS, although that may be due to improvements in our
Linux emulation.

Of course what everybody is salivating over is the ability to use
Netscape plugins with this version.  For that, you will need a Linux
Motif library, e.g. by way of the redhat_motif port I posted.

Flash 5.0r47 works.  I'm not sure it always works correctly, but it
displays various animations.  If you can't find one of those annoying
flash pages, there's a simple on at http://www.timeshipinfo.com/.

I haven't tried any other plugins yet.  I don't know what's available.
Supposedly there's a Java somewhere.  Pointers welcome.

Something I still need to look into:  Opera automatically finds
plugins in ~/.netscape/plugins, but _only_ if linux-netscape is
installed.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/opera/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	2001/06/02 21:22:09	1.2
+++ Makefile	2001/08/29 00:54:16
@@ -1,12 +1,13 @@
 # $OpenBSD: Makefile,v 1.2 2001/06/02 21:22:09 naddy Exp $
 
-COMMENT=	"fast and customizable WWW browser"
 ONLY_FOR_ARCHS=	i386
+
+COMMENT=	"fast and customizable WWW browser"
 
-PKGNAME=	opera-5.0
-DISTNAME=	opera-5.0-static.i386
+PKGNAME=	opera-5.05tp1
+DISTNAME=	opera-5.05_tp1-static_qt-libnpp-0.1.1
 CATEGORIES=	www
-NEED_VERSION=	1.405
+NEED_VERSION=	1.435
 HOMEPAGE=	http://www.opera.com/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -16,24 +17,22 @@
 PERMIT_DISTFILES_CDROM=	"Commercial software"
 PERMIT_DISTFILES_FTP=	"Commercial software"
 
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/500/ \
-		http://opera.online.no/linux/tgz/500/ \
-		ftp://gd.tuwien.ac.at/infosys/browsers/opera/linux/500/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/500/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/500/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/505/ \
+		http://opera.online.no/linux/tgz/505/
+EXTRACT_SUFX=	.x86.tar.gz
 
 RUN_DEPENDS=	/emul/linux/usr/lib/libpng.so.2:redhat_base->=6.2p1:emulators/redhat_base
+#		/emul/linux/usr/X11R6/lib/libXm.so.2::emulators/redhat_motif
 
 do-build:
-	sed 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/opera.sh >${WRKBUILD}/opera.sh
+	sed -e 's,@PREFIX@,${PREFIX},g' \
+	    -e 's,@LOCALBASE@,${LOCALBASE},g' \
+	    ${FILESDIR}/opera.sh >${WRKBUILD}/wrapper.sh
 
 do-install:
 	cd ${WRKBUILD} && ./install.sh \
-		--exec_prefix=${PREFIX}/libexec \
-		--docdir=${PREFIX}/share/doc/opera \
-		--sharedir=${PREFIX}/share/opera
-	${INSTALL_SCRIPT} ${WRKBUILD}/opera.sh ${PREFIX}/bin/opera
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/opera
-	${INSTALL_DATA} ${FILESDIR}/operarc ${PREFIX}/share/examples/opera
+	    --prefix=${PREFIX} \
+	    --exec_prefix=${PREFIX}/libexec \
+	    --docdir=${PREFIX}/share/doc/opera
 
 .include <bsd.port.mk>
Index: files/md5
===================================================================
RCS file: /cvs/ports/www/opera/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- files/md5	2001/05/16 14:44:27	1.1.1.1
+++ files/md5	2001/08/29 00:54:16
@@ -1,3 +1,3 @@
-MD5 (opera-5.0-static.i386.tar.gz) = 779bf93c11634107cce7cb51066e8b25
-RMD160 (opera-5.0-static.i386.tar.gz) = da993b65a3538f5e517cf5d4f7449c33d2524ae5
-SHA1 (opera-5.0-static.i386.tar.gz) = 992a14104e89c5c2683c47f4d18f395d5ae3ff6b
+MD5 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = b64ef8bbb7d8378589c2edd0c8b918af
+RMD160 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = 5f0c61e1092cca328180e795b3dbd47191a004c5
+SHA1 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = 38fc0e124f73b64bf69586a239c55cc680eb1a6b
Index: files/opera.sh
===================================================================
RCS file: /cvs/ports/www/opera/files/opera.sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 opera.sh
--- files/opera.sh	2001/05/16 14:44:27	1.1.1.1
+++ files/opera.sh	2001/08/29 00:54:16
@@ -2,4 +2,6 @@
 #
 # $OpenBSD: opera.sh,v 1.1.1.1 2001/05/16 14:44:27 naddy Exp $
 
-OPERA_DIR=@PREFIX@/share/opera exec @PREFIX@/libexec/opera "$@"
+export OPERA_DIR=@PREFIX@/share/opera
+export OPERA_PLUGIN_PATH=@PREFIX@/lib/opera/plugins:@LOCALBASE@/netscape/plugins
+exec @PREFIX@/libexec/opera-static "$@"
Index: files/operarc
===================================================================
RCS file: operarc
diff -N operarc
--- /tmp/cvsGyDQs25391	Tue Aug 28 18:54:16 2001
+++ /dev/null	Tue Aug 28 18:50:08 2001
@@ -1,4 +0,0 @@
-; $OpenBSD: operarc,v 1.1.1.1 2001/05/16 14:44:27 naddy Exp $
-;
-[Performance]
-Synchronous DNS Lookup=1
Index: patches/patch-install_sh
===================================================================
RCS file: /cvs/ports/www/opera/patches/patch-install_sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-install_sh
--- patches/patch-install_sh	2001/05/16 14:44:27	1.1.1.1
+++ patches/patch-install_sh	2001/08/29 00:54:16
@@ -1,10 +1,16 @@
 $OpenBSD: patch-install_sh,v 1.1.1.1 2001/05/16 14:44:27 naddy Exp $
---- install.sh.orig	Tue May 15 21:09:35 2001
-+++ install.sh	Tue May 15 21:10:28 2001
-@@ -159,10 +159,10 @@ runinstall()
- 	cp $v -fp opera.xpm opera.wmconfig opera.desktop opera_*.png $share_dir/
- 	cp $v -fp opera.adr $share_dir/
+--- install.sh.orig	Fri Aug 10 14:29:05 2001
++++ install.sh	Tue Aug 14 22:38:06 2001
+@@ -186,14 +186,14 @@ runinstall()
+ 	mkdir $v -p $plugin_dir/
+ 	chmod $vv 755 $plugin_dir
  
+-	cp $v -fdp plugins/* $plugin_dir
++	(cd plugins; pax -r -w -pe * $plugin_dir)
+         chmod $vv 755 $plugin_dir/operamotifwrapper
+-        chmod $vv 755 $plugin_dir/libnpp.so.0.1.0
++        chmod $vv 755 $plugin_dir/libnpp.so.0.1.1
+ 
 -	icons
 -	gnome
 -	kde2
@@ -13,6 +19,6 @@
 +#	gnome
 +#	kde2
 +#	kde
+ 
+ # Add uninstallation here
  
-     # Uninstallation
- #	echo '' > $share_dir/uninstall.sh
Index: pkg/DEINSTALL
===================================================================
RCS file: DEINSTALL
diff -N DEINSTALL
--- /tmp/cvsKxeot25391	Tue Aug 28 18:54:16 2001
+++ /dev/null	Tue Aug 28 18:50:08 2001
@@ -1,51 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/05/16 14:44:27 naddy Exp $
-#
-# De-installation setup of Opera
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/operarc	# hardcoded to /etc
-
-# Function: tell the user what they need to do to delete the port completely
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| these steps as root:"
-    echo "|"
-    echo "|       rm -f ${CONFIG_FILE}"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname DEINSTALL" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    DEINSTALL)
-	if [ -f ${CONFIG_FILE} ]; then
-	    do_notice "$1"
-	fi
-	;;
-    *)
-	echo "usage: $0 distname DEINSTALL" >&2
-	exit 1
-	;;
-esac
-
-exit 0
Index: pkg/INSTALL
===================================================================
RCS file: INSTALL
diff -N INSTALL
--- /tmp/cvsqXSKk25391	Tue Aug 28 18:54:16 2001
+++ /dev/null	Tue Aug 28 18:50:08 2001
@@ -1,68 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2001/05/16 14:44:27 naddy Exp $
-#
-# Pre/post-installation setup of Opera
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/operarc	# hardcoded to /etc
-SAMPLE_CONFIG_DIR=$PREFIX/share/examples/opera
-
-# Function: tell the user what they need to do to use the port just installed
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| The existing $1 configuration file, ${CONFIG_FILE},"
-    echo "| has NOT been changed.  You may want to compare it to the"
-    echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
-    echo "| and update your configuration as needed."
-    echo "+---------------"
-    echo
-}
-
-# Function: install configuration files
-#
-do_install()
-{
-    install -o root -g wheel ${SAMPLE_CONFIG_DIR}/operarc ${CONFIG_FILE}
-    echo
-    echo "+---------------"
-    echo "| The $1 configuration file, ${CONFIG_FILE},"
-    echo "| has been installed.  Please view this file and change"
-    echo "| the configuration to meet your needs"
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ -f ${CONFIG_FILE} ]; then
-	    do_notice "$1"
-	else
-	    do_install "$1"
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/opera/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST	2001/06/02 21:22:09	1.2
+++ pkg/PLIST	2001/08/29 00:54:16
@@ -1,8 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/06/02 21:22:09 naddy Exp $
+@comment $OpenBSD$
 bin/opera
-libexec/opera
+lib/opera/plugins/libnpp.so
+lib/opera/plugins/libnpp.so.0
+lib/opera/plugins/libnpp.so.0.1
+lib/opera/plugins/libnpp.so.0.1.1
+lib/opera/plugins/operamotifwrapper
+libexec/opera-static
 share/doc/opera/LICENSE
-share/examples/opera/operarc
 share/opera/buttons/DefSmall
 share/opera/buttons/Default
 share/opera/buttons/ReadMe.txt
@@ -202,3 +206,5 @@
 @dirrm share/opera
 @dirrm share/examples/opera
 @dirrm share/doc/opera
+@dirrm lib/opera/plugins
+@dirrm lib/opera