Date: Tue, 7 Feb 2006 21:33:02 +0100 From: "Arjan van Leeuwen" <avleeuwen@piwebs.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: vs@FreeBSD.org Subject: ports/92994: Resurrect www/opera-devel for Opera 9.0 TP 2 Message-ID: <1139344382.8373@winston.piwebs.com> Resent-Message-ID: <200602072040.k17Ke4LM014830@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92994 >Category: ports >Synopsis: Resurrect www/opera-devel for Opera 9.0 TP 2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 07 20:40:04 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD 6.0-RELEASE #13: Sun Nov 6 14:50:54 CET 2005 root@winston.piwebs.com:/usr/obj/usr/src/sys/WINSTON >Description: This archive contains a port of Opera 9.0 Technical Preview 2. Resurrect www/opera-devel. >How-To-Repeat: >Fix: --- opera-devel.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # opera-devel # opera-devel/Makefile # opera-devel/distinfo # opera-devel/files # opera-devel/pkg-descr # opera-devel/pkg-message # opera-devel/pkg-plist # opera-devel/files/patch-config::opera6rc # opera-devel/files/patch-ini::pluginpath.ini # opera-devel/files/patch-ini::spellcheck.ini # opera-devel/files/patch-install.sh # opera-devel/files/patch-search.ini # echo c - opera-devel mkdir -p opera-devel > /dev/null 2>&1 echo x - opera-devel/Makefile sed 's/^X//' >opera-devel/Makefile << 'END-of-opera-devel/Makefile' X# New ports collection makefile for: opera X# Date created: November 5th 2000 X# Whom: des X# X# $FreeBSD: ports/www/opera/Makefile,v 1.46 2005/11/22 21:58:49 pav Exp $ X# X XPORTNAME= opera XPORTVERSION= ${OPERA_VER}.${OPERA_DATE} XCATEGORIES= www ipv6 XMASTER_SITES= http://snapshot.opera.com/unix/${OPERA_VER}-${OPERA_REL}/intel-freebsd/ XPKGNAMESUFFIX= -devel XDISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en X XMAINTAINER= avleeuwen@piwebs.com XCOMMENT= A blazingly fast, full-featured, standards-compliant browser X XOPERA_VER= 9.0 XOPERA_REL= Preview-2 XOPERA_DATE= 20060206 X XDATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} XDOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} X XUSE_BZIP2= yes XWANT_GNOME= yes XUSE_X_PREFIX= yes XUSE_REINPLACE= yes XONLY_FOR_ARCHS= i386 X XNO_BUILD= yes XNO_FILTER_SHLIBS=yes X X.ifndef(WITHOUT_ASPELL) XLIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell X.endif X X.include <bsd.port.pre.mk> X X.if ${OSVERSION} >= 600000 XOPERA_TYPE= 4 XWITH_SHARED= yes X.elif ${OSVERSION} >= 500000 XOPERA_TYPE= 3 XWITH_SHARED= yes X.elifdef ${WITH_SHARED} XOPERA_TYPE= 2 X.else XOPERA_TYPE= 1 X.endif X X.if defined(WITH_SHARED) XOPERA_LIB= shared XLIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 X.else XOPERA_LIB= static X.endif X X.if ${HAVE_GNOME:Mgnomehier}!="" XPLIST_SUB+= GNOME="" X.else XPLIST_SUB+= GNOME="@comment " X.endif X X.if exists(${LOCALBASE}/bin/kde-config) XPLIST_SUB+= KDE="" X.else XPLIST_SUB+= KDE="@comment " X.endif X Xpre-everything:: X.if !defined(WITHOUT_ASPELL) || !defined(WITH_SHARED) X @${ECHO_CMD} '===> The following options are available for this port:' X @${ECHO_CMD} '===>' X.if !defined(WITHOUT_ASPELL) X @${ECHO_CMD} '===> Define WITHOUT_ASPELL to not install aspell.' X.endif X.if !defined(WITH_SHARED) X @${ECHO_CMD} '===> Define WITH_SHARED to use a shared Qt library.' X.endif X.endif X Xpost-patch: X @${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en X @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ X s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \ X ${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \ X ${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc X @${FIND} ${WRKSRC} -name '*.orig' -delete X @${FIND} ${WRKSRC} -name '*.bak' -delete X Xdo-install: X @(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX}) X Xpost-install: X @${CAT} ${PKGMESSAGE} X X.include <bsd.port.post.mk> END-of-opera-devel/Makefile echo x - opera-devel/distinfo sed 's/^X//' >opera-devel/distinfo << 'END-of-opera-devel/distinfo' XMD5 (opera-9.0-20060206.4-shared-qt.i386.freebsd-en.tar.bz2) = 63781286bea93b1abf355667693235e0 XSHA256 (opera-9.0-20060206.4-shared-qt.i386.freebsd-en.tar.bz2) = 51b399e2536371a34707ffa1e5eb4c893dd520f62b8f144587689b47067c4b7f XSIZE (opera-9.0-20060206.4-shared-qt.i386.freebsd-en.tar.bz2) = 4699407 END-of-opera-devel/distinfo echo c - opera-devel/files mkdir -p opera-devel/files > /dev/null 2>&1 echo x - opera-devel/pkg-descr sed 's/^X//' >opera-devel/pkg-descr << 'END-of-opera-devel/pkg-descr' XThe most full-featured Internet power tool on the market, Opera includes Xpop-up blocking, tabbed browsing, integrated searches, and advanced functions Xlike Opera's groundbreaking E-mail program, RSS Newsfeeds and IRC chat. And Xbecause we know that our users have different needs, you can customize Xthe look and content of your Opera browser with a few clicks of the mouse. X XWWW: http://www.opera.com/ END-of-opera-devel/pkg-descr echo x - opera-devel/pkg-message sed 's/^X//' >opera-devel/pkg-message << 'END-of-opera-devel/pkg-message' X*** XThis port will use the ~/.opera-devel directory to save its personal settings. X X*** THIS IS AN UNSTABLE PREVIEW VERSION OF OPERA. PLEASE DO NOT REPORT *** X*** BUGS TO THE PORT MAINTAINER. *** X*** *** X*** Use http://bugs.opera.com/ *** X*** or http://my.opera.com/community/forums/ *** X*** X END-of-opera-devel/pkg-message echo x - opera-devel/pkg-plist sed 's/^X//' >opera-devel/pkg-plist << 'END-of-opera-devel/pkg-plist' X@comment $FreeBSD: ports/www/opera/pkg-plist,v 1.23 2005/06/19 07:15:46 sf Exp $ Xbin/opera-devel X%%DOCSDIR%%/LICENSE X%%DATADIR%%/bin/missingsyms.so X%%DATADIR%%/bin/opera X%%DATADIR%%/bin/spellcheck.so X%%DATADIR%%/bin/works X%%DATADIR%%/chartables.bin X%%DATADIR%%/config/opera6rc X%%DATADIR%%/config/opera6rc.fixed X%%DATADIR%%/html40_entities.dtd X%%DATADIR%%/images/blank.gif X%%DATADIR%%/images/drive.gif X%%DATADIR%%/images/file.gif X%%DATADIR%%/images/folder.gif X%%DATADIR%%/images/link.gif X%%DATADIR%%/images/opera.xpm X%%DATADIR%%/images/opera_16x16.png X%%DATADIR%%/images/opera_22x22.png X%%DATADIR%%/images/opera_32x32.png X%%DATADIR%%/images/opera_48x48.png X%%DATADIR%%/images/operabanner.png X%%DATADIR%%/ini/dialog.ini X%%DATADIR%%/ini/fastforward.ini X%%DATADIR%%/ini/filehandler.ini X%%DATADIR%%/ini/pluginpath.ini X%%DATADIR%%/ini/spellcheck.ini X%%DATADIR%%/ini/standard_keyboard.ini X%%DATADIR%%/ini/standard_menu.ini X%%DATADIR%%/ini/standard_mouse.ini X%%DATADIR%%/ini/standard_toolbar.ini X%%DATADIR%%/ini/unix_keyboard.ini X%%DATADIR%%/ini/xmlentities.ini X%%DATADIR%%/java/opera.jar X%%DATADIR%%/java/opera.policy X%%DATADIR%%/jsconsole.html X%%DATADIR%%/lngcode.txt X%%DATADIR%%/locale/en/default.adr X%%DATADIR%%/locale/en/lngcode.txt X%%DATADIR%%/locale/en/license.txt X%%DATADIR%%/locale/en/search.ini X%%DATADIR%%/locale/english.lng X%%DATADIR%%/opera6.adr X%%DATADIR%%/plugins/libnpp.so X%%DATADIR%%/plugins/operapluginwrapper X%%DATADIR%%/plugins/operaplugincleaner X%%DATADIR%%/search.ini X%%DATADIR%%/skin/standard_skin.zip X%%DATADIR%%/skin/windows_skin.zip X%%DATADIR%%/styles/OPF.css X%%DATADIR%%/styles/about.css X%%DATADIR%%/styles/cache.css X%%DATADIR%%/styles/certinfo.css X%%DATADIR%%/styles/config.css X%%DATADIR%%/styles/contentblock.css X%%DATADIR%%/styles/dir.css X%%DATADIR%%/styles/drives.css X%%DATADIR%%/styles/email.css X%%DATADIR%%/styles/error.css X%%DATADIR%%/styles/history.css X%%DATADIR%%/styles/im.css X%%DATADIR%%/styles/image.css X%%DATADIR%%/styles/images/bar.png X%%DATADIR%%/styles/images/center.png X%%DATADIR%%/styles/images/opera.png X%%DATADIR%%/styles/images/root.png X%%DATADIR%%/styles/images/top.png X%%DATADIR%%/styles/info.css X%%DATADIR%%/styles/mime.css X%%DATADIR%%/styles/mimehead.css X%%DATADIR%%/styles/plugins.css X%%DATADIR%%/styles/user/accessibility.css X%%DATADIR%%/styles/user/contrastbw.css X%%DATADIR%%/styles/user/contrastwb.css X%%DATADIR%%/styles/user/debugwithoutline.css X%%DATADIR%%/styles/user/disabletables.css X%%DATADIR%%/styles/user/hidecertainsizes.css X%%DATADIR%%/styles/user/hidenonlinkimages.css X%%DATADIR%%/styles/user/imageandlinkonly.css X%%DATADIR%%/styles/user/nostalgia.css X%%DATADIR%%/styles/user/showstructure.css X%%DATADIR%%/styles/user/textonly.css X%%DATADIR%%/styles/user/userstyle.ini X%%DATADIR%%/styles/wml.css X%%DATADIR%%/svg-sebd.dat X%%DATADIR%%/svg-se.dat X%%DATADIR%%/svg-sabd.dat X%%DATADIR%%/svg-sa.dat X%%DATADIR%%/svg-mobd.dat X%%DATADIR%%/svg-mo.dat X X%%GNOME%%share/gnome/apps/Internet/opera-devel.desktop X%%GNOME%%share/gnome/pixmaps/opera-devel.xpm X@dirrm %%DATADIR%%/styles/user X@dirrm %%DATADIR%%/styles/images X@dirrm %%DATADIR%%/styles X@dirrm %%DATADIR%%/skin X@dirrm %%DATADIR%%/plugins X@dirrm %%DATADIR%%/locale/en X@dirrm %%DATADIR%%/locale X@dirrm %%DATADIR%%/java X@dirrm %%DATADIR%%/ini X@dirrm %%DATADIR%%/images X@dirrm %%DATADIR%%/config X@dirrm %%DATADIR%%/bin X@dirrm %%DATADIR%% X@dirrm %%DOCSDIR%% X X%%KDE%%@cwd %%LOCALBASE%% X%%KDE%%share/applnk/Internet/opera-devel.desktop X%%KDE%%share/icons/hicolor/22x22/apps/opera-devel.png X%%KDE%%share/icons/hicolor/32x32/apps/opera-devel.png X%%KDE%%share/icons/hicolor/48x48/apps/opera-devel.png X%%KDE%%share/icons/locolor/16x16/apps/opera-devel.png X%%KDE%%share/icons/locolor/22x22/apps/opera-devel.png X%%KDE%%share/icons/locolor/32x32/apps/opera-devel.png END-of-opera-devel/pkg-plist echo x - opera-devel/files/patch-config::opera6rc sed 's/^X//' >opera-devel/files/patch-config::opera6rc << 'END-of-opera-devel/files/patch-config::opera6rc' X--- config/opera6rc.orig Mon Jul 19 23:00:06 2004 X+++ config/opera6rc Mon Jul 19 23:00:16 2004 X@@ -1,5 +1,5 @@ X ; Put any default settings here that are overridable by users X X [User Prefs] X-Language Files Directory=/usr/share/opera/locale/ X+Language Files Directory=%%PREFIX%%/share/opera/locale/ X END-of-opera-devel/files/patch-config::opera6rc echo x - opera-devel/files/patch-ini::pluginpath.ini sed 's/^X//' >opera-devel/files/patch-ini::pluginpath.ini << 'END-of-opera-devel/files/patch-ini::pluginpath.ini' X--- ini/pluginpath.ini.orig Fri Sep 16 19:19:04 2005 X+++ ini/pluginpath.ini Tue Sep 20 22:35:57 2005 X@@ -3,50 +3,16 @@ X ; This file is stored in UTF-8 encoding X X [Paths] X-$PWD/plugins=1 X $HOME/.opera/plugins=1 X-/usr/lib/opera/plugins=1 X-/usr/lib/opera/plugins=1 X-/usr/local/lib/opera/plugins=1 X-/opt/lib/opera/plugins=1 X+%%PREFIX%%/share/opera/plugins=1 X+%%LOCALBASE%%/share/opera/plugins=1 X X-; Adobe Acrobat X-/usr/local/Acrobat7.0/Browsers/intellinux=1 X-/usr/local/Acrobat7/Browsers/intellinux=1 X-/usr/local/Acrobat5/Browsers/intellinux=1 X-/usr/local/Acrobat4/Browsers/intellinux=1 X-/usr/lib/Acrobat7.0/Browsers/intellinux=1 X-/usr/lib/Acrobat7/Browsers/intellinux=1 X-/usr/lib/Acrobat5/Browsers/intellinux=1 X-/usr/lib/Acrobat4/Browsers/intellinux=1 X-/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1 X-/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1 X-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1 X-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1 X-/opt/Acrobat7.0/Browsers/intellinux=1 X-/opt/Acrobat7/Browsers/intellinux=1 X-/opt/Acrobat5/Browsers/intellinux=1 X-/opt/Acrobat4/Browsers/intellinux=1 X-/usr/Acrobat7.0/Browsers/intellinux=1 X-/usr/Acrobat7/Browsers/intellinux=1 X-/usr/Acrobat5/Browsers/intellinux=1 X-/usr/Acrobat4/Browsers/intellinux=1 X+%%X11BASE%%/Acrobat7/Browser/intellinux=1 X+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1 X+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1 X X-; Realplayer X-/usr/lib/RealPlayer8/Plugins=1 X-/usr/lib/realplay/plugins=1 X-/usr/lib/RealPlayer8=1 X-/usr/lib/realplay=1 X- X-; Netscape Plug-in Paths X-$HOME/.netscape6/plugins=1 X+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1 X+%%X11BASE%%/lib/browser_plugins=1 X $HOME/.netscape/plugins=1 X-/opt/netscape/plugins=1 X-/usr/lib/netscape/plugins=1 X-/usr/local/netscape/plugins=1 X-/usr/local/lib/netscape/plugins=1 X-$HOME/.kde/.konqueror/nsplugins=1 X- X-[KDE] X-plugins=$HOME/.kde/share/config/kcmnspluginrc X+%%LOCALBASE%%/lib/netscape-linux/plugins=1 X END-of-opera-devel/files/patch-ini::pluginpath.ini echo x - opera-devel/files/patch-ini::spellcheck.ini sed 's/^X//' >opera-devel/files/patch-ini::spellcheck.ini << 'END-of-opera-devel/files/patch-ini::spellcheck.ini' X--- ini/spellcheck.ini.orig Thu May 13 13:51:43 2004 X+++ ini/spellcheck.ini Thu May 13 13:52:00 2004 X@@ -3,5 +3,6 @@ X ; This file is stored in UTF-8 encoding X X [Spell Check] X+Spell Check Engine=%%PREFIX%%/share/opera/bin/spellcheck.so X Default Language=en X Default Encoding=iso8859-1 END-of-opera-devel/files/patch-ini::spellcheck.ini echo x - opera-devel/files/patch-install.sh sed 's/^X//' >opera-devel/files/patch-install.sh << 'END-of-opera-devel/files/patch-install.sh' X--- install.sh.orig Mon Feb 6 13:02:45 2006 X+++ install.sh Tue Feb 7 21:26:31 2006 X@@ -108,8 +108,8 @@ X X if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then X wrapper_dir="${prefix}/bin" X- doc_dir="${prefix}/share/doc/opera" X- share_dir="${prefix}/share/opera" X+ doc_dir="${prefix}/share/doc/opera-devel" X+ share_dir="${prefix}/share/opera-devel" X exec_dir="${share_dir}/bin" X plugin_dir="${share_dir}/plugins" X else X@@ -381,7 +381,7 @@ X mvv='' # SunOS mv (no -v verbose option) X ;; X X- i[3456]86:FreeBSD|i[3456]86:NetBSD) X+ i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD) X cpf='-f' X if test "$verbose" -gt '1' X then X@@ -771,7 +771,7 @@ X debug_msg 0 "in generate_wrapper()" X X case "${machine}:${os}" in X- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) X+ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) X wrapper_ibmjava=" X IBMJava2-142/jre \\ X IBMJava2-141/jre \\ X@@ -806,10 +806,16 @@ X error 'os' X ;; X esac X- wrapper_file="${wrapper_dir}/opera" X+ wrapper_file="${wrapper_dir}/opera-devel" X X wrapper_contain="#!/bin/sh X X+# Location of locale data X+if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then X+ PATH_LOCALE=%%LOCALBASE%%/share/compat/locale X+ export PATH_LOCALE X+fi X+ X # Location of the Opera binaries X OPERA_BINARYDIR=${str_localdirexec} X export OPERA_BINARYDIR X@@ -865,6 +871,9 @@ X OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" X export OPERA_LD_PRELOAD X X+OPERA_PERSONALDIR=\${HOME}/.opera-devel X+export OPERA_PERSONALDIR X+ X # Native Java enviroment X if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then X INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` X@@ -888,69 +897,12 @@ X X if test ! \"\${OPERA_JAVA_DIR}\"; then X X- PREFIXES=\" X- /usr X- /usr/java X- /usr/lib X- /usr/local X- /opt\" X+ PREFIXES=\"%%LOCALBASE%%\" X X for SUNJAVA in \\ X- java-1.5.0-sun-1.5.0.06 \\ X- java-1.5.0-sun-1.5.0.06/jre \\ X- java-1.5.0-sun-1.5.0.05 \\ X- java-1.5.0-sun-1.5.0.05/jre \\ X- java-1.5.0-sun-1.5.0.04 \\ X- java-1.5.0-sun-1.5.0.04/jre \\ X- jre1.5.0_06 \\ X- jdk1.5.0_06/jre \\ X- jre1.5.0_05 \\ X- jdk1.5.0_05/jre \\ X- jre1.5.0_04 \\ X- jdk1.5.0_04/jre \\ X- jre1.5.0_03 \\ X- jdk1.5.0_03/jre \\ X- jre1.5.0_02 \\ X- jdk1.5.0_02/jre \\ X- jre1.5.0_01 \\ X- jdk1.5.0_01/jre \\ X- j2re1.4.2_06 \\ X- j2sdk1.4.2_06/jre \\ X- j2re1.4.2_04 \\ X- j2sdk1.4.2_04/jre \\ X- j2re1.4.2_03 \\ X- j2sdk1.4.2_03/jre \\ X- j2re1.4.2_02 \\ X- j2sdk1.4.2_02/jre \\ X- j2re1.4.2_01 \\ X- j2sdk1.4.2_01/jre \\ X- j2re1.4.2 \\ X- j2sdk1.4.2/jre \\ X- j2re1.4.1_01 \\ X- j2re1.4.1 \\ X- SUNJava2-1.4.1 \\ X- BlackdownJava2-1.4.1/jre \\ X- j2re1.4.0_01 \\ X- j2sdk1.4.0_01/jre \\ X- j2re1.4.0 \\ X- jre1.4.0 \\ X- j2se/1.4/jre \\ X- j2se/1.3/jre \\ X- j2se/jre \\ X- jre1.3.1_15 \\ X- jre1.3.1_04 \\ X- jre1.3.1_02 \\ X- jre1.3.1_01 \\ X- j2re1.3.1 \\ X- jre1.3.1 \\ X- j2re1.3 \\ X- j2se/1.3/jre \\ X- SunJava2-1.3/jre \\ X- java2re \\ X- jdk1.2.2/jre \\ X- jdk1.2/jre \\ X- jre \\ X- java \\ X+ jdk1.3.1/jre \\ X+ jdk1.4.2/jre \\ X+ jdk1.5.0/jre \\ X ; do X for PREFIX in \${PREFIXES}; do X if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi X@@ -1001,11 +953,8 @@ X X # Acrobat Reader X for BINDIR in \\ X- /usr/local/Acrobat[45]/bin \\ X- /usr/lib/Acrobat[45]/bin \\ X- /usr/X11R6/lib/Acrobat[45]/bin \\ X- /opt/Acrobat[45]/bin \\ X- /usr/Acrobat[45]/bin \\ X+ %%LOCALBASE%%/Acrobat4/bin \\ X+ %%LOCALBASE%%/Acrobat5/bin \\ X ; do X if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi X done X@@ -1016,12 +965,13 @@ X LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\" X export LD_LIBRARY_PATH X X-# Spellchecker needs to find libaspell.so.15 X+# Spellchecker needs to find libaspell.so.16 X for LIBASPELL_DIR in \\ X+ %%LOCALBASE%%/lib \\ X /usr/local/lib \\ X /opkg/lib \\ X ; do X- if test -f \"\${LIBASPELL_DIR}/libaspell.so.15\"; then X+ if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then X LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" X fi X done" X@@ -1123,7 +1073,7 @@ X chop "${OPERADESTDIR}" "str_localdirshare" X chop "${OPERADESTDIR}" "str_localdirplugin" X X- backup ${wrapper_dir}/opera opera X+ #backup ${wrapper_dir}/opera opera X X # Executable X debug_msg 1 "Executable" X@@ -1161,7 +1111,7 @@ X X #cp $cpv $cpf wrapper.sh $wrapper_dir/opera X generate_wrapper X- chmod $chmodv 755 $wrapper_dir/opera X+ chmod $chmodv 755 $wrapper_dir/opera-devel X X # Documentation X debug_msg 1 "Documentation" X@@ -1338,41 +1288,9 @@ X X if test -z "${OPERADESTDIR}" X then X- # System wide configuration files X- config_dir='/usr/local/etc' X- if can_write_to "$config_dir" X- then X- echo X- echo "System wide configuration files:" X- echo " $config_dir/opera6rc" X- echo " $config_dir/opera6rc.fixed" X- echo " would be ignored if installed with the prefix \"$prefix\"." X- if con_firm "Do you want to install them in $config_dir" X- then X- backup $config_dir/opera6rc opera6rc config X- backup $config_dir/opera6rc.fixed opera6rc.fixed config X- cp $cpv $cpf config/opera6rc $config_dir X- cp $cpv $cpf config/opera6rc.fixed $config_dir X- fi X- else X- echo X- echo "User \"${USERNAME}\" does not have write access to $config_dir" X- echo " System wide configuration files:" X- echo " $config_dir/opera6rc" X- echo " $config_dir/opera6rc.fixed" X- echo " were not installed." X- fi X- X # Shorcuts and Icons X bool_icons=1 # install icons by default X X- if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix=" X- then X- echo X- echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"." X- con_firm "Do you want to (try to) install them in default locations" || bool_icons=0 X- fi X- X if test "${bool_icons}" -ne 0 X then X xdg X@@ -1407,13 +1325,13 @@ X { X # arg1 = location X X- wmconfig_file="$1/opera" X+ wmconfig_file="$1/opera-devel" X X- wmconfig_contain='opera name "Opera" X+ wmconfig_contain='opera name "Opera Technical Preview" X opera description "Opera Web Browser" X-opera icon "opera.xpm" X-opera mini-icon "opera.xpm" X-opera exec "opera &" X+opera icon "opera-devel.xpm" X+opera mini-icon "opera-devel.xpm" X+opera exec "opera-devel &" X opera group "Internet"' X X echo "${wmconfig_contain}" > ${wmconfig_file} X@@ -1425,19 +1343,19 @@ X # arg1 = location X # arg2 = type X X- desktop_file="${1}/opera.desktop" X+ desktop_file="${1}/opera-devel.desktop" X desktop_contain='[Desktop Entry]' X X if test ${2}; then X if test "${2}" = "xdg"; then X desktop_contain="${desktop_contain} X Version=1.0 X-TryExec=opera" X+TryExec=opera-devel" X fi X X desktop_contain="${desktop_contain} X Encoding=UTF-8 X-Name=Opera X+Name=Opera Technical Preview X Name[af]=opera X Name[eo]=Opero X Name[zu]=I Opera X@@ -1461,7 +1379,7 @@ X GenericName[ven]=Buronza ya Webu X GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo X GenericName[zu]=Umkhangeli zincwadi we Web X-Exec=opera %u X+Exec=opera-devel %u X Terminal=false" X X # Application is not a category, according to X@@ -1476,19 +1394,19 @@ X if test "${2}" = "xdg"; then X desktop_contain="${desktop_contain} X Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel X-Icon=opera.png" X+Icon=opera-devel.png" X else X desktop_contain="${desktop_contain} X-Icon=opera" X+Icon=opera-devel" X fi X X desktop_contain="${desktop_contain} X MimeType=text/html;text/xml;application/xhtml+xml" X else X desktop_contain="${desktop_contain} X-Name=Opera X-Exec=opera X-Icon=opera.xpm X+Name=Opera Technical Preview X+Exec=opera-devel X+Icon=opera-devel.xpm X Terminal=0" X fi X X@@ -1582,48 +1500,43 @@ X # This function searches for common gnome icon paths. X debug_msg 1 "in gnome()" X X- if test -d /opt/gnome/ X+ if test -d %%X11BASE%%/share/gnome/; X then X- # /opt/gnome share X- if test -d /opt/gnome/share X- then X- # /opt/gnome icon X- if test ! -d /opt/gnome/share/pixmaps/ X+ # %%X11BASE%%/share/gnome icon X+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; X then X- if test -w /opt/gnome/share X+ if test -w %%X11BASE%%/share/gnome; X then X- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ X- chmod $chmodv 755 /opt/gnome/share/pixmaps X- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm X+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ X+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps X+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera-devel.xpm X fi X- elif test -w /opt/gnome/share/pixmaps X- then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm X+ elif test -w %%X11BASE%%/share/gnome/pixmaps X+ then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera-devel.xpm X fi X- # end /opt/gnome icon X+ # end %%X11BASE%%/share/gnome icon X X- # /opt/gnome link X- if test -d /opt/gnome/share/gnome/apps/ X+ # %%X11BASE%%/share/gnome link X+ if test -d %%X11BASE%%/share/gnome/apps/ X then X- if test -d /opt/gnome/share/gnome/apps/Internet/ X+ if test -d %%X11BASE%%/share/gnome/apps/Internet/ X then X- if test -w /opt/gnome/share/gnome/apps/Internet X- then generate_desktop /opt/gnome/share/gnome/apps/Internet X+ if test -w %%X11BASE%%/share/gnome/apps/Internet X+ then generate_desktop %%X11BASE%%/share/gnome/apps/Internet X fi X- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/ X+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/ X then X- if test -w /opt/gnome/share/gnome/apps/Networking/WWW X- then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW X+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW X+ then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW X fi X- elif test -w /opt/gnome/share/gnome/apps X+ elif test -w %%X11BASE%%/share/gnome/apps X then X- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ X- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet X- generate_desktop /opt/gnome/share/gnome/apps/Internet X+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ X+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet X+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet X fi X fi X- # end /opt/gnome link X- fi X- # end /opt/gnome share X+ # end %%X11BASE%%/share/gnome link X X elif test -d /usr/share/gnome/ X then X@@ -1634,10 +1547,10 @@ X then X mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/ X chmod $chmodv 755 /usr/share/gnome/pixmaps X- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm X+ cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera-devel.xpm X fi X elif test -w /usr/share/gnome/pixmaps X- then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm X+ then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera-devel.xpm X fi X # end /usr/share/gnome icon X X@@ -1671,45 +1584,45 @@ X # This function searches for common kde2 and kde 3 icon paths. X debug_msg 1 "in kde()" X X- if test -d /opt/kde$1/share X+ if test -d %%LOCALBASE%%/share; X then X- DIR_HI=/opt/kde$1/share/icons/hicolor X+ DIR_HI=%%LOCALBASE%%/share/icons/hicolor X if test -d "$DIR_HI" -a -w "$DIR_HI" X then X if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps X- then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png X+ then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera-devel.png X fi X if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps X- then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png X+ then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera-devel.png X fi X if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps X- then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png X+ then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera-devel.png X fi X fi X X- DIR_LO=/opt/kde$1/share/icons/locolor X+ DIR_LO=%%LOCALBASE%%/share/icons/locolor X if test -d $DIR_LO -a -w $DIR_LO X then X if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps X- then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png X+ then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera-devel.png X fi X if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps X- then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png X+ then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera-devel.png X fi X if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps X- then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png X+ then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera-devel.png X fi X fi X X- if test -d /opt/kde$1/share/applnk/ X+ if test -d %%LOCALBASE%%/share/applnk/ X then X- if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk X+ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk X then X- mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/ X- chmod $chmodv 755 /opt/kde$1/share/applnk/Internet X+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/ X+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet X fi X- if test -w /opt/kde$1/share/applnk/Internet X- then generate_desktop /opt/kde$1/share/applnk/Internet $1 X+ if test -w %%LOCALBASE%%/share/applnk/Internet X+ then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1 X fi X fi X fi X@@ -1778,34 +1691,9 @@ X } X X xdg() X-{ # http://standards.freedesktop.org X- if update-desktop-database --help >/dev/null 2>&1; then X- X- for ICON_DIR in ${XDG_DATA_DIRS}/icons/hicolor /usr/share/pixmaps/hicolor; do test -d ${ICON_DIR} && break; done X- X- if test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2 X- elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2 X- else X- test -d ${ICON_DIR}/48x48/apps && test -w ${ICON_DIR}/48x48/apps && cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png X- test -d ${ICON_DIR}/32x32/apps && test -w ${ICON_DIR}/32x32/apps && cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png X- test -d ${ICON_DIR}/22x22/apps && test -w ${ICON_DIR}/22x22/apps && cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png X- fi X- X- for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do test -d ${SHORTCUT_DIR} && break; done X- X- if test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return X- elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return X- fi X- generate_desktop ${SHORTCUT_DIR} xdg X- update-desktop-database X- else X- icons X+{ X gnome X kde 3 X- kde 2 X- kde1 X- mandrake X- fi X } X X # These are the only variables the needs to be changed END-of-opera-devel/files/patch-install.sh echo x - opera-devel/files/patch-search.ini sed 's/^X//' >opera-devel/files/patch-search.ini << 'END-of-opera-devel/files/patch-search.ini' X--- search.ini.orig Mon Feb 6 13:02:45 2006 X+++ search.ini Tue Feb 7 20:58:06 2006 X@@ -445,4 +445,44 @@ X Search Type=119 X Verbtext=0 X Position=-1 X-Nameid=291960 X+Nameid=0 X+ X+[Search Engine 35] X+Name=FreshP&orts X+URL=http://www.freshports.org/search.php?query=%s X+Query= X+Key=x X+Is post=0 X+Has endseparator=0 X+Encoding=utf-8 X+Search Type=0 X+Verbtext=17063 X+Position=-1 X+Nameid=0 X+ X+[Search Engine 36] X+Name=Google &BSD X+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8 X+Query= X+Key=x X+Is post=0 X+Has endseparator=0 X+Encoding=utf-8 X+Search Type=0 X+Verbtext=17063 X+Position=-1 X+Nameid=0 X+ X+[Search Engine 37] X+Name=FreeBSD &PRs X+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s X+Query= X+Key=x X+Is post=0 X+Has endseparator=0 X+Encoding=utf-8 X+Search Type=0 X+Verbtext=17063 X+Position=-1 X+Nameid=0 X+ END-of-opera-devel/files/patch-search.ini exit --- opera-devel.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1139344382.8373>