o Update 6.12.20030305 to 7.11.20030515.

  merge from linux-opera7 into linux-opera.
o Remove linux-opera7.

Submitted by:	Jeremy Messenger <mezz7@cox.net> (maintainer)

20 files changed, 486 insertions, 1006 deletions

diff --git a/MOVED b/MOVED
index f94ea94..b2f3f34 100644
--- a/MOVED
+++ b/MOVED
@@ -384,3 +384,4 @@ www/skipstone||2003-07-01|port is more than a year old with no update in sight
 graphics/glass||2003-07-03|useless
 www/linux-phoenix|www/linux-mozillafirebird|2003-07-03|legal problem with name
 graphics/kpovmodeler||2003-07-03|now part of kdegraphics
+www/linux-opera7|www/linux-opera7|2003-07-09|move to www/linux-opera
diff --git a/www/Makefile b/www/Makefile
index 630b311..ee72b9a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -159,7 +159,6 @@
     SUBDIR += linux-mozilla-devel
     SUBDIR += linux-mozillafirebird
     SUBDIR += linux-opera
-    SUBDIR += linux-opera7
     SUBDIR += ljdeps
     SUBDIR += logtools
     SUBDIR += lws
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 124db94..9755ded 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:		linux-opera4
+# New ports collection makefile for:		linux-opera
 # Date created:					December 6th 2000
 # Whom:						des
 #
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.12.20030305
-PORTREVISION=	1
+PORTVERSION=	7.11.20030515
+PORTREVISION=	2
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/612/final/en/i386/static/ \
-		ftp://ftp.opera.com/pub/opera/linux/612/final/en/i386/static/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/711/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2/-2/}.1-static-qt.i386
 
 MAINTAINER=	mezz7@cox.net
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
@@ -21,12 +20,53 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(/etc/X11/applnk)
+PLIST_SUB+=	APPLNK:=""
+.else
+PLIST_SUB+=	APPLNK:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/gnome)
+PLIST_SUB+=	GNOME:=""
+.else
+PLIST_SUB+=	GNOME:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/applnk/Internet)
+PLIST_SUB+=	KDE:=""
+.else
+PLIST_SUB+=	KDE:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/applnk/Networking)
+PLIST_SUB+=	KDE2:=""
+.else
+PLIST_SUB+=	KDE2:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/gnome/apps)
+PLIST_SUB+=	GNOMELNK:=""
+.else
+PLIST_SUB+=	GNOMELNK:="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
+
 do-install:
-	(cd ${WRKSRC} && ./install.sh --prefix="${PREFIX}")
+	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 345f5aa..c53aaca 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-6.12-20030305.1-static-qt.i386.tar.bz2) = 1f9f677dabeefbcf1195248ffc9095e5
+MD5 (opera-7.11-20030515.1-static-qt.i386.tar.bz2) = 5dacb87719576669d4c6e56df5a68fdd
diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa
deleted file mode 100644
index d926c7b..0000000
--- a/www/linux-opera-devel/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- install.sh.orig	Wed Mar  5 19:07:59 2003
-+++ install.sh	Tue Mar 11 18:37:28 2003
-@@ -765,6 +765,16 @@
- 	    wrapper_sunjava_machine="sparc"
- 	;;
- 
-+	i386:FreeBSD)
-+	    wrapper_plugin_paths="
-+    $prefix/Acrobat[45]/bin \\
-+    $prefix/lib/RealPlayer8/Plugins \\
-+    $prefix/lib/netscape-linux/plugins \\
-+    $prefix/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
-+    $prefix/linux-ibm-jdk1.3.0/jre/bin \\
-+    $prefix/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\"
-+	    ;;
-+
- 	mips*:Linux)
- 	    wrapper_plugin_paths=''
- 	;;
-@@ -890,7 +900,7 @@
- 
- # Acrobat Reader
- for BINDIR in \\
--    /usr/local/Acrobat[45]/bin \\
-+    $prefix/Acrobat[45]/bin \\
-     /usr/lib/Acrobat[45]/bin \\
-     /usr/X11R6/lib/Acrobat[45]/bin \\
-     /opt/Acrobat[45]/bin \\
-@@ -1100,8 +1110,9 @@
- 	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
- 
-      # System wide configuration files
--	config_dir="/etc"
-+	config_dir="$prefix/etc"
- 	if can_write_to "$config_dir"; then
-+if false; then # XXX
- 	    echo
- 	    echo "System wide configuration files:"
- 	    echo "  $config_dir/opera6rc"
-@@ -1128,6 +1139,7 @@
- 			;;
- 		esac
- 	    done
-+fi # XXX
- 	else
- 	    echo
- 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1138,10 +1150,10 @@
- 	fi
- 
-      # Shorcuts and Icons
--	icons
--	gnome
--	kde2
--	kde
-+#	icons
-+#	gnome
-+#	kde2
-+#	kde
- 
- # Add uninstallation here
- 
diff --git a/www/linux-opera7/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
index e1ecec3..e1ecec3 100644
--- a/www/linux-opera7/files/patch-install.sh
+++ b/www/linux-opera-devel/files/patch-install.sh
diff --git a/www/linux-opera-devel/pkg-descr b/www/linux-opera-devel/pkg-descr
index e3a20a1..1a8ab89 100644
--- a/www/linux-opera-devel/pkg-descr
+++ b/www/linux-opera-devel/pkg-descr
@@ -1,4 +1,18 @@
-Opera is currently the fastest and most standards-compliant full-featured
-graphical web browser around.
+Opera 7 is a substantial upgrade, with code rewritten from the rendering engine
+and up, resulting in the fastest, smallest, most full-featured desktop browser
+ever released.
+
+-New rendering engine
+Opera's new rendering engine supports W3C's DOM (Document Object Model) level 2,
+non-standard dynamic HTML (DHTML), CSS1 and CSS2, ECMAScript, and has improved
+HTML 4.01 support, as well as complete support for WML 1.3 and 2.0. It is
+faster, smaller and can dynamically change documents through DOM.
+
+-M2 -- new e-mail client
+Opera's new e-mail client, M2, automatically categorizes and sorts e-mail
+messages by contact and has an integrated spam filter. Innovative features such
+as QuickReply and QuickFind lets users answer or find e-mails at unrivalled
+speed. M2 supports POP3, IMAP, ESMTP, and threaded display of mailing lists.
+In addition, M2 supports news servers with password authentication.
 
 WWW: http://www.opera.com/
diff --git a/www/linux-opera7/pkg-message b/www/linux-opera-devel/pkg-message
index ba122bc..ba122bc 100644
--- a/www/linux-opera7/pkg-message
+++ b/www/linux-opera-devel/pkg-message
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 63ae767..60d44d0 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -1,340 +1,47 @@
 bin/opera
 share/doc/opera/LICENSE
 share/doc/opera/help
+share/icons/opera.xpm
+share/opera/bin/m2.so
 share/opera/bin/opera
-share/opera/buttons/DefSmall
-share/opera/buttons/Default
-share/opera/buttons/default/abc.gif
-share/opera/buttons/default/buttons.ini
-share/opera/buttons/default/cascade.gif
-share/opera/buttons/default/compose.gif
-share/opera/buttons/default/copy.gif
-share/opera/buttons/default/delete.gif
-share/opera/buttons/default/doccomp.gif
-share/opera/buttons/default/docerr.gif
-share/opera/buttons/default/dochtlst.gif
-share/opera/buttons/default/docim.gif
-share/opera/buttons/default/docload.gif
-share/opera/buttons/default/docmail.gif
-share/opera/buttons/default/docnews.gif
-share/opera/buttons/default/docprog.gif
-share/opera/buttons/default/docsrch.gif
-share/opera/buttons/default/doctrsf.gif
-share/opera/buttons/default/document.gif
-share/opera/buttons/default/docunkn.gif
-share/opera/buttons/default/docunrd.gif
-share/opera/buttons/default/dropdown.gif
-share/opera/buttons/default/figprog.gif
-share/opera/buttons/default/finished.gif
-share/opera/buttons/default/forward.gif
-share/opera/buttons/default/fullscre.gif
-share/opera/buttons/default/go.gif
-share/opera/buttons/default/hisecu.gif
-share/opera/buttons/default/home.gif
-share/opera/buttons/default/hotlist.gif
-share/opera/buttons/default/hotlstto.gif
-share/opera/buttons/default/html.gif
-share/opera/buttons/default/im.gif
-share/opera/buttons/default/incl.gif
-share/opera/buttons/default/keyb.gif
-share/opera/buttons/default/load.gif
-share/opera/buttons/default/loading.gif
-share/opera/buttons/default/losecu.gif
-share/opera/buttons/default/maxlist.gif
-share/opera/buttons/default/maxmail.gif
-share/opera/buttons/default/menu.gif
-share/opera/buttons/default/mesecu.gif
-share/opera/buttons/default/moveto.gif
-share/opera/buttons/default/new.gif
-share/opera/buttons/default/newbkmk.gif
-share/opera/buttons/default/newcntct.gif
-share/opera/buttons/default/newfldr.gif
-share/opera/buttons/default/newscatc.gif
-share/opera/buttons/default/newsfoll.gif
-share/opera/buttons/default/newsfoll1.gif
-share/opera/buttons/default/newsgrp.gif
-share/opera/buttons/default/newsmrea.gif
-share/opera/buttons/default/newsnext.gif
-share/opera/buttons/default/newsover.gif
-share/opera/buttons/default/newsprev.gif
-share/opera/buttons/default/newssall.gif
-share/opera/buttons/default/newsthr.gif
-share/opera/buttons/default/newsunr.gif
-share/opera/buttons/default/next.gif
-share/opera/buttons/default/noimg.gif
-share/opera/buttons/default/nosecu.gif
-share/opera/buttons/default/open.gif
-share/opera/buttons/default/previous.gif
-share/opera/buttons/default/previous1.gif
-share/opera/buttons/default/print.gif
-share/opera/buttons/default/printact.gif
-share/opera/buttons/default/printall.gif
-share/opera/buttons/default/printscr.gif
-share/opera/buttons/default/printvie.gif
-share/opera/buttons/default/redirect.gif
-share/opera/buttons/default/reload.gif
-share/opera/buttons/default/reply.gif
-share/opera/buttons/default/replyall.gif
-share/opera/buttons/default/save.gif
-share/opera/buttons/default/search.gif
-share/opera/buttons/default/send.gif
-share/opera/buttons/default/send1.gif
-share/opera/buttons/default/sendqd.gif
-share/opera/buttons/default/show.gif
-share/opera/buttons/default/split.gif
-share/opera/buttons/default/stop.gif
-share/opera/buttons/default/stop1.gif
-share/opera/buttons/default/tbsearch.gif
-share/opera/buttons/default/tile.gif
-share/opera/buttons/default/tilevert.gif
-share/opera/buttons/default/update.gif
-share/opera/buttons/default/url.gif
-share/opera/buttons/default/usermode.gif
-share/opera/buttons/default/websrch.gif
-share/opera/buttons/defsmall/abc.gif
-share/opera/buttons/defsmall/buttons.ini
-share/opera/buttons/defsmall/cascade.gif
-share/opera/buttons/defsmall/compose.gif
-share/opera/buttons/defsmall/copy.gif
-share/opera/buttons/defsmall/delete.gif
-share/opera/buttons/defsmall/dropdown.gif
-share/opera/buttons/defsmall/forward.gif
-share/opera/buttons/defsmall/fullscre.gif
-share/opera/buttons/defsmall/home.gif
-share/opera/buttons/defsmall/hotlist.gif
-share/opera/buttons/defsmall/hotlstto.gif
-share/opera/buttons/defsmall/imsmall.gif
-share/opera/buttons/defsmall/incl.gif
-share/opera/buttons/defsmall/keyb.gif
-share/opera/buttons/defsmall/maxlist.gif
-share/opera/buttons/defsmall/maxmail.gif
-share/opera/buttons/defsmall/menu.gif
-share/opera/buttons/defsmall/moveto.gif
-share/opera/buttons/defsmall/new.gif
-share/opera/buttons/defsmall/newbkmk.gif
-share/opera/buttons/defsmall/newcntct.gif
-share/opera/buttons/defsmall/newfldr.gif
-share/opera/buttons/defsmall/newscatc.gif
-share/opera/buttons/defsmall/newsfoll.gif
-share/opera/buttons/defsmall/newsgrp.gif
-share/opera/buttons/defsmall/newsmrea.gif
-share/opera/buttons/defsmall/newsnext.gif
-share/opera/buttons/defsmall/newsover.gif
-share/opera/buttons/defsmall/newsprev.gif
-share/opera/buttons/defsmall/newssall.gif
-share/opera/buttons/defsmall/newsthr.gif
-share/opera/buttons/defsmall/newsunr.gif
-share/opera/buttons/defsmall/next.gif
-share/opera/buttons/defsmall/open.gif
-share/opera/buttons/defsmall/previous.gif
-share/opera/buttons/defsmall/print.gif
-share/opera/buttons/defsmall/redirect.gif
-share/opera/buttons/defsmall/reload.gif
-share/opera/buttons/defsmall/reply.gif
-share/opera/buttons/defsmall/replyall.gif
-share/opera/buttons/defsmall/save.gif
-share/opera/buttons/defsmall/search.gif
-share/opera/buttons/defsmall/send.gif
-share/opera/buttons/defsmall/sendqd.gif
-share/opera/buttons/defsmall/split.gif
-share/opera/buttons/defsmall/tile.gif
-share/opera/buttons/defsmall/tilevert.gif
-share/opera/buttons/defsmall/update.gif
-share/opera/buttons/defsmall/url.gif
-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/buttons/readme.txt
-share/opera/buttons/standard/addressbar_high_security.png
-share/opera/buttons/standard/addressbar_html.png
-share/opera/buttons/standard/addressbar_html_alt2.png
-share/opera/buttons/standard/addressbar_html_alt3.png
-share/opera/buttons/standard/addressbar_html_alt4.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/boy10.png
-share/opera/buttons/standard/icons/boy11.png
-share/opera/buttons/standard/icons/boy13.png
-share/opera/buttons/standard/icons/boy14.png
-share/opera/buttons/standard/icons/boy15.png
-share/opera/buttons/standard/icons/boy16.png
-share/opera/buttons/standard/icons/close.png
-share/opera/buttons/standard/icons/dropdown.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/girl10.png
-share/opera/buttons/standard/icons/girl11.png
-share/opera/buttons/standard/icons/girl12.png
-share/opera/buttons/standard/icons/girl13.png
-share/opera/buttons/standard/icons/girl14.png
-share/opera/buttons/standard/icons/girl15.png
-share/opera/buttons/standard/icons/girl16.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/special01.png
-share/opera/buttons/standard/icons/special02.png
-share/opera/buttons/standard/icons/special03.png
-share/opera/buttons/standard/icons/special04.png
-share/opera/buttons/standard/icons/special05.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/skin/drop_target_bottom.png
-share/opera/buttons/standard/skin/drop_target_left.png
-share/opera/buttons/standard/skin/drop_target_right.png
-share/opera/buttons/standard/skin/drop_target_top.png
-share/opera/buttons/standard/skin/pagebar_active_corner_bottomleft.png
-share/opera/buttons/standard/skin/pagebar_active_corner_bottomright.png
-share/opera/buttons/standard/skin/pagebar_active_corner_topleft.png
-share/opera/buttons/standard/skin/pagebar_active_corner_topright.png
-share/opera/buttons/standard/skin/pagebar_active_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_active_tile_center.png
-share/opera/buttons/standard/skin/pagebar_active_tile_left.png
-share/opera/buttons/standard/skin/pagebar_active_tile_right.png
-share/opera/buttons/standard/skin/pagebar_active_tile_top.png
-share/opera/buttons/standard/skin/pagebar_border_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_border_tile_left.png
-share/opera/buttons/standard/skin/pagebar_border_tile_right.png
-share/opera/buttons/standard/skin/pagebar_border_tile_top.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_bottomleft.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_bottomright.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_topleft.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_topright.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_center.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_left.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_right.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_top.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/opera6rc
 share/opera/config/opera6rc.fixed
+share/opera/conmsg.html
+share/opera/console.html
+share/opera/contool.html
 share/opera/help/accessibility.html
 share/opera/help/advertising.html
+share/opera/help/context.html
 share/opera/help/dialogs.html
 share/opera/help/filetypes.html
 share/opera/help/fonts.html
+share/opera/help/glossary.html
 share/opera/help/help.css
 share/opera/help/history.html
+share/opera/help/hotlist.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/license.txt
 share/opera/help/look.html
-share/opera/help/menus.html
+share/opera/help/m2.html
+share/opera/help/main.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/startup.txt
-share/opera/help/tipday.txt
+share/opera/help/toc.html
+share/opera/help/toolbars.html
+share/opera/help/wand.html
+share/opera/help/welcome.html
 share/opera/help/windows.html
 share/opera/images/background.gif
 share/opera/images/blank.gif
@@ -352,18 +59,24 @@ share/opera/images/shared.gif
 share/opera/images/splash.png
 share/opera/images/startup1.png
 share/opera/images/startup2.png
-share/opera/java/lc.jar
+share/opera/ini/dialog.ini
+share/opera/ini/fastforward.ini
+share/opera/ini/minimal_toolbar.ini
+share/opera/ini/standard_keyboard.ini
+share/opera/ini/standard_menu.ini
+share/opera/ini/standard_mouse.ini
+share/opera/ini/standard_toolbar.ini
+share/opera/ini/unix_keyboard.ini
 share/opera/java/opera.jar
 share/opera/java/opera.policy
+share/opera/locale/english.lng
 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.8
 share/opera/plugins/operamotifwrapper
 share/opera/plugins/operaplugincleaner
 share/opera/search.ini
 share/opera/skin/foreground.png
+share/opera/skin/standard_skin.zip
 share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -373,26 +86,47 @@ share/opera/styles/drives.css
 share/opera/styles/email.css
 share/opera/styles/history.css
 share/opera/styles/im.css
+share/opera/styles/info.css
 share/opera/styles/mime.css
 share/opera/styles/mimehead.css
 share/opera/styles/opf.css
 share/opera/styles/plugins.css
+share/opera/styles/user/accessibility.css
+share/opera/styles/user/contrastbw.css
+share/opera/styles/user/contrastwb.css
+share/opera/styles/user/debugwithoutline.css
+share/opera/styles/user/defaultforms.css
+share/opera/styles/user/disabletables.css
+share/opera/styles/user/hidecertainsizes.css
+share/opera/styles/user/hidenonlinkimages.css
+share/opera/styles/user/imageandlinkonly.css
+share/opera/styles/user/nostalgia.css
+share/opera/styles/user/showstructure.css
+share/opera/styles/user/textonly.css
+share/opera/styles/user/userstyle.ini
 share/opera/styles/wml.css
+share/pixmaps/opera.xpm
+@dirrm share/opera/styles/user
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
 @dirrm share/opera/locale
 @dirrm share/opera/java
+@dirrm share/opera/ini
 @dirrm share/opera/images
 @dirrm share/opera/help
 @dirrm share/opera/config
-@dirrm share/opera/buttons/standard/skin
-@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
-@dirrm share/opera/buttons
 @dirrm share/opera/bin
 @dirrm share/opera
 @dirrm share/doc/opera
+
+%%KDE:%%share/applnk/Internet/opera.desktop
+%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
+%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
+%%GNOME:%%share/gnome/pixmaps/opera.xpm
+%%KDE2:%%@dirrm share/applnk/Networking/WWW
+
+@cwd /etc/X11
+wmconfig/opera
+%%APPLNK:%%applnk/Internet/opera.desktop
+
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 124db94..9755ded 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:		linux-opera4
+# New ports collection makefile for:		linux-opera
 # Date created:					December 6th 2000
 # Whom:						des
 #
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	6.12.20030305
-PORTREVISION=	1
+PORTVERSION=	7.11.20030515
+PORTREVISION=	2
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/612/final/en/i386/static/ \
-		ftp://ftp.opera.com/pub/opera/linux/612/final/en/i386/static/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/711/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/12./12-/}.1-static-qt.i386
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2/-2/}.1-static-qt.i386
 
 MAINTAINER=	mezz7@cox.net
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
@@ -21,12 +20,53 @@ RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(/etc/X11/applnk)
+PLIST_SUB+=	APPLNK:=""
+.else
+PLIST_SUB+=	APPLNK:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/gnome)
+PLIST_SUB+=	GNOME:=""
+.else
+PLIST_SUB+=	GNOME:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/applnk/Internet)
+PLIST_SUB+=	KDE:=""
+.else
+PLIST_SUB+=	KDE:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/applnk/Networking)
+PLIST_SUB+=	KDE2:=""
+.else
+PLIST_SUB+=	KDE2:="@comment "
+.endif
+
+.if exists(${X11BASE}/share/gnome/apps)
+PLIST_SUB+=	GNOMELNK:=""
+.else
+PLIST_SUB+=	GNOMELNK:="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
+
 do-install:
-	(cd ${WRKSRC} && ./install.sh --prefix="${PREFIX}")
+	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 345f5aa..c53aaca 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-6.12-20030305.1-static-qt.i386.tar.bz2) = 1f9f677dabeefbcf1195248ffc9095e5
+MD5 (opera-7.11-20030515.1-static-qt.i386.tar.bz2) = 5dacb87719576669d4c6e56df5a68fdd
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
deleted file mode 100644
index d926c7b..0000000
--- a/www/linux-opera/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- install.sh.orig	Wed Mar  5 19:07:59 2003
-+++ install.sh	Tue Mar 11 18:37:28 2003
-@@ -765,6 +765,16 @@
- 	    wrapper_sunjava_machine="sparc"
- 	;;
- 
-+	i386:FreeBSD)
-+	    wrapper_plugin_paths="
-+    $prefix/Acrobat[45]/bin \\
-+    $prefix/lib/RealPlayer8/Plugins \\
-+    $prefix/lib/netscape-linux/plugins \\
-+    $prefix/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
-+    $prefix/linux-ibm-jdk1.3.0/jre/bin \\
-+    $prefix/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\"
-+	    ;;
-+
- 	mips*:Linux)
- 	    wrapper_plugin_paths=''
- 	;;
-@@ -890,7 +900,7 @@
- 
- # Acrobat Reader
- for BINDIR in \\
--    /usr/local/Acrobat[45]/bin \\
-+    $prefix/Acrobat[45]/bin \\
-     /usr/lib/Acrobat[45]/bin \\
-     /usr/X11R6/lib/Acrobat[45]/bin \\
-     /opt/Acrobat[45]/bin \\
-@@ -1100,8 +1110,9 @@
- 	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
- 
-      # System wide configuration files
--	config_dir="/etc"
-+	config_dir="$prefix/etc"
- 	if can_write_to "$config_dir"; then
-+if false; then # XXX
- 	    echo
- 	    echo "System wide configuration files:"
- 	    echo "  $config_dir/opera6rc"
-@@ -1128,6 +1139,7 @@
- 			;;
- 		esac
- 	    done
-+fi # XXX
- 	else
- 	    echo
- 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1138,10 +1150,10 @@
- 	fi
- 
-      # Shorcuts and Icons
--	icons
--	gnome
--	kde2
--	kde
-+#	icons
-+#	gnome
-+#	kde2
-+#	kde
- 
- # Add uninstallation here
- 
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
new file mode 100644
index 0000000..e1ecec3
--- /dev/null
+++ b/www/linux-opera/files/patch-install.sh
@@ -0,0 +1,244 @@
+--- install.sh.orig	Thu May 15 11:36:54 2003
++++ install.sh	Tue May 20 18:11:25 2003
+@@ -712,27 +712,17 @@
+ 
+     wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
+     ${plugin_dir} \\
+-    /usr/lib/opera/plugins \\
+-    /usr/local/lib/opera/plugins \\
+-    /opt/lib/opera/plugins \\"
++    %%LOCALBASE%%/share/opera/plugins \\"
+ 
+     case "${machine}:${os}" in
+ 	i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ 	    wrapper_plugin_paths="
+-    /usr/local/Acrobat[45]/Browsers/intellinux \\
+-    /usr/lib/Acrobat[45]/Browsers/intellinux \\
+-    /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\
+-    /opt/Acrobat[45]/Browsers/intellinux \\
+-    /usr/Acrobat[45]/Browsers/intellinux \\
+-    /usr/j2se/jre/plugin/i386/ns4 \\
+-    /usr/java/jre1.4.0/plugin/i386/ns4 \\
+-    /usr/java/jre1.3.1/plugin/i386/ns4 \\
+-    /usr/lib/j2re1.3/plugin/i386/netscape4 \\
+-    /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\
+-    /usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\"
++    %%LOCALBASE%%/Acrobat[45]/Browsers/intellinux \\
++    %%LOCALBASE%%/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
++    %%LOCALBASE%%/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
+ 	    wrapper_ibmjava="
+-	    IBMJava2-14/jre \\
+-	    IBMJava2-131/jre \\"
++	    linux-ibm-jdk1.3.1/jre \\
++	    linux-ibm-jdk1.4.0/jre \\"
+ 	    wrapper_sunjava_machine="i386"
+ 	;;
+ 
+@@ -779,15 +769,9 @@
+ 	;;
+     esac
+     wrapper_netscape_plugin_paths="
+-    /usr/lib/RealPlayer8/Plugins \\
+-    /usr/lib/realplay/plugins \\
+-    /usr/lib/RealPlayer8 \\
+-    /usr/lib/realplay \\
++    %%LOCALBASE%%/lib/RealPlayer8/Plugins \\
+     \"\${HOME}/.netscape/plugins\" \\
+-    /opt/netscape/plugins \\
+-    /usr/lib/netscape/plugins \\
+-    /usr/local/netscape/plugins \\
+-    /usr/local/lib/netscape/plugins \\"
++    %%LOCALBASE%%/lib/netscape-linux/plugins \\"
+ 
+     wrapper_file="${wrapper_dir}/opera"
+     
+@@ -839,28 +823,13 @@
+ 
+ if test ! \"\${OPERA_JAVA_DIR}\"; then
+ 
+-    PREFIXES=\"
+-	/usr
+-	/usr/java
+-	/usr/lib
+-	/usr/local
+-	/opt\"
++    PREFIXES=\"%%LOCALBASE%%\"
+ 
+     for SUNJAVA in \\
+-	j2re1.4.1_01 \\
+-	j2re1.4.1 \\
+-	j2re1.4.0_01 \\
+-	j2sdk1.4.0_01/jre \\
+-	j2re1.4.0 \\
+-	jre1.4.0 \\
+-	j2se/1.4/jre \\
+-	j2se/1.3/jre \\
+-	j2se/jre \\
+-	jre1.3.1_02 \\
+-	jre1.3.1_01 \\
+-	j2re1.3.1 \\
+-	jre1.3.1 \\
+-	j2re1.3 \\
++	linux-blackdown-jdk1.3.1/jre \\
++	linux-blackdown-jdk1.4.1/jre \\
++	linux-sun-jdk1.3.1/jre \\
++	linux-sun-jdk1.4.1/jre \\
+ 	; do
+ 	for PREFIX in \${PREFIXES}; do
+ 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
+@@ -905,11 +874,8 @@
+ 
+ # Acrobat Reader
+ for BINDIR in \\
+-    /usr/local/Acrobat[45]/bin \\
+-    /usr/lib/Acrobat[45]/bin \\
+-    /usr/X11R6/lib/Acrobat[45]/bin \\
+-    /opt/Acrobat[45]/bin \\
+-    /usr/Acrobat[45]/bin \\
++    %%LOCALBASE%%/Acrobat4/bin \\
++    %%LOCALBASE%%/Acrobat5/bin \\
+     ; do
+     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
+ done
+@@ -1106,8 +1072,9 @@
+         chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
+ 
+      # System wide configuration files
+-	config_dir="/etc"
++	config_dir="$prefix/etc"
+ 	if can_write_to "$config_dir"; then
++if false; then # XXX
+ 	    echo
+ 	    echo "System wide configuration files:"
+ 	    echo "  $config_dir/opera6rc"
+@@ -1134,6 +1101,7 @@
+ 			;;
+ 		esac
+ 	    done
++fi # XXX
+ 	else
+ 	    echo
+ 	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
+@@ -1238,22 +1206,22 @@
+ 
+     debug_msg 0 "in icons()"
+ 
+-    if test ! -d /usr/share/icons; then
+-      if test -w /usr/share; then
+-        mkdir $mkdirv $mkdirp /usr/share/icons/
+-	chmod $chmodv 755 /usr/share/icons
+-	cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
++    if test ! -d %%X11PREFIX%%/share/icons; then
++      if test -w %%X11PREFIX%%/share; then
++        mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/icons/
++	chmod $chmodv 755 %%X11PREFIX%%/share/icons
++	cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/icons/opera.xpm
+       fi
+-    elif test -w /usr/share/icons; then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
++    elif test -w %%X11PREFIX%%/share/icons; then cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/icons/opera.xpm
+     fi
+   
+-    if test ! -d /usr/share/pixmaps; then
+-      if test -w /usr/share; then
+-	mkdir $mkdirv $mkdirp /usr/share/pixmaps/
+-	chmod $chmodv 755 /usr/share/pixmaps
+-	cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++    if test ! -d %%X11PREFIX%%/share/pixmaps; then
++      if test -w %%X11PREFIX%%/share; then
++	mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/pixmaps/
++	chmod $chmodv 755 %%X11PREFIX%%/share/pixmaps
++	cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/pixmaps/opera.xpm
+       fi
+-    elif test -w /usr/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++    elif test -w %%X11PREFIX%%/share/pixmaps/; then cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/pixmaps/opera.xpm
+     fi
+   
+     if test ! -d /etc/X11/wmconfig/; then
+@@ -1319,36 +1287,36 @@
+       fi
+       # end /opt/gnome share
+ 
+-    elif test -d /usr/share/gnome/; then
++    elif test -d %%X11PREFIX%%/share/gnome/; then
+ 
+-        # /usr/share/gnome icon
+-        if test ! -d /usr/share/gnome/pixmaps/; then
+-	  if test -w /usr/share/gnome; then
+-	    mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
+-	    chmod $chmodv 755 /usr/share/gnome/pixmaps
+-	    cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
++        # %%X11PREFIX%%/share/gnome icon
++        if test ! -d %%X11PREFIX%%/share/gnome/pixmaps/; then
++	  if test -w %%X11PREFIX%%/share/gnome; then
++	    mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/gnome/pixmaps/
++	    chmod $chmodv 755 %%X11PREFIX%%/share/gnome/pixmaps
++	    cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/gnome/pixmaps/opera.xpm
+ 	  fi
+-	elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
++	elif test -w %%X11PREFIX%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11PREFIX%%/share/gnome/pixmaps/opera.xpm
+ 	fi
+-	# end /usr/share/gnome icon
++	# end %%X11PREFIX%%/share/gnome icon
+ 
+-	# /usr/share/gnome link
+-	if test -d /usr/share/gnome/apps/; then
+-          if test -d /usr/share/gnome/apps/Internet/; then
+-            if test -w /usr/share/gnome/apps/Internet; then
+-              generate_desktop /usr/share/gnome/apps/Internet
++	# %%X11PREFIX%%/share/gnome link
++	if test -d %%X11PREFIX%%/share/gnome/apps/; then
++          if test -d %%X11PREFIX%%/share/gnome/apps/Internet/; then
++            if test -w %%X11PREFIX%%/share/gnome/apps/Internet; then
++              generate_desktop %%X11PREFIX%%/share/gnome/apps/Internet
+ 	    fi
+-          elif test -d /usr/share/gnome/apps/Networking/WWW/; then
+-            if test -w /usr/share/gnome/apps/Networking/WWW; then
+-	     generate_desktop /usr/share/gnome/apps/Networking/WWW
++          elif test -d %%X11PREFIX%%/share/gnome/apps/Networking/WWW/; then
++            if test -w %%X11PREFIX%%/share/gnome/apps/Networking/WWW; then
++	     generate_desktop %%X11PREFIX%%/share/gnome/apps/Networking/WWW
+ 	    fi
+-	  elif test -w /usr/share/gnome/apps; then
+-	    mkdir $mkdirv $mkdirp/usr/share/gnome/apps/Internet/
+-	    chmod $chmodv 755 /usr/share/gnome/apps/Internet
+-            generate_desktop /usr/share/gnome/apps/Internet
++	  elif test -w %%X11PREFIX%%/share/gnome/apps; then
++	    mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/gnome/apps/Internet/
++	    chmod $chmodv 755 %%X11PREFIX%%/share/gnome/apps/Internet
++            generate_desktop %%X11PREFIX%%/share/gnome/apps/Internet
+           fi
+ 	fi
+-	# end /usr/share/gnome link
++	# end %%X11PREFIX%%/share/gnome link
+    fi
+    # Add ximian here
+ }
+@@ -1385,12 +1353,12 @@
+ 
+     fi  
+     
+-    if test -d /usr/share/applnk/Networking; then
+-      if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
+-	    mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
+-	    chmod $chmodv 755 /usr/share/applnk/Networking/WWW
++    if test -d %%X11PREFIX%%/share/applnk/Networking; then
++      if test ! -d %%X11PREFIX%%/share/applnk/Networking/WWW/ -a -w %%X11PREFIX%%/share/applnk/Networking; then
++	    mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/applnk/Networking/WWW/
++	    chmod $chmodv 755 %%X11PREFIX%%/share/applnk/Networking/WWW
+       fi
+-      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
++      if test -w %%X11PREFIX%%/share/applnk/Networking/WWW; then generate_desktop %%X11PREFIX%%/share/applnk/Networking/WWW ${1}; fi
+     fi
+ }
+ 
+@@ -1414,8 +1382,8 @@
+       fi
+       if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
+ 
+-    elif test -d /usr/share/applnk/Internet/ -a -w /usr/share/applnk/Internet; then
+-      generate_desktop /usr/share/applnk/Internet
++    elif test -d %%X11PREFIX%%/share/applnk/Internet/ -a -w %%X11PREFIX%%/share/applnk/Internet; then
++      generate_desktop %%X11PREFIX%%/share/applnk/Internet
+     fi
+ }
+ 
diff --git a/www/linux-opera/pkg-descr b/www/linux-opera/pkg-descr
index e3a20a1..1a8ab89 100644
--- a/www/linux-opera/pkg-descr
+++ b/www/linux-opera/pkg-descr
@@ -1,4 +1,18 @@
-Opera is currently the fastest and most standards-compliant full-featured
-graphical web browser around.
+Opera 7 is a substantial upgrade, with code rewritten from the rendering engine
+and up, resulting in the fastest, smallest, most full-featured desktop browser
+ever released.
+
+-New rendering engine
+Opera's new rendering engine supports W3C's DOM (Document Object Model) level 2,
+non-standard dynamic HTML (DHTML), CSS1 and CSS2, ECMAScript, and has improved
+HTML 4.01 support, as well as complete support for WML 1.3 and 2.0. It is
+faster, smaller and can dynamically change documents through DOM.
+
+-M2 -- new e-mail client
+Opera's new e-mail client, M2, automatically categorizes and sorts e-mail
+messages by contact and has an integrated spam filter. Innovative features such
+as QuickReply and QuickFind lets users answer or find e-mails at unrivalled
+speed. M2 supports POP3, IMAP, ESMTP, and threaded display of mailing lists.
+In addition, M2 supports news servers with password authentication.
 
 WWW: http://www.opera.com/
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
new file mode 100644
index 0000000..ba122bc
--- /dev/null
+++ b/www/linux-opera/pkg-message
@@ -0,0 +1,7 @@
+Changelogs for 7.11 Final: http://www.opera.com/linux/changelogs/711/
+
+If you are upgrade from version 6 final or 7 development, it might be a good
+idea to backup your personal "~/.opera" directory and remove it. This can be
+done from the command line using "cp -Rp ~/.opera ~/.opera-mybackup" and
+"rm -rf ~/.opera".
+
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 63ae767..60d44d0 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,340 +1,47 @@
 bin/opera
 share/doc/opera/LICENSE
 share/doc/opera/help
+share/icons/opera.xpm
+share/opera/bin/m2.so
 share/opera/bin/opera
-share/opera/buttons/DefSmall
-share/opera/buttons/Default
-share/opera/buttons/default/abc.gif
-share/opera/buttons/default/buttons.ini
-share/opera/buttons/default/cascade.gif
-share/opera/buttons/default/compose.gif
-share/opera/buttons/default/copy.gif
-share/opera/buttons/default/delete.gif
-share/opera/buttons/default/doccomp.gif
-share/opera/buttons/default/docerr.gif
-share/opera/buttons/default/dochtlst.gif
-share/opera/buttons/default/docim.gif
-share/opera/buttons/default/docload.gif
-share/opera/buttons/default/docmail.gif
-share/opera/buttons/default/docnews.gif
-share/opera/buttons/default/docprog.gif
-share/opera/buttons/default/docsrch.gif
-share/opera/buttons/default/doctrsf.gif
-share/opera/buttons/default/document.gif
-share/opera/buttons/default/docunkn.gif
-share/opera/buttons/default/docunrd.gif
-share/opera/buttons/default/dropdown.gif
-share/opera/buttons/default/figprog.gif
-share/opera/buttons/default/finished.gif
-share/opera/buttons/default/forward.gif
-share/opera/buttons/default/fullscre.gif
-share/opera/buttons/default/go.gif
-share/opera/buttons/default/hisecu.gif
-share/opera/buttons/default/home.gif
-share/opera/buttons/default/hotlist.gif
-share/opera/buttons/default/hotlstto.gif
-share/opera/buttons/default/html.gif
-share/opera/buttons/default/im.gif
-share/opera/buttons/default/incl.gif
-share/opera/buttons/default/keyb.gif
-share/opera/buttons/default/load.gif
-share/opera/buttons/default/loading.gif
-share/opera/buttons/default/losecu.gif
-share/opera/buttons/default/maxlist.gif
-share/opera/buttons/default/maxmail.gif
-share/opera/buttons/default/menu.gif
-share/opera/buttons/default/mesecu.gif
-share/opera/buttons/default/moveto.gif
-share/opera/buttons/default/new.gif
-share/opera/buttons/default/newbkmk.gif
-share/opera/buttons/default/newcntct.gif
-share/opera/buttons/default/newfldr.gif
-share/opera/buttons/default/newscatc.gif
-share/opera/buttons/default/newsfoll.gif
-share/opera/buttons/default/newsfoll1.gif
-share/opera/buttons/default/newsgrp.gif
-share/opera/buttons/default/newsmrea.gif
-share/opera/buttons/default/newsnext.gif
-share/opera/buttons/default/newsover.gif
-share/opera/buttons/default/newsprev.gif
-share/opera/buttons/default/newssall.gif
-share/opera/buttons/default/newsthr.gif
-share/opera/buttons/default/newsunr.gif
-share/opera/buttons/default/next.gif
-share/opera/buttons/default/noimg.gif
-share/opera/buttons/default/nosecu.gif
-share/opera/buttons/default/open.gif
-share/opera/buttons/default/previous.gif
-share/opera/buttons/default/previous1.gif
-share/opera/buttons/default/print.gif
-share/opera/buttons/default/printact.gif
-share/opera/buttons/default/printall.gif
-share/opera/buttons/default/printscr.gif
-share/opera/buttons/default/printvie.gif
-share/opera/buttons/default/redirect.gif
-share/opera/buttons/default/reload.gif
-share/opera/buttons/default/reply.gif
-share/opera/buttons/default/replyall.gif
-share/opera/buttons/default/save.gif
-share/opera/buttons/default/search.gif
-share/opera/buttons/default/send.gif
-share/opera/buttons/default/send1.gif
-share/opera/buttons/default/sendqd.gif
-share/opera/buttons/default/show.gif
-share/opera/buttons/default/split.gif
-share/opera/buttons/default/stop.gif
-share/opera/buttons/default/stop1.gif
-share/opera/buttons/default/tbsearch.gif
-share/opera/buttons/default/tile.gif
-share/opera/buttons/default/tilevert.gif
-share/opera/buttons/default/update.gif
-share/opera/buttons/default/url.gif
-share/opera/buttons/default/usermode.gif
-share/opera/buttons/default/websrch.gif
-share/opera/buttons/defsmall/abc.gif
-share/opera/buttons/defsmall/buttons.ini
-share/opera/buttons/defsmall/cascade.gif
-share/opera/buttons/defsmall/compose.gif
-share/opera/buttons/defsmall/copy.gif
-share/opera/buttons/defsmall/delete.gif
-share/opera/buttons/defsmall/dropdown.gif
-share/opera/buttons/defsmall/forward.gif
-share/opera/buttons/defsmall/fullscre.gif
-share/opera/buttons/defsmall/home.gif
-share/opera/buttons/defsmall/hotlist.gif
-share/opera/buttons/defsmall/hotlstto.gif
-share/opera/buttons/defsmall/imsmall.gif
-share/opera/buttons/defsmall/incl.gif
-share/opera/buttons/defsmall/keyb.gif
-share/opera/buttons/defsmall/maxlist.gif
-share/opera/buttons/defsmall/maxmail.gif
-share/opera/buttons/defsmall/menu.gif
-share/opera/buttons/defsmall/moveto.gif
-share/opera/buttons/defsmall/new.gif
-share/opera/buttons/defsmall/newbkmk.gif
-share/opera/buttons/defsmall/newcntct.gif
-share/opera/buttons/defsmall/newfldr.gif
-share/opera/buttons/defsmall/newscatc.gif
-share/opera/buttons/defsmall/newsfoll.gif
-share/opera/buttons/defsmall/newsgrp.gif
-share/opera/buttons/defsmall/newsmrea.gif
-share/opera/buttons/defsmall/newsnext.gif
-share/opera/buttons/defsmall/newsover.gif
-share/opera/buttons/defsmall/newsprev.gif
-share/opera/buttons/defsmall/newssall.gif
-share/opera/buttons/defsmall/newsthr.gif
-share/opera/buttons/defsmall/newsunr.gif
-share/opera/buttons/defsmall/next.gif
-share/opera/buttons/defsmall/open.gif
-share/opera/buttons/defsmall/previous.gif
-share/opera/buttons/defsmall/print.gif
-share/opera/buttons/defsmall/redirect.gif
-share/opera/buttons/defsmall/reload.gif
-share/opera/buttons/defsmall/reply.gif
-share/opera/buttons/defsmall/replyall.gif
-share/opera/buttons/defsmall/save.gif
-share/opera/buttons/defsmall/search.gif
-share/opera/buttons/defsmall/send.gif
-share/opera/buttons/defsmall/sendqd.gif
-share/opera/buttons/defsmall/split.gif
-share/opera/buttons/defsmall/tile.gif
-share/opera/buttons/defsmall/tilevert.gif
-share/opera/buttons/defsmall/update.gif
-share/opera/buttons/defsmall/url.gif
-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/buttons/readme.txt
-share/opera/buttons/standard/addressbar_high_security.png
-share/opera/buttons/standard/addressbar_html.png
-share/opera/buttons/standard/addressbar_html_alt2.png
-share/opera/buttons/standard/addressbar_html_alt3.png
-share/opera/buttons/standard/addressbar_html_alt4.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/boy10.png
-share/opera/buttons/standard/icons/boy11.png
-share/opera/buttons/standard/icons/boy13.png
-share/opera/buttons/standard/icons/boy14.png
-share/opera/buttons/standard/icons/boy15.png
-share/opera/buttons/standard/icons/boy16.png
-share/opera/buttons/standard/icons/close.png
-share/opera/buttons/standard/icons/dropdown.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/girl10.png
-share/opera/buttons/standard/icons/girl11.png
-share/opera/buttons/standard/icons/girl12.png
-share/opera/buttons/standard/icons/girl13.png
-share/opera/buttons/standard/icons/girl14.png
-share/opera/buttons/standard/icons/girl15.png
-share/opera/buttons/standard/icons/girl16.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/special01.png
-share/opera/buttons/standard/icons/special02.png
-share/opera/buttons/standard/icons/special03.png
-share/opera/buttons/standard/icons/special04.png
-share/opera/buttons/standard/icons/special05.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/skin/drop_target_bottom.png
-share/opera/buttons/standard/skin/drop_target_left.png
-share/opera/buttons/standard/skin/drop_target_right.png
-share/opera/buttons/standard/skin/drop_target_top.png
-share/opera/buttons/standard/skin/pagebar_active_corner_bottomleft.png
-share/opera/buttons/standard/skin/pagebar_active_corner_bottomright.png
-share/opera/buttons/standard/skin/pagebar_active_corner_topleft.png
-share/opera/buttons/standard/skin/pagebar_active_corner_topright.png
-share/opera/buttons/standard/skin/pagebar_active_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_active_tile_center.png
-share/opera/buttons/standard/skin/pagebar_active_tile_left.png
-share/opera/buttons/standard/skin/pagebar_active_tile_right.png
-share/opera/buttons/standard/skin/pagebar_active_tile_top.png
-share/opera/buttons/standard/skin/pagebar_border_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_border_tile_left.png
-share/opera/buttons/standard/skin/pagebar_border_tile_right.png
-share/opera/buttons/standard/skin/pagebar_border_tile_top.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_bottomleft.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_bottomright.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_topleft.png
-share/opera/buttons/standard/skin/pagebar_inactive_corner_topright.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_bottom.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_center.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_left.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_right.png
-share/opera/buttons/standard/skin/pagebar_inactive_tile_top.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/opera6rc
 share/opera/config/opera6rc.fixed
+share/opera/conmsg.html
+share/opera/console.html
+share/opera/contool.html
 share/opera/help/accessibility.html
 share/opera/help/advertising.html
+share/opera/help/context.html
 share/opera/help/dialogs.html
 share/opera/help/filetypes.html
 share/opera/help/fonts.html
+share/opera/help/glossary.html
 share/opera/help/help.css
 share/opera/help/history.html
+share/opera/help/hotlist.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/license.txt
 share/opera/help/look.html
-share/opera/help/menus.html
+share/opera/help/m2.html
+share/opera/help/main.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/startup.txt
-share/opera/help/tipday.txt
+share/opera/help/toc.html
+share/opera/help/toolbars.html
+share/opera/help/wand.html
+share/opera/help/welcome.html
 share/opera/help/windows.html
 share/opera/images/background.gif
 share/opera/images/blank.gif
@@ -352,18 +59,24 @@ share/opera/images/shared.gif
 share/opera/images/splash.png
 share/opera/images/startup1.png
 share/opera/images/startup2.png
-share/opera/java/lc.jar
+share/opera/ini/dialog.ini
+share/opera/ini/fastforward.ini
+share/opera/ini/minimal_toolbar.ini
+share/opera/ini/standard_keyboard.ini
+share/opera/ini/standard_menu.ini
+share/opera/ini/standard_mouse.ini
+share/opera/ini/standard_toolbar.ini
+share/opera/ini/unix_keyboard.ini
 share/opera/java/opera.jar
 share/opera/java/opera.policy
+share/opera/locale/english.lng
 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.8
 share/opera/plugins/operamotifwrapper
 share/opera/plugins/operaplugincleaner
 share/opera/search.ini
 share/opera/skin/foreground.png
+share/opera/skin/standard_skin.zip
 share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -373,26 +86,47 @@ share/opera/styles/drives.css
 share/opera/styles/email.css
 share/opera/styles/history.css
 share/opera/styles/im.css
+share/opera/styles/info.css
 share/opera/styles/mime.css
 share/opera/styles/mimehead.css
 share/opera/styles/opf.css
 share/opera/styles/plugins.css
+share/opera/styles/user/accessibility.css
+share/opera/styles/user/contrastbw.css
+share/opera/styles/user/contrastwb.css
+share/opera/styles/user/debugwithoutline.css
+share/opera/styles/user/defaultforms.css
+share/opera/styles/user/disabletables.css
+share/opera/styles/user/hidecertainsizes.css
+share/opera/styles/user/hidenonlinkimages.css
+share/opera/styles/user/imageandlinkonly.css
+share/opera/styles/user/nostalgia.css
+share/opera/styles/user/showstructure.css
+share/opera/styles/user/textonly.css
+share/opera/styles/user/userstyle.ini
 share/opera/styles/wml.css
+share/pixmaps/opera.xpm
+@dirrm share/opera/styles/user
 @dirrm share/opera/styles
 @dirrm share/opera/skin
 @dirrm share/opera/plugins
 @dirrm share/opera/locale
 @dirrm share/opera/java
+@dirrm share/opera/ini
 @dirrm share/opera/images
 @dirrm share/opera/help
 @dirrm share/opera/config
-@dirrm share/opera/buttons/standard/skin
-@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
-@dirrm share/opera/buttons
 @dirrm share/opera/bin
 @dirrm share/opera
 @dirrm share/doc/opera
+
+%%KDE:%%share/applnk/Internet/opera.desktop
+%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
+%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
+%%GNOME:%%share/gnome/pixmaps/opera.xpm
+%%KDE2:%%@dirrm share/applnk/Networking/WWW
+
+@cwd /etc/X11
+wmconfig/opera
+%%APPLNK:%%applnk/Internet/opera.desktop
+
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
deleted file mode 100644
index 59a21ab..0000000
--- a/www/linux-opera7/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# New ports collection makefile for:		linux-opera7
-# Date created:					17 February 2003
-# Whom:						Mezz <mezz7@cox.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	opera
-PORTVERSION=	7.11.20030515
-PORTREVISION=	2
-CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/711/final/en/i386/static/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2/-2/}.1-static-qt.i386
-
-MAINTAINER=	mezz7@cox.net
-COMMENT=	A blazingly fast, full-featured, standards-compliant browser
-
-RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif
-
-USE_BZIP2=	yes
-USE_LINUX=	yes
-USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
-ONLY_FOR_ARCHS=	i386
-
-NO_BUILD=	yes
-NO_FILTER_SHLIBS=yes
-
-.include <bsd.port.pre.mk>
-
-.if exists(/etc/X11/applnk)
-PLIST_SUB+=	APPLNK:=""
-.else
-PLIST_SUB+=	APPLNK:="@comment "
-.endif
-
-.if exists(${X11BASE}/share/gnome)
-PLIST_SUB+=	GNOME:=""
-.else
-PLIST_SUB+=	GNOME:="@comment "
-.endif
-
-.if exists(${X11BASE}/share/applnk/Internet)
-PLIST_SUB+=	KDE:=""
-.else
-PLIST_SUB+=	KDE:="@comment "
-.endif
-
-.if exists(${X11BASE}/share/applnk/Networking)
-PLIST_SUB+=	KDE2:=""
-.else
-PLIST_SUB+=	KDE2:="@comment "
-.endif
-
-.if exists(${X11BASE}/share/gnome/apps)
-PLIST_SUB+=	GNOMELNK:=""
-.else
-PLIST_SUB+=	GNOMELNK:="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
-
-do-install:
-	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
deleted file mode 100644
index c53aaca..0000000
--- a/www/linux-opera7/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (opera-7.11-20030515.1-static-qt.i386.tar.bz2) = 5dacb87719576669d4c6e56df5a68fdd
diff --git a/www/linux-opera7/pkg-descr b/www/linux-opera7/pkg-descr
deleted file mode 100644
index 1a8ab89..0000000
--- a/www/linux-opera7/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Opera 7 is a substantial upgrade, with code rewritten from the rendering engine
-and up, resulting in the fastest, smallest, most full-featured desktop browser
-ever released.
-
--New rendering engine
-Opera's new rendering engine supports W3C's DOM (Document Object Model) level 2,
-non-standard dynamic HTML (DHTML), CSS1 and CSS2, ECMAScript, and has improved
-HTML 4.01 support, as well as complete support for WML 1.3 and 2.0. It is
-faster, smaller and can dynamically change documents through DOM.
-
--M2 -- new e-mail client
-Opera's new e-mail client, M2, automatically categorizes and sorts e-mail
-messages by contact and has an integrated spam filter. Innovative features such
-as QuickReply and QuickFind lets users answer or find e-mails at unrivalled
-speed. M2 supports POP3, IMAP, ESMTP, and threaded display of mailing lists.
-In addition, M2 supports news servers with password authentication.
-
-WWW: http://www.opera.com/
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
deleted file mode 100644
index 60d44d0..0000000
--- a/www/linux-opera7/pkg-plist
+++ /dev/null
@@ -1,132 +0,0 @@
-bin/opera
-share/doc/opera/LICENSE
-share/doc/opera/help
-share/icons/opera.xpm
-share/opera/bin/m2.so
-share/opera/bin/opera
-share/opera/chartables.bin
-share/opera/config/opera6rc
-share/opera/config/opera6rc.fixed
-share/opera/conmsg.html
-share/opera/console.html
-share/opera/contool.html
-share/opera/help/accessibility.html
-share/opera/help/advertising.html
-share/opera/help/context.html
-share/opera/help/dialogs.html
-share/opera/help/filetypes.html
-share/opera/help/fonts.html
-share/opera/help/glossary.html
-share/opera/help/help.css
-share/opera/help/history.html
-share/opera/help/hotlist.html
-share/opera/help/index.html
-share/opera/help/keyboard.html
-share/opera/help/languages.html
-share/opera/help/license.txt
-share/opera/help/look.html
-share/opera/help/m2.html
-share/opera/help/main.html
-share/opera/help/mouse.html
-share/opera/help/multimedia.html
-share/opera/help/network.html
-share/opera/help/page.html
-share/opera/help/paths.html
-share/opera/help/personal.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/toc.html
-share/opera/help/toolbars.html
-share/opera/help/wand.html
-share/opera/help/welcome.html
-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/images/shared.gif
-share/opera/images/splash.png
-share/opera/images/startup1.png
-share/opera/images/startup2.png
-share/opera/ini/dialog.ini
-share/opera/ini/fastforward.ini
-share/opera/ini/minimal_toolbar.ini
-share/opera/ini/standard_keyboard.ini
-share/opera/ini/standard_menu.ini
-share/opera/ini/standard_mouse.ini
-share/opera/ini/standard_toolbar.ini
-share/opera/ini/unix_keyboard.ini
-share/opera/java/opera.jar
-share/opera/java/opera.policy
-share/opera/locale/english.lng
-share/opera/opera6.adr
-share/opera/plugins/libnpp.so
-share/opera/plugins/operamotifwrapper
-share/opera/plugins/operaplugincleaner
-share/opera/search.ini
-share/opera/skin/foreground.png
-share/opera/skin/standard_skin.zip
-share/opera/styles/OPF.css
-share/opera/styles/about.css
-share/opera/styles/cache.css
-share/opera/styles/csr.css
-share/opera/styles/dir.css
-share/opera/styles/drives.css
-share/opera/styles/email.css
-share/opera/styles/history.css
-share/opera/styles/im.css
-share/opera/styles/info.css
-share/opera/styles/mime.css
-share/opera/styles/mimehead.css
-share/opera/styles/opf.css
-share/opera/styles/plugins.css
-share/opera/styles/user/accessibility.css
-share/opera/styles/user/contrastbw.css
-share/opera/styles/user/contrastwb.css
-share/opera/styles/user/debugwithoutline.css
-share/opera/styles/user/defaultforms.css
-share/opera/styles/user/disabletables.css
-share/opera/styles/user/hidecertainsizes.css
-share/opera/styles/user/hidenonlinkimages.css
-share/opera/styles/user/imageandlinkonly.css
-share/opera/styles/user/nostalgia.css
-share/opera/styles/user/showstructure.css
-share/opera/styles/user/textonly.css
-share/opera/styles/user/userstyle.ini
-share/opera/styles/wml.css
-share/pixmaps/opera.xpm
-@dirrm share/opera/styles/user
-@dirrm share/opera/styles
-@dirrm share/opera/skin
-@dirrm share/opera/plugins
-@dirrm share/opera/locale
-@dirrm share/opera/java
-@dirrm share/opera/ini
-@dirrm share/opera/images
-@dirrm share/opera/help
-@dirrm share/opera/config
-@dirrm share/opera/bin
-@dirrm share/opera
-@dirrm share/doc/opera
-
-%%KDE:%%share/applnk/Internet/opera.desktop
-%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
-%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
-%%GNOME:%%share/gnome/pixmaps/opera.xpm
-%%KDE2:%%@dirrm share/applnk/Networking/WWW
-
-@cwd /etc/X11
-wmconfig/opera
-%%APPLNK:%%applnk/Internet/opera.desktop
-