Upgrade to 6.0-20011122.1.

PR:		ports/32300

5 files changed, 215 insertions, 72 deletions

diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index bb0767e..1cb1e5f 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -7,20 +7,17 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-PORTVERSION=	5.05-tp1
-PORTREVISION=	2
+PORTVERSION=	6.0-20011122.1
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/tgz/505/ \
-		ftp://ftp.opera.com/pub/opera/linux/505/
-DISTNAME=	opera-5.05_tp1-static_qt-libnpp-0.1.1
-DISTFILES=	${DISTNAME}.x86${EXTRACT_SUFX}
+MASTER_SITES=	http://opera.online.no/linux/600/tp1/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/tp1/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-static_qt.i386
 
 MAINTAINER=	des@FreeBSD.org
 
 RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 		${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
-		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png \
-		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
+		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
 
 ONLY_FOR_ARCHS=	i386
 
@@ -28,8 +25,7 @@ NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DATADIR%%|${DATADIR}|;' \
-	    <${FILESDIR}/opera.sh >${WRKSRC}/wrapper.sh
+	${PERL} -p -i -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/install.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh \
@@ -38,5 +34,7 @@ do-install:
 	    --docdir=${DOCSDIR} \
 	    --sharedir=${DATADIR} \
 	    --plugindir=${DATADIR}/plugins )
+	rmdir ${DATADIR}/uninst/rollback_${PORTVERSION}
+	rmdir ${DATADIR}/uninst
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index c1ed6c2..4f63580 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-5.05_tp1-static_qt-libnpp-0.1.1.x86.tar.gz) = b64ef8bbb7d8378589c2edd0c8b918af
+MD5 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 694d71d83d3b6cc37b02070cc2c475de
diff --git a/www/linux-opera7/files/opera.sh b/www/linux-opera7/files/opera.sh
deleted file mode 100644
index 815dcaa..0000000
--- a/www/linux-opera7/files/opera.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-OPERA_DIR="%%PREFIX%%/share/opera"
-OPERA_PLUGIN_PATH="%%PREFIX%%/share/opera/plugins"
-for plugin_dir in \
-    %%PREFIX%%/lib/netscape-linux/plugins \
-    %%PREFIX%%/linux-jdk1.3.1/jre/plugin/i386/ns4 \
-    %%PREFIX%%/Acrobat4/Browsers/intellinux \
-    ;
-do
-    if [ -d "${plugin_dir}" ] ; then
-        OPERA_PLUGIN_PATH="${OPERA_PLUGIN_PATH}:${plugin_dir}"
-    fi
-done
-export OPERA_DIR OPERA_PLUGIN_PATH
-exec %%DATADIR%%/bin/opera-static "$@"
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index 0f11d6f..0dad53b 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,19 +1,43 @@
---- install.sh.orig	Fri Aug 10 14:29:05 2001
-+++ install.sh	Tue Aug 14 13:14:35 2001
-@@ -186,14 +186,9 @@
- 	mkdir $v -p $plugin_dir/
- 	chmod $vv 755 $plugin_dir
+--- install.sh.orig	Tue Nov 27 00:56:59 2001
++++ install.sh	Tue Nov 27 01:01:20 2001
+@@ -228,7 +228,16 @@
+ 	    mvv=''    # SunOS mv (no -v verbose option)
+ 	;;
  
--	cp $v -fdp plugins/* $plugin_dir
-+	(cd plugins && tar -cf - . | tar $v -xf - -C $plugin_dir)
-         chmod $vv 755 $plugin_dir/operamotifwrapper
--        chmod $vv 755 $plugin_dir/libnpp.so.0.1.0
--
--	icons
--	gnome
--	kde2
--	kde
-+        chmod $vv 755 $plugin_dir/libnpp.so.0.1.1
- 
- # Add uninstallation here
+-	i[3456]86:NetBSD)
++	i[3456]86:FreeBSD|i[3456]86:NetBSD)
++	    cpf='-f'
++	    if test "$verbose" -gt '1'; then
++		chmodv='-v'
++		mkdirv='-v'
++	    fi
++	    if test "$verbose" -gt '0'; then
++		mvv='-v'
++		cpv='-v'
++	    fi
+ 	;;
  
+ 	i[3456]86:Linux)
+@@ -491,18 +500,11 @@
+ for DIR in \\
+     \"\${HOME}/.opera/plugins\" \\
+     ${plugin_dir} \\
+-    /usr/lib/opera/plugins \\
+-    /usr/local/Acrobat4/Browsers/intellinux \\
++    %%PREFIX%%/lib/opera/plugins \\
++    %%PREFIX%%/Acrobat4/Browsers/intellinux \\
+-    /usr/java/jre1.3.1/plugin/i386/ns4 \\
+-    /usr/lib/RealPlayer8/Plugins \\
+-    /usr/lib/realplay/plugins \\
+-    /usr/lib/RealPlayer8 \\
+-    /usr/lib/realplay \\
++    %%PREFIX%%/java/linux-*jdk*/jre/plugin/i386/ns4 \\
+     \"\${HOME}/.netscape/plugins\" \\
+-    /opt/netscape/plugins \\
+-    /usr/lib/netscape/plugins \\
+-    /usr/local/netscape/plugins \\
+-    /usr/local/lib/netscape/plugins \\
++    %%PREFIX%%/lib/netscape-linux/plugins \\
+     ; do
+     if test -d \${DIR} ; then 
+ 	OPERA_PLUGIN_PATH=\"\${OPERA_PLUGIN_PATH}\":\"\${DIR}\"
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index 7683bb3..4c937c3 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -1,6 +1,7 @@
 bin/opera
 share/doc/opera/LICENSE
-share/opera/bin/opera-static
+share/doc/opera/help
+share/opera/bin/opera
 share/opera/buttons/DefSmall
 share/opera/buttons/Default
 share/opera/buttons/ReadMe.txt
@@ -144,45 +145,175 @@ share/opera/buttons/examples/example_big.ini
 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/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/plugins/libnpp.so
 share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
-share/opera/plugins/libnpp.so.0.1.1
+share/opera/plugins/libnpp.so.0.1.5
 share/opera/plugins/operamotifwrapper
-share/opera/styles/OPF.CSS
+share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
 share/opera/styles/csr.css
@@ -193,12 +324,17 @@ share/opera/styles/history.css
 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/plugins
 @dirrm share/opera/images
 @dirrm share/opera/help
+@dirrm share/opera/config
+@dirrm share/opera/buttons/standard/icons
+@dirrm share/opera/buttons/standard
 @dirrm share/opera/buttons/examples
 @dirrm share/opera/buttons/defsmall
 @dirrm share/opera/buttons/default