Update to version 9.5:

- drop 4.x support
- native amd64 binaries
- changed to the mail storage format
- changed shortcuts (part of the old one can be enabled back via Preferences)
- no search.ini FreeBSD customizations anymore (but it will keep your custom
searches)

See full log at:
http://www.opera.com/docs/changelogs/freebsd/950/

PR:		ports/124678
Submitted by:	Arjan van Leeuwen (maintainer)

7 files changed, 298 insertions, 596 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 985fbcd9e740..c18dc9b0b3dd 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
 CATEGORIES=	www ipv6
 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}/ \
@@ -23,107 +22,61 @@ MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER
 		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}/
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
+		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
+DISTNAME=	${PORTNAME}-${OPERA_VER}${OPERA_MINVER}-freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
 
 MAINTAINER=	freebsd-maintainer@opera.com
-COMMENT=	A blazingly fast, full-featured, standards-compliant browser
+COMMENT=	Blazingly fast, full-featured, standards-compliant browser, devel version
 
-OPERA_VER=	9.27
+OPERA_VER=	9.50
 OPERA_MINVER=
 OPERA_REL=	final
-OPERA_DATE=	20080331
-OPERA_BUILD=	709
+OPERA_DATE=	20080611
+OPERA_BUILD=	2042
 
-DATADIR=	${PREFIX}/share/${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
-WANT_GNOME=	yes
-ONLY_FOR_ARCHS=	i386
-WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
+USE_QT_VER=	3
 
 MAN1=		opera.1
 
 NO_BUILD=	yes
 
-OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on \
-		SHARED	"Use a shared Qt library (instead of static)"	on
-
-.if exists(${LOCALBASE}/lib/libqt-mt.prl)
-QT_PRESENT=	on
-.else
-QT_PRESENT=	off
-.endif
+OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700040
-OPERA_TYPE=	1
-.elif ${OSVERSION} >= 600000
-OPERA_TYPE=	4
+.if ${OSVERSION} >= 600000
+ONLY_FOR_ARCHS=	i386 amd64
 .else
-OPERA_TYPE=	3
+ONLY_FOR_ARCHS=	i386
 .endif
 
-.if ${OSVERSION} > 700000
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-symhack
-PLIST_SUB+=	SYMHACK=""
+.if ${ARCH} == amd64
+OPERA_LIB=	amd64
 .else
-PLIST_SUB+=	SYMHACK="@comment "
-.endif
-
-.if !defined(WITHOUT_ASPELL)
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
-.endif
-
-.if defined(WITH_SHARED) && ${OPERA_TYPE} > 1
 OPERA_LIB=	shared
-LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
-.else
-OPERA_LIB=	static
-OPERA_TYPE=	1
 .endif
 
-.if ${OPERA_TYPE} == 1
-LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
-.if ${OSVERSION} >= 600000
-LIB_DEPENDS+=	z.2:${PORTSDIR}/misc/compat5x
-.endif
-.endif
-
-.if ${HAVE_GNOME:Mgnomehier}!=""
-PLIST_SUB+=	GNOME=""
+.if ${OSVERSION} >= 700000
+OPERA_TYPE=	7
+.elif ${OSVERSION} >= 600000
+OPERA_TYPE=	6
+.elif ${OSVERSION} >= 500000
+OPERA_TYPE=	5
 .else
-PLIST_SUB+=	GNOME="@comment "
+IGNORE=	is only supported on FreeBSD 5.x and higher
 .endif
 
-.if exists(${LOCALBASE}/bin/kde-config)
-PLIST_SUB+=	KDE=""
-.else
-PLIST_SUB+=	KDE="@comment "
+.if !defined(WITHOUT_ASPELL)
+LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .endif
 
-post-patch:
-	@${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
-			${WRKSRC}/config/opera6rc
-	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/install.sh
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-
 do-install:
-	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
-
-post-install:
-.if ${OSVERSION} > 700000
-	@${CP} ${FILESDIR}/symhack.c ${WRKSRC}/
-	@(cd ${WRKSRC}/ && ${CC} -shared -o symhack.so symhack.c)
-	@${INSTALL_DATA} ${WRKSRC}/symhack.so ${DATADIR}/
-.endif
-
-	@${CAT} ${PKGMESSAGE}
+	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX} --docdir=${DOCSDIR} --sharedir=${DATADIR} --exec_prefix=${DATADIR}/bin --plugindir=${DATADIR}/plugins)
 
 .include <bsd.port.post.mk>
diff --git a/www/opera/distinfo b/www/opera/distinfo
index ed65f1ca9f27..5bb7039760b4 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,9 +1,15 @@
-MD5 (opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2) = 576a831d5c0d29efdae53e91502e29e5
-SHA256 (opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2) = ac695d429e859f2764d4c3d80798b0bcce9a8670c83ebe61ef568d197bd61aab
-SIZE (opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2) = 6561843
-MD5 (opera-9.27-20080331.3-shared-qt.i386.freebsd-en.tar.bz2) = f0fef0d357eb072907c9d9ea1e444e9f
-SHA256 (opera-9.27-20080331.3-shared-qt.i386.freebsd-en.tar.bz2) = 686c8f8006529599795b1b7fc113467689917873f0d48eebe5acd8b4d546af18
-SIZE (opera-9.27-20080331.3-shared-qt.i386.freebsd-en.tar.bz2) = 5135533
-MD5 (opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2) = 155d70909a62aff585f76fa6125e0833
-SHA256 (opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2) = 07b5ba9d9f012a281f76de272b06d7cb8c74fcd3a87f82ed3bde6cb42996017a
-SIZE (opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2) = 5137208
+MD5 (opera-9.50-freebsd5-shared-qt3.i386.tar.bz2) = 2ddf575b0b0fcb5176acde99a681716c
+SHA256 (opera-9.50-freebsd5-shared-qt3.i386.tar.bz2) = a060e6604a00a91c74dbe3e61e5a7591b9be2750bc9e130b145e943e6a98616c
+SIZE (opera-9.50-freebsd5-shared-qt3.i386.tar.bz2) = 7102500
+MD5 (opera-9.50-freebsd6-shared-qt3.i386.tar.bz2) = a36b743ead6600c04fe1a652ec1bc066
+SHA256 (opera-9.50-freebsd6-shared-qt3.i386.tar.bz2) = f08d731c286a87e70a18b5a7f2dadf673d142d1405927d4643c5bc0751a25eb9
+SIZE (opera-9.50-freebsd6-shared-qt3.i386.tar.bz2) = 7102733
+MD5 (opera-9.50-freebsd7-shared-qt3.i386.tar.bz2) = 95db58bfe2611755cdeb9a952612d1e1
+SHA256 (opera-9.50-freebsd7-shared-qt3.i386.tar.bz2) = 892e7c6fe69216d6e3bc69243e6bff3df38c4f0202de4eba19c06d4e9ea3b5bb
+SIZE (opera-9.50-freebsd7-shared-qt3.i386.tar.bz2) = 6983336
+MD5 (opera-9.50-freebsd6-shared-qt3.amd64.tar.bz2) = e51aff015af1071ecb98053812b53a9d
+SHA256 (opera-9.50-freebsd6-shared-qt3.amd64.tar.bz2) = 9a908a8bf353871f3204460d7207a7971d350aa2c80c119275f9bd5efcc3ab6e
+SIZE (opera-9.50-freebsd6-shared-qt3.amd64.tar.bz2) = 7603851
+MD5 (opera-9.50-freebsd7-shared-qt3.amd64.tar.bz2) = 2f99abea2747f83dce9d0770d907d797
+SHA256 (opera-9.50-freebsd7-shared-qt3.amd64.tar.bz2) = 94fb0b88743624a8d3ed2d64332a90660b3c1368561e06a4aedd9e51e1e9eb74
+SIZE (opera-9.50-freebsd7-shared-qt3.amd64.tar.bz2) = 7517607
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index 8e3c5761f316..2691c97855db 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -1,351 +1,19 @@
---- install.sh.orig	Thu Dec 14 15:06:40 2006
-+++ install.sh	Thu Jan 25 15:56:02 2007
-@@ -924,69 +924,14 @@
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
- 
--    PREFIXES=\"
--	/usr
--	/usr/java
--	/usr/lib
--	/usr/local
--	/opt\"
-+    PREFIXES=\"%%LOCALBASE%%\"
- 
-     for SUNJAVA in \\
--	java-1.5.0-sun-1.5.0.06 \\
--	java-1.5.0-sun-1.5.0.06/jre \\
--	java-1.5.0-sun-1.5.0.05 \\
--	java-1.5.0-sun-1.5.0.05/jre \\
--	java-1.5.0-sun-1.5.0.04 \\
--	java-1.5.0-sun-1.5.0.04/jre \\
--	jre1.5.0_06 \\
--	jdk1.5.0_06/jre \\
--	jre1.5.0_05 \\
--	jdk1.5.0_05/jre \\
--	jre1.5.0_04 \\
--	jdk1.5.0_04/jre \\
--	jre1.5.0_03 \\
--	jdk1.5.0_03/jre \\
--	jre1.5.0_02 \\
--	jdk1.5.0_02/jre \\
--	jre1.5.0_01 \\
--	jdk1.5.0_01/jre \\
--	j2re1.4.2_06 \\
--	j2sdk1.4.2_06/jre \\
--	j2re1.4.2_04 \\
--	j2sdk1.4.2_04/jre \\
--	j2re1.4.2_03 \\
--	j2sdk1.4.2_03/jre \\
--	j2re1.4.2_02 \\
--	j2sdk1.4.2_02/jre \\
--	j2re1.4.2_01 \\
--	j2sdk1.4.2_01/jre \\
--	j2re1.4.2 \\
--	j2sdk1.4.2/jre \\
--	j2re1.4.1_01 \\
--	j2re1.4.1 \\
--	SUNJava2-1.4.1 \\
--	BlackdownJava2-1.4.1/jre \\
--	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_15 \\
--	jre1.3.1_04 \\
--	jre1.3.1_02 \\
--	jre1.3.1_01 \\
--	j2re1.3.1 \\
--	jre1.3.1 \\
--	j2re1.3 \\
--	j2se/1.3/jre \\
--	SunJava2-1.3/jre \\
--	java2re \\
--	jdk1.2.2/jre \\
--	jdk1.2/jre \\
--	jre \\
--	java \\
-+	jdk1.3.1/jre \\
-+	jdk1.4.2/jre \\
-+	jdk1.5.0/jre \\
-+	diablo-jre1.5.0 \\
-+	diablo-jdk1.5.0/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
-@@ -1037,11 +982,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
-@@ -1052,12 +994,13 @@
- LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
- export LD_LIBRARY_PATH
- 
--# Spellchecker needs to find libaspell.so.15
-+# Spellchecker needs to find libaspell.so.16
- for LIBASPELL_DIR in \\
-+    %%LOCALBASE%%/lib \\
-     /usr/local/lib \\
-     /opkg/lib \\
- ; do
--    if test -f \"\${LIBASPELL_DIR}/libaspell.so.15\"; then
-+    if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then
-         LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
-     fi
- done"
-@@ -1167,7 +1110,7 @@
-     chop "${OPERADESTDIR}" "str_localdirshare"
-     chop "${OPERADESTDIR}" "str_localdirplugin"
+--- install.sh.orig	2008-06-17 14:57:32.206032200 +0200
++++ install.sh	2008-06-17 14:58:16.609863511 +0200
+@@ -1274,7 +1274,6 @@
+     mkdir $mkdirv $mkdirp $plugin_dir/
  
+     # Wrapper
 -    backup ${wrapper_dir}/opera opera
-+    #backup ${wrapper_dir}/opera opera
- 
-     # Executable
-     debug_msg 1 "Executable"
-@@ -1340,41 +1283,9 @@
- 
-     if test -z "${OPERADESTDIR}"
-     then
--	# System wide configuration files
--	config_dir='/usr/local/etc'
--	if can_write_to "$config_dir"
--	then
--	    echo
--	    echo "System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " would be ignored if installed with the prefix \"$prefix\"."
--	    if con_firm "Do you want to install them in $config_dir"
--	    then
--		backup $config_dir/opera6rc opera6rc config
--		backup $config_dir/opera6rc.fixed opera6rc.fixed config
--		cp $cpv $cpf config/opera6rc $config_dir
--		cp $cpv $cpf config/opera6rc.fixed $config_dir
--	    fi
--	else
--	    echo
--	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
--	    echo " System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " were not installed."
--	fi
--
- 	# Shorcuts and Icons
- 	bool_icons=1 # install icons by default
+     debug_msg 1 "Wrapper"
+     mkdir $mkdirv $mkdirp $wrapper_dir/
  
--	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
--	then
--	    echo
--	    echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
--	    con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
--	fi
--
- 	if test "${bool_icons}" -ne 0
- 	then xdg
- 	fi
-@@ -1585,48 +1496,43 @@
-     # This function searches for common gnome icon paths.
-     debug_msg 1 "in gnome()"
+@@ -1282,7 +1281,7 @@
+     generate_wrapper
+     chmod $chmodv 755 $wrapper_dir/opera
  
--    if test -d /opt/gnome/
-+    if test -d %%LOCALBASE%%/share/gnome/;
+-    if test -z "$OPERADESTDIR"
++    if false
      then
--	# /opt/gnome share
--	if test -d /opt/gnome/share
--	then
--	    # /opt/gnome icon
--	    if test ! -d /opt/gnome/share/pixmaps/
-+	    # %%LOCALBASE%%/share icon
-+	    if test ! -d %%LOCALBASE%%/share/pixmaps/;
- 	    then
--		if test -w /opt/gnome/share
-+		if test -w %%LOCALBASE%%/share/gnome;
- 		then
--		    mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
--		    chmod $chmodv 755 /opt/gnome/share/pixmaps
--		    cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+		    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
-+		    chmod $chmodv 755 %%LOCALBASE%%/share/pixmaps
-+		    cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/pixmaps/opera.xpm
- 		fi
--	    elif test -w /opt/gnome/share/pixmaps
--	    then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+	    elif test -w %%LOCALBASE%%/share/pixmaps
-+	    then cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/pixmaps/opera.xpm
- 	    fi
--	    # end /opt/gnome icon
-+	    # end %%LOCALBASE%%/share icon
- 
--	    # /opt/gnome link
--	    if test -d /opt/gnome/share/gnome/apps/
-+	    # %%LOCALBASE%%/share/gnome link
-+	    if test -d %%LOCALBASE%%/share/gnome/apps/
- 	    then
--		if test -d /opt/gnome/share/gnome/apps/Internet/
-+		if test -d %%LOCALBASE%%/share/gnome/apps/Internet/
- 		then
--		    if test -w /opt/gnome/share/gnome/apps/Internet
--		    then generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    if test -w %%LOCALBASE%%/share/gnome/apps/Internet
-+		    then generate_desktop %%LOCALBASE%%/share/gnome/apps/Internet
- 		    fi
--		elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/
-+		elif test -d %%LOCALBASE%%/share/gnome/apps/Networking/WWW/
- 		then
--		    if test -w /opt/gnome/share/gnome/apps/Networking/WWW
--		    then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
-+		    if test -w %%LOCALBASE%%/share/gnome/apps/Networking/WWW
-+		    then generate_desktop %%LOCALBASE%%/share/gnome/apps/Networking/WWW
- 		    fi
--		elif test -w /opt/gnome/share/gnome/apps
-+		elif test -w %%LOCALBASE%%/share/gnome/apps
- 		then
--		    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
--		    chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
--		    generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/gnome/apps/Internet/
-+		    chmod $chmodv 755 %%LOCALBASE%%/share/gnome/apps/Internet
-+		    generate_desktop %%LOCALBASE%%/share/gnome/apps/Internet
- 		fi
- 	    fi
--	    # end /opt/gnome link
--	fi
--	# end /opt/gnome share
-+	    # end %%LOCALBASE%%/share/gnome link
- 
-     elif test -d /usr/share/gnome/
-     then
-@@ -1674,47 +1580,34 @@
-     # This function searches for common kde2 and kde 3 icon paths.
-     debug_msg 1 "in kde()"
- 
--    if test -d /opt/kde$1/share
--    then
--	DIR_HI=/opt/kde$1/share/icons/hicolor
--	if test -d "$DIR_HI" -a -w "$DIR_HI"
--	then
--	    if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
--	    then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
--	    fi
--	    if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps
--	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
--	    fi
--	    if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps
--	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
--	    fi
--	fi
-+    DIR_HI=%%LOCALBASE%%/share/icons/hicolor
-+    mkdir -p $DIR_HI/48x48/apps
-+    mkdir -p $DIR_HI/32x32/apps
-+    mkdir -p $DIR_HI/22x22/apps
-+
-+    cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-+    cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-+    cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-+
-+    DIR_LO=%%LOCALBASE%%/share/icons/locolor
-+    mkdir -p $DIR_LO/32x32/apps
-+    mkdir -p $DIR_LO/22x22/apps
-+    mkdir -p $DIR_LO/16x16/apps
-+
-+    cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-+    cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-+    cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png
- 
--	DIR_LO=/opt/kde$1/share/icons/locolor
--	if test -d $DIR_LO -a -w $DIR_LO
-+    if test -d %%LOCALBASE%%/share/applnk/
- 	then
--	    if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
--	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png
--	    fi
--	    if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps
--	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png
--	    fi
--	    if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps
--	    then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png
--	    fi
--	fi
--
--	if test -d /opt/kde$1/share/applnk/
--	then
--	    if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk
-+	    if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
- 	    then
--		mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/
--		chmod $chmodv 755 /opt/kde$1/share/applnk/Internet
-+		mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
-+		chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
- 	    fi
--	    if test -w /opt/kde$1/share/applnk/Internet
--	    then generate_desktop /opt/kde$1/share/applnk/Internet $1
-+	    if test -w %%LOCALBASE%%/share/applnk/Internet
-+	    then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
- 	    fi
--	fi
-     fi
- 
-     if test -d /usr/share/applnk/Networking
-@@ -1796,45 +1689,9 @@
- }
- 
- xdg()
--{   # http://standards.freedesktop.org
--    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
--	    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
--
--	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
--	${UDD}
--    else
--	icons
--	gnome
--	kde 3
--	kde 2
--	kde1
--	mandrake
--    fi
-+{
-+    gnome
-+    kde 3
- }
- 
- echo test | sed -n -e 's/test//' || error 'sed'
+ 	# System wide configuration files
+ 	case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
diff --git a/www/opera/files/patch-search.ini b/www/opera/files/patch-search.ini
deleted file mode 100644
index 67a3839f6411..000000000000
--- a/www/opera/files/patch-search.ini
+++ /dev/null
@@ -1,48 +0,0 @@
---- search.ini.orig	Mon Apr  9 18:07:38 2007
-+++ search.ini	Wed Apr 11 14:26:05 2007
-@@ -445,4 +445,44 @@
- Search Type=119
- Verbtext=0
- Position=-1
--Nameid=291960
-+Nameid=0
-+
-+[Search Engine 35]
-+Name=FreshP&orts
-+URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 36]
-+Name=Google &BSD
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
diff --git a/www/opera/files/symhack.c b/www/opera/files/symhack.c
deleted file mode 100644
index 57bc7c676de0..000000000000
--- a/www/opera/files/symhack.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <resolv.h>
-
-int *
-__h_error(void)
-{
-        return (&__res_state()->res_h_errno);
-}
diff --git a/www/opera/pkg-message b/www/opera/pkg-message
deleted file mode 100644
index 5e98a0233137..000000000000
--- a/www/opera/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-###########################################################################
-
-To use Linux plugins such as Adobe Flash and Acrobat Reader, install the
-www/opera-linuxplugins port.
-
-###########################################################################
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index ba5fa09b8898..16bfe991f87b 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -1,128 +1,268 @@
-@comment $FreeBSD$
 bin/opera
-%%DOCSDIR%%/LICENSE
-%%DATADIR%%/bin/missingsyms.so
-%%DATADIR%%/bin/opera
-%%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/svg-mo.dat
+%%DATADIR%%/skin/windows_skin.zip
+%%DATADIR%%/skin/standard_skin.zip
+%%DATADIR%%/opera6.adr
+%%DATADIR%%/svg-se.dat
 %%DATADIR%%/html40_entities.dtd
-%%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%%/ini/dialog.ini
-%%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/filehandler.ini
-%%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/standard_keyboard.ini
-%%DATADIR%%/ini/standard_menu.ini
-%%DATADIR%%/ini/standard_mouse.ini
-%%DATADIR%%/ini/standard_toolbar.ini
-%%DATADIR%%/ini/unix_keyboard.ini
-%%DATADIR%%/ini/xmlentities.ini
-%%DATADIR%%/java/opera.jar
+%%DATADIR%%/svg-sebd.dat
 %%DATADIR%%/java/opera.policy
-%%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
-%%DATADIR%%/locale/en/license.txt
-%%DATADIR%%/locale/en/search.ini
-%%DATADIR%%/locale/english.lng
-%%DATADIR%%/opera6.adr
-%%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operapluginwrapper
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/search.ini
-%%DATADIR%%/skin/standard_skin.zip
-%%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/styles/about.css
-%%DATADIR%%/styles/cache.css
-%%DATADIR%%/styles/certinfo.css
-%%DATADIR%%/styles/config.css
-%%DATADIR%%/styles/contentblock.css
-%%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
-%%DATADIR%%/styles/error.css
-%%DATADIR%%/styles/history.css
+%%DATADIR%%/java/opera.jar
+%%DATADIR%%/bin/works
+%%DATADIR%%/bin/operapluginwrapper
+%%DATADIR%%/bin/missingsyms.so
+%%DATADIR%%/bin/spellcheck.so
+%%DATADIR%%/bin/operaplugincleaner
+%%DATADIR%%/bin/opera
 %%DATADIR%%/styles/im.css
-%%DATADIR%%/styles/image.css
-%%DATADIR%%/styles/images/bar.png
-%%DATADIR%%/styles/images/center.png
-%%DATADIR%%/styles/images/opera.png
-%%DATADIR%%/styles/images/red_center.png
-%%DATADIR%%/styles/images/red_left.png
-%%DATADIR%%/styles/images/red_right.png
-%%DATADIR%%/styles/images/root.png
-%%DATADIR%%/styles/images/top.png
-%%DATADIR%%/styles/info.css
 %%DATADIR%%/styles/mime.css
+%%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/certinfo.css
+%%DATADIR%%/styles/error.css
+%%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/plugins.css
-%%DATADIR%%/styles/user/accessibility.css
-%%DATADIR%%/styles/user/altdebugger.css
-%%DATADIR%%/styles/user/classid.css
-%%DATADIR%%/styles/user/contrastbw.css
-%%DATADIR%%/styles/user/contrastwb.css
-%%DATADIR%%/styles/user/disablebreaks.css
-%%DATADIR%%/styles/user/disablefloats.css
+%%DATADIR%%/styles/user/toc.css
 %%DATADIR%%/styles/user/disableforms.css
+%%DATADIR%%/styles/user/disablebreaks.css
 %%DATADIR%%/styles/user/disablepositioning.css
-%%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/outline.css
-%%DATADIR%%/styles/user/structureblock.css
-%%DATADIR%%/styles/user/structureinline.css
+%%DATADIR%%/styles/user/disablefloats.css
+%%DATADIR%%/styles/user/altdebugger.css
 %%DATADIR%%/styles/user/structuretables.css
+%%DATADIR%%/styles/user/classid.css
+%%DATADIR%%/styles/user/structureblock.css
+%%DATADIR%%/styles/user/outline.css
+%%DATADIR%%/styles/user/disabletables.css
+%%DATADIR%%/styles/user/contrastwb.css
 %%DATADIR%%/styles/user/tablelayout.css
-%%DATADIR%%/styles/user/toc.css
-%%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/user/structureinline.css
+%%DATADIR%%/styles/user/contrastbw.css
+%%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/wml.css
-%%DATADIR%%/svg-sebd.dat
-%%DATADIR%%/svg-se.dat
-%%DATADIR%%/svg-sabd.dat
+%%DATADIR%%/styles/history.css
+%%DATADIR%%/styles/images/red_right.png
+%%DATADIR%%/styles/images/flag.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/folder.png
+%%DATADIR%%/styles/images/red_left.png
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/bar.png
+%%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/top.png
+%%DATADIR%%/styles/images/section.png
+%%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/opera.png
+%%DATADIR%%/styles/images/red_center.png
+%%DATADIR%%/styles/config.css
+%%DATADIR%%/styles/search.css
+%%DATADIR%%/styles/message.css
+%%DATADIR%%/styles/dir.css
+%%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/mathml.css
+%%DATADIR%%/styles/contentblock.css
+%%DATADIR%%/styles/about.css
+%%DATADIR%%/styles/image.css
+%%DATADIR%%/encoding.bin
+%%DATADIR%%/lngcode.txt
+%%DATADIR%%/ini/xmlentities.ini
+%%DATADIR%%/ini/unix_keyboard.ini
+%%DATADIR%%/ini/font.ini
+%%DATADIR%%/ini/filehandler.ini
+%%DATADIR%%/ini/standard_keyboard_compat.ini
+%%DATADIR%%/ini/mailproviders.xml
+%%DATADIR%%/ini/pluginpath.ini
+%%DATADIR%%/ini/dialog.ini
+%%DATADIR%%/ini/standard_mouse.ini
+%%DATADIR%%/ini/fastforward.ini
+%%DATADIR%%/ini/standard_menu.ini
+%%DATADIR%%/ini/standard_toolbar.ini
+%%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/svg-sa.dat
+%%DATADIR%%/search.ini
+%%DATADIR%%/locale/nl/search.ini
+%%DATADIR%%/locale/nl/nederlands.lng
+%%DATADIR%%/locale/nl/opera6.adr
+%%DATADIR%%/locale/nl/license.txt
+%%DATADIR%%/locale/fr/search.ini
+%%DATADIR%%/locale/fr/francais.lng
+%%DATADIR%%/locale/fr/license.txt
+%%DATADIR%%/locale/fr/opera6.adr
+%%DATADIR%%/locale/en-GB/license.txt
+%%DATADIR%%/locale/en-GB/opera6.adr
+%%DATADIR%%/locale/en-GB/british.lng
+%%DATADIR%%/locale/en-GB/search.ini
+%%DATADIR%%/locale/lt/search.ini
+%%DATADIR%%/locale/lt/lithuanian.lng
+%%DATADIR%%/locale/lt/license.txt
+%%DATADIR%%/locale/lt/opera6.adr
+%%DATADIR%%/locale/cs/opera6.adr
+%%DATADIR%%/locale/cs/czech.lng
+%%DATADIR%%/locale/cs/search.ini
+%%DATADIR%%/locale/cs/license.txt
+%%DATADIR%%/locale/pl/search.ini
+%%DATADIR%%/locale/pl/opera6.adr
+%%DATADIR%%/locale/pl/polski.lng
+%%DATADIR%%/locale/pl/license.txt
+%%DATADIR%%/locale/zh-cn/license.txt
+%%DATADIR%%/locale/zh-cn/search.ini
+%%DATADIR%%/locale/zh-cn/opera6.adr
+%%DATADIR%%/locale/zh-cn/chinese_simp.lng
+%%DATADIR%%/locale/hu/license.txt
+%%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/hu/hungarian.lng
+%%DATADIR%%/locale/hu/opera6.adr
+%%DATADIR%%/locale/hr/search.ini
+%%DATADIR%%/locale/hr/license.txt
+%%DATADIR%%/locale/hr/opera6.adr
+%%DATADIR%%/locale/hr/croatian.lng
+%%DATADIR%%/locale/bg/opera6.adr
+%%DATADIR%%/locale/bg/search.ini
+%%DATADIR%%/locale/bg/license.txt
+%%DATADIR%%/locale/bg/bulgarian.lng
+%%DATADIR%%/locale/nb/opera6.adr
+%%DATADIR%%/locale/nb/license.txt
+%%DATADIR%%/locale/nb/norsk.lng
+%%DATADIR%%/locale/nb/search.ini
+%%DATADIR%%/locale/pt-BR/opera6.adr
+%%DATADIR%%/locale/pt-BR/brazilportuguese.lng
+%%DATADIR%%/locale/pt-BR/search.ini
+%%DATADIR%%/locale/pt-BR/license.txt
+%%DATADIR%%/locale/es-LA/espanol-america_latina.lng
+%%DATADIR%%/locale/es-LA/search.ini
+%%DATADIR%%/locale/es-LA/license.txt
+%%DATADIR%%/locale/es-LA/opera6.adr
+%%DATADIR%%/locale/zh-tw/search.ini
+%%DATADIR%%/locale/zh-tw/license.txt
+%%DATADIR%%/locale/zh-tw/opera6.adr
+%%DATADIR%%/locale/zh-tw/chinese.lng
+%%DATADIR%%/locale/da/dansk.lng
+%%DATADIR%%/locale/da/search.ini
+%%DATADIR%%/locale/da/opera6.adr
+%%DATADIR%%/locale/da/license.txt
+%%DATADIR%%/locale/tr/opera6.adr
+%%DATADIR%%/locale/tr/license.txt
+%%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/tr/search.ini
+%%DATADIR%%/locale/be/search.ini
+%%DATADIR%%/locale/be/opera6.adr
+%%DATADIR%%/locale/be/byelorussian.lng
+%%DATADIR%%/locale/be/license.txt
+%%DATADIR%%/locale/ka/search.ini
+%%DATADIR%%/locale/ka/georgian.lng
+%%DATADIR%%/locale/ka/opera6.adr
+%%DATADIR%%/locale/ka/license.txt
+%%DATADIR%%/locale/fr-CA/license.txt
+%%DATADIR%%/locale/fr-CA/opera6.adr
+%%DATADIR%%/locale/fr-CA/search.ini
+%%DATADIR%%/locale/fr-CA/francais-canadien.lng
+%%DATADIR%%/locale/fy/license.txt
+%%DATADIR%%/locale/fy/search.ini
+%%DATADIR%%/locale/fy/frisian.lng
+%%DATADIR%%/locale/fy/opera6.adr
+%%DATADIR%%/locale/hi/license.txt
+%%DATADIR%%/locale/hi/opera6.adr
+%%DATADIR%%/locale/hi/search.ini
+%%DATADIR%%/locale/hi/hindi.lng
+%%DATADIR%%/locale/es-ES/espanol-espana.lng
+%%DATADIR%%/locale/es-ES/search.ini
+%%DATADIR%%/locale/es-ES/license.txt
+%%DATADIR%%/locale/es-ES/opera6.adr
+%%DATADIR%%/locale/it/search.ini
+%%DATADIR%%/locale/it/italiano.lng
+%%DATADIR%%/locale/it/license.txt
+%%DATADIR%%/locale/it/opera6.adr
+%%DATADIR%%/locale/ru/opera6.adr
+%%DATADIR%%/locale/ru/russian.lng
+%%DATADIR%%/locale/ru/search.ini
+%%DATADIR%%/locale/ru/license.txt
+%%DATADIR%%/locale/mk/opera6.adr
+%%DATADIR%%/locale/mk/macedonian.lng
+%%DATADIR%%/locale/mk/search.ini
+%%DATADIR%%/locale/mk/license.txt
+%%DATADIR%%/locale/sv/opera6.adr
+%%DATADIR%%/locale/sv/svenska.lng
+%%DATADIR%%/locale/sv/search.ini
+%%DATADIR%%/locale/sv/license.txt
+%%DATADIR%%/locale/fi/license.txt
+%%DATADIR%%/locale/fi/opera6.adr
+%%DATADIR%%/locale/fi/search.ini
+%%DATADIR%%/locale/fi/suomi.lng
+%%DATADIR%%/locale/pt/portuguese.lng
+%%DATADIR%%/locale/pt/opera6.adr
+%%DATADIR%%/locale/pt/search.ini
+%%DATADIR%%/locale/pt/license.txt
+%%DATADIR%%/locale/ko/korean.lng
+%%DATADIR%%/locale/ko/opera6.adr
+%%DATADIR%%/locale/ko/search.ini
+%%DATADIR%%/locale/ko/license.txt
+%%DATADIR%%/locale/el/opera6.adr
+%%DATADIR%%/locale/el/greek.lng
+%%DATADIR%%/locale/el/search.ini
+%%DATADIR%%/locale/el/license.txt
+%%DATADIR%%/locale/ja/opera6.adr
+%%DATADIR%%/locale/ja/license.txt
+%%DATADIR%%/locale/ja/japanese.lng
+%%DATADIR%%/locale/ja/search.ini
+%%DATADIR%%/locale/de/search.ini
+%%DATADIR%%/locale/de/license.txt
+%%DATADIR%%/locale/de/deutsch.lng
+%%DATADIR%%/locale/de/opera6.adr
+%%DATADIR%%/locale/nn/opera6.adr
+%%DATADIR%%/locale/nn/nynorsk.lng
+%%DATADIR%%/locale/nn/license.txt
+%%DATADIR%%/locale/nn/search.ini
+%%DATADIR%%/locale/en/license.txt
+%%DATADIR%%/locale/en/opera6.adr
+%%DATADIR%%/locale/en/search.ini
+%%DATADIR%%/locale/english.lng
 %%DATADIR%%/svg-mobd.dat
-%%DATADIR%%/svg-mo.dat
-%%SYMHACK%%%%DATADIR%%/symhack.so
+%%DATADIR%%/svg-sabd.dat
+%%DOCSDIR%%/LGPL
+%%DOCSDIR%%/LICENSE
 
-%%GNOME%%share/gnome/apps/Internet/opera.desktop
-%%GNOME%%share/pixmaps/opera.xpm
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/locale/zh-tw
+@dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/tr
+@dirrm %%DATADIR%%/locale/sv
+@dirrm %%DATADIR%%/locale/ru
+@dirrm %%DATADIR%%/locale/pt-BR
+@dirrm %%DATADIR%%/locale/pt
+@dirrm %%DATADIR%%/locale/pl
+@dirrm %%DATADIR%%/locale/nn
+@dirrm %%DATADIR%%/locale/nl
+@dirrm %%DATADIR%%/locale/nb
+@dirrm %%DATADIR%%/locale/mk
+@dirrm %%DATADIR%%/locale/lt
+@dirrm %%DATADIR%%/locale/ko
+@dirrm %%DATADIR%%/locale/ka
+@dirrm %%DATADIR%%/locale/ja
+@dirrm %%DATADIR%%/locale/it
+@dirrm %%DATADIR%%/locale/hu
+@dirrm %%DATADIR%%/locale/hr
+@dirrm %%DATADIR%%/locale/hi
+@dirrm %%DATADIR%%/locale/fy
+@dirrm %%DATADIR%%/locale/fr-CA
+@dirrm %%DATADIR%%/locale/fr
+@dirrm %%DATADIR%%/locale/fi
+@dirrm %%DATADIR%%/locale/es-LA
+@dirrm %%DATADIR%%/locale/es-ES
+@dirrm %%DATADIR%%/locale/en-GB
 @dirrm %%DATADIR%%/locale/en
+@dirrm %%DATADIR%%/locale/el
+@dirrm %%DATADIR%%/locale/de
+@dirrm %%DATADIR%%/locale/da
+@dirrm %%DATADIR%%/locale/cs
+@dirrm %%DATADIR%%/locale/bg
+@dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/ini
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-
-@cwd %%LOCALBASE%%
-%%KDE%%share/applnk/Internet/opera.desktop
-share/icons/hicolor/22x22/apps/opera.png
-share/icons/hicolor/32x32/apps/opera.png
-share/icons/hicolor/48x48/apps/opera.png
-share/icons/locolor/16x16/apps/opera.png
-share/icons/locolor/22x22/apps/opera.png
-share/icons/locolor/32x32/apps/opera.png
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor/22x22/apps
-@dirrmtry share/icons/locolor/22x22
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor
-@dirrmtry share/icons