diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 4415b429c0e8..a7497d114697 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	linux-opera
-PORTVERSION=	4.0b3
+PORTVERSION=	4.0b4
 CATEGORIES=	www linux
 MASTER_SITES=	http://opera.online.no/linux/tgz/
-DISTNAME=	opera-4.0-b3-static.i386
+DISTNAME=	opera-4.0-b4-20001211.012-static.i386
 
 MAINTAINER=	des@FreeBSD.org
 
-RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \
-		/compat/linux/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
+RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
+		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png \
+		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
 NO_BUILD=	yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DISTNAME%%|${DISTNAME}|' \
-	    <${FILESDIR}/opera.sh >${WRKDIR}/opera.sh
+	${SED} 's|%%PREFIX%%|${PREFIX}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera
 
 do-install:
-	(cd ${WRKDIR} && \
-	    tar cf - ${DISTNAME} | tar --unlink -xpf - -C ${PREFIX})
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	${MKDIR} ${PREFIX}/opera-4.0
+	(cd ${WRKSRC} && \
+	    tar cf - . | tar --unlink -xpf - -C ${PREFIX}/opera-4.0)
+	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin/opera
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 038fd3f8aa68..f0532cd077d9 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-4.0-b3-static.i386.tar.gz) = 49784111f40eaedc1bcc31d13e32bccc
+MD5 (opera-4.0-b4-20001211.012-static.i386.tar.gz) = b212737b27048199b22d1763fa627280
diff --git a/www/linux-opera-devel/files/opera.sh b/www/linux-opera-devel/files/opera.sh
index a6213d01e74d..b0fcdd71a809 100644
--- a/www/linux-opera-devel/files/opera.sh
+++ b/www/linux-opera-devel/files/opera.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-%%PREFIX%%/%%DISTNAME%%/opera
+%%PREFIX%%/opera-4.0/opera
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index e1307e65ae8f..51035f7e6c11 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -1,162 +1,190 @@
 bin/opera
-opera-4.0-b3-static.i386/LICENSE
-opera-4.0-b3-static.i386/README
-opera-4.0-b3-static.i386/buttons/default/abc.gif
-opera-4.0-b3-static.i386/buttons/default/buttons.ini
-opera-4.0-b3-static.i386/buttons/default/cascade.gif
-opera-4.0-b3-static.i386/buttons/default/compose.gif
-opera-4.0-b3-static.i386/buttons/default/copy.gif
-opera-4.0-b3-static.i386/buttons/default/delete.gif
-opera-4.0-b3-static.i386/buttons/default/doccomp.gif
-opera-4.0-b3-static.i386/buttons/default/docerr.gif
-opera-4.0-b3-static.i386/buttons/default/dochtlst.gif
-opera-4.0-b3-static.i386/buttons/default/docload.gif
-opera-4.0-b3-static.i386/buttons/default/docmail.gif
-opera-4.0-b3-static.i386/buttons/default/docnews.gif
-opera-4.0-b3-static.i386/buttons/default/docprog.gif
-opera-4.0-b3-static.i386/buttons/default/docsrch.gif
-opera-4.0-b3-static.i386/buttons/default/doctrsf.gif
-opera-4.0-b3-static.i386/buttons/default/document.gif
-opera-4.0-b3-static.i386/buttons/default/docunrd.gif
-opera-4.0-b3-static.i386/buttons/default/dropdown.gif
-opera-4.0-b3-static.i386/buttons/default/figprog.gif
-opera-4.0-b3-static.i386/buttons/default/finished.gif
-opera-4.0-b3-static.i386/buttons/default/forward.gif
-opera-4.0-b3-static.i386/buttons/default/fullscre.gif
-opera-4.0-b3-static.i386/buttons/default/go.gif
-opera-4.0-b3-static.i386/buttons/default/hisecu.gif
-opera-4.0-b3-static.i386/buttons/default/home.gif
-opera-4.0-b3-static.i386/buttons/default/hotlist.gif
-opera-4.0-b3-static.i386/buttons/default/hotlstto.gif
-opera-4.0-b3-static.i386/buttons/default/im.gif
-opera-4.0-b3-static.i386/buttons/default/incl.gif
-opera-4.0-b3-static.i386/buttons/default/keyb.gif
-opera-4.0-b3-static.i386/buttons/default/load.gif
-opera-4.0-b3-static.i386/buttons/default/loading.gif
-opera-4.0-b3-static.i386/buttons/default/losecu.gif
-opera-4.0-b3-static.i386/buttons/default/maxlist.gif
-opera-4.0-b3-static.i386/buttons/default/maxmail.gif
-opera-4.0-b3-static.i386/buttons/default/menu.gif
-opera-4.0-b3-static.i386/buttons/default/mesecu.gif
-opera-4.0-b3-static.i386/buttons/default/moveto.gif
-opera-4.0-b3-static.i386/buttons/default/new.gif
-opera-4.0-b3-static.i386/buttons/default/newbkmk.gif
-opera-4.0-b3-static.i386/buttons/default/newcntct.gif
-opera-4.0-b3-static.i386/buttons/default/newfldr.gif
-opera-4.0-b3-static.i386/buttons/default/newscatc.gif
-opera-4.0-b3-static.i386/buttons/default/newsfoll.gif
-opera-4.0-b3-static.i386/buttons/default/newsfoll1.gif
-opera-4.0-b3-static.i386/buttons/default/newsgrp.gif
-opera-4.0-b3-static.i386/buttons/default/newsmrea.gif
-opera-4.0-b3-static.i386/buttons/default/newsnext.gif
-opera-4.0-b3-static.i386/buttons/default/newsover.gif
-opera-4.0-b3-static.i386/buttons/default/newsprev.gif
-opera-4.0-b3-static.i386/buttons/default/newssall.gif
-opera-4.0-b3-static.i386/buttons/default/newsthr.gif
-opera-4.0-b3-static.i386/buttons/default/newsunr.gif
-opera-4.0-b3-static.i386/buttons/default/next.gif
-opera-4.0-b3-static.i386/buttons/default/noimg.gif
-opera-4.0-b3-static.i386/buttons/default/nosecu.gif
-opera-4.0-b3-static.i386/buttons/default/open.gif
-opera-4.0-b3-static.i386/buttons/default/previous.gif
-opera-4.0-b3-static.i386/buttons/default/previous1.gif
-opera-4.0-b3-static.i386/buttons/default/print.gif
-opera-4.0-b3-static.i386/buttons/default/printact.gif
-opera-4.0-b3-static.i386/buttons/default/printall.gif
-opera-4.0-b3-static.i386/buttons/default/printscr.gif
-opera-4.0-b3-static.i386/buttons/default/printvie.gif
-opera-4.0-b3-static.i386/buttons/default/redirect.gif
-opera-4.0-b3-static.i386/buttons/default/reload.gif
-opera-4.0-b3-static.i386/buttons/default/reply.gif
-opera-4.0-b3-static.i386/buttons/default/replyall.gif
-opera-4.0-b3-static.i386/buttons/default/save.gif
-opera-4.0-b3-static.i386/buttons/default/search.gif
-opera-4.0-b3-static.i386/buttons/default/send.gif
-opera-4.0-b3-static.i386/buttons/default/send1.gif
-opera-4.0-b3-static.i386/buttons/default/sendqd.gif
-opera-4.0-b3-static.i386/buttons/default/show.gif
-opera-4.0-b3-static.i386/buttons/default/split.gif
-opera-4.0-b3-static.i386/buttons/default/stop.gif
-opera-4.0-b3-static.i386/buttons/default/stop1.gif
-opera-4.0-b3-static.i386/buttons/default/tbsearch.gif
-opera-4.0-b3-static.i386/buttons/default/tile.gif
-opera-4.0-b3-static.i386/buttons/default/tilevert.gif
-opera-4.0-b3-static.i386/buttons/default/update.gif
-opera-4.0-b3-static.i386/buttons/default/url.gif
-opera-4.0-b3-static.i386/buttons/default/usermode.gif
-opera-4.0-b3-static.i386/buttons/default/websrch.gif
-opera-4.0-b3-static.i386/buttons/defsmall/abc.gif
-opera-4.0-b3-static.i386/buttons/defsmall/buttons.ini
-opera-4.0-b3-static.i386/buttons/defsmall/cascade.gif
-opera-4.0-b3-static.i386/buttons/defsmall/compose.gif
-opera-4.0-b3-static.i386/buttons/defsmall/copy.gif
-opera-4.0-b3-static.i386/buttons/defsmall/delete.gif
-opera-4.0-b3-static.i386/buttons/defsmall/dropdown.gif
-opera-4.0-b3-static.i386/buttons/defsmall/forward.gif
-opera-4.0-b3-static.i386/buttons/defsmall/fullscre.gif
-opera-4.0-b3-static.i386/buttons/defsmall/home.gif
-opera-4.0-b3-static.i386/buttons/defsmall/hotlist.gif
-opera-4.0-b3-static.i386/buttons/defsmall/hotlstto.gif
-opera-4.0-b3-static.i386/buttons/defsmall/imsmall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/incl.gif
-opera-4.0-b3-static.i386/buttons/defsmall/keyb.gif
-opera-4.0-b3-static.i386/buttons/defsmall/maxlist.gif
-opera-4.0-b3-static.i386/buttons/defsmall/maxmail.gif
-opera-4.0-b3-static.i386/buttons/defsmall/menu.gif
-opera-4.0-b3-static.i386/buttons/defsmall/moveto.gif
-opera-4.0-b3-static.i386/buttons/defsmall/new.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newbkmk.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newcntct.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newfldr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newscatc.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsfoll.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsgrp.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsmrea.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsnext.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsover.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsprev.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newssall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsthr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsunr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/next.gif
-opera-4.0-b3-static.i386/buttons/defsmall/open.gif
-opera-4.0-b3-static.i386/buttons/defsmall/previous.gif
-opera-4.0-b3-static.i386/buttons/defsmall/print.gif
-opera-4.0-b3-static.i386/buttons/defsmall/redirect.gif
-opera-4.0-b3-static.i386/buttons/defsmall/reload.gif
-opera-4.0-b3-static.i386/buttons/defsmall/reply.gif
-opera-4.0-b3-static.i386/buttons/defsmall/replyall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/save.gif
-opera-4.0-b3-static.i386/buttons/defsmall/search.gif
-opera-4.0-b3-static.i386/buttons/defsmall/send.gif
-opera-4.0-b3-static.i386/buttons/defsmall/sendqd.gif
-opera-4.0-b3-static.i386/buttons/defsmall/split.gif
-opera-4.0-b3-static.i386/buttons/defsmall/tile.gif
-opera-4.0-b3-static.i386/buttons/defsmall/tilevert.gif
-opera-4.0-b3-static.i386/buttons/defsmall/update.gif
-opera-4.0-b3-static.i386/buttons/defsmall/url.gif
-opera-4.0-b3-static.i386/images/int_dir.gif
-opera-4.0-b3-static.i386/images/int_drv.gif
-opera-4.0-b3-static.i386/images/int_file.gif
-opera-4.0-b3-static.i386/images/int_link.gif
-opera-4.0-b3-static.i386/install.sh
-opera-4.0-b3-static.i386/opera
-opera-4.0-b3-static.i386/opera.adr
-opera-4.0-b3-static.i386/opera.desktop
-opera-4.0-b3-static.i386/opera.wmconfig
-opera-4.0-b3-static.i386/opera.xpm
-opera-4.0-b3-static.i386/styles/cache.css
-opera-4.0-b3-static.i386/styles/dir.css
-opera-4.0-b3-static.i386/styles/drives.css
-opera-4.0-b3-static.i386/styles/history.css
-opera-4.0-b3-static.i386/styles/mailstyle.css
-opera-4.0-b3-static.i386/styles/opf.css
-opera-4.0-b3-static.i386/styles/plugins.css
-opera-4.0-b3-static.i386/styles/wml.css
-opera-4.0-b3-static.i386/uninstall.sh
-@dirrm opera-4.0-b3-static.i386/styles
-@dirrm opera-4.0-b3-static.i386/images
-@dirrm opera-4.0-b3-static.i386/buttons/defsmall
-@dirrm opera-4.0-b3-static.i386/buttons/default
-@dirrm opera-4.0-b3-static.i386/buttons
-@dirrm opera-4.0-b3-static.i386
+opera-4.0/LICENSE
+opera-4.0/README
+opera-4.0/buttons/default/abc.gif
+opera-4.0/buttons/default/buttons.ini
+opera-4.0/buttons/default/cascade.gif
+opera-4.0/buttons/default/compose.gif
+opera-4.0/buttons/default/copy.gif
+opera-4.0/buttons/default/delete.gif
+opera-4.0/buttons/default/doccomp.gif
+opera-4.0/buttons/default/docerr.gif
+opera-4.0/buttons/default/dochtlst.gif
+opera-4.0/buttons/default/docload.gif
+opera-4.0/buttons/default/docmail.gif
+opera-4.0/buttons/default/docnews.gif
+opera-4.0/buttons/default/docprog.gif
+opera-4.0/buttons/default/docsrch.gif
+opera-4.0/buttons/default/doctrsf.gif
+opera-4.0/buttons/default/document.gif
+opera-4.0/buttons/default/docunrd.gif
+opera-4.0/buttons/default/dropdown.gif
+opera-4.0/buttons/default/figprog.gif
+opera-4.0/buttons/default/finished.gif
+opera-4.0/buttons/default/forward.gif
+opera-4.0/buttons/default/fullscre.gif
+opera-4.0/buttons/default/go.gif
+opera-4.0/buttons/default/hisecu.gif
+opera-4.0/buttons/default/home.gif
+opera-4.0/buttons/default/hotlist.gif
+opera-4.0/buttons/default/hotlstto.gif
+opera-4.0/buttons/default/im.gif
+opera-4.0/buttons/default/incl.gif
+opera-4.0/buttons/default/keyb.gif
+opera-4.0/buttons/default/load.gif
+opera-4.0/buttons/default/loading.gif
+opera-4.0/buttons/default/losecu.gif
+opera-4.0/buttons/default/maxlist.gif
+opera-4.0/buttons/default/maxmail.gif
+opera-4.0/buttons/default/menu.gif
+opera-4.0/buttons/default/mesecu.gif
+opera-4.0/buttons/default/moveto.gif
+opera-4.0/buttons/default/new.gif
+opera-4.0/buttons/default/newbkmk.gif
+opera-4.0/buttons/default/newcntct.gif
+opera-4.0/buttons/default/newfldr.gif
+opera-4.0/buttons/default/newscatc.gif
+opera-4.0/buttons/default/newsfoll.gif
+opera-4.0/buttons/default/newsfoll1.gif
+opera-4.0/buttons/default/newsgrp.gif
+opera-4.0/buttons/default/newsmrea.gif
+opera-4.0/buttons/default/newsnext.gif
+opera-4.0/buttons/default/newsover.gif
+opera-4.0/buttons/default/newsprev.gif
+opera-4.0/buttons/default/newssall.gif
+opera-4.0/buttons/default/newsthr.gif
+opera-4.0/buttons/default/newsunr.gif
+opera-4.0/buttons/default/next.gif
+opera-4.0/buttons/default/noimg.gif
+opera-4.0/buttons/default/nosecu.gif
+opera-4.0/buttons/default/open.gif
+opera-4.0/buttons/default/previous.gif
+opera-4.0/buttons/default/previous1.gif
+opera-4.0/buttons/default/print.gif
+opera-4.0/buttons/default/printact.gif
+opera-4.0/buttons/default/printall.gif
+opera-4.0/buttons/default/printscr.gif
+opera-4.0/buttons/default/printvie.gif
+opera-4.0/buttons/default/redirect.gif
+opera-4.0/buttons/default/reload.gif
+opera-4.0/buttons/default/reply.gif
+opera-4.0/buttons/default/replyall.gif
+opera-4.0/buttons/default/save.gif
+opera-4.0/buttons/default/search.gif
+opera-4.0/buttons/default/send.gif
+opera-4.0/buttons/default/send1.gif
+opera-4.0/buttons/default/sendqd.gif
+opera-4.0/buttons/default/show.gif
+opera-4.0/buttons/default/split.gif
+opera-4.0/buttons/default/stop.gif
+opera-4.0/buttons/default/stop1.gif
+opera-4.0/buttons/default/tbsearch.gif
+opera-4.0/buttons/default/tile.gif
+opera-4.0/buttons/default/tilevert.gif
+opera-4.0/buttons/default/update.gif
+opera-4.0/buttons/default/url.gif
+opera-4.0/buttons/default/usermode.gif
+opera-4.0/buttons/default/websrch.gif
+opera-4.0/buttons/defsmall/abc.gif
+opera-4.0/buttons/defsmall/buttons.ini
+opera-4.0/buttons/defsmall/cascade.gif
+opera-4.0/buttons/defsmall/compose.gif
+opera-4.0/buttons/defsmall/copy.gif
+opera-4.0/buttons/defsmall/delete.gif
+opera-4.0/buttons/defsmall/dropdown.gif
+opera-4.0/buttons/defsmall/forward.gif
+opera-4.0/buttons/defsmall/fullscre.gif
+opera-4.0/buttons/defsmall/home.gif
+opera-4.0/buttons/defsmall/hotlist.gif
+opera-4.0/buttons/defsmall/hotlstto.gif
+opera-4.0/buttons/defsmall/imsmall.gif
+opera-4.0/buttons/defsmall/incl.gif
+opera-4.0/buttons/defsmall/keyb.gif
+opera-4.0/buttons/defsmall/maxlist.gif
+opera-4.0/buttons/defsmall/maxmail.gif
+opera-4.0/buttons/defsmall/menu.gif
+opera-4.0/buttons/defsmall/moveto.gif
+opera-4.0/buttons/defsmall/new.gif
+opera-4.0/buttons/defsmall/newbkmk.gif
+opera-4.0/buttons/defsmall/newcntct.gif
+opera-4.0/buttons/defsmall/newfldr.gif
+opera-4.0/buttons/defsmall/newscatc.gif
+opera-4.0/buttons/defsmall/newsfoll.gif
+opera-4.0/buttons/defsmall/newsgrp.gif
+opera-4.0/buttons/defsmall/newsmrea.gif
+opera-4.0/buttons/defsmall/newsnext.gif
+opera-4.0/buttons/defsmall/newsover.gif
+opera-4.0/buttons/defsmall/newsprev.gif
+opera-4.0/buttons/defsmall/newssall.gif
+opera-4.0/buttons/defsmall/newsthr.gif
+opera-4.0/buttons/defsmall/newsunr.gif
+opera-4.0/buttons/defsmall/next.gif
+opera-4.0/buttons/defsmall/open.gif
+opera-4.0/buttons/defsmall/previous.gif
+opera-4.0/buttons/defsmall/print.gif
+opera-4.0/buttons/defsmall/redirect.gif
+opera-4.0/buttons/defsmall/reload.gif
+opera-4.0/buttons/defsmall/reply.gif
+opera-4.0/buttons/defsmall/replyall.gif
+opera-4.0/buttons/defsmall/save.gif
+opera-4.0/buttons/defsmall/search.gif
+opera-4.0/buttons/defsmall/send.gif
+opera-4.0/buttons/defsmall/sendqd.gif
+opera-4.0/buttons/defsmall/split.gif
+opera-4.0/buttons/defsmall/tile.gif
+opera-4.0/buttons/defsmall/tilevert.gif
+opera-4.0/buttons/defsmall/update.gif
+opera-4.0/buttons/defsmall/url.gif
+opera-4.0/help/ReadMe.txt
+opera-4.0/help/access.htm
+opera-4.0/help/alpha.htm
+opera-4.0/help/bookmark.htm
+opera-4.0/help/contact.htm
+opera-4.0/help/dialogs.htm
+opera-4.0/help/elektra.css
+opera-4.0/help/features.htm
+opera-4.0/help/helphelp.htm
+opera-4.0/help/index.htm
+opera-4.0/help/keyboard.htm
+opera-4.0/help/link_up.gif
+opera-4.0/help/menus.htm
+opera-4.0/help/prefmenu.htm
+opera-4.0/help/readmeXX.txt
+opera-4.0/help/reg_form.txt
+opera-4.0/help/security.htm
+opera-4.0/help/starter.htm
+opera-4.0/help/terms.htm
+opera-4.0/help/trouble.htm
+opera-4.0/help/valid-xhtml10.png
+opera-4.0/images/drive.gif
+opera-4.0/images/file.gif
+opera-4.0/images/folder.gif
+opera-4.0/images/link.gif
+opera-4.0/install.sh
+opera-4.0/opera
+opera-4.0/opera.adr
+opera-4.0/opera.desktop
+opera-4.0/opera.wmconfig
+opera-4.0/opera.xpm
+opera-4.0/opera_16x16.png
+opera-4.0/opera_22x22.png
+opera-4.0/opera_32x32.png
+opera-4.0/opera_48x48.png
+opera-4.0/styles/about.css
+opera-4.0/styles/cache.css
+opera-4.0/styles/csr.css
+opera-4.0/styles/dir.css
+opera-4.0/styles/drives.css
+opera-4.0/styles/email.css
+opera-4.0/styles/history.css
+opera-4.0/styles/im.css
+opera-4.0/styles/plugins.css
+opera-4.0/styles/wml.css
+opera-4.0/uninstall.sh
+@dirrm opera-4.0/styles
+@dirrm opera-4.0/images
+@dirrm opera-4.0/help
+@dirrm opera-4.0/buttons/defsmall
+@dirrm opera-4.0/buttons/default
+@dirrm opera-4.0/buttons
+@dirrm opera-4.0
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 4415b429c0e8..a7497d114697 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	linux-opera
-PORTVERSION=	4.0b3
+PORTVERSION=	4.0b4
 CATEGORIES=	www linux
 MASTER_SITES=	http://opera.online.no/linux/tgz/
-DISTNAME=	opera-4.0-b3-static.i386
+DISTNAME=	opera-4.0-b4-20001211.012-static.i386
 
 MAINTAINER=	des@FreeBSD.org
 
-RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \
-		/compat/linux/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
+RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
+		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png \
+		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
 NO_BUILD=	yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DISTNAME%%|${DISTNAME}|' \
-	    <${FILESDIR}/opera.sh >${WRKDIR}/opera.sh
+	${SED} 's|%%PREFIX%%|${PREFIX}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera
 
 do-install:
-	(cd ${WRKDIR} && \
-	    tar cf - ${DISTNAME} | tar --unlink -xpf - -C ${PREFIX})
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	${MKDIR} ${PREFIX}/opera-4.0
+	(cd ${WRKSRC} && \
+	    tar cf - . | tar --unlink -xpf - -C ${PREFIX}/opera-4.0)
+	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin/opera
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 038fd3f8aa68..f0532cd077d9 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-4.0-b3-static.i386.tar.gz) = 49784111f40eaedc1bcc31d13e32bccc
+MD5 (opera-4.0-b4-20001211.012-static.i386.tar.gz) = b212737b27048199b22d1763fa627280
diff --git a/www/linux-opera/files/opera.sh b/www/linux-opera/files/opera.sh
index a6213d01e74d..b0fcdd71a809 100644
--- a/www/linux-opera/files/opera.sh
+++ b/www/linux-opera/files/opera.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-%%PREFIX%%/%%DISTNAME%%/opera
+%%PREFIX%%/opera-4.0/opera
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index e1307e65ae8f..51035f7e6c11 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,162 +1,190 @@
 bin/opera
-opera-4.0-b3-static.i386/LICENSE
-opera-4.0-b3-static.i386/README
-opera-4.0-b3-static.i386/buttons/default/abc.gif
-opera-4.0-b3-static.i386/buttons/default/buttons.ini
-opera-4.0-b3-static.i386/buttons/default/cascade.gif
-opera-4.0-b3-static.i386/buttons/default/compose.gif
-opera-4.0-b3-static.i386/buttons/default/copy.gif
-opera-4.0-b3-static.i386/buttons/default/delete.gif
-opera-4.0-b3-static.i386/buttons/default/doccomp.gif
-opera-4.0-b3-static.i386/buttons/default/docerr.gif
-opera-4.0-b3-static.i386/buttons/default/dochtlst.gif
-opera-4.0-b3-static.i386/buttons/default/docload.gif
-opera-4.0-b3-static.i386/buttons/default/docmail.gif
-opera-4.0-b3-static.i386/buttons/default/docnews.gif
-opera-4.0-b3-static.i386/buttons/default/docprog.gif
-opera-4.0-b3-static.i386/buttons/default/docsrch.gif
-opera-4.0-b3-static.i386/buttons/default/doctrsf.gif
-opera-4.0-b3-static.i386/buttons/default/document.gif
-opera-4.0-b3-static.i386/buttons/default/docunrd.gif
-opera-4.0-b3-static.i386/buttons/default/dropdown.gif
-opera-4.0-b3-static.i386/buttons/default/figprog.gif
-opera-4.0-b3-static.i386/buttons/default/finished.gif
-opera-4.0-b3-static.i386/buttons/default/forward.gif
-opera-4.0-b3-static.i386/buttons/default/fullscre.gif
-opera-4.0-b3-static.i386/buttons/default/go.gif
-opera-4.0-b3-static.i386/buttons/default/hisecu.gif
-opera-4.0-b3-static.i386/buttons/default/home.gif
-opera-4.0-b3-static.i386/buttons/default/hotlist.gif
-opera-4.0-b3-static.i386/buttons/default/hotlstto.gif
-opera-4.0-b3-static.i386/buttons/default/im.gif
-opera-4.0-b3-static.i386/buttons/default/incl.gif
-opera-4.0-b3-static.i386/buttons/default/keyb.gif
-opera-4.0-b3-static.i386/buttons/default/load.gif
-opera-4.0-b3-static.i386/buttons/default/loading.gif
-opera-4.0-b3-static.i386/buttons/default/losecu.gif
-opera-4.0-b3-static.i386/buttons/default/maxlist.gif
-opera-4.0-b3-static.i386/buttons/default/maxmail.gif
-opera-4.0-b3-static.i386/buttons/default/menu.gif
-opera-4.0-b3-static.i386/buttons/default/mesecu.gif
-opera-4.0-b3-static.i386/buttons/default/moveto.gif
-opera-4.0-b3-static.i386/buttons/default/new.gif
-opera-4.0-b3-static.i386/buttons/default/newbkmk.gif
-opera-4.0-b3-static.i386/buttons/default/newcntct.gif
-opera-4.0-b3-static.i386/buttons/default/newfldr.gif
-opera-4.0-b3-static.i386/buttons/default/newscatc.gif
-opera-4.0-b3-static.i386/buttons/default/newsfoll.gif
-opera-4.0-b3-static.i386/buttons/default/newsfoll1.gif
-opera-4.0-b3-static.i386/buttons/default/newsgrp.gif
-opera-4.0-b3-static.i386/buttons/default/newsmrea.gif
-opera-4.0-b3-static.i386/buttons/default/newsnext.gif
-opera-4.0-b3-static.i386/buttons/default/newsover.gif
-opera-4.0-b3-static.i386/buttons/default/newsprev.gif
-opera-4.0-b3-static.i386/buttons/default/newssall.gif
-opera-4.0-b3-static.i386/buttons/default/newsthr.gif
-opera-4.0-b3-static.i386/buttons/default/newsunr.gif
-opera-4.0-b3-static.i386/buttons/default/next.gif
-opera-4.0-b3-static.i386/buttons/default/noimg.gif
-opera-4.0-b3-static.i386/buttons/default/nosecu.gif
-opera-4.0-b3-static.i386/buttons/default/open.gif
-opera-4.0-b3-static.i386/buttons/default/previous.gif
-opera-4.0-b3-static.i386/buttons/default/previous1.gif
-opera-4.0-b3-static.i386/buttons/default/print.gif
-opera-4.0-b3-static.i386/buttons/default/printact.gif
-opera-4.0-b3-static.i386/buttons/default/printall.gif
-opera-4.0-b3-static.i386/buttons/default/printscr.gif
-opera-4.0-b3-static.i386/buttons/default/printvie.gif
-opera-4.0-b3-static.i386/buttons/default/redirect.gif
-opera-4.0-b3-static.i386/buttons/default/reload.gif
-opera-4.0-b3-static.i386/buttons/default/reply.gif
-opera-4.0-b3-static.i386/buttons/default/replyall.gif
-opera-4.0-b3-static.i386/buttons/default/save.gif
-opera-4.0-b3-static.i386/buttons/default/search.gif
-opera-4.0-b3-static.i386/buttons/default/send.gif
-opera-4.0-b3-static.i386/buttons/default/send1.gif
-opera-4.0-b3-static.i386/buttons/default/sendqd.gif
-opera-4.0-b3-static.i386/buttons/default/show.gif
-opera-4.0-b3-static.i386/buttons/default/split.gif
-opera-4.0-b3-static.i386/buttons/default/stop.gif
-opera-4.0-b3-static.i386/buttons/default/stop1.gif
-opera-4.0-b3-static.i386/buttons/default/tbsearch.gif
-opera-4.0-b3-static.i386/buttons/default/tile.gif
-opera-4.0-b3-static.i386/buttons/default/tilevert.gif
-opera-4.0-b3-static.i386/buttons/default/update.gif
-opera-4.0-b3-static.i386/buttons/default/url.gif
-opera-4.0-b3-static.i386/buttons/default/usermode.gif
-opera-4.0-b3-static.i386/buttons/default/websrch.gif
-opera-4.0-b3-static.i386/buttons/defsmall/abc.gif
-opera-4.0-b3-static.i386/buttons/defsmall/buttons.ini
-opera-4.0-b3-static.i386/buttons/defsmall/cascade.gif
-opera-4.0-b3-static.i386/buttons/defsmall/compose.gif
-opera-4.0-b3-static.i386/buttons/defsmall/copy.gif
-opera-4.0-b3-static.i386/buttons/defsmall/delete.gif
-opera-4.0-b3-static.i386/buttons/defsmall/dropdown.gif
-opera-4.0-b3-static.i386/buttons/defsmall/forward.gif
-opera-4.0-b3-static.i386/buttons/defsmall/fullscre.gif
-opera-4.0-b3-static.i386/buttons/defsmall/home.gif
-opera-4.0-b3-static.i386/buttons/defsmall/hotlist.gif
-opera-4.0-b3-static.i386/buttons/defsmall/hotlstto.gif
-opera-4.0-b3-static.i386/buttons/defsmall/imsmall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/incl.gif
-opera-4.0-b3-static.i386/buttons/defsmall/keyb.gif
-opera-4.0-b3-static.i386/buttons/defsmall/maxlist.gif
-opera-4.0-b3-static.i386/buttons/defsmall/maxmail.gif
-opera-4.0-b3-static.i386/buttons/defsmall/menu.gif
-opera-4.0-b3-static.i386/buttons/defsmall/moveto.gif
-opera-4.0-b3-static.i386/buttons/defsmall/new.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newbkmk.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newcntct.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newfldr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newscatc.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsfoll.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsgrp.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsmrea.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsnext.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsover.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsprev.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newssall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsthr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsunr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/next.gif
-opera-4.0-b3-static.i386/buttons/defsmall/open.gif
-opera-4.0-b3-static.i386/buttons/defsmall/previous.gif
-opera-4.0-b3-static.i386/buttons/defsmall/print.gif
-opera-4.0-b3-static.i386/buttons/defsmall/redirect.gif
-opera-4.0-b3-static.i386/buttons/defsmall/reload.gif
-opera-4.0-b3-static.i386/buttons/defsmall/reply.gif
-opera-4.0-b3-static.i386/buttons/defsmall/replyall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/save.gif
-opera-4.0-b3-static.i386/buttons/defsmall/search.gif
-opera-4.0-b3-static.i386/buttons/defsmall/send.gif
-opera-4.0-b3-static.i386/buttons/defsmall/sendqd.gif
-opera-4.0-b3-static.i386/buttons/defsmall/split.gif
-opera-4.0-b3-static.i386/buttons/defsmall/tile.gif
-opera-4.0-b3-static.i386/buttons/defsmall/tilevert.gif
-opera-4.0-b3-static.i386/buttons/defsmall/update.gif
-opera-4.0-b3-static.i386/buttons/defsmall/url.gif
-opera-4.0-b3-static.i386/images/int_dir.gif
-opera-4.0-b3-static.i386/images/int_drv.gif
-opera-4.0-b3-static.i386/images/int_file.gif
-opera-4.0-b3-static.i386/images/int_link.gif
-opera-4.0-b3-static.i386/install.sh
-opera-4.0-b3-static.i386/opera
-opera-4.0-b3-static.i386/opera.adr
-opera-4.0-b3-static.i386/opera.desktop
-opera-4.0-b3-static.i386/opera.wmconfig
-opera-4.0-b3-static.i386/opera.xpm
-opera-4.0-b3-static.i386/styles/cache.css
-opera-4.0-b3-static.i386/styles/dir.css
-opera-4.0-b3-static.i386/styles/drives.css
-opera-4.0-b3-static.i386/styles/history.css
-opera-4.0-b3-static.i386/styles/mailstyle.css
-opera-4.0-b3-static.i386/styles/opf.css
-opera-4.0-b3-static.i386/styles/plugins.css
-opera-4.0-b3-static.i386/styles/wml.css
-opera-4.0-b3-static.i386/uninstall.sh
-@dirrm opera-4.0-b3-static.i386/styles
-@dirrm opera-4.0-b3-static.i386/images
-@dirrm opera-4.0-b3-static.i386/buttons/defsmall
-@dirrm opera-4.0-b3-static.i386/buttons/default
-@dirrm opera-4.0-b3-static.i386/buttons
-@dirrm opera-4.0-b3-static.i386
+opera-4.0/LICENSE
+opera-4.0/README
+opera-4.0/buttons/default/abc.gif
+opera-4.0/buttons/default/buttons.ini
+opera-4.0/buttons/default/cascade.gif
+opera-4.0/buttons/default/compose.gif
+opera-4.0/buttons/default/copy.gif
+opera-4.0/buttons/default/delete.gif
+opera-4.0/buttons/default/doccomp.gif
+opera-4.0/buttons/default/docerr.gif
+opera-4.0/buttons/default/dochtlst.gif
+opera-4.0/buttons/default/docload.gif
+opera-4.0/buttons/default/docmail.gif
+opera-4.0/buttons/default/docnews.gif
+opera-4.0/buttons/default/docprog.gif
+opera-4.0/buttons/default/docsrch.gif
+opera-4.0/buttons/default/doctrsf.gif
+opera-4.0/buttons/default/document.gif
+opera-4.0/buttons/default/docunrd.gif
+opera-4.0/buttons/default/dropdown.gif
+opera-4.0/buttons/default/figprog.gif
+opera-4.0/buttons/default/finished.gif
+opera-4.0/buttons/default/forward.gif
+opera-4.0/buttons/default/fullscre.gif
+opera-4.0/buttons/default/go.gif
+opera-4.0/buttons/default/hisecu.gif
+opera-4.0/buttons/default/home.gif
+opera-4.0/buttons/default/hotlist.gif
+opera-4.0/buttons/default/hotlstto.gif
+opera-4.0/buttons/default/im.gif
+opera-4.0/buttons/default/incl.gif
+opera-4.0/buttons/default/keyb.gif
+opera-4.0/buttons/default/load.gif
+opera-4.0/buttons/default/loading.gif
+opera-4.0/buttons/default/losecu.gif
+opera-4.0/buttons/default/maxlist.gif
+opera-4.0/buttons/default/maxmail.gif
+opera-4.0/buttons/default/menu.gif
+opera-4.0/buttons/default/mesecu.gif
+opera-4.0/buttons/default/moveto.gif
+opera-4.0/buttons/default/new.gif
+opera-4.0/buttons/default/newbkmk.gif
+opera-4.0/buttons/default/newcntct.gif
+opera-4.0/buttons/default/newfldr.gif
+opera-4.0/buttons/default/newscatc.gif
+opera-4.0/buttons/default/newsfoll.gif
+opera-4.0/buttons/default/newsfoll1.gif
+opera-4.0/buttons/default/newsgrp.gif
+opera-4.0/buttons/default/newsmrea.gif
+opera-4.0/buttons/default/newsnext.gif
+opera-4.0/buttons/default/newsover.gif
+opera-4.0/buttons/default/newsprev.gif
+opera-4.0/buttons/default/newssall.gif
+opera-4.0/buttons/default/newsthr.gif
+opera-4.0/buttons/default/newsunr.gif
+opera-4.0/buttons/default/next.gif
+opera-4.0/buttons/default/noimg.gif
+opera-4.0/buttons/default/nosecu.gif
+opera-4.0/buttons/default/open.gif
+opera-4.0/buttons/default/previous.gif
+opera-4.0/buttons/default/previous1.gif
+opera-4.0/buttons/default/print.gif
+opera-4.0/buttons/default/printact.gif
+opera-4.0/buttons/default/printall.gif
+opera-4.0/buttons/default/printscr.gif
+opera-4.0/buttons/default/printvie.gif
+opera-4.0/buttons/default/redirect.gif
+opera-4.0/buttons/default/reload.gif
+opera-4.0/buttons/default/reply.gif
+opera-4.0/buttons/default/replyall.gif
+opera-4.0/buttons/default/save.gif
+opera-4.0/buttons/default/search.gif
+opera-4.0/buttons/default/send.gif
+opera-4.0/buttons/default/send1.gif
+opera-4.0/buttons/default/sendqd.gif
+opera-4.0/buttons/default/show.gif
+opera-4.0/buttons/default/split.gif
+opera-4.0/buttons/default/stop.gif
+opera-4.0/buttons/default/stop1.gif
+opera-4.0/buttons/default/tbsearch.gif
+opera-4.0/buttons/default/tile.gif
+opera-4.0/buttons/default/tilevert.gif
+opera-4.0/buttons/default/update.gif
+opera-4.0/buttons/default/url.gif
+opera-4.0/buttons/default/usermode.gif
+opera-4.0/buttons/default/websrch.gif
+opera-4.0/buttons/defsmall/abc.gif
+opera-4.0/buttons/defsmall/buttons.ini
+opera-4.0/buttons/defsmall/cascade.gif
+opera-4.0/buttons/defsmall/compose.gif
+opera-4.0/buttons/defsmall/copy.gif
+opera-4.0/buttons/defsmall/delete.gif
+opera-4.0/buttons/defsmall/dropdown.gif
+opera-4.0/buttons/defsmall/forward.gif
+opera-4.0/buttons/defsmall/fullscre.gif
+opera-4.0/buttons/defsmall/home.gif
+opera-4.0/buttons/defsmall/hotlist.gif
+opera-4.0/buttons/defsmall/hotlstto.gif
+opera-4.0/buttons/defsmall/imsmall.gif
+opera-4.0/buttons/defsmall/incl.gif
+opera-4.0/buttons/defsmall/keyb.gif
+opera-4.0/buttons/defsmall/maxlist.gif
+opera-4.0/buttons/defsmall/maxmail.gif
+opera-4.0/buttons/defsmall/menu.gif
+opera-4.0/buttons/defsmall/moveto.gif
+opera-4.0/buttons/defsmall/new.gif
+opera-4.0/buttons/defsmall/newbkmk.gif
+opera-4.0/buttons/defsmall/newcntct.gif
+opera-4.0/buttons/defsmall/newfldr.gif
+opera-4.0/buttons/defsmall/newscatc.gif
+opera-4.0/buttons/defsmall/newsfoll.gif
+opera-4.0/buttons/defsmall/newsgrp.gif
+opera-4.0/buttons/defsmall/newsmrea.gif
+opera-4.0/buttons/defsmall/newsnext.gif
+opera-4.0/buttons/defsmall/newsover.gif
+opera-4.0/buttons/defsmall/newsprev.gif
+opera-4.0/buttons/defsmall/newssall.gif
+opera-4.0/buttons/defsmall/newsthr.gif
+opera-4.0/buttons/defsmall/newsunr.gif
+opera-4.0/buttons/defsmall/next.gif
+opera-4.0/buttons/defsmall/open.gif
+opera-4.0/buttons/defsmall/previous.gif
+opera-4.0/buttons/defsmall/print.gif
+opera-4.0/buttons/defsmall/redirect.gif
+opera-4.0/buttons/defsmall/reload.gif
+opera-4.0/buttons/defsmall/reply.gif
+opera-4.0/buttons/defsmall/replyall.gif
+opera-4.0/buttons/defsmall/save.gif
+opera-4.0/buttons/defsmall/search.gif
+opera-4.0/buttons/defsmall/send.gif
+opera-4.0/buttons/defsmall/sendqd.gif
+opera-4.0/buttons/defsmall/split.gif
+opera-4.0/buttons/defsmall/tile.gif
+opera-4.0/buttons/defsmall/tilevert.gif
+opera-4.0/buttons/defsmall/update.gif
+opera-4.0/buttons/defsmall/url.gif
+opera-4.0/help/ReadMe.txt
+opera-4.0/help/access.htm
+opera-4.0/help/alpha.htm
+opera-4.0/help/bookmark.htm
+opera-4.0/help/contact.htm
+opera-4.0/help/dialogs.htm
+opera-4.0/help/elektra.css
+opera-4.0/help/features.htm
+opera-4.0/help/helphelp.htm
+opera-4.0/help/index.htm
+opera-4.0/help/keyboard.htm
+opera-4.0/help/link_up.gif
+opera-4.0/help/menus.htm
+opera-4.0/help/prefmenu.htm
+opera-4.0/help/readmeXX.txt
+opera-4.0/help/reg_form.txt
+opera-4.0/help/security.htm
+opera-4.0/help/starter.htm
+opera-4.0/help/terms.htm
+opera-4.0/help/trouble.htm
+opera-4.0/help/valid-xhtml10.png
+opera-4.0/images/drive.gif
+opera-4.0/images/file.gif
+opera-4.0/images/folder.gif
+opera-4.0/images/link.gif
+opera-4.0/install.sh
+opera-4.0/opera
+opera-4.0/opera.adr
+opera-4.0/opera.desktop
+opera-4.0/opera.wmconfig
+opera-4.0/opera.xpm
+opera-4.0/opera_16x16.png
+opera-4.0/opera_22x22.png
+opera-4.0/opera_32x32.png
+opera-4.0/opera_48x48.png
+opera-4.0/styles/about.css
+opera-4.0/styles/cache.css
+opera-4.0/styles/csr.css
+opera-4.0/styles/dir.css
+opera-4.0/styles/drives.css
+opera-4.0/styles/email.css
+opera-4.0/styles/history.css
+opera-4.0/styles/im.css
+opera-4.0/styles/plugins.css
+opera-4.0/styles/wml.css
+opera-4.0/uninstall.sh
+@dirrm opera-4.0/styles
+@dirrm opera-4.0/images
+@dirrm opera-4.0/help
+@dirrm opera-4.0/buttons/defsmall
+@dirrm opera-4.0/buttons/default
+@dirrm opera-4.0/buttons
+@dirrm opera-4.0
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 4415b429c0e8..a7497d114697 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	linux-opera
-PORTVERSION=	4.0b3
+PORTVERSION=	4.0b4
 CATEGORIES=	www linux
 MASTER_SITES=	http://opera.online.no/linux/tgz/
-DISTNAME=	opera-4.0-b3-static.i386
+DISTNAME=	opera-4.0-b4-20001211.012-static.i386
 
 MAINTAINER=	des@FreeBSD.org
 
-RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \
-		/compat/linux/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
+RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
+		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png \
+		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
 NO_BUILD=	yes
 
 do-configure:
-	${SED} 's|%%PREFIX%%|${PREFIX}|; s|%%DISTNAME%%|${DISTNAME}|' \
-	    <${FILESDIR}/opera.sh >${WRKDIR}/opera.sh
+	${SED} 's|%%PREFIX%%|${PREFIX}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera
 
 do-install:
-	(cd ${WRKDIR} && \
-	    tar cf - ${DISTNAME} | tar --unlink -xpf - -C ${PREFIX})
-	${INSTALL_SCRIPT} ${WRKDIR}/opera.sh ${PREFIX}/bin/opera
+	${MKDIR} ${PREFIX}/opera-4.0
+	(cd ${WRKSRC} && \
+	    tar cf - . | tar --unlink -xpf - -C ${PREFIX}/opera-4.0)
+	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin/opera
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index 038fd3f8aa68..f0532cd077d9 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-4.0-b3-static.i386.tar.gz) = 49784111f40eaedc1bcc31d13e32bccc
+MD5 (opera-4.0-b4-20001211.012-static.i386.tar.gz) = b212737b27048199b22d1763fa627280
diff --git a/www/linux-opera7/files/opera.sh b/www/linux-opera7/files/opera.sh
index a6213d01e74d..b0fcdd71a809 100644
--- a/www/linux-opera7/files/opera.sh
+++ b/www/linux-opera7/files/opera.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-%%PREFIX%%/%%DISTNAME%%/opera
+%%PREFIX%%/opera-4.0/opera
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index e1307e65ae8f..51035f7e6c11 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -1,162 +1,190 @@
 bin/opera
-opera-4.0-b3-static.i386/LICENSE
-opera-4.0-b3-static.i386/README
-opera-4.0-b3-static.i386/buttons/default/abc.gif
-opera-4.0-b3-static.i386/buttons/default/buttons.ini
-opera-4.0-b3-static.i386/buttons/default/cascade.gif
-opera-4.0-b3-static.i386/buttons/default/compose.gif
-opera-4.0-b3-static.i386/buttons/default/copy.gif
-opera-4.0-b3-static.i386/buttons/default/delete.gif
-opera-4.0-b3-static.i386/buttons/default/doccomp.gif
-opera-4.0-b3-static.i386/buttons/default/docerr.gif
-opera-4.0-b3-static.i386/buttons/default/dochtlst.gif
-opera-4.0-b3-static.i386/buttons/default/docload.gif
-opera-4.0-b3-static.i386/buttons/default/docmail.gif
-opera-4.0-b3-static.i386/buttons/default/docnews.gif
-opera-4.0-b3-static.i386/buttons/default/docprog.gif
-opera-4.0-b3-static.i386/buttons/default/docsrch.gif
-opera-4.0-b3-static.i386/buttons/default/doctrsf.gif
-opera-4.0-b3-static.i386/buttons/default/document.gif
-opera-4.0-b3-static.i386/buttons/default/docunrd.gif
-opera-4.0-b3-static.i386/buttons/default/dropdown.gif
-opera-4.0-b3-static.i386/buttons/default/figprog.gif
-opera-4.0-b3-static.i386/buttons/default/finished.gif
-opera-4.0-b3-static.i386/buttons/default/forward.gif
-opera-4.0-b3-static.i386/buttons/default/fullscre.gif
-opera-4.0-b3-static.i386/buttons/default/go.gif
-opera-4.0-b3-static.i386/buttons/default/hisecu.gif
-opera-4.0-b3-static.i386/buttons/default/home.gif
-opera-4.0-b3-static.i386/buttons/default/hotlist.gif
-opera-4.0-b3-static.i386/buttons/default/hotlstto.gif
-opera-4.0-b3-static.i386/buttons/default/im.gif
-opera-4.0-b3-static.i386/buttons/default/incl.gif
-opera-4.0-b3-static.i386/buttons/default/keyb.gif
-opera-4.0-b3-static.i386/buttons/default/load.gif
-opera-4.0-b3-static.i386/buttons/default/loading.gif
-opera-4.0-b3-static.i386/buttons/default/losecu.gif
-opera-4.0-b3-static.i386/buttons/default/maxlist.gif
-opera-4.0-b3-static.i386/buttons/default/maxmail.gif
-opera-4.0-b3-static.i386/buttons/default/menu.gif
-opera-4.0-b3-static.i386/buttons/default/mesecu.gif
-opera-4.0-b3-static.i386/buttons/default/moveto.gif
-opera-4.0-b3-static.i386/buttons/default/new.gif
-opera-4.0-b3-static.i386/buttons/default/newbkmk.gif
-opera-4.0-b3-static.i386/buttons/default/newcntct.gif
-opera-4.0-b3-static.i386/buttons/default/newfldr.gif
-opera-4.0-b3-static.i386/buttons/default/newscatc.gif
-opera-4.0-b3-static.i386/buttons/default/newsfoll.gif
-opera-4.0-b3-static.i386/buttons/default/newsfoll1.gif
-opera-4.0-b3-static.i386/buttons/default/newsgrp.gif
-opera-4.0-b3-static.i386/buttons/default/newsmrea.gif
-opera-4.0-b3-static.i386/buttons/default/newsnext.gif
-opera-4.0-b3-static.i386/buttons/default/newsover.gif
-opera-4.0-b3-static.i386/buttons/default/newsprev.gif
-opera-4.0-b3-static.i386/buttons/default/newssall.gif
-opera-4.0-b3-static.i386/buttons/default/newsthr.gif
-opera-4.0-b3-static.i386/buttons/default/newsunr.gif
-opera-4.0-b3-static.i386/buttons/default/next.gif
-opera-4.0-b3-static.i386/buttons/default/noimg.gif
-opera-4.0-b3-static.i386/buttons/default/nosecu.gif
-opera-4.0-b3-static.i386/buttons/default/open.gif
-opera-4.0-b3-static.i386/buttons/default/previous.gif
-opera-4.0-b3-static.i386/buttons/default/previous1.gif
-opera-4.0-b3-static.i386/buttons/default/print.gif
-opera-4.0-b3-static.i386/buttons/default/printact.gif
-opera-4.0-b3-static.i386/buttons/default/printall.gif
-opera-4.0-b3-static.i386/buttons/default/printscr.gif
-opera-4.0-b3-static.i386/buttons/default/printvie.gif
-opera-4.0-b3-static.i386/buttons/default/redirect.gif
-opera-4.0-b3-static.i386/buttons/default/reload.gif
-opera-4.0-b3-static.i386/buttons/default/reply.gif
-opera-4.0-b3-static.i386/buttons/default/replyall.gif
-opera-4.0-b3-static.i386/buttons/default/save.gif
-opera-4.0-b3-static.i386/buttons/default/search.gif
-opera-4.0-b3-static.i386/buttons/default/send.gif
-opera-4.0-b3-static.i386/buttons/default/send1.gif
-opera-4.0-b3-static.i386/buttons/default/sendqd.gif
-opera-4.0-b3-static.i386/buttons/default/show.gif
-opera-4.0-b3-static.i386/buttons/default/split.gif
-opera-4.0-b3-static.i386/buttons/default/stop.gif
-opera-4.0-b3-static.i386/buttons/default/stop1.gif
-opera-4.0-b3-static.i386/buttons/default/tbsearch.gif
-opera-4.0-b3-static.i386/buttons/default/tile.gif
-opera-4.0-b3-static.i386/buttons/default/tilevert.gif
-opera-4.0-b3-static.i386/buttons/default/update.gif
-opera-4.0-b3-static.i386/buttons/default/url.gif
-opera-4.0-b3-static.i386/buttons/default/usermode.gif
-opera-4.0-b3-static.i386/buttons/default/websrch.gif
-opera-4.0-b3-static.i386/buttons/defsmall/abc.gif
-opera-4.0-b3-static.i386/buttons/defsmall/buttons.ini
-opera-4.0-b3-static.i386/buttons/defsmall/cascade.gif
-opera-4.0-b3-static.i386/buttons/defsmall/compose.gif
-opera-4.0-b3-static.i386/buttons/defsmall/copy.gif
-opera-4.0-b3-static.i386/buttons/defsmall/delete.gif
-opera-4.0-b3-static.i386/buttons/defsmall/dropdown.gif
-opera-4.0-b3-static.i386/buttons/defsmall/forward.gif
-opera-4.0-b3-static.i386/buttons/defsmall/fullscre.gif
-opera-4.0-b3-static.i386/buttons/defsmall/home.gif
-opera-4.0-b3-static.i386/buttons/defsmall/hotlist.gif
-opera-4.0-b3-static.i386/buttons/defsmall/hotlstto.gif
-opera-4.0-b3-static.i386/buttons/defsmall/imsmall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/incl.gif
-opera-4.0-b3-static.i386/buttons/defsmall/keyb.gif
-opera-4.0-b3-static.i386/buttons/defsmall/maxlist.gif
-opera-4.0-b3-static.i386/buttons/defsmall/maxmail.gif
-opera-4.0-b3-static.i386/buttons/defsmall/menu.gif
-opera-4.0-b3-static.i386/buttons/defsmall/moveto.gif
-opera-4.0-b3-static.i386/buttons/defsmall/new.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newbkmk.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newcntct.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newfldr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newscatc.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsfoll.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsgrp.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsmrea.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsnext.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsover.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsprev.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newssall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsthr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/newsunr.gif
-opera-4.0-b3-static.i386/buttons/defsmall/next.gif
-opera-4.0-b3-static.i386/buttons/defsmall/open.gif
-opera-4.0-b3-static.i386/buttons/defsmall/previous.gif
-opera-4.0-b3-static.i386/buttons/defsmall/print.gif
-opera-4.0-b3-static.i386/buttons/defsmall/redirect.gif
-opera-4.0-b3-static.i386/buttons/defsmall/reload.gif
-opera-4.0-b3-static.i386/buttons/defsmall/reply.gif
-opera-4.0-b3-static.i386/buttons/defsmall/replyall.gif
-opera-4.0-b3-static.i386/buttons/defsmall/save.gif
-opera-4.0-b3-static.i386/buttons/defsmall/search.gif
-opera-4.0-b3-static.i386/buttons/defsmall/send.gif
-opera-4.0-b3-static.i386/buttons/defsmall/sendqd.gif
-opera-4.0-b3-static.i386/buttons/defsmall/split.gif
-opera-4.0-b3-static.i386/buttons/defsmall/tile.gif
-opera-4.0-b3-static.i386/buttons/defsmall/tilevert.gif
-opera-4.0-b3-static.i386/buttons/defsmall/update.gif
-opera-4.0-b3-static.i386/buttons/defsmall/url.gif
-opera-4.0-b3-static.i386/images/int_dir.gif
-opera-4.0-b3-static.i386/images/int_drv.gif
-opera-4.0-b3-static.i386/images/int_file.gif
-opera-4.0-b3-static.i386/images/int_link.gif
-opera-4.0-b3-static.i386/install.sh
-opera-4.0-b3-static.i386/opera
-opera-4.0-b3-static.i386/opera.adr
-opera-4.0-b3-static.i386/opera.desktop
-opera-4.0-b3-static.i386/opera.wmconfig
-opera-4.0-b3-static.i386/opera.xpm
-opera-4.0-b3-static.i386/styles/cache.css
-opera-4.0-b3-static.i386/styles/dir.css
-opera-4.0-b3-static.i386/styles/drives.css
-opera-4.0-b3-static.i386/styles/history.css
-opera-4.0-b3-static.i386/styles/mailstyle.css
-opera-4.0-b3-static.i386/styles/opf.css
-opera-4.0-b3-static.i386/styles/plugins.css
-opera-4.0-b3-static.i386/styles/wml.css
-opera-4.0-b3-static.i386/uninstall.sh
-@dirrm opera-4.0-b3-static.i386/styles
-@dirrm opera-4.0-b3-static.i386/images
-@dirrm opera-4.0-b3-static.i386/buttons/defsmall
-@dirrm opera-4.0-b3-static.i386/buttons/default
-@dirrm opera-4.0-b3-static.i386/buttons
-@dirrm opera-4.0-b3-static.i386
+opera-4.0/LICENSE
+opera-4.0/README
+opera-4.0/buttons/default/abc.gif
+opera-4.0/buttons/default/buttons.ini
+opera-4.0/buttons/default/cascade.gif
+opera-4.0/buttons/default/compose.gif
+opera-4.0/buttons/default/copy.gif
+opera-4.0/buttons/default/delete.gif
+opera-4.0/buttons/default/doccomp.gif
+opera-4.0/buttons/default/docerr.gif
+opera-4.0/buttons/default/dochtlst.gif
+opera-4.0/buttons/default/docload.gif
+opera-4.0/buttons/default/docmail.gif
+opera-4.0/buttons/default/docnews.gif
+opera-4.0/buttons/default/docprog.gif
+opera-4.0/buttons/default/docsrch.gif
+opera-4.0/buttons/default/doctrsf.gif
+opera-4.0/buttons/default/document.gif
+opera-4.0/buttons/default/docunrd.gif
+opera-4.0/buttons/default/dropdown.gif
+opera-4.0/buttons/default/figprog.gif
+opera-4.0/buttons/default/finished.gif
+opera-4.0/buttons/default/forward.gif
+opera-4.0/buttons/default/fullscre.gif
+opera-4.0/buttons/default/go.gif
+opera-4.0/buttons/default/hisecu.gif
+opera-4.0/buttons/default/home.gif
+opera-4.0/buttons/default/hotlist.gif
+opera-4.0/buttons/default/hotlstto.gif
+opera-4.0/buttons/default/im.gif
+opera-4.0/buttons/default/incl.gif
+opera-4.0/buttons/default/keyb.gif
+opera-4.0/buttons/default/load.gif
+opera-4.0/buttons/default/loading.gif
+opera-4.0/buttons/default/losecu.gif
+opera-4.0/buttons/default/maxlist.gif
+opera-4.0/buttons/default/maxmail.gif
+opera-4.0/buttons/default/menu.gif
+opera-4.0/buttons/default/mesecu.gif
+opera-4.0/buttons/default/moveto.gif
+opera-4.0/buttons/default/new.gif
+opera-4.0/buttons/default/newbkmk.gif
+opera-4.0/buttons/default/newcntct.gif
+opera-4.0/buttons/default/newfldr.gif
+opera-4.0/buttons/default/newscatc.gif
+opera-4.0/buttons/default/newsfoll.gif
+opera-4.0/buttons/default/newsfoll1.gif
+opera-4.0/buttons/default/newsgrp.gif
+opera-4.0/buttons/default/newsmrea.gif
+opera-4.0/buttons/default/newsnext.gif
+opera-4.0/buttons/default/newsover.gif
+opera-4.0/buttons/default/newsprev.gif
+opera-4.0/buttons/default/newssall.gif
+opera-4.0/buttons/default/newsthr.gif
+opera-4.0/buttons/default/newsunr.gif
+opera-4.0/buttons/default/next.gif
+opera-4.0/buttons/default/noimg.gif
+opera-4.0/buttons/default/nosecu.gif
+opera-4.0/buttons/default/open.gif
+opera-4.0/buttons/default/previous.gif
+opera-4.0/buttons/default/previous1.gif
+opera-4.0/buttons/default/print.gif
+opera-4.0/buttons/default/printact.gif
+opera-4.0/buttons/default/printall.gif
+opera-4.0/buttons/default/printscr.gif
+opera-4.0/buttons/default/printvie.gif
+opera-4.0/buttons/default/redirect.gif
+opera-4.0/buttons/default/reload.gif
+opera-4.0/buttons/default/reply.gif
+opera-4.0/buttons/default/replyall.gif
+opera-4.0/buttons/default/save.gif
+opera-4.0/buttons/default/search.gif
+opera-4.0/buttons/default/send.gif
+opera-4.0/buttons/default/send1.gif
+opera-4.0/buttons/default/sendqd.gif
+opera-4.0/buttons/default/show.gif
+opera-4.0/buttons/default/split.gif
+opera-4.0/buttons/default/stop.gif
+opera-4.0/buttons/default/stop1.gif
+opera-4.0/buttons/default/tbsearch.gif
+opera-4.0/buttons/default/tile.gif
+opera-4.0/buttons/default/tilevert.gif
+opera-4.0/buttons/default/update.gif
+opera-4.0/buttons/default/url.gif
+opera-4.0/buttons/default/usermode.gif
+opera-4.0/buttons/default/websrch.gif
+opera-4.0/buttons/defsmall/abc.gif
+opera-4.0/buttons/defsmall/buttons.ini
+opera-4.0/buttons/defsmall/cascade.gif
+opera-4.0/buttons/defsmall/compose.gif
+opera-4.0/buttons/defsmall/copy.gif
+opera-4.0/buttons/defsmall/delete.gif
+opera-4.0/buttons/defsmall/dropdown.gif
+opera-4.0/buttons/defsmall/forward.gif
+opera-4.0/buttons/defsmall/fullscre.gif
+opera-4.0/buttons/defsmall/home.gif
+opera-4.0/buttons/defsmall/hotlist.gif
+opera-4.0/buttons/defsmall/hotlstto.gif
+opera-4.0/buttons/defsmall/imsmall.gif
+opera-4.0/buttons/defsmall/incl.gif
+opera-4.0/buttons/defsmall/keyb.gif
+opera-4.0/buttons/defsmall/maxlist.gif
+opera-4.0/buttons/defsmall/maxmail.gif
+opera-4.0/buttons/defsmall/menu.gif
+opera-4.0/buttons/defsmall/moveto.gif
+opera-4.0/buttons/defsmall/new.gif
+opera-4.0/buttons/defsmall/newbkmk.gif
+opera-4.0/buttons/defsmall/newcntct.gif
+opera-4.0/buttons/defsmall/newfldr.gif
+opera-4.0/buttons/defsmall/newscatc.gif
+opera-4.0/buttons/defsmall/newsfoll.gif
+opera-4.0/buttons/defsmall/newsgrp.gif
+opera-4.0/buttons/defsmall/newsmrea.gif
+opera-4.0/buttons/defsmall/newsnext.gif
+opera-4.0/buttons/defsmall/newsover.gif
+opera-4.0/buttons/defsmall/newsprev.gif
+opera-4.0/buttons/defsmall/newssall.gif
+opera-4.0/buttons/defsmall/newsthr.gif
+opera-4.0/buttons/defsmall/newsunr.gif
+opera-4.0/buttons/defsmall/next.gif
+opera-4.0/buttons/defsmall/open.gif
+opera-4.0/buttons/defsmall/previous.gif
+opera-4.0/buttons/defsmall/print.gif
+opera-4.0/buttons/defsmall/redirect.gif
+opera-4.0/buttons/defsmall/reload.gif
+opera-4.0/buttons/defsmall/reply.gif
+opera-4.0/buttons/defsmall/replyall.gif
+opera-4.0/buttons/defsmall/save.gif
+opera-4.0/buttons/defsmall/search.gif
+opera-4.0/buttons/defsmall/send.gif
+opera-4.0/buttons/defsmall/sendqd.gif
+opera-4.0/buttons/defsmall/split.gif
+opera-4.0/buttons/defsmall/tile.gif
+opera-4.0/buttons/defsmall/tilevert.gif
+opera-4.0/buttons/defsmall/update.gif
+opera-4.0/buttons/defsmall/url.gif
+opera-4.0/help/ReadMe.txt
+opera-4.0/help/access.htm
+opera-4.0/help/alpha.htm
+opera-4.0/help/bookmark.htm
+opera-4.0/help/contact.htm
+opera-4.0/help/dialogs.htm
+opera-4.0/help/elektra.css
+opera-4.0/help/features.htm
+opera-4.0/help/helphelp.htm
+opera-4.0/help/index.htm
+opera-4.0/help/keyboard.htm
+opera-4.0/help/link_up.gif
+opera-4.0/help/menus.htm
+opera-4.0/help/prefmenu.htm
+opera-4.0/help/readmeXX.txt
+opera-4.0/help/reg_form.txt
+opera-4.0/help/security.htm
+opera-4.0/help/starter.htm
+opera-4.0/help/terms.htm
+opera-4.0/help/trouble.htm
+opera-4.0/help/valid-xhtml10.png
+opera-4.0/images/drive.gif
+opera-4.0/images/file.gif
+opera-4.0/images/folder.gif
+opera-4.0/images/link.gif
+opera-4.0/install.sh
+opera-4.0/opera
+opera-4.0/opera.adr
+opera-4.0/opera.desktop
+opera-4.0/opera.wmconfig
+opera-4.0/opera.xpm
+opera-4.0/opera_16x16.png
+opera-4.0/opera_22x22.png
+opera-4.0/opera_32x32.png
+opera-4.0/opera_48x48.png
+opera-4.0/styles/about.css
+opera-4.0/styles/cache.css
+opera-4.0/styles/csr.css
+opera-4.0/styles/dir.css
+opera-4.0/styles/drives.css
+opera-4.0/styles/email.css
+opera-4.0/styles/history.css
+opera-4.0/styles/im.css
+opera-4.0/styles/plugins.css
+opera-4.0/styles/wml.css
+opera-4.0/uninstall.sh
+@dirrm opera-4.0/styles
+@dirrm opera-4.0/images
+@dirrm opera-4.0/help
+@dirrm opera-4.0/buttons/defsmall
+@dirrm opera-4.0/buttons/default
+@dirrm opera-4.0/buttons
+@dirrm opera-4.0