Upgrade to 5.0b6. This one was a real bitch.

4 files changed, 269 insertions, 198 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index c06cdfdf1c19..c5faed373709 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	linux-opera
-PORTVERSION=	4.0b5
+PORTVERSION=	5.0b6
 CATEGORIES=	www linux
 MASTER_SITES=	http://opera.online.no/linux/tgz/
-DISTNAME=	opera-4.0-b5-20010103.014-static.i386
+DISTNAME=	opera-5.0-b6-20010212.017-static.i386
 
 MAINTAINER=	des@FreeBSD.org
 
+IS_INTERACTIVE=	YES
+NO_PACKAGE=	"User must agree to license prior to installation."
+
 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}|' <${FILESDIR}/opera.sh >${WRKDIR}/opera
-
 do-install:
-	${MKDIR} ${PREFIX}/opera-4.0
-	(cd ${WRKSRC} && \
-	    tar cf - . | tar --unlink -xpf - -C ${PREFIX}/opera-4.0)
-	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin/opera
+	(cd ${WRKSRC} && ./install.sh \
+	    --exec_prefix=${PREFIX}/bin \
+	    --docdir=${PREFIX}/share/doc/opera \
+	    --sharedir=${PREFIX}/share/opera )
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 1b9c7075a137..7d34a218dc4b 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-4.0-b5-20010103.014-static.i386.tar.gz) = 1ad77756e4ea719015f0f171e36f542b
+MD5 (opera-5.0-b6-20010212.017-static.i386.tar.gz) = 90e7315dae9d4842a57a61e9b8c5473d
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
new file mode 100644
index 000000000000..0da43e44e604
--- /dev/null
+++ b/www/linux-opera/files/patch-aa
@@ -0,0 +1,63 @@
+--- install.sh.orig	Thu Feb  8 14:43:35 2001
++++ install.sh	Mon Mar  5 17:37:06 2001
+@@ -138,17 +138,17 @@
+ {
+     # Executable
+         chmod $vv 755 opera
+-	cp $v -fup opera $exec_dir/
++	cp $v -fp opera $exec_dir/
+ 
+     # Documentation
+ 	mkdir $v -p $doc_dir/
+ 	chmod $vv 755 $doc_dir
+-	cp $v -fup LICENSE $doc_dir
++	cp $v -fp LICENSE $doc_dir
+ 
+     # Shared files
+ 	mkdir $v -p $share_dir/buttons/
+ 	chmod $vv 755 $share_dir/buttons
+-	cp $v -Rfup buttons/* $share_dir/buttons/
++	cp $v -Rfp buttons/* $share_dir/buttons/
+ 
+ 	# fix for windows button sets
+         cd $share_dir/buttons
+@@ -158,18 +158,18 @@
+ 
+ 	mkdir $v -p $share_dir/help/
+ 	chmod $vv 755 $share_dir/help
+-	cp $v -Rfup help/* $share_dir/help/
++	cp $v -Rfp help/* $share_dir/help/
+ 	    
+ 	mkdir $v -p $share_dir/images/
+ 	chmod $vv 755 $share_dir/images
+-	cp $v -Rfup images/* $share_dir/images/
++	cp $v -Rfp images/* $share_dir/images/
+ 	
+ 	mkdir $v -p  $share_dir/styles/
+ 	chmod $vv 755 $share_dir/styles
+-	cp $v -Rfup styles/* $share_dir/styles/
++	cp $v -Rfp styles/* $share_dir/styles/
+ 
+-	cp $v -fup opera.xpm opera.wmconfig opera.desktop opera_*.png $share_dir/
+-	cp $v -iup opera.adr $share_dir/
++	cp $v -fp opera.xpm opera.wmconfig opera.desktop opera_*.png $share_dir/
++	cp $v -ip opera.adr $share_dir/
+ 	
+ 
+ 	icons
+@@ -193,11 +193,11 @@
+ 
+ icons()
+ {
+-    if test ! -d /usr/share/icons; then install $v -m 755 -o 0 -g 0 -d /usr/share/icons/; fi
+-    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/icons/opera.xpm
++    if test ! -d $share_dir/icons; then install $v -m 755 -o 0 -g 0 -d $share_dir/icons/; fi
++    install $v -C -m 644 -o 0 -g 0 $share_dir/opera.xpm $share_dir/icons/opera.xpm
+   
+-    if test ! -d /usr/share/pixmaps; then install $v -m 755 -o 0 -g 0 -d /usr/share/pixmaps/; fi   
+-    install $v -m 644 -o 0 -g 0 $share_dir/opera.xpm /usr/share/pixmaps/opera.xpm
++    if test ! -d $share_dir/pixmaps; then install $v -m 755 -o 0 -g 0 -d $share_dir/pixmaps/; fi   
++    install $v -C -m 644 -o 0 -g 0 $share_dir/opera.xpm $share_dir/pixmaps/opera.xpm
+   
+     if test -d /etc/X11/wmconfig/; then install $v -m 644 -o 0 -g 0 $share_dir/opera.wmconfig /etc/X11/wmconfig/opera; fi
+     
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 421e68e0e8cd..89710bb88e68 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,189 +1,197 @@
 bin/opera
-opera-4.0/LICENSE
-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
+share/doc/opera/LICENSE
+share/opera/buttons/DefSmall
+share/opera/buttons/Default
+share/opera/buttons/ReadMe.txt
+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/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/help/access.htm
+share/opera/help/alpha.htm
+share/opera/help/bookmark.htm
+share/opera/help/contact.htm
+share/opera/help/dialogs.htm
+share/opera/help/features.htm
+share/opera/help/helphelp.htm
+share/opera/help/index.htm
+share/opera/help/keyboard.htm
+share/opera/help/link_up.gif
+share/opera/help/menus.htm
+share/opera/help/opera5.css
+share/opera/help/prefmenu.htm
+share/opera/help/reg_form.txt
+share/opera/help/security.htm
+share/opera/help/starter.htm
+share/opera/help/terms.htm
+share/opera/help/trouble.htm
+share/opera/icons/opera.xpm
+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/operabanner.png
+share/opera/opera.adr
+share/opera/opera.desktop
+share/opera/opera.wmconfig
+share/opera/opera.xpm
+share/opera/opera_16x16.png
+share/opera/opera_22x22.png
+share/opera/opera_32x32.png
+share/opera/opera_48x48.png
+share/opera/pixmaps/opera.xpm
+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/mime.css
+share/opera/styles/opf.css
+share/opera/styles/plugins.css
+share/opera/styles/wml.css
+@dirrm share/opera/styles
+@dirrm share/opera/pixmaps
+@dirrm share/opera/images
+@dirrm share/opera/icons
+@dirrm share/opera/help
+@dirrm share/opera/buttons/defsmall
+@dirrm share/opera/buttons/default
+@dirrm share/opera/buttons
+@dirrm share/opera
+@dirrm share/doc/opera