- Update www/opera-devel to Opera 9 Beta 1

- Generate BSD bookmarks

PR:		96093
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)

8 files changed, 206 insertions, 98 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 9acdac92b16e..dc7fdad3b148 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -7,18 +7,33 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://snapshot.opera.com/unix/${OPERA_VER}-${OPERA_REL}/intel-freebsd/
+MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://www.opera.mirroarrr.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/&,} \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en-${OPERA_BUILD}
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 OPERA_VER=	9.0
-OPERA_REL=	Preview-2
-OPERA_DATE=	20060206
+OPERA_MINVER=	0
+OPERA_REL=	beta1
+OPERA_DATE=	20060411
+OPERA_BUILD=	236
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -28,11 +43,13 @@ WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386
 
+MAN1=		opera-devel.1
+
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-OPTIONS=	SHARED	"Use a shared Qt library (instead of static)"	${QT_PRESENT} \
-		ASPELL	"Use the aspell library for spell checking"	on
+OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on \
+		SHARED	"Use a shared Qt library (instead of static)"	${QT_PRESENT}
 
 .if exists(${X11BASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
@@ -47,14 +64,14 @@ OPERA_TYPE=	4
 .elif ${OSVERSION} >= 500000
 OPERA_TYPE=	3
 .else
-OPERA_TYPE=	2
+OPERA_TYPE=	1
 .endif
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .endif
 
-.if defined(WITH_SHARED)
+.if defined(WITH_SHARED) && ${OPERA_TYPE} > 1
 OPERA_LIB=	shared
 LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 .else
@@ -86,7 +103,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
 			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
-			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+			${WRKSRC}/config/opera6rc
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index 9cd24260c320..61ddd358bc51 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1,12 +1,9 @@
-MD5 (opera-9.0-20060206.3-shared-qt.i386.freebsd-en.tar.bz2) = 3b4168185ec99df2e762d10b700fd01d
-SHA256 (opera-9.0-20060206.3-shared-qt.i386.freebsd-en.tar.bz2) = 7ac1258a02b19d467f478e376cc21d4cf97ab6b6dfe6fe6d0f44ae22a917e958
-SIZE (opera-9.0-20060206.3-shared-qt.i386.freebsd-en.tar.bz2) = 4699105
-MD5 (opera-9.0-20060206.4-shared-qt.i386.freebsd-en.tar.bz2) = 63781286bea93b1abf355667693235e0
-SHA256 (opera-9.0-20060206.4-shared-qt.i386.freebsd-en.tar.bz2) = 51b399e2536371a34707ffa1e5eb4c893dd520f62b8f144587689b47067c4b7f
-SIZE (opera-9.0-20060206.4-shared-qt.i386.freebsd-en.tar.bz2) = 4699407
-MD5 (opera-9.0-20060206.1-static-qt.i386.freebsd-en.tar.bz2) = f6cdd630e3b2be35eb603951fe85b5e2
-SHA256 (opera-9.0-20060206.1-static-qt.i386.freebsd-en.tar.bz2) = 736bc30d29cb16267abbf300596bc569b73cf62151a9b3d0f781f54cb153d50c
-SIZE (opera-9.0-20060206.1-static-qt.i386.freebsd-en.tar.bz2) = 6164675
-MD5 (opera-9.0-20060206.2-shared-qt.i386.freebsd-en.tar.bz2) = 57e17a42f6602827d711867a8d0dc787
-SHA256 (opera-9.0-20060206.2-shared-qt.i386.freebsd-en.tar.bz2) = 799ee09ef602742ab91d95aa2562cdf33f9d8f64b2d6d9c6db88fbac44e6638f
-SIZE (opera-9.0-20060206.2-shared-qt.i386.freebsd-en.tar.bz2) = 4409158
+MD5 (opera-9.0-20060411.1-static-qt.i386.freebsd-en-236.tar.bz2) = a37cee68d1243369b18d00ca7128fc4c
+SHA256 (opera-9.0-20060411.1-static-qt.i386.freebsd-en-236.tar.bz2) = ce8d378c6ba392d9c90cd9b09a597983b867f8ba3e4e3b31a5d3f422b55604a4
+SIZE (opera-9.0-20060411.1-static-qt.i386.freebsd-en-236.tar.bz2) = 6347441
+MD5 (opera-9.0-20060411.3-shared-qt.i386.freebsd-en-236.tar.bz2) = 89ccd95fca178d21ce819ae6efc4c9d3
+SHA256 (opera-9.0-20060411.3-shared-qt.i386.freebsd-en-236.tar.bz2) = e03aeeac5dfaef8869e6b30748d093742c394ce510e44ea161b69fd861df86d1
+SIZE (opera-9.0-20060411.3-shared-qt.i386.freebsd-en-236.tar.bz2) = 4948067
+MD5 (opera-9.0-20060411.4-shared-qt.i386.freebsd-en-236.tar.bz2) = 4a00e2a1dcc107e5ad200e19dd0c3c0d
+SHA256 (opera-9.0-20060411.4-shared-qt.i386.freebsd-en-236.tar.bz2) = 460c8687c941787b45ac4d35bb06fdb322b1210f173ce74858d0dcbe9d5a4ac1
+SIZE (opera-9.0-20060411.4-shared-qt.i386.freebsd-en-236.tar.bz2) = 4949636
diff --git a/www/opera-devel/files/patch-ini_spellcheck.ini b/www/opera-devel/files/patch-ini_spellcheck.ini
deleted file mode 100644
index a2ec7c7ccb2e..000000000000
--- a/www/opera-devel/files/patch-ini_spellcheck.ini
+++ /dev/null
@@ -1,9 +0,0 @@
---- ini/spellcheck.ini.orig	Thu May 13 13:51:43 2004
-+++ ini/spellcheck.ini	Thu May 13 13:52:00 2004
-@@ -3,5 +3,6 @@
- ; This file is stored in UTF-8 encoding
- 
- [Spell Check]
-+Spell Check Engine=%%PREFIX%%/share/opera/bin/spellcheck.so
- Default Language=en
- Default Encoding=iso8859-1
diff --git a/www/opera-devel/files/patch-install.sh b/www/opera-devel/files/patch-install.sh
index 15d09b1be403..5d721404c65e 100644
--- a/www/opera-devel/files/patch-install.sh
+++ b/www/opera-devel/files/patch-install.sh
@@ -1,17 +1,26 @@
---- install.sh.orig	Mon Feb  6 13:02:45 2006
-+++ install.sh	Tue Feb  7 21:26:31 2006
-@@ -108,8 +108,8 @@
+--- install.sh.orig	Tue Apr 11 12:23:52 2006
++++ install.sh	Thu Apr 20 11:33:45 2006
+@@ -106,7 +106,7 @@
  
+     test "${prefix}" || prefix="${str_defaultprefix}"
+ 
+-    share_dir="${prefix}/share/opera"
++    share_dir="${prefix}/share/opera-devel"
      if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then
-         wrapper_dir="${prefix}/bin"
--        doc_dir="${prefix}/share/doc/opera"
--        share_dir="${prefix}/share/opera"
-+        doc_dir="${prefix}/share/doc/opera-devel"
-+        share_dir="${prefix}/share/opera-devel"
          exec_dir="${share_dir}/bin"
          plugin_dir="${share_dir}/plugins"
-     else
-@@ -381,7 +381,7 @@
+@@ -114,8 +114,8 @@
+ 	exec_dir="${prefix}/lib/opera/$opera_version"
+ 	plugin_dir="${prefix}/lib/opera/plugins"
+     fi
+-    man_dir="${prefix}/share/man"
+-    doc_dir="${prefix}/share/doc/opera"
++    man_dir="${prefix}/man"
++    doc_dir="${prefix}/share/doc/opera-devel"
+     wrapper_dir="${prefix}/bin"
+ }
+ 
+@@ -397,7 +397,7 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
  
@@ -20,7 +29,7 @@
  		cpf='-f'
  		if test "$verbose" -gt '1'
  		then
-@@ -771,7 +771,7 @@
+@@ -789,7 +789,7 @@
      debug_msg 0 "in generate_wrapper()"
  
      case "${machine}:${os}" in
@@ -29,7 +38,7 @@
  	    wrapper_ibmjava="
  	    IBMJava2-142/jre \\
  	    IBMJava2-141/jre \\
-@@ -806,10 +806,16 @@
+@@ -824,7 +824,7 @@
  		error 'os'
  	;;
      esac
@@ -38,16 +47,7 @@
  
      wrapper_contain="#!/bin/sh
  
-+# Location of locale data
-+if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then
-+    PATH_LOCALE=%%LOCALBASE%%/share/compat/locale
-+    export PATH_LOCALE
-+fi
-+
- # Location of the Opera binaries
- OPERA_BINARYDIR=${str_localdirexec}
- export OPERA_BINARYDIR
-@@ -865,6 +871,9 @@
+@@ -887,6 +887,9 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -57,7 +57,7 @@
  # Native Java enviroment
  if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
      INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -888,69 +897,12 @@
+@@ -910,69 +913,12 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -131,7 +131,7 @@
  	; 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
-@@ -1001,11 +953,8 @@
+@@ -1023,11 +969,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -145,7 +145,7 @@
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1016,12 +965,13 @@
+@@ -1038,12 +981,13 @@
  LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
  export LD_LIBRARY_PATH
  
@@ -161,7 +161,7 @@
          LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
      fi
  done"
-@@ -1123,7 +1073,7 @@
+@@ -1153,7 +1097,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -170,16 +170,25 @@
  
      # Executable
      debug_msg 1 "Executable"
-@@ -1161,7 +1111,7 @@
+@@ -1191,7 +1135,7 @@
  
      #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
      generate_wrapper
 -    chmod $chmodv 755 $wrapper_dir/opera
 +    chmod $chmodv 755 $wrapper_dir/opera-devel
  
+     # Manual page
+     debug_msg 1 "Manual page"
+@@ -1200,7 +1144,7 @@
+     chmod $chmodv 755 ${man_dir}
+     mkdir $mkdirv $mkdirp ${man_dir}/man1
+     chmod $chmodv 755 ${man_dir}/man1
+-    cp $cpv $cpf man/opera.1 ${man_dir}/man1
++    cp $cpv $cpf man/opera.1 ${man_dir}/man1/opera-devel.1
+ 
      # Documentation
      debug_msg 1 "Documentation"
-@@ -1338,41 +1288,9 @@
+@@ -1377,41 +1321,9 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -221,7 +230,7 @@
  	if test "${bool_icons}" -ne 0
  	then
  	    xdg
-@@ -1407,13 +1325,13 @@
+@@ -1448,13 +1360,13 @@
  {
      # arg1 = location
  
@@ -229,7 +238,7 @@
 +    wmconfig_file="$1/opera-devel"
  
 -    wmconfig_contain='opera name "Opera"
-+    wmconfig_contain='opera name "Opera Technical Preview"
++    wmconfig_contain='opera name "Opera Beta"
  opera description "Opera Web Browser"
 -opera icon "opera.xpm"
 -opera mini-icon "opera.xpm"
@@ -240,7 +249,7 @@
  opera group "Internet"'
  
      echo "${wmconfig_contain}" > ${wmconfig_file}
-@@ -1425,19 +1343,19 @@
+@@ -1466,19 +1378,19 @@
      # arg1 = location
      # arg2 = type
  
@@ -259,11 +268,11 @@
  	desktop_contain="${desktop_contain}
  Encoding=UTF-8
 -Name=Opera
-+Name=Opera Technical Preview
++Name=Opera Beta
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1461,7 +1379,7 @@
+@@ -1502,7 +1414,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
@@ -272,7 +281,7 @@
  Terminal=false"
  
  # Application is not a category, according to
-@@ -1476,19 +1394,19 @@
+@@ -1517,19 +1429,19 @@
  	if test "${2}" = "xdg"; then
  	    desktop_contain="${desktop_contain}
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
@@ -291,13 +300,13 @@
 -Name=Opera
 -Exec=opera
 -Icon=opera.xpm
-+Name=Opera Technical Preview
++Name=Opera Beta
 +Exec=opera-devel
 +Icon=opera-devel.xpm
  Terminal=0"
      fi
  
-@@ -1582,48 +1500,43 @@
+@@ -1623,48 +1535,43 @@
      # This function searches for common gnome icon paths.
      debug_msg 1 "in gnome()"
  
@@ -369,7 +378,7 @@
  
      elif test -d /usr/share/gnome/
      then
-@@ -1634,10 +1547,10 @@
+@@ -1675,10 +1582,10 @@
  	    then
  		mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
  		chmod $chmodv 755 /usr/share/gnome/pixmaps
@@ -382,7 +391,7 @@
  	fi
  	# end /usr/share/gnome icon
  
-@@ -1671,45 +1584,45 @@
+@@ -1712,45 +1619,45 @@
      # This function searches for common kde2 and kde 3 icon paths.
      debug_msg 1 "in kde()"
  
@@ -443,39 +452,52 @@
  	    fi
  	fi
      fi
-@@ -1778,34 +1691,9 @@
+@@ -1834,45 +1741,9 @@
  }
  
  xdg()
 -{   # http://standards.freedesktop.org
--    if update-desktop-database --help >/dev/null 2>&1; then
--
--	for ICON_DIR in ${XDG_DATA_DIRS}/icons/hicolor /usr/share/pixmaps/hicolor; do test -d ${ICON_DIR} && break; done
+-    UDD=''
+-    for BIN_DIR in `pathdirs`; do
+-	test -x ${BIN_DIR}/update-desktop-database || continue
+-	UDD=${BIN_DIR}/update-desktop-database; break
+-    done
+-    
+-    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+-    if test "$UDD"; then
+-	for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor; do
+-	    test -d ${ICON_DIR} && break
+-	done
 -
 -	if   test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2
 -	elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2
 -	else
--	    test -d ${ICON_DIR}/48x48/apps && test -w ${ICON_DIR}/48x48/apps && cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
--	    test -d ${ICON_DIR}/32x32/apps && test -w ${ICON_DIR}/32x32/apps && cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
--	    test -d ${ICON_DIR}/22x22/apps && test -w ${ICON_DIR}/22x22/apps && cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
+-	    for RESOLUTION in 48x48 32x32 22x22; do
+-		TO_DIR=${ICON_DIR}/${RESOLUTION}/apps
+-		test -d ${TO_DIR} && test -w ${TO_DIR} && cp $cpv $share_dir/images/opera_${RESOLUTION}.png ${TO_DIR}/opera.png
+-	    done
 -	fi
--
--	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do test -d ${SHORTCUT_DIR} && break; done
--
+-	
+-	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do
+-	    test -d ${SHORTCUT_DIR} && break;
+-	done
+-	
 -	if   test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return
 -	elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return
 -	fi
 -	generate_desktop ${SHORTCUT_DIR} xdg
--	update-desktop-database
+-	${UDD}
 -    else
 -	icons
-+{
- 	gnome
- 	kde 3
+-	gnome
+-	kde 3
 -	kde 2
 -	kde1
 -	mandrake
 -    fi
++{   
++    gnome
++    kde 3
  }
  
  # These are the only variables the needs to be changed
diff --git a/www/opera-devel/files/patch-opera6.adr b/www/opera-devel/files/patch-opera6.adr
new file mode 100644
index 000000000000..b402a6c61a0a
--- /dev/null
+++ b/www/opera-devel/files/patch-opera6.adr
@@ -0,0 +1,74 @@
+--- opera6.adr.orig	Thu Apr 20 11:52:06 2006
++++ opera6.adr	Thu Apr 20 11:52:12 2006
+@@ -25,14 +25,14 @@
+ 	URL=http://my.opera.com/
+ 	ICONFILE=my.opera.com.ico
+ 	ON PERSONALBAR=YES
+-	PERSONALBAR_POS=1
++	PERSONALBAR_POS=2
+ 
+ #URL
+ 	ID=16
+ 	NAME=Opera Web Mail
+ 	URL=http://www.operamail.com/
+ 	ON PERSONALBAR=YES
+-	PERSONALBAR_POS=2
++	PERSONALBAR_POS=3
+ 
+ #URL
+ 	ID=17
+@@ -41,23 +41,51 @@
+ 
+ -
+ 
++#FOLDER
++	ID=18
++	NAME=BSD
++	ON PERSONALBAR=YES
++	PERSONALBAR_POS=1
++
++#URL
++	ID=19
++	NAME=The FreeBSD Project
++	URL=http://www.freebsd.org/
++
++#URL
++	ID=20
++	NAME=BSD News
++	URL=http://bsdnews.com/
++
+ #URL
+ 	ID=21
++	NAME=Daemon News
++	URL=http://www.daemonnews.org/
++
++#URL
++	ID=22
++	NAME=BSDForums.org
++	URL=http://bsdforums.org/
++
++-
++
++#URL
++	ID=23
+ 	NAME=Download.com
+ 	URL=http://www.download.com/
+ 
+ #URL
+-	ID=22
++	ID=24
+ 	NAME=Amazon.com
+ 	URL=http://www.amazon.com/exec/obidos/redirect-home/opera-20
+ 
+ #URL
+-	ID=23
++	ID=25
+ 	NAME=Shopping.com
+ 	URL=http://www.shopping.com/?linkin_id=3005960
+ 
+ #URL
+-	ID=24
++	ID=26
+ 	NAME=eBay
+ 	URL=http://www.ebay.com/
+ 
diff --git a/www/opera-devel/files/patch-search.ini b/www/opera-devel/files/patch-search.ini
index f1d06000b027..722cfc877c79 100644
--- a/www/opera-devel/files/patch-search.ini
+++ b/www/opera-devel/files/patch-search.ini
@@ -1,5 +1,23 @@
---- search.ini.orig	Mon Feb  6 13:02:45 2006
-+++ search.ini	Tue Feb  7 20:58:06 2006
+--- search.ini.orig	Tue Apr 11 12:23:52 2006
++++ search.ini	Thu Apr 20 11:51:10 2006
+@@ -55,7 +55,7 @@
+ Search Type=40
+ Verbtext=0
+ Nameid=69678
+-Position=3
++Position=4
+ 
+ [Search Engine 5]
+ Name=
+@@ -68,7 +68,7 @@
+ Search Type=41
+ Verbtext=0
+ Nameid=17174
+-Position=4
++Position=5
+ 
+ [Search Engine 6]
+ Name=
 @@ -445,4 +445,44 @@
  Search Type=119
  Verbtext=0
diff --git a/www/opera-devel/pkg-message b/www/opera-devel/pkg-message
index 377dc40ba37f..c433433e7bba 100644
--- a/www/opera-devel/pkg-message
+++ b/www/opera-devel/pkg-message
@@ -1,9 +1,8 @@
 ***
 This port will use the ~/.opera-devel directory to save its personal settings.
 
-*** THIS IS AN UNSTABLE PREVIEW VERSION OF OPERA. PLEASE DO NOT REPORT ***
-***                   BUGS TO THE PORT MAINTAINER.                     ***
+***      THIS IS A BETA VERSION OF OPERA. PLEASE REPORT BUGS TO:       ***
 ***                                                                    ***
-***                    Use http://bugs.opera.com/                      ***
+***                       http://bugs.opera.com/                       ***
 ***             or http://my.opera.com/community/forums/               ***
 ***
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index 5cca8e3d7d2d..89b810bfd83f 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -9,22 +9,15 @@ bin/opera-devel
 %%DATADIR%%/config/opera6rc
 %%DATADIR%%/config/opera6rc.fixed
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/blank.gif
-%%DATADIR%%/images/drive.gif
-%%DATADIR%%/images/file.gif
-%%DATADIR%%/images/folder.gif
-%%DATADIR%%/images/link.gif
 %%DATADIR%%/images/opera.xpm
 %%DATADIR%%/images/opera_16x16.png
 %%DATADIR%%/images/opera_22x22.png
 %%DATADIR%%/images/opera_32x32.png
 %%DATADIR%%/images/opera_48x48.png
-%%DATADIR%%/images/operabanner.png
 %%DATADIR%%/ini/dialog.ini
 %%DATADIR%%/ini/fastforward.ini
 %%DATADIR%%/ini/filehandler.ini
 %%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/spellcheck.ini
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
@@ -33,7 +26,6 @@ bin/opera-devel
 %%DATADIR%%/ini/xmlentities.ini
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
-%%DATADIR%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/en/default.adr
 %%DATADIR%%/locale/en/lngcode.txt
@@ -55,7 +47,6 @@ bin/opera-devel
 %%DATADIR%%/styles/contentblock.css
 %%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/drives.css
-%%DATADIR%%/styles/email.css
 %%DATADIR%%/styles/error.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
@@ -67,7 +58,6 @@ bin/opera-devel
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
 %%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/mimehead.css
 %%DATADIR%%/styles/plugins.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/contrastbw.css