aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/linux-opera-devel/Makefile108
-rw-r--r--www/linux-opera-devel/distinfo6
-rw-r--r--www/linux-opera-devel/files/patch-install.sh433
-rw-r--r--www/linux-opera-devel/files/patch-pluginpath.ini15
-rw-r--r--www/linux-opera-devel/files/patch-search.ini102
-rw-r--r--www/linux-opera-devel/pkg-plist164
-rw-r--r--www/linux-opera/Makefile108
-rw-r--r--www/linux-opera/distinfo6
-rw-r--r--www/linux-opera/files/patch-install.sh433
-rw-r--r--www/linux-opera/files/patch-pluginpath.ini15
-rw-r--r--www/linux-opera/files/patch-search.ini102
-rw-r--r--www/linux-opera/pkg-plist164
12 files changed, 602 insertions, 1054 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index c3db6b94b12d..0094ba821456 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,38 +7,49 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}
-PORTREVISION= 1
CATEGORIES= www linux
-MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/&,}
+MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/ \
+ http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
+ http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/&,}
PKGNAMEPREFIX= linux-
-DISTNAME= ${PORTNAME}-${OPERA_VER}.gcc4-bundled-qt4.i386
+DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
MAINTAINER= mezz@FreeBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-WRKSRC= ${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
+RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
+
USE_BZIP2= yes
USE_LINUX= yes
USE_LINUX_APPS= aspell naslibs png xorglibs
ONLY_FOR_ARCHS= i386 amd64
+USE_GNOME= desktopfileutils
+WANT_GNOME= yes
NO_BUILD= yes
-OPERA_VER= 10.10
-OPERA_BUILD= 4742
+OPERA_VER= 10.60
+OPERA_BUILD= 6386
DATADIR= ${PREFIX}/share/${UNIQUENAME}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
-MAN1= linux-opera.1
+MAN1= linux-opera.1 linux-opera-widget-manager.1
+
+RENAME= opera opera-widget-manager lib/opera \
+ share/applications/opera-browser.desktop \
+ share/applications/opera-widget-installer.desktop \
+ share/applications/opera-widget-manager.desktop \
+ share/doc/opera share/opera man/man1/opera.1 \
+ man/man1/opera-widget-manager.1 \
+ share/mime/packages/opera-unite-application.xml \
+ share/mime/packages/opera-widget.xml
.include <bsd.port.pre.mk>
@@ -48,27 +59,68 @@ IGNORE= you need FreeBSD>=7.0 RELEASE with Linux emulation 2.6.x.
IGNORE= you need to use non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f8 and OVERRIDE_LINUX_NONBASE_PORTS=f8). You also can use f10 instead of f8, but I only have tested it with f8.
.endif
+.if ${HAVE_GNOME:Mgtk20}!=""
+INSTALLS_ICONS= yes
+.endif
+
post-extract:
- @${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
- ${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
+ @${GUNZIP_CMD} ${WRKSRC}/share/man/man1/*.gz
+ @${MV} ${WRKSRC}/share/man ${WRKSRC}/man
+ @for _r in ${RENAME}; do \
+ linux=`${ECHO_CMD} $${_r} | \
+ ${SED} -e 's|opera|${UNIQUENAME}|g'`; \
+ ${MV} ${WRKSRC}/$${_r} ${WRKSRC}/$${linux}; \
+ done; \
+ for _f in `find ${WRKSRC}/share/icons -type f | \
+ sed -e 's|${WRKSRC}/||g'`; do \
+ linux=`${ECHO_CMD} $${_f} | \
+ ${SED} -e 's|opera|${UNIQUENAME}|g'`; \
+ ${MV} ${WRKSRC}/$${_f} ${WRKSRC}/$${linux}; \
+ done
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
s|%%LINUXBASE%%|${LINUXBASE}|g' \
- ${WRKSRC}/install.sh \
- ${WRKSRC}/usr/share/opera/defaults/pluginpath.ini
- @${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
- ${WRKSRC}/Manifest.md5
+ ${WRKSRC}/share/${UNIQUENAME}/defaults/pluginpath.ini
+ @${REINPLACE_CMD} -e '/man1/s|opera|${UNIQUENAME}|g ; \
+ /man1/s|1.gz|1|g ; /man1/s|share/||g ; \
+ s|bin/opera|bin/${UNIQUENAME}|g ; \
+ s|name=$$(uname -s)|name=Linux|g ; \
+ s|lib/opera|lib/${UNIQUENAME}|g ; \
+ s|applications/opera|applications/${UNIQUENAME}|g ; \
+ s|doc/opera|doc/${UNIQUENAME}|g ; \
+ /hicolor/s|/opera|/${UNIQUENAME}|g ; \
+ s|packages/opera|packages/${UNIQUENAME}|g ; \
+ s|share/opera|share/${UNIQUENAME}|g ; \
+ s|PREFIX=/usr/local|PREFIX=${PREFIX}|g ; \
+ /OPERA_PERSONALDIR/s|.opera|.${UNIQUENAME}|g ; \
+ s|opera)|${UNIQUENAME})|g ; \
+ s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \
+ s|^.*rmdir.*mime/packages.*||g ; \
+ s|^.*GX - bin/uninstall-opera@.*||g' \
+ ${WRKSRC}/install
+ @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \
+ /Exec/s|opera|${UNIQUENAME}|g ; \
+ /Icon/s|opera|${UNIQUENAME}|g ; \
+ /StartupWMClass/s|opera|${UNIQUENAME}|g ; \
+ s|TryExec=.*||g ; /^$$/d' \
+ ${WRKSRC}/share/applications/*.desktop
+ @${REINPLACE_CMD} -e 's|lib/opera|lib/${UNIQUENAME}|g ; \
+ s|doc/opera|doc/${UNIQUENAME}|g ; \
+ s|share/opera|share/${UNIQUENAME}|g ; \
+ s|opera-widget-manager|${UNIQUENAME}-widget-manager|g ; \
+ s|opera (1)|${UNIQUENAME} (1)|g ; \
+ s|\.opera@@|\.${UNIQUENAME}@@|g ; \
+ s|B opera@@|B ${UNIQUENAME}@@|g ; \
+ /standards-compliant/s|opera|${UNIQUENAME}|g' \
+ ${WRKSRC}/man/man1/*.1
+ @${REINPLACE_CMD} -e '/<icon/s|opera|${UNIQUENAME}|g' \
+ ${WRKSRC}/share/mime/packages/*.xml
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${FIND} ${WRKSRC} -name '*.bak' -delete
do-install:
- @(cd ${WRKSRC} && ./install.sh \
- --prefix=${PREFIX} \
- --docdir=${DOCSDIR} \
- --sharedir=${DATADIR} \
- --exec_prefix=${DATADIR}/bin \
- --plugindir=${DATADIR}/plugins)
+ @(cd ${WRKSRC} && ./install --system --quiet --force)
.include <bsd.port.post.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index e4d6ffcfc456..2011824d565b 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = 02cb0cec164bcf77639b97fbe69d13f4
-SHA256 (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = bdec041032a798f4b8b492546269396d05987538376cc5d28acd9562849e8944
-SIZE (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = 16529068
+MD5 (opera-10.60-6386.i386.linux.tar.bz2) = e86d604b2f9397a618e8ecf357748f55
+SHA256 (opera-10.60-6386.i386.linux.tar.bz2) = be189172893cef848dbc48cad90948dd488cf2da1f7fae56ff15cd9d60ec4880
+SIZE (opera-10.60-6386.i386.linux.tar.bz2) = 12653386
diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
deleted file mode 100644
index e6d8de2ad7d3..000000000000
--- a/www/linux-opera-devel/files/patch-install.sh
+++ /dev/null
@@ -1,433 +0,0 @@
---- install.sh.orig 2009-08-30 14:25:11.000000000 -0500
-+++ install.sh 2009-08-30 16:51:54.000000000 -0500
-@@ -832,10 +832,9 @@
- case "${machine}:${os}" in
- x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86_64:OpenBSD|x86:QNX)
- wrapper_ibmjava="
-- IBMJava2-142/jre \\
-- IBMJava2-141/jre \\
-- IBMJava2-14/jre \\
-- IBMJava2-131/jre \\"
-+ linux-ibm-jdk1.3.1/jre \\
-+ linux-ibm-jdk1.4.0/jre \\
-+ linux-ibm-jdk1.4.1/jre \\"
- wrapper_sunjava_machine="i386"
- ;;
-
-@@ -865,10 +864,19 @@
- error os
- ;;
- esac
-- wrapper_file="${wrapper_dir}/opera"
-+ wrapper_file="${wrapper_dir}/linux-opera"
-
- wrapper_contain="#!/bin/sh
-
-+# Required to check on shm_allow_removed if it is disable then set the
-+# OPERA_NUM_XSHM to 0 or it will causing Opera to halt or/and give strange
-+# behavior.
-+if [ \`/sbin/sysctl -n kern.ipc.shm_allow_removed\` -eq 0 ]; then
-+ OPERA_NUM_XSHM=\"0\"
-+ export OPERA_NUM_XSHM
-+ echo \"shm_allow_removed is disable, set OPERA_NUM_XSHM to 0 to disable shared memory.\"
-+fi
-+
- # Required for Session Management
- case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
- export OPERA_SCRIPT_PATH
-@@ -928,8 +936,12 @@
- OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
- export OPERA_LD_PRELOAD
-
-+# ~/.linux-opera
-+OPERA_PERSONALDIR=\${HOME}/.linux-opera
-+export OPERA_PERSONALDIR
-+
- # Native Java enviroment
--for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
-+for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.linux-opera\"
- do if test -f \"\$d/javapath.txt\"
- then
- INIJAVA=\`cat \"\$d/javapath.txt\"\`
-@@ -950,88 +962,17 @@
-
- if test ! \"\${OPERA_JAVA_DIR}\"
- then
-- PREFIXES=\"
-- /usr
-- /usr/java
-- /usr/lib
-- /usr/local
-- /opt\"
-+ PREFIXES=\"%%LOCALBASE%%\"
-
- for SUNJAVA in \\
-- java-6-sun \\
-- java-6-sun-1.6.0.00 \\
-- java-1.5.0-sun \\
-- java-1.5.0-sun-1.5.0.09 \\
-- java-1.5.0-sun-1.5.0.09/jre \\
-- java-1.5.0-sun-1.5.0.08 \\
-- java-1.5.0-sun-1.5.0.08/jre \\
-- java-1.5.0-sun-1.5.0.07 \\
-- java-1.5.0-sun-1.5.0.07/jre \\
-- java-1.5.0-sun-1.5.0.06 \\
-- java-1.5.0-sun-1.5.0.06/jre \\
-- jre1.5.0_06 \\
-- jdk1.5.0_06/jre \\
-- java-1.5.0-sun-1.5.0.05 \\
-- java-1.5.0-sun-1.5.0.05/jre \\
-- jre1.5.0_05 \\
-- jdk1.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_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 \\
-- jdk1.5.0/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 \\
-- jdk1.6.0/jre \\
-- diablo-jre1.5.0 \\
-- diablo-jdk1.5.0/jre \\
-- diablo-jre1.6.0 \\
-- diablo-jdk1.6.0/jre \\
-- openjdk6/jre \\
-+ linux-blackdown-jdk1.3.1/jre \\
-+ linux-blackdown-jdk1.4.1/jre \\
-+ linux-blackdown-jdk1.4.2/jre \\
-+ linux-sun-jdk1.3.1/jre \\
-+ linux-sun-jdk1.4.1/jre \\
-+ linux-sun-jdk1.4.2/jre \\
-+ linux-sun-jdk1.5.0/jre \\
-+ linux-sun-jdk1.6.0/jre \\
- ; do
- for PREFIX in \${PREFIXES}
- do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
-@@ -1085,11 +1026,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%%/Adobe/Reader8/ENU/Adobe/Reader8/Reader/intellinux/bin \\
-+ %%LOCALBASE%%/Adobe/Reader9/ENU/Adobe/Reader9/Reader/intellinux/bin \\
- ; do
- if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
- done
-@@ -1102,8 +1040,7 @@
-
- # Spellchecker needs to find libaspell.so.15
- for LIBASPELL_DIR in \\
-- /usr/local/lib \\
-- /opkg/lib \\
-+ %%LINUXBASE%%/usr/lib \\
- ; do
- if ls \$LIBASPELL_DIR/libaspell.so.1[5-9] >/dev/null 2>&1
- then LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
-@@ -1111,13 +1048,6 @@
- done"
-
- case "${os}" in
-- AnyBSD|OpenBSD)
--wrapper_contain="${wrapper_contain}
--
--# Make sure the compat libraries are found
--test -d /usr/local/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:/usr/local/lib/compat/\"
--"
-- ;;
- SunOS)
- wrapper_contain="${wrapper_contain}
-
-@@ -1146,7 +1076,7 @@
- };
-
- // Opera package classes get all permissions
--grant codebase \"file://${str_localdirshare}/java//opera.jar\" {
-+grant codebase \"file://${str_localdirshare}/java/opera.jar\" {
- permission java.security.AllPermission;
- };
-
-@@ -1263,12 +1193,12 @@
- chop "${OPERADESTDIR}" "str_localdirshare"
- chop "${OPERADESTDIR}" "str_localdirplugin"
-
-- md5check Manifest.md5
-+ #md5check Manifest.md5
- part_install "`manifest_path operapluginwrapper`" "$exec_dir" Binaries
- manifest_contains operapluginwrapper-native && part_install "`manifest_path operapluginwrapper-native`" "$exec_dir" Binaries
- manifest_contains operapluginwrapper-ia32-linux && part_install "`manifest_path operapluginwrapper-ia32-linux`" "$exec_dir" Binaries
- part_install "`manifest_path LICENSE`" "$doc_dir" Documentation
-- part_install "`manifest_path man1/opera.1`" "$man_dir" "Manual page"
-+ part_install "`manifest_path man1/linux-opera.1`" "$man_dir" "Manual page"
-
- share_src="`manifest_path 'html40_entities\.dtd'`"
- part_install "$share_src" "$share_dir" "Shared resources"
-@@ -1277,84 +1207,20 @@
- mkdir $mkdirv $mkdirp $plugin_dir/
-
- # Wrapper
-- backup ${wrapper_dir}/opera opera
-+ #backup ${wrapper_dir}/opera opera
- debug_msg 1 "Wrapper"
- mkdir $mkdirv $mkdirp $wrapper_dir/
-
- #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
- generate_wrapper
-- chmod $chmodv 755 $wrapper_dir/opera
-+ chmod $chmodv 755 $wrapper_dir/linux-opera
-
- if test -z "$OPERADESTDIR"
- then
-- # System wide configuration files
-- case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
-- # TODO: work out what's going on here and replace with something that sets OPERA_ROOTPREFS to where they went !
-- if can_write_to "$config_dir"
-- then
-- warn
-- warn "System wide configuration files:"
-- warn " $config_dir/operaprefs_default.ini"
-- warn " $config_dir/operaprefs_fixed.ini"
-- warn " would be ignored if installed with the prefix \"$prefix\"."
-- bool_config=1
-- if [ "$flag_mode" = '--interactive' ]
-- then con_firm "Do you want to install them in $config_dir" || bool_config=0
-- else warn "Installing in default location $config_dir instead."
-- fi
--
-- if [ $bool_config -eq 1 ]
-- then
-- if [ -f "$config_dir/opera6rc" ]
-- then
-- mv -f "$config_dir/opera6rc" "$config_dir/operaprefs_default.ini"
-- fi
-- if [ -f "$config_dir/opera6rc.fixed" ]
-- then
-- mv -f "$config_dir/opera6rc.fixed" "$config_dir/operaprefs_fixed.ini"
-- fi
-- if [ -f "$config_dir/operaprefs_default.ini" ]
-- then
-- if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/operaprefs_default.ini exists: over-write it ?"
-- then
-- backup $config_dir/operaprefs_default.ini operaprefs_default.ini config
-- cp $cpv $cpf etc/operaprefs_default.ini $config_dir
-- fi
-- else cp $cpv $cpf etc/operaprefs_default.ini $config_dir
-- fi
-- if [ -f "$config_dir/operaprefs_fixed.ini" ]
-- then
-- if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/operaprefs_fixed.ini exists: over-write it ?"
-- then
-- backup $config_dir/operaprefs_fixed.ini operaprefs_fixed.ini config
-- cp $cpv $cpf etc/operaprefs_fixed.ini $config_dir
-- fi
-- else cp $cpv $cpf etc/operaprefs_fixed.ini $config_dir
-- fi
-- fi
-- else
-- warn
-- warn "User \"${USERNAME}\" does not have write access to $config_dir"
-- warn " System wide configuration files:"
-- warn " $config_dir/operaprefs_default.ini"
-- warn " $config_dir/operaprefs_fixed.ini"
-- warn " were not installed."
-- fi
--
- # Shorcuts and Icons
- bool_icons=1 # install icons by default
-- if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
-- then
-- warn
-- warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
-- if [ "$flag_mode" = "--force" ]
-- then warn "Installing them in default locations."
-- else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
-- fi
-- fi
--
- if test "$bool_icons" -ne 0
-- then xdg
-+ then icons
- fi
-
- fi # OPERADESTDIR
-@@ -1403,24 +1269,24 @@
- echo '[Desktop Entry]'
- if test -z "$1"
- then cat <<EOF
--Name=Opera
--Exec=opera
--Icon=opera.xpm
-+Name=Opera (linux version)
-+Exec=linux-opera
-+Icon=linux-opera.xpm
- Terminal=false
- EOF
- else
- if test "$1" = "xdg"
- then cat <<EOF
- Version=1.0
--TryExec=opera
-+TryExec=linux-opera
- EOF
- fi
- cat <<EOF
- Encoding=UTF-8
--Name=Opera
--Name[af]=opera
--Name[eo]=Opero
--Name[zu]=I Opera
-+Name=Opera (linux version)
-+Name[af]=opera (linux version)
-+Name[eo]=Opero (linux version)
-+Name[zu]=I Opera (linux version)
- GenericName=Web browser
- GenericName[bs]=Web preglednik
- GenericName[de]=Web-Browser
-@@ -1441,7 +1307,7 @@
- GenericName[ven]=Buronza ya Webu
- GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
- GenericName[zu]=Umkhangeli zincwadi we Web
--Exec=opera %u
-+Exec=linux-opera %u
- Terminal=false
- EOF
-
-@@ -1457,15 +1323,16 @@
- if test "$1" = "xdg"
- then cat <<EOF
- Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
--Icon=opera.png
-+Icon=linux-opera.png
- EOF
-- else echo 'Icon=opera'
-+ else echo 'Icon=linux-opera'
- fi
- echo 'MimeType=text/html;text/xml;application/xhtml+xml'
- fi
- cat <<EOF
- Comment=Web Browser
- Type=Application
-+Categories=Application;Network;WebBrowser;
- EOF
- }
-
-@@ -1473,7 +1340,7 @@
- {
- # arg1 = location
- # arg2 = type
-- desktop_content $2 > "$1/opera.desktop" && chmod $chmodv 644 "$1/opera.desktop"
-+ desktop_content $2 > "$1/linux-opera.desktop" && chmod $chmodv 644 "$1/linux-opera.desktop"
- }
-
- generate_mdk_menu()
-@@ -1498,51 +1365,26 @@
-
- debug_msg 0 "in icons()"
-
-- if test ! -d /usr/share/icons
-- then
-- if test -w /usr/share
-- then
-- mkdir $mkdirv $mkdirp /usr/share/icons/
-- cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
-- fi
-- elif test -w /usr/share/icons
-- then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
-- fi
--
-- if test ! -d /usr/share/pixmaps
-+ if test ! -d %%LOCALBASE%%/share/pixmaps/
- then
-- if test -w /usr/share
-+ if test -w %%LOCALBASE%%/share
- then
-- mkdir $mkdirv $mkdirp /usr/share/pixmaps/
-- cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
-+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
-+ cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
- fi
-- elif test -w /usr/share/pixmaps/
-- then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
-+ elif test -w %%LOCALBASE%%/share/pixmaps/
-+ then cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
- fi
-
-- if test ! -d /etc/X11/wmconfig/
-+ if test ! -d %%LOCALBASE%%/share/applications/
- then
-- if test -w /etc/X11
-+ if test -w %%LOCALBASE%%/share
- then
-- mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
-- generate_wmconfig /etc/X11/wmconfig
-- fi
-- elif test -w /etc/X11/wmconfig/
-- then generate_wmconfig /etc/X11/wmconfig
-- fi
--
-- if test -d /etc/X11/applnk/
-- then
-- if test ! -d /etc/X11/applnk/Internet/
-- then
-- if test -w /etc/X11/applnk
-- then
-- mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
-- generate_desktop /etc/X11/applnk/Internet
-- fi
-- elif test -w /etc/X11/applnk/Internet
-- then generate_desktop /etc/X11/applnk/Internet
-+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
-+ generate_desktop %%LOCALBASE%%/share/applications
- fi
-+ elif test -w %%LOCALBASE%%/share/applications
-+ then generate_desktop %%LOCALBASE%%/share/applications
- fi
- }
-
diff --git a/www/linux-opera-devel/files/patch-pluginpath.ini b/www/linux-opera-devel/files/patch-pluginpath.ini
index ad844dd3e16d..4878d1ab8dc1 100644
--- a/www/linux-opera-devel/files/patch-pluginpath.ini
+++ b/www/linux-opera-devel/files/patch-pluginpath.ini
@@ -1,6 +1,6 @@
---- usr/share/opera/defaults/pluginpath.ini.orig 2009-11-24 20:26:57.000000000 -0600
-+++ usr/share/opera/defaults/pluginpath.ini 2009-11-24 20:30:45.000000000 -0600
-@@ -2,74 +2,27 @@
+--- share/linux-opera/defaults/pluginpath.ini.orig 2010-07-01 21:29:07.000000000 -0500
++++ share/linux-opera/defaults/pluginpath.ini 2010-07-01 21:31:52.000000000 -0500
+@@ -2,79 +2,27 @@
; Do not edit this file while Opera is running
; This file is stored in UTF-8 encoding
@@ -9,6 +9,7 @@
-
[Paths]
-$PWD/plugins=1
+-$HOME/.local/lib/opera/plugins=1
-$OPERA_PERSONALDIR/plugins=1
-/usr/lib/opera/plugins=1
-/usr/local/lib/opera/plugins=1
@@ -80,10 +81,14 @@
-/usr/X11R6/lib/mozilla/plugins=1
-/usr/lib64/browser-plugins=1
-/usr/lib/browser-plugins=1
-+%%LOCALBASE%%/lib/linux-mozilla/plugins=1
-
+-
-; General path for gentoo
-/usr/lib32/nsbrowser/plugins=1
+-
+-; Java on Ubuntu
+-/usr/lib/xulrunner-addons/plugins=1
++%%LOCALBASE%%/lib/linux-mozilla/plugins=1
+
+; Global plugins path in FreeBSD. Need this for
+; the Adobe Acrobat7 and other plugins too.
+%%LOCALBASE%%/lib/browser_linux_plugins=1
diff --git a/www/linux-opera-devel/files/patch-search.ini b/www/linux-opera-devel/files/patch-search.ini
index 8bf7183efc24..5791323da42c 100644
--- a/www/linux-opera-devel/files/patch-search.ini
+++ b/www/linux-opera-devel/files/patch-search.ini
@@ -1,159 +1,189 @@
---- usr/share/opera/defaults/search.ini.orig 2009-08-30 17:05:50.000000000 -0500
-+++ usr/share/opera/defaults/search.ini 2009-08-30 17:09:42.000000000 -0500
-@@ -129,7 +129,7 @@
+--- share/linux-opera/defaults/search.ini.orig 2010-07-02 21:10:37.000000000 -0500
++++ share/linux-opera/defaults/search.ini 2010-07-02 21:14:02.000000000 -0500
+@@ -110,7 +110,7 @@
Query=
- Key=f
+ Key=w
Is post=0
-Has endseparator=0
+Has endseparator=-1
- Encoding=
- Search Type=12
+ Encoding=utf-8
+ Search Type=0
Verbtext=0
-@@ -430,3 +430,67 @@
+@@ -438,3 +438,82 @@
Position=-1
Nameid=291960
+[Search Engine 31]
++UNIQUEID=30D43310864611DF85EAE75821912D1F
+Name=Google BSD
++Verbtext=0
+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+Query=
+Key=d
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 32]
++UNIQUEID=336D7100864511DF85E99B0CD0A9B97D
+Name=FreeBSD mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
++Verbtext=0
++URL=http://markmail.org/search/?q=%s&q=list﷐3Aorg.freebsd%20order%3Adate-backward
+Query=
+Key=m
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 33]
++UNIQUEID=796FB180864611DF85EBC9A9B78DF71A
+Name=FreeBSD PRs
++Verbtext=0
+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
+Query=
+Key=p
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 34]
++UNIQUEID=931A95F0864611DF85EC9C9C0D818A0D
+Name=FreshPorts
++Verbtext=0
+URL=http://www.freshports.org/search.php?query=%s
+Query=
+Key=t
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 35]
++UNIQUEID=A9234D60864611DF85EDA797C35FF306
+Name=FreeBSD.org
++Verbtext=0
+URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
+Query=
+Key=c
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
---- usr/share/opera/locale/en/search.ini.orig 2009-08-30 17:10:08.000000000 -0500
-+++ usr/share/opera/locale/en/search.ini 2009-08-30 17:12:24.000000000 -0500
-@@ -129,7 +129,7 @@
++Deleted=0
+--- share/linux-opera/locale/en/search.ini.orig 2010-07-02 21:17:18.000000000 -0500
++++ share/linux-opera/locale/en/search.ini 2010-07-02 21:19:09.000000000 -0500
+@@ -110,7 +110,7 @@
Query=
- Key=f
+ Key=w
Is post=0
-Has endseparator=0
+Has endseparator=-1
- Encoding=
- Search Type=12
+ Encoding=utf-8
+ Search Type=0
Verbtext=0
-@@ -429,3 +429,68 @@
+@@ -437,3 +437,83 @@
Verbtext=0
Position=-1
Nameid=291960
+
+[Search Engine 31]
++UNIQUEID=30D43310864611DF85EAE75821912D1F
+Name=Google BSD
++Verbtext=0
+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+Query=
+Key=d
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 32]
++UNIQUEID=336D7100864511DF85E99B0CD0A9B97D
+Name=FreeBSD mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
++Verbtext=0
++URL=http://markmail.org/search/?q=%s&q=list﷐3Aorg.freebsd%20order%3Adate-backward
+Query=
+Key=m
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 33]
++UNIQUEID=796FB180864611DF85EBC9A9B78DF71A
+Name=FreeBSD PRs
++Verbtext=0
+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
+Query=
+Key=p
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 34]
++UNIQUEID=931A95F0864611DF85EC9C9C0D818A0D
+Name=FreshPorts
++Verbtext=0
+URL=http://www.freshports.org/search.php?query=%s
+Query=
+Key=t
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 35]
++UNIQUEID=A9234D60864611DF85EDA797C35FF306
+Name=FreeBSD.org
++Verbtext=0
+URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
+Query=
+Key=c
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index bb31e4bb40dc..cf9ed9dcd189 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -1,22 +1,57 @@
bin/linux-opera
-share/applications/linux-opera.desktop
-%%DOCSDIR%%/LGPL
+bin/linux-opera-widget-manager
+lib/linux-opera/gstreamer/LGPL.txt
+lib/linux-opera/gstreamer/README.txt
+lib/linux-opera/gstreamer/plugins/libgstoperamatroska.so
+lib/linux-opera/gstreamer/plugins/libgstoperavp8.so
+lib/linux-opera/liboperagtk.so
+lib/linux-opera/liboperakde4.so
+lib/linux-opera/opera
+lib/linux-opera/operaplugincleaner
+lib/linux-opera/operapluginwrapper
+lib/linux-opera/plugins/README
+share/applications/linux-opera-browser.desktop
+share/applications/linux-opera-widget-installer.desktop
+share/applications/linux-opera-widget-manager.desktop
+%%DOCSDIR%%/LGPL-2
+%%DOCSDIR%%/LGPL-3
%%DOCSDIR%%/LICENSE
-%%DATADIR%%/bin/libQtCore.so.4
-%%DATADIR%%/bin/libQtGui.so.4
-%%DATADIR%%/bin/missingsyms.so
-%%DATADIR%%/bin/opera
-%%DATADIR%%/bin/operaplugincleaner
-%%DATADIR%%/bin/operapluginwrapper
-%%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/works
+share/icons/hicolor/128x128/apps/linux-opera-browser.png
+share/icons/hicolor/128x128/apps/linux-opera-widget-manager.png
+share/icons/hicolor/128x128/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/128x128/mimetypes/linux-opera-widget.png
+share/icons/hicolor/16x16/apps/linux-opera-browser.png
+share/icons/hicolor/16x16/apps/linux-opera-widget-manager.png
+share/icons/hicolor/16x16/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/16x16/mimetypes/linux-opera-widget.png
+share/icons/hicolor/22x22/apps/linux-opera-browser.png
+share/icons/hicolor/22x22/apps/linux-opera-widget-manager.png
+share/icons/hicolor/22x22/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/22x22/mimetypes/linux-opera-widget.png
+share/icons/hicolor/24x24/apps/linux-opera-browser.png
+share/icons/hicolor/24x24/apps/linux-opera-widget-manager.png
+share/icons/hicolor/24x24/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/32x32/apps/linux-opera-browser.png
+share/icons/hicolor/32x32/apps/linux-opera-widget-manager.png
+share/icons/hicolor/32x32/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/32x32/mimetypes/linux-opera-widget.png
+share/icons/hicolor/48x48/apps/linux-opera-browser.png
+share/icons/hicolor/48x48/apps/linux-opera-widget-manager.png
+share/icons/hicolor/48x48/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/48x48/mimetypes/linux-opera-widget.png
+share/icons/hicolor/scalable/apps/linux-opera-browser.svg
+share/icons/hicolor/scalable/apps/linux-opera-widget-manager.svg
+share/icons/hicolor/scalable/apps/linux-opera-widget.svg
+share/icons/hicolor/scalable/mimetypes/linux-opera-unite-application.svg
%%DATADIR%%/defaults/bookmarks.adr
%%DATADIR%%/defaults/feedreaders.ini
%%DATADIR%%/defaults/filehandler.ini
%%DATADIR%%/defaults/font.ini
%%DATADIR%%/defaults/license.txt
%%DATADIR%%/defaults/mailproviders.xml
+%%DATADIR%%/defaults/plugin-ignore.ini
%%DATADIR%%/defaults/pluginpath.ini
+%%DATADIR%%/defaults/public_domains.dat
%%DATADIR%%/defaults/search.ini
%%DATADIR%%/defaults/standard_speeddial.ini
%%DATADIR%%/defaults/standard_trusted_repositories.ini
@@ -32,23 +67,34 @@ share/applications/linux-opera.desktop
%%DATADIR%%/extra/svg-se.dat
%%DATADIR%%/extra/svg-sebd.dat
%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/java/opera.policy
%%DATADIR%%/lngcode.txt
%%DATADIR%%/locale/be/be.lng
%%DATADIR%%/locale/be/bookmarks.adr
+%%DATADIR%%/locale/be/license.txt
%%DATADIR%%/locale/be/search.ini
%%DATADIR%%/locale/be/standard_speeddial.ini
%%DATADIR%%/locale/bg/bg.lng
+%%DATADIR%%/locale/bg/bookmarks.adr
+%%DATADIR%%/locale/bg/license.txt
+%%DATADIR%%/locale/bg/search.ini
+%%DATADIR%%/locale/bg/standard_speeddial.ini
+%%DATADIR%%/locale/cs/bookmarks.adr
%%DATADIR%%/locale/cs/cs.lng
+%%DATADIR%%/locale/cs/license.txt
+%%DATADIR%%/locale/cs/search.ini
+%%DATADIR%%/locale/cs/standard_speeddial.ini
%%DATADIR%%/locale/da/da.lng
+%%DATADIR%%/locale/da/license.txt
%%DATADIR%%/locale/de/bookmarks.adr
%%DATADIR%%/locale/de/de.lng
+%%DATADIR%%/locale/de/license.txt
%%DATADIR%%/locale/de/search.ini
%%DATADIR%%/locale/de/standard_speeddial.ini
%%DATADIR%%/locale/el/el.lng
+%%DATADIR%%/locale/el/license.txt
%%DATADIR%%/locale/en-GB/bookmarks.adr
%%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en-GB/license.txt
%%DATADIR%%/locale/en-GB/search.ini
%%DATADIR%%/locale/en-GB/standard_speeddial.ini
%%DATADIR%%/locale/en/bookmarks.adr
@@ -59,26 +105,38 @@ share/applications/linux-opera.desktop
%%DATADIR%%/locale/en/standard_speeddial.ini
%%DATADIR%%/locale/es-ES/bookmarks.adr
%%DATADIR%%/locale/es-ES/es-ES.lng
+%%DATADIR%%/locale/es-ES/license.txt
%%DATADIR%%/locale/es-ES/search.ini
%%DATADIR%%/locale/es-ES/standard_speeddial.ini
%%DATADIR%%/locale/es-LA/es-LA.lng
+%%DATADIR%%/locale/es-LA/license.txt
%%DATADIR%%/locale/et/et.lng
+%%DATADIR%%/locale/et/license.txt
%%DATADIR%%/locale/fi/fi.lng
+%%DATADIR%%/locale/fi/license.txt
%%DATADIR%%/locale/fr-CA/fr-CA.lng
+%%DATADIR%%/locale/fr-CA/license.txt
%%DATADIR%%/locale/fr/bookmarks.adr
%%DATADIR%%/locale/fr/fr.lng
+%%DATADIR%%/locale/fr/license.txt
%%DATADIR%%/locale/fr/search.ini
%%DATADIR%%/locale/fr/standard_speeddial.ini
%%DATADIR%%/locale/fy/fy.lng
+%%DATADIR%%/locale/fy/license.txt
%%DATADIR%%/locale/hi/hi.lng
-%%DATADIR%%/locale/hi/standard_speeddial.ini
+%%DATADIR%%/locale/hi/license.txt
%%DATADIR%%/locale/hr/hr.lng
+%%DATADIR%%/locale/hr/license.txt
+%%DATADIR%%/locale/hu/bookmarks.adr
%%DATADIR%%/locale/hu/hu.lng
-%%DATADIR%%/locale/id/bookmarks.adr
+%%DATADIR%%/locale/hu/license.txt
+%%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/hu/standard_speeddial.ini
%%DATADIR%%/locale/id/id.lng
-%%DATADIR%%/locale/id/standard_speeddial.ini
+%%DATADIR%%/locale/id/license.txt
%%DATADIR%%/locale/it/bookmarks.adr
%%DATADIR%%/locale/it/it.lng
+%%DATADIR%%/locale/it/license.txt
%%DATADIR%%/locale/it/search.ini
%%DATADIR%%/locale/it/standard_speeddial.ini
%%DATADIR%%/locale/ja/bookmarks.adr
@@ -87,38 +145,69 @@ share/applications/linux-opera.desktop
%%DATADIR%%/locale/ja/search.ini
%%DATADIR%%/locale/ja/standard_speeddial.ini
%%DATADIR%%/locale/ka/ka.lng
+%%DATADIR%%/locale/ka/license.txt
%%DATADIR%%/locale/ko/ko.lng
+%%DATADIR%%/locale/ko/license.txt
+%%DATADIR%%/locale/lt/license.txt
%%DATADIR%%/locale/lt/lt.lng
+%%DATADIR%%/locale/mk/license.txt
%%DATADIR%%/locale/mk/mk.lng
%%DATADIR%%/locale/nb/bookmarks.adr
+%%DATADIR%%/locale/nb/license.txt
%%DATADIR%%/locale/nb/nb.lng
%%DATADIR%%/locale/nb/search.ini
%%DATADIR%%/locale/nb/standard_speeddial.ini
+%%DATADIR%%/locale/nl/license.txt
%%DATADIR%%/locale/nl/nl.lng
+%%DATADIR%%/locale/nn/license.txt
%%DATADIR%%/locale/nn/nn.lng
%%DATADIR%%/locale/pl/bookmarks.adr
+%%DATADIR%%/locale/pl/license.txt
%%DATADIR%%/locale/pl/pl.lng
%%DATADIR%%/locale/pl/search.ini
%%DATADIR%%/locale/pl/standard_speeddial.ini
+%%DATADIR%%/locale/pt-BR/license.txt
%%DATADIR%%/locale/pt-BR/pt-BR.lng
+%%DATADIR%%/locale/pt/license.txt
%%DATADIR%%/locale/pt/pt.lng
+%%DATADIR%%/locale/ro/bookmarks.adr
+%%DATADIR%%/locale/ro/license.txt
%%DATADIR%%/locale/ro/ro.lng
+%%DATADIR%%/locale/ro/search.ini
+%%DATADIR%%/locale/ro/standard_speeddial.ini
%%DATADIR%%/locale/ru/bookmarks.adr
+%%DATADIR%%/locale/ru/license.txt
%%DATADIR%%/locale/ru/ru.lng
%%DATADIR%%/locale/ru/search.ini
%%DATADIR%%/locale/ru/standard_speeddial.ini
+%%DATADIR%%/locale/sk/bookmarks.adr
+%%DATADIR%%/locale/sk/license.txt
+%%DATADIR%%/locale/sk/search.ini
%%DATADIR%%/locale/sk/sk.lng
+%%DATADIR%%/locale/sk/standard_speeddial.ini
+%%DATADIR%%/locale/sr/bookmarks.adr
+%%DATADIR%%/locale/sr/license.txt
+%%DATADIR%%/locale/sr/search.ini
%%DATADIR%%/locale/sr/sr.lng
+%%DATADIR%%/locale/sr/standard_speeddial.ini
+%%DATADIR%%/locale/sv/license.txt
%%DATADIR%%/locale/sv/sv.lng
+%%DATADIR%%/locale/ta/license.txt
%%DATADIR%%/locale/ta/ta.lng
+%%DATADIR%%/locale/te/license.txt
%%DATADIR%%/locale/te/te.lng
+%%DATADIR%%/locale/tr/license.txt
%%DATADIR%%/locale/tr/tr.lng
%%DATADIR%%/locale/uk/bookmarks.adr
+%%DATADIR%%/locale/uk/license.txt
%%DATADIR%%/locale/uk/search.ini
%%DATADIR%%/locale/uk/standard_speeddial.ini
%%DATADIR%%/locale/uk/uk.lng
+%%DATADIR%%/locale/vi/license.txt
+%%DATADIR%%/locale/vi/vi.lng
%%DATADIR%%/locale/zh-cn/bookmarks.adr
%%DATADIR%%/locale/zh-cn/browser.js
+%%DATADIR%%/locale/zh-cn/license.txt
%%DATADIR%%/locale/zh-cn/search.ini
%%DATADIR%%/locale/zh-cn/standard_speeddial.ini
%%DATADIR%%/locale/zh-cn/turbosettings.xml
@@ -126,11 +215,24 @@ share/applications/linux-opera.desktop
%%DATADIR%%/locale/zh-hk/browser.js
%%DATADIR%%/locale/zh-hk/turbosettings.xml
%%DATADIR%%/locale/zh-tw/browser.js
+%%DATADIR%%/locale/zh-tw/license.txt
%%DATADIR%%/locale/zh-tw/turbosettings.xml
%%DATADIR%%/locale/zh-tw/zh-tw.lng
-%%DATADIR%%/scripts/common.js
-%%DATADIR%%/scripts/substance.js
+%%DATADIR%%/mathml.dtd
+%%DATADIR%%/package-id.ini
+%%DATADIR%%/package/lib/binprint.sh
+%%DATADIR%%/package/lib/layout_common.sh
+%%DATADIR%%/package/lib/layout_deb.sh
+%%DATADIR%%/package/lib/layout_tar.sh
+%%DATADIR%%/package/lib/main.sh
+%%DATADIR%%/package/lib/normalize.sh
+%%DATADIR%%/package/lib/package_deb.sh
+%%DATADIR%%/package/lib/package_rpm.sh
+%%DATADIR%%/package/lib/package_tar.sh
+%%DATADIR%%/package/lib/xml.sh
+%%DATADIR%%/package/main.sh
%%DATADIR%%/skin/standard_skin.zip
+%%DATADIR%%/skin/unix_skin.zip
%%DATADIR%%/styles/about.css
%%DATADIR%%/styles/cache.css
%%DATADIR%%/styles/certinfo.css
@@ -144,8 +246,11 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/image.css
%%DATADIR%%/styles/images/Opera_256x256.png
%%DATADIR%%/styles/images/bar.png
+%%DATADIR%%/styles/images/bkgd-rev.png
+%%DATADIR%%/styles/images/bkgd.png
%%DATADIR%%/styles/images/bullet.png
%%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/corner.png
%%DATADIR%%/styles/images/customize.gif
%%DATADIR%%/styles/images/darkBox.png
%%DATADIR%%/styles/images/defaultFavicon.png
@@ -153,16 +258,21 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/images/file.png
%%DATADIR%%/styles/images/flag.png
%%DATADIR%%/styles/images/folder.png
+%%DATADIR%%/styles/images/hanger.png
%%DATADIR%%/styles/images/header-expanded.png
%%DATADIR%%/styles/images/header.png
+%%DATADIR%%/styles/images/opera-icon-red.png
+%%DATADIR%%/styles/images/opera-icon-white.png
%%DATADIR%%/styles/images/opera.png
%%DATADIR%%/styles/images/page-bot.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/search.png
%%DATADIR%%/styles/images/section.png
%%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/tooltiptail.png
%%DATADIR%%/styles/images/top.png
%%DATADIR%%/styles/images/warning.png
%%DATADIR%%/styles/info.css
@@ -173,6 +283,7 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/mime.css
%%DATADIR%%/styles/opera.css
%%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/private.css
%%DATADIR%%/styles/search.css
%%DATADIR%%/styles/unstyledxml.css
%%DATADIR%%/styles/user/accessibility.css
@@ -193,6 +304,7 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/user/toc.css
%%DATADIR%%/styles/warning.css
%%DATADIR%%/styles/webfeeds.html
+%%DATADIR%%/styles/webstorage.css
%%DATADIR%%/styles/wml.css
%%DATADIR%%/ui/dialog.ini
%%DATADIR%%/ui/fastforward.ini
@@ -209,18 +321,20 @@ share/applications/linux-opera.desktop
%%DATADIR%%/unite/messenger.ua
%%DATADIR%%/unite/photoSharing.ua
%%DATADIR%%/unite/webserver.ua
-share/pixmaps/linux-opera.png
+share/mime/packages/linux-opera-unite-application.xml
+share/mime/packages/linux-opera-widget.xml
@dirrm %%DATADIR%%/unite
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/styles/user
@dirrm %%DATADIR%%/styles/images
@dirrm %%DATADIR%%/styles
@dirrm %%DATADIR%%/skin
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/package/lib
+@dirrm %%DATADIR%%/package
@dirrm %%DATADIR%%/locale/zh-tw
@dirrm %%DATADIR%%/locale/zh-hk
@dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/vi
@dirrm %%DATADIR%%/locale/uk
@dirrm %%DATADIR%%/locale/tr
@dirrm %%DATADIR%%/locale/te
@@ -262,10 +376,16 @@ share/pixmaps/linux-opera.png
@dirrm %%DATADIR%%/locale/bg
@dirrm %%DATADIR%%/locale/be
@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/java
@dirrm %%DATADIR%%/extra
@dirrm %%DATADIR%%/defaults
-@dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
+@dirrm lib/linux-opera/plugins
+@dirrm lib/linux-opera/gstreamer/plugins
+@dirrm lib/linux-opera/gstreamer
+@dirrm lib/linux-opera
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index c3db6b94b12d..0094ba821456 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,38 +7,49 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}
-PORTREVISION= 1
CATEGORIES= www linux
-MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/&,}
+MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/ \
+ http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/ \
+ ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
+ http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/ \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/&,}
PKGNAMEPREFIX= linux-
-DISTNAME= ${PORTNAME}-${OPERA_VER}.gcc4-bundled-qt4.i386
+DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
MAINTAINER= mezz@FreeBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-WRKSRC= ${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
+RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
+
USE_BZIP2= yes
USE_LINUX= yes
USE_LINUX_APPS= aspell naslibs png xorglibs
ONLY_FOR_ARCHS= i386 amd64
+USE_GNOME= desktopfileutils
+WANT_GNOME= yes
NO_BUILD= yes
-OPERA_VER= 10.10
-OPERA_BUILD= 4742
+OPERA_VER= 10.60
+OPERA_BUILD= 6386
DATADIR= ${PREFIX}/share/${UNIQUENAME}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
-MAN1= linux-opera.1
+MAN1= linux-opera.1 linux-opera-widget-manager.1
+
+RENAME= opera opera-widget-manager lib/opera \
+ share/applications/opera-browser.desktop \
+ share/applications/opera-widget-installer.desktop \
+ share/applications/opera-widget-manager.desktop \
+ share/doc/opera share/opera man/man1/opera.1 \
+ man/man1/opera-widget-manager.1 \
+ share/mime/packages/opera-unite-application.xml \
+ share/mime/packages/opera-widget.xml
.include <bsd.port.pre.mk>
@@ -48,27 +59,68 @@ IGNORE= you need FreeBSD>=7.0 RELEASE with Linux emulation 2.6.x.
IGNORE= you need to use non-default linux ports (define OVERRIDE_LINUX_BASE_PORT=f8 and OVERRIDE_LINUX_NONBASE_PORTS=f8). You also can use f10 instead of f8, but I only have tested it with f8.
.endif
+.if ${HAVE_GNOME:Mgtk20}!=""
+INSTALLS_ICONS= yes
+.endif
+
post-extract:
- @${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
- ${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
+ @${GUNZIP_CMD} ${WRKSRC}/share/man/man1/*.gz
+ @${MV} ${WRKSRC}/share/man ${WRKSRC}/man
+ @for _r in ${RENAME}; do \
+ linux=`${ECHO_CMD} $${_r} | \
+ ${SED} -e 's|opera|${UNIQUENAME}|g'`; \
+ ${MV} ${WRKSRC}/$${_r} ${WRKSRC}/$${linux}; \
+ done; \
+ for _f in `find ${WRKSRC}/share/icons -type f | \
+ sed -e 's|${WRKSRC}/||g'`; do \
+ linux=`${ECHO_CMD} $${_f} | \
+ ${SED} -e 's|opera|${UNIQUENAME}|g'`; \
+ ${MV} ${WRKSRC}/$${_f} ${WRKSRC}/$${linux}; \
+ done
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
s|%%LINUXBASE%%|${LINUXBASE}|g' \
- ${WRKSRC}/install.sh \
- ${WRKSRC}/usr/share/opera/defaults/pluginpath.ini
- @${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
- ${WRKSRC}/Manifest.md5
+ ${WRKSRC}/share/${UNIQUENAME}/defaults/pluginpath.ini
+ @${REINPLACE_CMD} -e '/man1/s|opera|${UNIQUENAME}|g ; \
+ /man1/s|1.gz|1|g ; /man1/s|share/||g ; \
+ s|bin/opera|bin/${UNIQUENAME}|g ; \
+ s|name=$$(uname -s)|name=Linux|g ; \
+ s|lib/opera|lib/${UNIQUENAME}|g ; \
+ s|applications/opera|applications/${UNIQUENAME}|g ; \
+ s|doc/opera|doc/${UNIQUENAME}|g ; \
+ /hicolor/s|/opera|/${UNIQUENAME}|g ; \
+ s|packages/opera|packages/${UNIQUENAME}|g ; \
+ s|share/opera|share/${UNIQUENAME}|g ; \
+ s|PREFIX=/usr/local|PREFIX=${PREFIX}|g ; \
+ /OPERA_PERSONALDIR/s|.opera|.${UNIQUENAME}|g ; \
+ s|opera)|${UNIQUENAME})|g ; \
+ s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \
+ s|^.*rmdir.*mime/packages.*||g ; \
+ s|^.*GX - bin/uninstall-opera@.*||g' \
+ ${WRKSRC}/install
+ @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \
+ /Exec/s|opera|${UNIQUENAME}|g ; \
+ /Icon/s|opera|${UNIQUENAME}|g ; \
+ /StartupWMClass/s|opera|${UNIQUENAME}|g ; \
+ s|TryExec=.*||g ; /^$$/d' \
+ ${WRKSRC}/share/applications/*.desktop
+ @${REINPLACE_CMD} -e 's|lib/opera|lib/${UNIQUENAME}|g ; \
+ s|doc/opera|doc/${UNIQUENAME}|g ; \
+ s|share/opera|share/${UNIQUENAME}|g ; \
+ s|opera-widget-manager|${UNIQUENAME}-widget-manager|g ; \
+ s|opera (1)|${UNIQUENAME} (1)|g ; \
+ s|\.opera@@|\.${UNIQUENAME}@@|g ; \
+ s|B opera@@|B ${UNIQUENAME}@@|g ; \
+ /standards-compliant/s|opera|${UNIQUENAME}|g' \
+ ${WRKSRC}/man/man1/*.1
+ @${REINPLACE_CMD} -e '/<icon/s|opera|${UNIQUENAME}|g' \
+ ${WRKSRC}/share/mime/packages/*.xml
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${FIND} ${WRKSRC} -name '*.bak' -delete
do-install:
- @(cd ${WRKSRC} && ./install.sh \
- --prefix=${PREFIX} \
- --docdir=${DOCSDIR} \
- --sharedir=${DATADIR} \
- --exec_prefix=${DATADIR}/bin \
- --plugindir=${DATADIR}/plugins)
+ @(cd ${WRKSRC} && ./install --system --quiet --force)
.include <bsd.port.post.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index e4d6ffcfc456..2011824d565b 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = 02cb0cec164bcf77639b97fbe69d13f4
-SHA256 (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = bdec041032a798f4b8b492546269396d05987538376cc5d28acd9562849e8944
-SIZE (opera-10.10.gcc4-bundled-qt4.i386.tar.bz2) = 16529068
+MD5 (opera-10.60-6386.i386.linux.tar.bz2) = e86d604b2f9397a618e8ecf357748f55
+SHA256 (opera-10.60-6386.i386.linux.tar.bz2) = be189172893cef848dbc48cad90948dd488cf2da1f7fae56ff15cd9d60ec4880
+SIZE (opera-10.60-6386.i386.linux.tar.bz2) = 12653386
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
deleted file mode 100644
index e6d8de2ad7d3..000000000000
--- a/www/linux-opera/files/patch-install.sh
+++ /dev/null
@@ -1,433 +0,0 @@
---- install.sh.orig 2009-08-30 14:25:11.000000000 -0500
-+++ install.sh 2009-08-30 16:51:54.000000000 -0500
-@@ -832,10 +832,9 @@
- case "${machine}:${os}" in
- x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86_64:OpenBSD|x86:QNX)
- wrapper_ibmjava="
-- IBMJava2-142/jre \\
-- IBMJava2-141/jre \\
-- IBMJava2-14/jre \\
-- IBMJava2-131/jre \\"
-+ linux-ibm-jdk1.3.1/jre \\
-+ linux-ibm-jdk1.4.0/jre \\
-+ linux-ibm-jdk1.4.1/jre \\"
- wrapper_sunjava_machine="i386"
- ;;
-
-@@ -865,10 +864,19 @@
- error os
- ;;
- esac
-- wrapper_file="${wrapper_dir}/opera"
-+ wrapper_file="${wrapper_dir}/linux-opera"
-
- wrapper_contain="#!/bin/sh
-
-+# Required to check on shm_allow_removed if it is disable then set the
-+# OPERA_NUM_XSHM to 0 or it will causing Opera to halt or/and give strange
-+# behavior.
-+if [ \`/sbin/sysctl -n kern.ipc.shm_allow_removed\` -eq 0 ]; then
-+ OPERA_NUM_XSHM=\"0\"
-+ export OPERA_NUM_XSHM
-+ echo \"shm_allow_removed is disable, set OPERA_NUM_XSHM to 0 to disable shared memory.\"
-+fi
-+
- # Required for Session Management
- case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
- export OPERA_SCRIPT_PATH
-@@ -928,8 +936,12 @@
- OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
- export OPERA_LD_PRELOAD
-
-+# ~/.linux-opera
-+OPERA_PERSONALDIR=\${HOME}/.linux-opera
-+export OPERA_PERSONALDIR
-+
- # Native Java enviroment
--for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
-+for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.linux-opera\"
- do if test -f \"\$d/javapath.txt\"
- then
- INIJAVA=\`cat \"\$d/javapath.txt\"\`
-@@ -950,88 +962,17 @@
-
- if test ! \"\${OPERA_JAVA_DIR}\"
- then
-- PREFIXES=\"
-- /usr
-- /usr/java
-- /usr/lib
-- /usr/local
-- /opt\"
-+ PREFIXES=\"%%LOCALBASE%%\"
-
- for SUNJAVA in \\
-- java-6-sun \\
-- java-6-sun-1.6.0.00 \\
-- java-1.5.0-sun \\
-- java-1.5.0-sun-1.5.0.09 \\
-- java-1.5.0-sun-1.5.0.09/jre \\
-- java-1.5.0-sun-1.5.0.08 \\
-- java-1.5.0-sun-1.5.0.08/jre \\
-- java-1.5.0-sun-1.5.0.07 \\
-- java-1.5.0-sun-1.5.0.07/jre \\
-- java-1.5.0-sun-1.5.0.06 \\
-- java-1.5.0-sun-1.5.0.06/jre \\
-- jre1.5.0_06 \\
-- jdk1.5.0_06/jre \\
-- java-1.5.0-sun-1.5.0.05 \\
-- java-1.5.0-sun-1.5.0.05/jre \\
-- jre1.5.0_05 \\
-- jdk1.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_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 \\
-- jdk1.5.0/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 \\
-- jdk1.6.0/jre \\
-- diablo-jre1.5.0 \\
-- diablo-jdk1.5.0/jre \\
-- diablo-jre1.6.0 \\
-- diablo-jdk1.6.0/jre \\
-- openjdk6/jre \\
-+ linux-blackdown-jdk1.3.1/jre \\
-+ linux-blackdown-jdk1.4.1/jre \\
-+ linux-blackdown-jdk1.4.2/jre \\
-+ linux-sun-jdk1.3.1/jre \\
-+ linux-sun-jdk1.4.1/jre \\
-+ linux-sun-jdk1.4.2/jre \\
-+ linux-sun-jdk1.5.0/jre \\
-+ linux-sun-jdk1.6.0/jre \\
- ; do
- for PREFIX in \${PREFIXES}
- do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
-@@ -1085,11 +1026,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%%/Adobe/Reader8/ENU/Adobe/Reader8/Reader/intellinux/bin \\
-+ %%LOCALBASE%%/Adobe/Reader9/ENU/Adobe/Reader9/Reader/intellinux/bin \\
- ; do
- if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
- done
-@@ -1102,8 +1040,7 @@
-
- # Spellchecker needs to find libaspell.so.15
- for LIBASPELL_DIR in \\
-- /usr/local/lib \\
-- /opkg/lib \\
-+ %%LINUXBASE%%/usr/lib \\
- ; do
- if ls \$LIBASPELL_DIR/libaspell.so.1[5-9] >/dev/null 2>&1
- then LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
-@@ -1111,13 +1048,6 @@
- done"
-
- case "${os}" in
-- AnyBSD|OpenBSD)
--wrapper_contain="${wrapper_contain}
--
--# Make sure the compat libraries are found
--test -d /usr/local/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:/usr/local/lib/compat/\"
--"
-- ;;
- SunOS)
- wrapper_contain="${wrapper_contain}
-
-@@ -1146,7 +1076,7 @@
- };
-
- // Opera package classes get all permissions
--grant codebase \"file://${str_localdirshare}/java//opera.jar\" {
-+grant codebase \"file://${str_localdirshare}/java/opera.jar\" {
- permission java.security.AllPermission;
- };
-
-@@ -1263,12 +1193,12 @@
- chop "${OPERADESTDIR}" "str_localdirshare"
- chop "${OPERADESTDIR}" "str_localdirplugin"
-
-- md5check Manifest.md5
-+ #md5check Manifest.md5
- part_install "`manifest_path operapluginwrapper`" "$exec_dir" Binaries
- manifest_contains operapluginwrapper-native && part_install "`manifest_path operapluginwrapper-native`" "$exec_dir" Binaries
- manifest_contains operapluginwrapper-ia32-linux && part_install "`manifest_path operapluginwrapper-ia32-linux`" "$exec_dir" Binaries
- part_install "`manifest_path LICENSE`" "$doc_dir" Documentation
-- part_install "`manifest_path man1/opera.1`" "$man_dir" "Manual page"
-+ part_install "`manifest_path man1/linux-opera.1`" "$man_dir" "Manual page"
-
- share_src="`manifest_path 'html40_entities\.dtd'`"
- part_install "$share_src" "$share_dir" "Shared resources"
-@@ -1277,84 +1207,20 @@
- mkdir $mkdirv $mkdirp $plugin_dir/
-
- # Wrapper
-- backup ${wrapper_dir}/opera opera
-+ #backup ${wrapper_dir}/opera opera
- debug_msg 1 "Wrapper"
- mkdir $mkdirv $mkdirp $wrapper_dir/
-
- #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
- generate_wrapper
-- chmod $chmodv 755 $wrapper_dir/opera
-+ chmod $chmodv 755 $wrapper_dir/linux-opera
-
- if test -z "$OPERADESTDIR"
- then
-- # System wide configuration files
-- case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
-- # TODO: work out what's going on here and replace with something that sets OPERA_ROOTPREFS to where they went !
-- if can_write_to "$config_dir"
-- then
-- warn
-- warn "System wide configuration files:"
-- warn " $config_dir/operaprefs_default.ini"
-- warn " $config_dir/operaprefs_fixed.ini"
-- warn " would be ignored if installed with the prefix \"$prefix\"."
-- bool_config=1
-- if [ "$flag_mode" = '--interactive' ]
-- then con_firm "Do you want to install them in $config_dir" || bool_config=0
-- else warn "Installing in default location $config_dir instead."
-- fi
--
-- if [ $bool_config -eq 1 ]
-- then
-- if [ -f "$config_dir/opera6rc" ]
-- then
-- mv -f "$config_dir/opera6rc" "$config_dir/operaprefs_default.ini"
-- fi
-- if [ -f "$config_dir/opera6rc.fixed" ]
-- then
-- mv -f "$config_dir/opera6rc.fixed" "$config_dir/operaprefs_fixed.ini"
-- fi
-- if [ -f "$config_dir/operaprefs_default.ini" ]
-- then
-- if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/operaprefs_default.ini exists: over-write it ?"
-- then
-- backup $config_dir/operaprefs_default.ini operaprefs_default.ini config
-- cp $cpv $cpf etc/operaprefs_default.ini $config_dir
-- fi
-- else cp $cpv $cpf etc/operaprefs_default.ini $config_dir
-- fi
-- if [ -f "$config_dir/operaprefs_fixed.ini" ]
-- then
-- if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/operaprefs_fixed.ini exists: over-write it ?"
-- then
-- backup $config_dir/operaprefs_fixed.ini operaprefs_fixed.ini config
-- cp $cpv $cpf etc/operaprefs_fixed.ini $config_dir
-- fi
-- else cp $cpv $cpf etc/operaprefs_fixed.ini $config_dir
-- fi
-- fi
-- else
-- warn
-- warn "User \"${USERNAME}\" does not have write access to $config_dir"
-- warn " System wide configuration files:"
-- warn " $config_dir/operaprefs_default.ini"
-- warn " $config_dir/operaprefs_fixed.ini"
-- warn " were not installed."
-- fi
--
- # Shorcuts and Icons
- bool_icons=1 # install icons by default
-- if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
-- then
-- warn
-- warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
-- if [ "$flag_mode" = "--force" ]
-- then warn "Installing them in default locations."
-- else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
-- fi
-- fi
--
- if test "$bool_icons" -ne 0
-- then xdg
-+ then icons
- fi
-
- fi # OPERADESTDIR
-@@ -1403,24 +1269,24 @@
- echo '[Desktop Entry]'
- if test -z "$1"
- then cat <<EOF
--Name=Opera
--Exec=opera
--Icon=opera.xpm
-+Name=Opera (linux version)
-+Exec=linux-opera
-+Icon=linux-opera.xpm
- Terminal=false
- EOF
- else
- if test "$1" = "xdg"
- then cat <<EOF
- Version=1.0
--TryExec=opera
-+TryExec=linux-opera
- EOF
- fi
- cat <<EOF
- Encoding=UTF-8
--Name=Opera
--Name[af]=opera
--Name[eo]=Opero
--Name[zu]=I Opera
-+Name=Opera (linux version)
-+Name[af]=opera (linux version)
-+Name[eo]=Opero (linux version)
-+Name[zu]=I Opera (linux version)
- GenericName=Web browser
- GenericName[bs]=Web preglednik
- GenericName[de]=Web-Browser
-@@ -1441,7 +1307,7 @@
- GenericName[ven]=Buronza ya Webu
- GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
- GenericName[zu]=Umkhangeli zincwadi we Web
--Exec=opera %u
-+Exec=linux-opera %u
- Terminal=false
- EOF
-
-@@ -1457,15 +1323,16 @@
- if test "$1" = "xdg"
- then cat <<EOF
- Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
--Icon=opera.png
-+Icon=linux-opera.png
- EOF
-- else echo 'Icon=opera'
-+ else echo 'Icon=linux-opera'
- fi
- echo 'MimeType=text/html;text/xml;application/xhtml+xml'
- fi
- cat <<EOF
- Comment=Web Browser
- Type=Application
-+Categories=Application;Network;WebBrowser;
- EOF
- }
-
-@@ -1473,7 +1340,7 @@
- {
- # arg1 = location
- # arg2 = type
-- desktop_content $2 > "$1/opera.desktop" && chmod $chmodv 644 "$1/opera.desktop"
-+ desktop_content $2 > "$1/linux-opera.desktop" && chmod $chmodv 644 "$1/linux-opera.desktop"
- }
-
- generate_mdk_menu()
-@@ -1498,51 +1365,26 @@
-
- debug_msg 0 "in icons()"
-
-- if test ! -d /usr/share/icons
-- then
-- if test -w /usr/share
-- then
-- mkdir $mkdirv $mkdirp /usr/share/icons/
-- cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
-- fi
-- elif test -w /usr/share/icons
-- then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
-- fi
--
-- if test ! -d /usr/share/pixmaps
-+ if test ! -d %%LOCALBASE%%/share/pixmaps/
- then
-- if test -w /usr/share
-+ if test -w %%LOCALBASE%%/share
- then
-- mkdir $mkdirv $mkdirp /usr/share/pixmaps/
-- cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
-+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
-+ cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
- fi
-- elif test -w /usr/share/pixmaps/
-- then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
-+ elif test -w %%LOCALBASE%%/share/pixmaps/
-+ then cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
- fi
-
-- if test ! -d /etc/X11/wmconfig/
-+ if test ! -d %%LOCALBASE%%/share/applications/
- then
-- if test -w /etc/X11
-+ if test -w %%LOCALBASE%%/share
- then
-- mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
-- generate_wmconfig /etc/X11/wmconfig
-- fi
-- elif test -w /etc/X11/wmconfig/
-- then generate_wmconfig /etc/X11/wmconfig
-- fi
--
-- if test -d /etc/X11/applnk/
-- then
-- if test ! -d /etc/X11/applnk/Internet/
-- then
-- if test -w /etc/X11/applnk
-- then
-- mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
-- generate_desktop /etc/X11/applnk/Internet
-- fi
-- elif test -w /etc/X11/applnk/Internet
-- then generate_desktop /etc/X11/applnk/Internet
-+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
-+ generate_desktop %%LOCALBASE%%/share/applications
- fi
-+ elif test -w %%LOCALBASE%%/share/applications
-+ then generate_desktop %%LOCALBASE%%/share/applications
- fi
- }
-
diff --git a/www/linux-opera/files/patch-pluginpath.ini b/www/linux-opera/files/patch-pluginpath.ini
index ad844dd3e16d..4878d1ab8dc1 100644
--- a/www/linux-opera/files/patch-pluginpath.ini
+++ b/www/linux-opera/files/patch-pluginpath.ini
@@ -1,6 +1,6 @@
---- usr/share/opera/defaults/pluginpath.ini.orig 2009-11-24 20:26:57.000000000 -0600
-+++ usr/share/opera/defaults/pluginpath.ini 2009-11-24 20:30:45.000000000 -0600
-@@ -2,74 +2,27 @@
+--- share/linux-opera/defaults/pluginpath.ini.orig 2010-07-01 21:29:07.000000000 -0500
++++ share/linux-opera/defaults/pluginpath.ini 2010-07-01 21:31:52.000000000 -0500
+@@ -2,79 +2,27 @@
; Do not edit this file while Opera is running
; This file is stored in UTF-8 encoding
@@ -9,6 +9,7 @@
-
[Paths]
-$PWD/plugins=1
+-$HOME/.local/lib/opera/plugins=1
-$OPERA_PERSONALDIR/plugins=1
-/usr/lib/opera/plugins=1
-/usr/local/lib/opera/plugins=1
@@ -80,10 +81,14 @@
-/usr/X11R6/lib/mozilla/plugins=1
-/usr/lib64/browser-plugins=1
-/usr/lib/browser-plugins=1
-+%%LOCALBASE%%/lib/linux-mozilla/plugins=1
-
+-
-; General path for gentoo
-/usr/lib32/nsbrowser/plugins=1
+-
+-; Java on Ubuntu
+-/usr/lib/xulrunner-addons/plugins=1
++%%LOCALBASE%%/lib/linux-mozilla/plugins=1
+
+; Global plugins path in FreeBSD. Need this for
+; the Adobe Acrobat7 and other plugins too.
+%%LOCALBASE%%/lib/browser_linux_plugins=1
diff --git a/www/linux-opera/files/patch-search.ini b/www/linux-opera/files/patch-search.ini
index 8bf7183efc24..5791323da42c 100644
--- a/www/linux-opera/files/patch-search.ini
+++ b/www/linux-opera/files/patch-search.ini
@@ -1,159 +1,189 @@
---- usr/share/opera/defaults/search.ini.orig 2009-08-30 17:05:50.000000000 -0500
-+++ usr/share/opera/defaults/search.ini 2009-08-30 17:09:42.000000000 -0500
-@@ -129,7 +129,7 @@
+--- share/linux-opera/defaults/search.ini.orig 2010-07-02 21:10:37.000000000 -0500
++++ share/linux-opera/defaults/search.ini 2010-07-02 21:14:02.000000000 -0500
+@@ -110,7 +110,7 @@
Query=
- Key=f
+ Key=w
Is post=0
-Has endseparator=0
+Has endseparator=-1
- Encoding=
- Search Type=12
+ Encoding=utf-8
+ Search Type=0
Verbtext=0
-@@ -430,3 +430,67 @@
+@@ -438,3 +438,82 @@
Position=-1
Nameid=291960
+[Search Engine 31]
++UNIQUEID=30D43310864611DF85EAE75821912D1F
+Name=Google BSD
++Verbtext=0
+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+Query=
+Key=d
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 32]
++UNIQUEID=336D7100864511DF85E99B0CD0A9B97D
+Name=FreeBSD mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
++Verbtext=0
++URL=http://markmail.org/search/?q=%s&q=list﷐3Aorg.freebsd%20order%3Adate-backward
+Query=
+Key=m
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 33]
++UNIQUEID=796FB180864611DF85EBC9A9B78DF71A
+Name=FreeBSD PRs
++Verbtext=0
+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
+Query=
+Key=p
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 34]
++UNIQUEID=931A95F0864611DF85EC9C9C0D818A0D
+Name=FreshPorts
++Verbtext=0
+URL=http://www.freshports.org/search.php?query=%s
+Query=
+Key=t
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 35]
++UNIQUEID=A9234D60864611DF85EDA797C35FF306
+Name=FreeBSD.org
++Verbtext=0
+URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
+Query=
+Key=c
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
---- usr/share/opera/locale/en/search.ini.orig 2009-08-30 17:10:08.000000000 -0500
-+++ usr/share/opera/locale/en/search.ini 2009-08-30 17:12:24.000000000 -0500
-@@ -129,7 +129,7 @@
++Deleted=0
+--- share/linux-opera/locale/en/search.ini.orig 2010-07-02 21:17:18.000000000 -0500
++++ share/linux-opera/locale/en/search.ini 2010-07-02 21:19:09.000000000 -0500
+@@ -110,7 +110,7 @@
Query=
- Key=f
+ Key=w
Is post=0
-Has endseparator=0
+Has endseparator=-1
- Encoding=
- Search Type=12
+ Encoding=utf-8
+ Search Type=0
Verbtext=0
-@@ -429,3 +429,68 @@
+@@ -437,3 +437,83 @@
Verbtext=0
Position=-1
Nameid=291960
+
+[Search Engine 31]
++UNIQUEID=30D43310864611DF85EAE75821912D1F
+Name=Google BSD
++Verbtext=0
+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+Query=
+Key=d
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 32]
++UNIQUEID=336D7100864511DF85E99B0CD0A9B97D
+Name=FreeBSD mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
++Verbtext=0
++URL=http://markmail.org/search/?q=%s&q=list﷐3Aorg.freebsd%20order%3Adate-backward
+Query=
+Key=m
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 33]
++UNIQUEID=796FB180864611DF85EBC9A9B78DF71A
+Name=FreeBSD PRs
++Verbtext=0
+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
+Query=
+Key=p
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 34]
++UNIQUEID=931A95F0864611DF85EC9C9C0D818A0D
+Name=FreshPorts
++Verbtext=0
+URL=http://www.freshports.org/search.php?query=%s
+Query=
+Key=t
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
+
+[Search Engine 35]
++UNIQUEID=A9234D60864611DF85EDA797C35FF306
+Name=FreeBSD.org
++Verbtext=0
+URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
+Query=
+Key=c
+Is post=0
++UseTLD=0
+Has endseparator=0
-+Encoding=utf-8
++Encoding=us-ascii
+Search Type=0
-+Verbtext=0
+Position=-1
+Nameid=0
++Deleted=0
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index bb31e4bb40dc..cf9ed9dcd189 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,22 +1,57 @@
bin/linux-opera
-share/applications/linux-opera.desktop
-%%DOCSDIR%%/LGPL
+bin/linux-opera-widget-manager
+lib/linux-opera/gstreamer/LGPL.txt
+lib/linux-opera/gstreamer/README.txt
+lib/linux-opera/gstreamer/plugins/libgstoperamatroska.so
+lib/linux-opera/gstreamer/plugins/libgstoperavp8.so
+lib/linux-opera/liboperagtk.so
+lib/linux-opera/liboperakde4.so
+lib/linux-opera/opera
+lib/linux-opera/operaplugincleaner
+lib/linux-opera/operapluginwrapper
+lib/linux-opera/plugins/README
+share/applications/linux-opera-browser.desktop
+share/applications/linux-opera-widget-installer.desktop
+share/applications/linux-opera-widget-manager.desktop
+%%DOCSDIR%%/LGPL-2
+%%DOCSDIR%%/LGPL-3
%%DOCSDIR%%/LICENSE
-%%DATADIR%%/bin/libQtCore.so.4
-%%DATADIR%%/bin/libQtGui.so.4
-%%DATADIR%%/bin/missingsyms.so
-%%DATADIR%%/bin/opera
-%%DATADIR%%/bin/operaplugincleaner
-%%DATADIR%%/bin/operapluginwrapper
-%%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/works
+share/icons/hicolor/128x128/apps/linux-opera-browser.png
+share/icons/hicolor/128x128/apps/linux-opera-widget-manager.png
+share/icons/hicolor/128x128/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/128x128/mimetypes/linux-opera-widget.png
+share/icons/hicolor/16x16/apps/linux-opera-browser.png
+share/icons/hicolor/16x16/apps/linux-opera-widget-manager.png
+share/icons/hicolor/16x16/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/16x16/mimetypes/linux-opera-widget.png
+share/icons/hicolor/22x22/apps/linux-opera-browser.png
+share/icons/hicolor/22x22/apps/linux-opera-widget-manager.png
+share/icons/hicolor/22x22/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/22x22/mimetypes/linux-opera-widget.png
+share/icons/hicolor/24x24/apps/linux-opera-browser.png
+share/icons/hicolor/24x24/apps/linux-opera-widget-manager.png
+share/icons/hicolor/24x24/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/32x32/apps/linux-opera-browser.png
+share/icons/hicolor/32x32/apps/linux-opera-widget-manager.png
+share/icons/hicolor/32x32/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/32x32/mimetypes/linux-opera-widget.png
+share/icons/hicolor/48x48/apps/linux-opera-browser.png
+share/icons/hicolor/48x48/apps/linux-opera-widget-manager.png
+share/icons/hicolor/48x48/mimetypes/linux-opera-unite-application.png
+share/icons/hicolor/48x48/mimetypes/linux-opera-widget.png
+share/icons/hicolor/scalable/apps/linux-opera-browser.svg
+share/icons/hicolor/scalable/apps/linux-opera-widget-manager.svg
+share/icons/hicolor/scalable/apps/linux-opera-widget.svg
+share/icons/hicolor/scalable/mimetypes/linux-opera-unite-application.svg
%%DATADIR%%/defaults/bookmarks.adr
%%DATADIR%%/defaults/feedreaders.ini
%%DATADIR%%/defaults/filehandler.ini
%%DATADIR%%/defaults/font.ini
%%DATADIR%%/defaults/license.txt
%%DATADIR%%/defaults/mailproviders.xml
+%%DATADIR%%/defaults/plugin-ignore.ini
%%DATADIR%%/defaults/pluginpath.ini
+%%DATADIR%%/defaults/public_domains.dat
%%DATADIR%%/defaults/search.ini
%%DATADIR%%/defaults/standard_speeddial.ini
%%DATADIR%%/defaults/standard_trusted_repositories.ini
@@ -32,23 +67,34 @@ share/applications/linux-opera.desktop
%%DATADIR%%/extra/svg-se.dat
%%DATADIR%%/extra/svg-sebd.dat
%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/java/opera.policy
%%DATADIR%%/lngcode.txt
%%DATADIR%%/locale/be/be.lng
%%DATADIR%%/locale/be/bookmarks.adr
+%%DATADIR%%/locale/be/license.txt
%%DATADIR%%/locale/be/search.ini
%%DATADIR%%/locale/be/standard_speeddial.ini
%%DATADIR%%/locale/bg/bg.lng
+%%DATADIR%%/locale/bg/bookmarks.adr
+%%DATADIR%%/locale/bg/license.txt
+%%DATADIR%%/locale/bg/search.ini
+%%DATADIR%%/locale/bg/standard_speeddial.ini
+%%DATADIR%%/locale/cs/bookmarks.adr
%%DATADIR%%/locale/cs/cs.lng
+%%DATADIR%%/locale/cs/license.txt
+%%DATADIR%%/locale/cs/search.ini
+%%DATADIR%%/locale/cs/standard_speeddial.ini
%%DATADIR%%/locale/da/da.lng
+%%DATADIR%%/locale/da/license.txt
%%DATADIR%%/locale/de/bookmarks.adr
%%DATADIR%%/locale/de/de.lng
+%%DATADIR%%/locale/de/license.txt
%%DATADIR%%/locale/de/search.ini
%%DATADIR%%/locale/de/standard_speeddial.ini
%%DATADIR%%/locale/el/el.lng
+%%DATADIR%%/locale/el/license.txt
%%DATADIR%%/locale/en-GB/bookmarks.adr
%%DATADIR%%/locale/en-GB/en-GB.lng
+%%DATADIR%%/locale/en-GB/license.txt
%%DATADIR%%/locale/en-GB/search.ini
%%DATADIR%%/locale/en-GB/standard_speeddial.ini
%%DATADIR%%/locale/en/bookmarks.adr
@@ -59,26 +105,38 @@ share/applications/linux-opera.desktop
%%DATADIR%%/locale/en/standard_speeddial.ini
%%DATADIR%%/locale/es-ES/bookmarks.adr
%%DATADIR%%/locale/es-ES/es-ES.lng
+%%DATADIR%%/locale/es-ES/license.txt
%%DATADIR%%/locale/es-ES/search.ini
%%DATADIR%%/locale/es-ES/standard_speeddial.ini
%%DATADIR%%/locale/es-LA/es-LA.lng
+%%DATADIR%%/locale/es-LA/license.txt
%%DATADIR%%/locale/et/et.lng
+%%DATADIR%%/locale/et/license.txt
%%DATADIR%%/locale/fi/fi.lng
+%%DATADIR%%/locale/fi/license.txt
%%DATADIR%%/locale/fr-CA/fr-CA.lng
+%%DATADIR%%/locale/fr-CA/license.txt
%%DATADIR%%/locale/fr/bookmarks.adr
%%DATADIR%%/locale/fr/fr.lng
+%%DATADIR%%/locale/fr/license.txt
%%DATADIR%%/locale/fr/search.ini
%%DATADIR%%/locale/fr/standard_speeddial.ini
%%DATADIR%%/locale/fy/fy.lng
+%%DATADIR%%/locale/fy/license.txt
%%DATADIR%%/locale/hi/hi.lng
-%%DATADIR%%/locale/hi/standard_speeddial.ini
+%%DATADIR%%/locale/hi/license.txt
%%DATADIR%%/locale/hr/hr.lng
+%%DATADIR%%/locale/hr/license.txt
+%%DATADIR%%/locale/hu/bookmarks.adr
%%DATADIR%%/locale/hu/hu.lng
-%%DATADIR%%/locale/id/bookmarks.adr
+%%DATADIR%%/locale/hu/license.txt
+%%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/hu/standard_speeddial.ini
%%DATADIR%%/locale/id/id.lng
-%%DATADIR%%/locale/id/standard_speeddial.ini
+%%DATADIR%%/locale/id/license.txt
%%DATADIR%%/locale/it/bookmarks.adr
%%DATADIR%%/locale/it/it.lng
+%%DATADIR%%/locale/it/license.txt
%%DATADIR%%/locale/it/search.ini
%%DATADIR%%/locale/it/standard_speeddial.ini
%%DATADIR%%/locale/ja/bookmarks.adr
@@ -87,38 +145,69 @@ share/applications/linux-opera.desktop
%%DATADIR%%/locale/ja/search.ini
%%DATADIR%%/locale/ja/standard_speeddial.ini
%%DATADIR%%/locale/ka/ka.lng
+%%DATADIR%%/locale/ka/license.txt
%%DATADIR%%/locale/ko/ko.lng
+%%DATADIR%%/locale/ko/license.txt
+%%DATADIR%%/locale/lt/license.txt
%%DATADIR%%/locale/lt/lt.lng
+%%DATADIR%%/locale/mk/license.txt
%%DATADIR%%/locale/mk/mk.lng
%%DATADIR%%/locale/nb/bookmarks.adr
+%%DATADIR%%/locale/nb/license.txt
%%DATADIR%%/locale/nb/nb.lng
%%DATADIR%%/locale/nb/search.ini
%%DATADIR%%/locale/nb/standard_speeddial.ini
+%%DATADIR%%/locale/nl/license.txt
%%DATADIR%%/locale/nl/nl.lng
+%%DATADIR%%/locale/nn/license.txt
%%DATADIR%%/locale/nn/nn.lng
%%DATADIR%%/locale/pl/bookmarks.adr
+%%DATADIR%%/locale/pl/license.txt
%%DATADIR%%/locale/pl/pl.lng
%%DATADIR%%/locale/pl/search.ini
%%DATADIR%%/locale/pl/standard_speeddial.ini
+%%DATADIR%%/locale/pt-BR/license.txt
%%DATADIR%%/locale/pt-BR/pt-BR.lng
+%%DATADIR%%/locale/pt/license.txt
%%DATADIR%%/locale/pt/pt.lng
+%%DATADIR%%/locale/ro/bookmarks.adr
+%%DATADIR%%/locale/ro/license.txt
%%DATADIR%%/locale/ro/ro.lng
+%%DATADIR%%/locale/ro/search.ini
+%%DATADIR%%/locale/ro/standard_speeddial.ini
%%DATADIR%%/locale/ru/bookmarks.adr
+%%DATADIR%%/locale/ru/license.txt
%%DATADIR%%/locale/ru/ru.lng
%%DATADIR%%/locale/ru/search.ini
%%DATADIR%%/locale/ru/standard_speeddial.ini
+%%DATADIR%%/locale/sk/bookmarks.adr
+%%DATADIR%%/locale/sk/license.txt
+%%DATADIR%%/locale/sk/search.ini
%%DATADIR%%/locale/sk/sk.lng
+%%DATADIR%%/locale/sk/standard_speeddial.ini
+%%DATADIR%%/locale/sr/bookmarks.adr
+%%DATADIR%%/locale/sr/license.txt
+%%DATADIR%%/locale/sr/search.ini
%%DATADIR%%/locale/sr/sr.lng
+%%DATADIR%%/locale/sr/standard_speeddial.ini
+%%DATADIR%%/locale/sv/license.txt
%%DATADIR%%/locale/sv/sv.lng
+%%DATADIR%%/locale/ta/license.txt
%%DATADIR%%/locale/ta/ta.lng
+%%DATADIR%%/locale/te/license.txt
%%DATADIR%%/locale/te/te.lng
+%%DATADIR%%/locale/tr/license.txt
%%DATADIR%%/locale/tr/tr.lng
%%DATADIR%%/locale/uk/bookmarks.adr
+%%DATADIR%%/locale/uk/license.txt
%%DATADIR%%/locale/uk/search.ini
%%DATADIR%%/locale/uk/standard_speeddial.ini
%%DATADIR%%/locale/uk/uk.lng
+%%DATADIR%%/locale/vi/license.txt
+%%DATADIR%%/locale/vi/vi.lng
%%DATADIR%%/locale/zh-cn/bookmarks.adr
%%DATADIR%%/locale/zh-cn/browser.js
+%%DATADIR%%/locale/zh-cn/license.txt
%%DATADIR%%/locale/zh-cn/search.ini
%%DATADIR%%/locale/zh-cn/standard_speeddial.ini
%%DATADIR%%/locale/zh-cn/turbosettings.xml
@@ -126,11 +215,24 @@ share/applications/linux-opera.desktop
%%DATADIR%%/locale/zh-hk/browser.js
%%DATADIR%%/locale/zh-hk/turbosettings.xml
%%DATADIR%%/locale/zh-tw/browser.js
+%%DATADIR%%/locale/zh-tw/license.txt
%%DATADIR%%/locale/zh-tw/turbosettings.xml
%%DATADIR%%/locale/zh-tw/zh-tw.lng
-%%DATADIR%%/scripts/common.js
-%%DATADIR%%/scripts/substance.js
+%%DATADIR%%/mathml.dtd
+%%DATADIR%%/package-id.ini
+%%DATADIR%%/package/lib/binprint.sh
+%%DATADIR%%/package/lib/layout_common.sh
+%%DATADIR%%/package/lib/layout_deb.sh
+%%DATADIR%%/package/lib/layout_tar.sh
+%%DATADIR%%/package/lib/main.sh
+%%DATADIR%%/package/lib/normalize.sh
+%%DATADIR%%/package/lib/package_deb.sh
+%%DATADIR%%/package/lib/package_rpm.sh
+%%DATADIR%%/package/lib/package_tar.sh
+%%DATADIR%%/package/lib/xml.sh
+%%DATADIR%%/package/main.sh
%%DATADIR%%/skin/standard_skin.zip
+%%DATADIR%%/skin/unix_skin.zip
%%DATADIR%%/styles/about.css
%%DATADIR%%/styles/cache.css
%%DATADIR%%/styles/certinfo.css
@@ -144,8 +246,11 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/image.css
%%DATADIR%%/styles/images/Opera_256x256.png
%%DATADIR%%/styles/images/bar.png
+%%DATADIR%%/styles/images/bkgd-rev.png
+%%DATADIR%%/styles/images/bkgd.png
%%DATADIR%%/styles/images/bullet.png
%%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/corner.png
%%DATADIR%%/styles/images/customize.gif
%%DATADIR%%/styles/images/darkBox.png
%%DATADIR%%/styles/images/defaultFavicon.png
@@ -153,16 +258,21 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/images/file.png
%%DATADIR%%/styles/images/flag.png
%%DATADIR%%/styles/images/folder.png
+%%DATADIR%%/styles/images/hanger.png
%%DATADIR%%/styles/images/header-expanded.png
%%DATADIR%%/styles/images/header.png
+%%DATADIR%%/styles/images/opera-icon-red.png
+%%DATADIR%%/styles/images/opera-icon-white.png
%%DATADIR%%/styles/images/opera.png
%%DATADIR%%/styles/images/page-bot.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/search.png
%%DATADIR%%/styles/images/section.png
%%DATADIR%%/styles/images/smartGroup.png
+%%DATADIR%%/styles/images/tooltiptail.png
%%DATADIR%%/styles/images/top.png
%%DATADIR%%/styles/images/warning.png
%%DATADIR%%/styles/info.css
@@ -173,6 +283,7 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/mime.css
%%DATADIR%%/styles/opera.css
%%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/private.css
%%DATADIR%%/styles/search.css
%%DATADIR%%/styles/unstyledxml.css
%%DATADIR%%/styles/user/accessibility.css
@@ -193,6 +304,7 @@ share/applications/linux-opera.desktop
%%DATADIR%%/styles/user/toc.css
%%DATADIR%%/styles/warning.css
%%DATADIR%%/styles/webfeeds.html
+%%DATADIR%%/styles/webstorage.css
%%DATADIR%%/styles/wml.css
%%DATADIR%%/ui/dialog.ini
%%DATADIR%%/ui/fastforward.ini
@@ -209,18 +321,20 @@ share/applications/linux-opera.desktop
%%DATADIR%%/unite/messenger.ua
%%DATADIR%%/unite/photoSharing.ua
%%DATADIR%%/unite/webserver.ua
-share/pixmaps/linux-opera.png
+share/mime/packages/linux-opera-unite-application.xml
+share/mime/packages/linux-opera-widget.xml
@dirrm %%DATADIR%%/unite
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/styles/user
@dirrm %%DATADIR%%/styles/images
@dirrm %%DATADIR%%/styles
@dirrm %%DATADIR%%/skin
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/package/lib
+@dirrm %%DATADIR%%/package
@dirrm %%DATADIR%%/locale/zh-tw
@dirrm %%DATADIR%%/locale/zh-hk
@dirrm %%DATADIR%%/locale/zh-cn
+@dirrm %%DATADIR%%/locale/vi
@dirrm %%DATADIR%%/locale/uk
@dirrm %%DATADIR%%/locale/tr
@dirrm %%DATADIR%%/locale/te
@@ -262,10 +376,16 @@ share/pixmaps/linux-opera.png
@dirrm %%DATADIR%%/locale/bg
@dirrm %%DATADIR%%/locale/be
@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/java
@dirrm %%DATADIR%%/extra
@dirrm %%DATADIR%%/defaults
-@dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
+@dirrm lib/linux-opera/plugins
+@dirrm lib/linux-opera/gstreamer/plugins
+@dirrm lib/linux-opera/gstreamer
+@dirrm lib/linux-opera
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true