Preview: www/opera 6.0TP1

[Christian Weisgerber <naddy_(_at_)_mips_(_dot_)_inka_(_dot_)_de>]

I have attached a tentative update of the www/opera port to the
latest "technology preview" beta release 6.0TP1.

The new version has grown even more preference settings, Unicode
support, mouse gestures, and new icons.  It will pick up most of
the old configuration settings from an old ~/.opera dir, including
the old icons.  Large font sizes, i.e. headings, now use sensible
fonts by default.  The usefulness of Unicode support is strongly
diminished because only Latin 1 fonts are used out of the box.
Presumably this can be fixed by user configuration, but I haven't
figured out any details yet.

An Opera 5 registration is not valid for Opera 6, and an upgrade
to 6.x/Linux doesn't seem to be offered yet.  Unless there is
overwhelming demand, I don't intend to commit an update to the port
until 6.x registrations are available.

Bizarrely, Opera 6 seems to use /etc/opera5rc and ~/.opera/opera5.ini
as main configuration files.

-- 
Christian "naddy" Weisgerber                          naddy_(_at_)_mips_(_dot_)_inka_(_dot_)_de

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/opera/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	13 Nov 2001 22:13:25 -0000	1.6
+++ Makefile	2 Dec 2001 20:36:40 -0000
@@ -4,10 +4,10 @@
 
 COMMENT=	"fast and customizable WWW browser"
 
-PKGNAME=	opera-5.05tp1p1
-DISTNAME=	opera-5.05_tp1-static_qt-libnpp-0.1.1
+PKGNAME=	opera-6.0.20011122.1
+DISTNAME=	opera-6.0-20011122.1-static_qt.i386
 CATEGORIES=	www
-NEED_VERSION=	1.496
+NEED_VERSION=	1.500
 HOMEPAGE=	http://www.opera.com/
 
 MAINTAINER=	Christian Weisgerber <naddy_(_at_)_openbsd_(_dot_)_org>
@@ -17,9 +17,9 @@
 PERMIT_DISTFILES_CDROM=	"Commercial software"
 PERMIT_DISTFILES_FTP=	"Commercial software"
 
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/505/ \
-		http://opera.online.no/linux/tgz/505/
-EXTRACT_SUFX=	.x86.tar.gz
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/600/tp1/ \
+		http://opera.online.no/linux/600/tp1/
+EXTRACT_SUFX=	.tar.gz
 
 RUN_DEPENDS=	:redhat_base->=6.2p1:emulators/redhat/base \
 		::emulators/redhat/motif
@@ -27,17 +27,16 @@
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
 
-do-configure:
-	sed -e 's,@PREFIX@,${PREFIX},g' \
-	    -e 's,@LOCALBASE@,${LOCALBASE},g' \
-	    ${FILESDIR}/opera.sh >${WRKBUILD}/wrapper.sh
-
 do-install:
 	cd ${WRKBUILD} && ./install.sh \
 	    --prefix=${PREFIX} \
-	    --exec_prefix=${PREFIX}/libexec \
-	    --docdir=${PREFIX}/share/doc/opera
+	    --exec_prefix=${PREFIX}/libexec
+	cd ${PREFIX}/share/doc/opera; \
+	    ln -sf ../../opera/help .
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/opera
 	${INSTALL_DATA} ${FILESDIR}/operarc ${PREFIX}/share/examples/opera
+	sed -e 's:@PREFIX@:${TRUEPREFIX}:g' \
+	    -e 's:@LOCALBASE@:${LOCALBASE}:g' \
+	    ${FILESDIR}/opera.sh >${PREFIX}/bin/opera
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: distinfo
diff -N distinfo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ distinfo	2 Dec 2001 20:36:40 -0000
@@ -0,0 +1,3 @@
+MD5 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 694d71d83d3b6cc37b02070cc2c475de
+RMD160 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 7238ae12a7b3fe0864e4dbaeed4e1020e00bae9a
+SHA1 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 3c882053dea8d3589659d93cc638983991da9552
Index: files/md5
===================================================================
RCS file: files/md5
diff -N files/md5
--- files/md5	16 Sep 2001 17:10:29 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-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.3
diff -u -r1.3 opera.sh
--- files/opera.sh	23 Sep 2001 15:16:32 -0000	1.3
+++ files/opera.sh	2 Dec 2001 20:36:40 -0000
@@ -10,4 +10,4 @@
 export OPERA_DIR=_(_at_)_PREFIX@/share/opera
 export OPERA_PLUGIN_PATH=${OPERA_PLUGIN_PATH-${PLUGIN_PATH}}
 
-exec @PREFIX@/libexec/opera-static "$@"
+exec @PREFIX@/libexec/opera "$@"
Index: patches/patch-install_sh
===================================================================
RCS file: /cvs/ports/www/opera/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -r1.2 patch-install_sh
--- patches/patch-install_sh	16 Sep 2001 17:10:29 -0000	1.2
+++ patches/patch-install_sh	2 Dec 2001 20:36:40 -0000
@@ -1,15 +1,19 @@
 $OpenBSD: patch-install_sh,v 1.2 2001/09/16 17:10:29 naddy Exp $
---- 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
+--- install.sh.orig	Thu Nov 22 12:38:09 2001
++++ install.sh	Sun Dec  2 21:37:57 2001
+@@ -231,6 +231,9 @@ set_os_spesific()
+ 	i[3456]86:NetBSD)
+ 	;;
  
--	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
++	i386:OpenBSD)
++	;;
++
+ 	i[3456]86:Linux)
+ 		cpf='-f'
+ 		if test "$verbose" -gt '1'; then
+@@ -619,10 +622,10 @@ run_install()
+ 	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major
+ 	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
  
 -	icons
 -	gnome
Index: pkg/DEINSTALL
===================================================================
RCS file: /cvs/ports/www/opera/pkg/DEINSTALL,v
retrieving revision 1.3
diff -u -r1.3 DEINSTALL
--- pkg/DEINSTALL	14 Oct 2001 23:27:02 -0000	1.3
+++ pkg/DEINSTALL	2 Dec 2001 20:36:40 -0000
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/operarc	# hardcoded to /etc
+CONFIG_FILE=/etc/opera5rc	# hardcoded to /etc
 
 # Function: tell the user what they need to do to delete the port completely
 #
Index: pkg/INSTALL
===================================================================
RCS file: /cvs/ports/www/opera/pkg/INSTALL,v
retrieving revision 1.3
diff -u -r1.3 INSTALL
--- pkg/INSTALL	14 Oct 2001 23:27:02 -0000	1.3
+++ pkg/INSTALL	2 Dec 2001 20:36:40 -0000
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/operarc	# hardcoded to /etc
+CONFIG_FILE=/etc/opera5rc	# 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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/opera/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST	31 Oct 2001 14:52:24 -0000	1.5
+++ pkg/PLIST	2 Dec 2001 20:36:40 -0000
@@ -1,12 +1,13 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.5 2001/10/31 14:52:24 wilfried Exp $
+_(_at_)_comment $OpenBSD$
 bin/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/libnpp.so.0.1.5
 lib/opera/plugins/operamotifwrapper
-libexec/opera-static
+libexec/opera
 share/doc/opera/LICENSE
+share/doc/opera/help
 share/examples/opera/operarc
 share/opera/buttons/DefSmall
 share/opera/buttons/Default
@@ -151,40 +152,170 @@
 share/opera/buttons/examples/example_small.ini
 share/opera/buttons/examples/opera_22x22.png
 share/opera/buttons/examples/opera_32x32.png
-share/opera/help/access.htm
-share/opera/help/alpha.htm
-share/opera/help/bookmark.htm
-share/opera/help/contact.htm
-share/opera/help/dialogs.htm
-share/opera/help/features.htm
-share/opera/help/helphelp.htm
-share/opera/help/index.htm
-share/opera/help/keyboard.htm
-share/opera/help/link_up.gif
-share/opera/help/menus.htm
-share/opera/help/opera5.css
-share/opera/help/prefmenu.htm
-share/opera/help/reg_form.txt
-share/opera/help/security.htm
-share/opera/help/starter.htm
-share/opera/help/terms.htm
-share/opera/help/trouble.htm
+share/opera/buttons/standard/addressbar_high_security.png
+share/opera/buttons/standard/addressbar_load_images.png
+share/opera/buttons/standard/addressbar_low_security.png
+share/opera/buttons/standard/addressbar_medium_security.png
+share/opera/buttons/standard/addressbar_no_images.png
+share/opera/buttons/standard/addressbar_no_security.png
+share/opera/buttons/standard/addressbar_print_pv.png
+share/opera/buttons/standard/addressbar_show_images.png
+share/opera/buttons/standard/buttons.ini
+share/opera/buttons/standard/general_delete.png
+share/opera/buttons/standard/general_move_to.png
+share/opera/buttons/standard/general_new_folder.png
+share/opera/buttons/standard/general_next.png
+share/opera/buttons/standard/general_previous.png
+share/opera/buttons/standard/general_save.png
+share/opera/buttons/standard/general_stop.png
+share/opera/buttons/standard/general_view.png
+share/opera/buttons/standard/hotlist_new_bookmark.png
+share/opera/buttons/standard/hotlist_new_contact.png
+share/opera/buttons/standard/icons/bookmark_unvisited.png
+share/opera/buttons/standard/icons/bookmark_visited.png
+share/opera/buttons/standard/icons/boy01.png
+share/opera/buttons/standard/icons/boy02.png
+share/opera/buttons/standard/icons/boy03.png
+share/opera/buttons/standard/icons/boy04.png
+share/opera/buttons/standard/icons/boy05.png
+share/opera/buttons/standard/icons/boy06.png
+share/opera/buttons/standard/icons/boy07.png
+share/opera/buttons/standard/icons/boy08.png
+share/opera/buttons/standard/icons/boy09.png
+share/opera/buttons/standard/icons/folder_closed.png
+share/opera/buttons/standard/icons/folder_find_results.png
+share/opera/buttons/standard/icons/folder_open.png
+share/opera/buttons/standard/icons/folder_parent.png
+share/opera/buttons/standard/icons/folder_personalbar.png
+share/opera/buttons/standard/icons/girl01.png
+share/opera/buttons/standard/icons/girl02.png
+share/opera/buttons/standard/icons/girl03.png
+share/opera/buttons/standard/icons/girl04.png
+share/opera/buttons/standard/icons/girl05.png
+share/opera/buttons/standard/icons/girl06.png
+share/opera/buttons/standard/icons/girl07.png
+share/opera/buttons/standard/icons/girl08.png
+share/opera/buttons/standard/icons/girl09.png
+share/opera/buttons/standard/icons/news_read.png
+share/opera/buttons/standard/icons/news_subscribed.png
+share/opera/buttons/standard/icons/news_unread.png
+share/opera/buttons/standard/icons/news_unsubscribed.png
+share/opera/buttons/standard/icons/status_away.png
+share/opera/buttons/standard/icons/status_no_messaging.png
+share/opera/buttons/standard/icons/status_not_available.png
+share/opera/buttons/standard/icons/status_offline.png
+share/opera/buttons/standard/icons/status_online.png
+share/opera/buttons/standard/icons/status_requesting.png
+share/opera/buttons/standard/icons/transfer_failure.png
+share/opera/buttons/standard/icons/transfer_loading.png
+share/opera/buttons/standard/icons/transfer_loading_waiting.png
+share/opera/buttons/standard/icons/transfer_size_mismatch.png
+share/opera/buttons/standard/icons/transfer_stopped.png
+share/opera/buttons/standard/mail_add_attachment.png
+share/opera/buttons/standard/mail_check.png
+share/opera/buttons/standard/mail_compose.png
+share/opera/buttons/standard/mail_redirect.png
+share/opera/buttons/standard/mail_reply.png
+share/opera/buttons/standard/mail_reply_all.png
+share/opera/buttons/standard/mail_send.png
+share/opera/buttons/standard/mail_send_all.png
+share/opera/buttons/standard/main_active_bookmark_folder.png
+share/opera/buttons/standard/main_back.png
+share/opera/buttons/standard/main_cascade.png
+share/opera/buttons/standard/main_find.png
+share/opera/buttons/standard/main_forward.png
+share/opera/buttons/standard/main_full_screen.png
+share/opera/buttons/standard/main_home.png
+share/opera/buttons/standard/main_hotlist.png
+share/opera/buttons/standard/main_new.png
+share/opera/buttons/standard/main_open.png
+share/opera/buttons/standard/main_print.png
+share/opera/buttons/standard/main_reload.png
+share/opera/buttons/standard/main_save.png
+share/opera/buttons/standard/main_stop.png
+share/opera/buttons/standard/main_tile.png
+share/opera/buttons/standard/news_catch_up.png
+share/opera/buttons/standard/personalbar_bookmark.png
+share/opera/buttons/standard/progress_empty.png
+share/opera/buttons/standard/progress_full.png
+share/opera/buttons/standard/search_music.png
+share/opera/buttons/standard/search_shopping.png
+share/opera/buttons/standard/search_stock.png
+share/opera/buttons/standard/search_web.png
+share/opera/buttons/standard/special_dropdown.png
+share/opera/buttons/standard/transfers_resume.png
+share/opera/buttons/standard/transfers_retransfer.png
+share/opera/buttons/standard/windowbar_doc_complete.png
+share/opera/buttons/standard/windowbar_doc_complete_unread.png
+share/opera/buttons/standard/windowbar_doc_incomplete.png
+share/opera/buttons/standard/windowbar_hotlist.png
+share/opera/buttons/standard/windowbar_mail_box.png
+share/opera/buttons/standard/windowbar_mail_search.png
+share/opera/buttons/standard/windowbar_messaging_new.png
+share/opera/buttons/standard/windowbar_messaging_normal.png
+share/opera/buttons/standard/windowbar_news_article.png
+share/opera/buttons/standard/windowbar_news_group.png
+share/opera/buttons/standard/windowbar_news_group_list.png
+share/opera/buttons/standard/windowbar_transfers.png
+share/opera/buttons/standard/windowbar_unknown.png
+share/opera/chartables.bin
+share/opera/config/bugreport
+share/opera/config/opera.1
+share/opera/config/opera.desktop
+share/opera/config/opera.wmconfig
+share/opera/config/operarc
+share/opera/config/operarc.fixed
+share/opera/help/accessibility.html
+share/opera/help/advertising.html
+share/opera/help/dialogs.html
+share/opera/help/filetypes.html
+share/opera/help/fonts.html
+share/opera/help/help.css
+share/opera/help/history.html
+share/opera/help/index.html
+share/opera/help/interface.html
+share/opera/help/keyboard.html
+share/opera/help/languages.html
+share/opera/help/layout.html
+share/opera/help/look.html
+share/opera/help/menus.html
+share/opera/help/mouse.html
+share/opera/help/multimedia.html
+share/opera/help/network.html
+share/opera/help/opera.html
+share/opera/help/page.html
+share/opera/help/paths.html
+share/opera/help/personal.html
+share/opera/help/plugins.html
+share/opera/help/privacy.html
+share/opera/help/search.html
+share/opera/help/security.html
+share/opera/help/sounds.html
+share/opera/help/start.html
+share/opera/help/tipday.txt
+share/opera/help/windows.html
 share/opera/images/background.gif
 share/opera/images/blank.gif
 share/opera/images/drive.gif
 share/opera/images/file.gif
 share/opera/images/folder.gif
 share/opera/images/link.gif
+share/opera/images/opera.xpm
+share/opera/images/opera_16x16.png
+share/opera/images/opera_22x22.png
+share/opera/images/opera_32x32.png
+share/opera/images/opera_48x48.png
 share/opera/images/operabanner.png
-share/opera/opera.adr
-share/opera/opera.desktop
-share/opera/opera.wmconfig
-share/opera/opera.xpm
-share/opera/opera_16x16.png
-share/opera/opera_22x22.png
-share/opera/opera_32x32.png
-share/opera/opera_48x48.png
-share/opera/styles/OPF.CSS
+share/opera/images/p2p1.gif
+share/opera/images/p2p2.gif
+share/opera/images/p2p3.gif
+share/opera/images/p2p4.gif
+share/opera/images/p2p5.gif
+share/opera/images/p2p6.gif
+share/opera/images/shared.gif
+share/opera/images/splash.png
+share/opera/opera6.adr
+share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
 share/opera/styles/csr.css
@@ -195,11 +326,16 @@
 share/opera/styles/im.css
 share/opera/styles/mime.css
 share/opera/styles/mimehead.css
+share/opera/styles/opf.css
 share/opera/styles/plugins.css
 share/opera/styles/wml.css
+share/opera/unicode.dat
 @dirrm share/opera/styles
 @dirrm share/opera/images
 @dirrm share/opera/help
+_(_at_)_dirrm share/opera/config
+_(_at_)_dirrm share/opera/buttons/standard/icons
+_(_at_)_dirrm share/opera/buttons/standard
 @dirrm share/opera/buttons/examples
 @dirrm share/opera/buttons/defsmall
 @dirrm share/opera/buttons/default