[Midnightbsd-cvs] mports: www/linux-opera: FInally update opera for linux
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jan 3 20:43:20 EST 2009
Log Message:
-----------
FInally update opera for linux
Modified Files:
--------------
mports/www/linux-opera:
Makefile (r1.11 -> r1.12)
distinfo (r1.7 -> r1.8)
pkg-plist (r1.3 -> r1.4)
mports/www/linux-opera/files:
patch-install.sh (r1.2 -> r1.3)
patch-search.ini (r1.2 -> r1.3)
Added Files:
-----------
mports/www/linux-opera/files:
linux-opera.desktop.in (r1.1)
patch-pluginpath.ini (r1.1)
Removed Files:
-------------
mports/www/linux-opera/files:
patch-locale::en::search.ini
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/linux-opera/pkg-plist -L www/linux-opera/pkg-plist -u -r1.3 -r1.4
--- www/linux-opera/pkg-plist
+++ www/linux-opera/pkg-plist
@@ -1,24 +1,25 @@
bin/linux-opera
- at comment share/applications/linux-opera.desktop
+share/apps/Internet/linux-opera.desktop
+share/applnk/Internet/linux-opera.desktop
+%%DOCSDIR%%/LGPL
%%DOCSDIR%%/LICENSE
%%DATADIR%%/bin/missingsyms.so
%%DATADIR%%/bin/opera
+%%DATADIR%%/bin/operaplugincleaner
+%%DATADIR%%/bin/operapluginwrapper
%%DATADIR%%/bin/spellcheck.so
%%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/encoding.bin
%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/opera.xpm
-%%DATADIR%%/images/opera_16x16.png
-%%DATADIR%%/images/opera_22x22.png
-%%DATADIR%%/images/opera_32x32.png
-%%DATADIR%%/images/opera_48x48.png
%%DATADIR%%/ini/dialog.ini
%%DATADIR%%/ini/fastforward.ini
%%DATADIR%%/ini/filehandler.ini
+%%DATADIR%%/ini/font.ini
+%%DATADIR%%/ini/mailproviders.xml
%%DATADIR%%/ini/pluginpath.ini
+%%DATADIR%%/ini/speeddial_default.ini
%%DATADIR%%/ini/standard_keyboard.ini
+%%DATADIR%%/ini/standard_keyboard_compat.ini
%%DATADIR%%/ini/standard_menu.ini
%%DATADIR%%/ini/standard_mouse.ini
%%DATADIR%%/ini/standard_toolbar.ini
@@ -27,14 +28,163 @@
%%DATADIR%%/java/opera.jar
%%DATADIR%%/java/opera.policy
%%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
+%%DATADIR%%/locale/be/byelorussian.lng
+%%DATADIR%%/locale/be/license.txt
+%%DATADIR%%/locale/be/opera6.adr
+%%DATADIR%%/locale/be/search.ini
+%%DATADIR%%/locale/bg/bulgarian.lng
+%%DATADIR%%/locale/bg/license.txt
+%%DATADIR%%/locale/bg/opera6.adr
+%%DATADIR%%/locale/bg/search.ini
+%%DATADIR%%/locale/cs/czech.lng
+%%DATADIR%%/locale/cs/license.txt
+%%DATADIR%%/locale/cs/opera6.adr
+%%DATADIR%%/locale/cs/search.ini
+%%DATADIR%%/locale/da/dansk.lng
+%%DATADIR%%/locale/da/license.txt
+%%DATADIR%%/locale/da/opera6.adr
+%%DATADIR%%/locale/da/search.ini
+%%DATADIR%%/locale/de/deutsch.lng
+%%DATADIR%%/locale/de/license.txt
+%%DATADIR%%/locale/de/opera6.adr
+%%DATADIR%%/locale/de/search.ini
+%%DATADIR%%/locale/el/greek.lng
+%%DATADIR%%/locale/el/license.txt
+%%DATADIR%%/locale/el/opera6.adr
+%%DATADIR%%/locale/el/search.ini
+%%DATADIR%%/locale/en-GB/british.lng
+%%DATADIR%%/locale/en-GB/license.txt
+%%DATADIR%%/locale/en-GB/opera6.adr
+%%DATADIR%%/locale/en-GB/search.ini
%%DATADIR%%/locale/en/license.txt
+%%DATADIR%%/locale/en/opera6.adr
%%DATADIR%%/locale/en/search.ini
%%DATADIR%%/locale/english.lng
+%%DATADIR%%/locale/es-ES/espanol-espana.lng
+%%DATADIR%%/locale/es-ES/license.txt
+%%DATADIR%%/locale/es-ES/opera6.adr
+%%DATADIR%%/locale/es-ES/search.ini
+%%DATADIR%%/locale/es-LA/espanol-america_latina.lng
+%%DATADIR%%/locale/es-LA/license.txt
+%%DATADIR%%/locale/es-LA/opera6.adr
+%%DATADIR%%/locale/es-LA/search.ini
+%%DATADIR%%/locale/et/eesti.lng
+%%DATADIR%%/locale/et/license.txt
+%%DATADIR%%/locale/et/opera6.adr
+%%DATADIR%%/locale/et/search.ini
+%%DATADIR%%/locale/fi/license.txt
+%%DATADIR%%/locale/fi/opera6.adr
+%%DATADIR%%/locale/fi/search.ini
+%%DATADIR%%/locale/fi/suomi.lng
+%%DATADIR%%/locale/fr-CA/francais-canadien.lng
+%%DATADIR%%/locale/fr-CA/license.txt
+%%DATADIR%%/locale/fr-CA/opera6.adr
+%%DATADIR%%/locale/fr-CA/search.ini
+%%DATADIR%%/locale/fr/francais.lng
+%%DATADIR%%/locale/fr/license.txt
+%%DATADIR%%/locale/fr/opera6.adr
+%%DATADIR%%/locale/fr/search.ini
+%%DATADIR%%/locale/fy/frisian.lng
+%%DATADIR%%/locale/fy/license.txt
+%%DATADIR%%/locale/fy/opera6.adr
+%%DATADIR%%/locale/fy/search.ini
+%%DATADIR%%/locale/hi/hindi.lng
+%%DATADIR%%/locale/hi/license.txt
+%%DATADIR%%/locale/hi/opera6.adr
+%%DATADIR%%/locale/hi/search.ini
+%%DATADIR%%/locale/hr/croatian.lng
+%%DATADIR%%/locale/hr/license.txt
+%%DATADIR%%/locale/hr/opera6.adr
+%%DATADIR%%/locale/hr/search.ini
+%%DATADIR%%/locale/hu/hungarian.lng
+%%DATADIR%%/locale/hu/license.txt
+%%DATADIR%%/locale/hu/opera6.adr
+%%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/id/indonesian.lng
+%%DATADIR%%/locale/id/license.txt
+%%DATADIR%%/locale/id/opera6.adr
+%%DATADIR%%/locale/id/search.ini
+%%DATADIR%%/locale/it/italiano.lng
+%%DATADIR%%/locale/it/license.txt
+%%DATADIR%%/locale/it/opera6.adr
+%%DATADIR%%/locale/it/search.ini
+%%DATADIR%%/locale/ja/japanese.lng
+%%DATADIR%%/locale/ja/license.txt
+%%DATADIR%%/locale/ja/opera6.adr
+%%DATADIR%%/locale/ja/search.ini
+%%DATADIR%%/locale/ka/georgian.lng
+%%DATADIR%%/locale/ka/license.txt
+%%DATADIR%%/locale/ka/opera6.adr
+%%DATADIR%%/locale/ka/search.ini
+%%DATADIR%%/locale/ko/korean.lng
+%%DATADIR%%/locale/ko/license.txt
+%%DATADIR%%/locale/ko/opera6.adr
+%%DATADIR%%/locale/ko/search.ini
+%%DATADIR%%/locale/lt/license.txt
+%%DATADIR%%/locale/lt/lithuanian.lng
+%%DATADIR%%/locale/lt/opera6.adr
+%%DATADIR%%/locale/lt/search.ini
+%%DATADIR%%/locale/mk/license.txt
+%%DATADIR%%/locale/mk/macedonian.lng
+%%DATADIR%%/locale/mk/opera6.adr
+%%DATADIR%%/locale/mk/search.ini
+%%DATADIR%%/locale/nb/license.txt
+%%DATADIR%%/locale/nb/norsk.lng
+%%DATADIR%%/locale/nb/opera6.adr
+%%DATADIR%%/locale/nb/search.ini
+%%DATADIR%%/locale/nl/license.txt
+%%DATADIR%%/locale/nl/nederlands.lng
+%%DATADIR%%/locale/nl/opera6.adr
+%%DATADIR%%/locale/nl/search.ini
+%%DATADIR%%/locale/nn/license.txt
+%%DATADIR%%/locale/nn/nynorsk.lng
+%%DATADIR%%/locale/nn/opera6.adr
+%%DATADIR%%/locale/nn/search.ini
+%%DATADIR%%/locale/pl/license.txt
+%%DATADIR%%/locale/pl/opera6.adr
+%%DATADIR%%/locale/pl/polski.lng
+%%DATADIR%%/locale/pl/search.ini
+%%DATADIR%%/locale/pt-BR/brazilportuguese.lng
+%%DATADIR%%/locale/pt-BR/license.txt
+%%DATADIR%%/locale/pt-BR/opera6.adr
+%%DATADIR%%/locale/pt-BR/search.ini
+%%DATADIR%%/locale/pt/license.txt
+%%DATADIR%%/locale/pt/opera6.adr
+%%DATADIR%%/locale/pt/portuguese.lng
+%%DATADIR%%/locale/pt/search.ini
+%%DATADIR%%/locale/ru/license.txt
+%%DATADIR%%/locale/ru/opera6.adr
+%%DATADIR%%/locale/ru/russian.lng
+%%DATADIR%%/locale/ru/search.ini
+%%DATADIR%%/locale/sv/license.txt
+%%DATADIR%%/locale/sv/opera6.adr
+%%DATADIR%%/locale/sv/search.ini
+%%DATADIR%%/locale/sv/svenska.lng
+%%DATADIR%%/locale/ta/license.txt
+%%DATADIR%%/locale/ta/opera6.adr
+%%DATADIR%%/locale/ta/search.ini
+%%DATADIR%%/locale/ta/tamil.lng
+%%DATADIR%%/locale/te/license.txt
+%%DATADIR%%/locale/te/opera6.adr
+%%DATADIR%%/locale/te/search.ini
+%%DATADIR%%/locale/te/telugu.lng
+%%DATADIR%%/locale/tr/license.txt
+%%DATADIR%%/locale/tr/opera6.adr
+%%DATADIR%%/locale/tr/search.ini
+%%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/uk/license.txt
+%%DATADIR%%/locale/uk/opera6.adr
+%%DATADIR%%/locale/uk/search.ini
+%%DATADIR%%/locale/uk/ukrainian.lng
+%%DATADIR%%/locale/zh-cn/chinese_simp.lng
+%%DATADIR%%/locale/zh-cn/license.txt
+%%DATADIR%%/locale/zh-cn/opera6.adr
+%%DATADIR%%/locale/zh-cn/search.ini
+%%DATADIR%%/locale/zh-tw/chinese.lng
+%%DATADIR%%/locale/zh-tw/license.txt
+%%DATADIR%%/locale/zh-tw/opera6.adr
+%%DATADIR%%/locale/zh-tw/search.ini
%%DATADIR%%/opera6.adr
-%%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/plugins/operapluginwrapper
%%DATADIR%%/search.ini
%%DATADIR%%/skin/standard_skin.zip
%%DATADIR%%/skin/windows_skin.zip
@@ -44,22 +194,31 @@
%%DATADIR%%/styles/config.css
%%DATADIR%%/styles/contentblock.css
%%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
%%DATADIR%%/styles/error.css
%%DATADIR%%/styles/history.css
%%DATADIR%%/styles/im.css
%%DATADIR%%/styles/image.css
%%DATADIR%%/styles/images/bar.png
%%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/flag.png
+%%DATADIR%%/styles/images/folder.png
%%DATADIR%%/styles/images/opera.png
%%DATADIR%%/styles/images/red_center.png
%%DATADIR%%/styles/images/red_left.png
%%DATADIR%%/styles/images/red_right.png
%%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/section.png
+%%DATADIR%%/styles/images/smartGroup.png
%%DATADIR%%/styles/images/top.png
%%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/mathml.css
+%%DATADIR%%/styles/message.css
%%DATADIR%%/styles/mime.css
%%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/search.css
%%DATADIR%%/styles/user/accessibility.css
%%DATADIR%%/styles/user/altdebugger.css
%%DATADIR%%/styles/user/classid.css
@@ -77,6 +236,7 @@
%%DATADIR%%/styles/user/tablelayout.css
%%DATADIR%%/styles/user/toc.css
%%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/webfeeds.html
%%DATADIR%%/styles/wml.css
%%DATADIR%%/svg-mo.dat
%%DATADIR%%/svg-mobd.dat
@@ -90,13 +250,51 @@
@dirrm %%DATADIR%%/styles
@dirrm %%DATADIR%%/skin
@dirrm %%DATADIR%%/plugins
+ at dirrm %%DATADIR%%/locale/zh-tw
+ at dirrm %%DATADIR%%/locale/zh-cn
+ at dirrm %%DATADIR%%/locale/uk
+ at dirrm %%DATADIR%%/locale/tr
+ at dirrm %%DATADIR%%/locale/te
+ at dirrm %%DATADIR%%/locale/ta
+ at dirrm %%DATADIR%%/locale/sv
+ at dirrm %%DATADIR%%/locale/ru
+ at dirrm %%DATADIR%%/locale/pt-BR
+ at dirrm %%DATADIR%%/locale/pt
+ at dirrm %%DATADIR%%/locale/pl
+ at dirrm %%DATADIR%%/locale/nn
+ at dirrm %%DATADIR%%/locale/nl
+ at dirrm %%DATADIR%%/locale/nb
+ at dirrm %%DATADIR%%/locale/mk
+ at dirrm %%DATADIR%%/locale/lt
+ at dirrm %%DATADIR%%/locale/ko
+ at dirrm %%DATADIR%%/locale/ka
+ at dirrm %%DATADIR%%/locale/ja
+ at dirrm %%DATADIR%%/locale/it
+ at dirrm %%DATADIR%%/locale/id
+ at dirrm %%DATADIR%%/locale/hu
+ at dirrm %%DATADIR%%/locale/hr
+ at dirrm %%DATADIR%%/locale/hi
+ at dirrm %%DATADIR%%/locale/fy
+ at dirrm %%DATADIR%%/locale/fr-CA
+ at dirrm %%DATADIR%%/locale/fr
+ at dirrm %%DATADIR%%/locale/fi
+ at dirrm %%DATADIR%%/locale/et
+ at dirrm %%DATADIR%%/locale/es-LA
+ at dirrm %%DATADIR%%/locale/es-ES
+ at dirrm %%DATADIR%%/locale/en-GB
@dirrm %%DATADIR%%/locale/en
+ at dirrm %%DATADIR%%/locale/el
+ at dirrm %%DATADIR%%/locale/de
+ at dirrm %%DATADIR%%/locale/da
+ at dirrm %%DATADIR%%/locale/cs
+ at dirrm %%DATADIR%%/locale/bg
+ at dirrm %%DATADIR%%/locale/be
@dirrm %%DATADIR%%/locale
@dirrm %%DATADIR%%/java
@dirrm %%DATADIR%%/ini
- at dirrm %%DATADIR%%/images
- at dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
+ at dirrmtry share/apps/Internet
+ at dirrmtry share/applnk/Internet
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L www/linux-opera/Makefile -L www/linux-opera/Makefile -u -r1.11 -r1.12
--- www/linux-opera/Makefile
+++ www/linux-opera/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= opera
-PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
-PORTREVISION= 1
+PORTVERSION= ${OPERA_VER}
CATEGORIES= www linux
MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
@@ -21,7 +20,7 @@
http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
PKGNAMEPREFIX= linux-
-DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
+DISTNAME= ${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
MAINTAINER= ports at MidnightBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
@@ -29,7 +28,7 @@
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
-WRKSRC= ${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+WRKSRC= ${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
USE_XLIB= yes
USE_BZIP2= yes
USE_LINUX= yes
@@ -37,34 +36,43 @@
NO_BUILD= yes
-DEPRECATED= There is a security issue with this verison of opera.
-
-OPERA_VER= 9.27
-OPERA_DATE= 20080331
-OPERA_BUILD= 709
-
+OPERA_VER= 9.63
+OPERA_BUILD= 2474
DATADIR= ${PREFIX}/share/${UNIQUENAME}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
MAN1= linux-opera.1
+post-extract:
+ @${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
+ ${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
+ @${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/linux-opera.desktop.in >${WRKDIR}/linux-opera.desktop
+
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini
+ ${WRKSRC}/install.sh ${WRKSRC}/usr/share/opera/ini/pluginpath.ini
+ ${REINPLACE_CMD} -e 's|FreeBSD|MidnightBSD|g' \
+ ${WRKSRC}/install.sh
+ @${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
+ ${WRKSRC}/Manifest.md5
@${FIND} ${WRKSRC} -name '*.orig' -delete
@${FIND} ${WRKSRC} -name '*.bak' -delete
do-install:
- ${MKDIR} ${PREFIX}/share/applications
- ${MKDIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/images/opera.xpm ${PREFIX}/share/pixmaps/linux-opera.xpm
+ @${MKDIR} ${PREFIX}/share/apps/Internet
+ @${MKDIR} ${PREFIX}/share/applnk/Internet
+ @${MKDIR} ${PREFIX}/share/applications
+ @${MKDIR} ${PREFIX}/share/pixmaps
+ @${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/opera.xpm ${PREFIX}/share/pixmaps/linux-opera.xpm
@(cd ${WRKSRC} && ./install.sh \
--prefix=${PREFIX} \
--docdir=${DOCSDIR} \
--sharedir=${DATADIR} \
--exec_prefix=${DATADIR}/bin \
--plugindir=${DATADIR}/plugins)
+ @${INSTALL_DATA} ${WRKDIR}/linux-opera.desktop ${PREFIX}/share/apps/Internet/
+ @${INSTALL_DATA} ${WRKDIR}/linux-opera.desktop ${PREFIX}/share/applnk/Internet/
# We must make sure that the correct java jar file is used after installation.
post-fake:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/distinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -L www/linux-opera/distinfo -L www/linux-opera/distinfo -u -r1.7 -r1.8
--- www/linux-opera/distinfo
+++ www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = dbf6bae423a897e92c0fcf1f4752bd9a
-SHA256 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
-SIZE (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 6813669
+MD5 (opera-9.63.gcc4-static-qt3.i386.tar.bz2) = bda1689f1895f614509b74e1bdd61ec3
+SHA256 (opera-9.63.gcc4-static-qt3.i386.tar.bz2) = 0e33b1c2f8154147ce29c4f4ba02c20a76170363cf8f8269b4c047f49378b7d0
+SIZE (opera-9.63.gcc4-static-qt3.i386.tar.bz2) = 9266959
Index: patch-search.ini
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/files/patch-search.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/linux-opera/files/patch-search.ini -L www/linux-opera/files/patch-search.ini -u -r1.2 -r1.3
--- www/linux-opera/files/patch-search.ini
+++ www/linux-opera/files/patch-search.ini
@@ -1,21 +1,21 @@
---- search.ini.orig Wed Apr 11 12:53:11 2007
-+++ search.ini Wed Apr 11 12:54:29 2007
-@@ -154,7 +154,7 @@
+--- usr/share/opera/search.ini.orig 2008-06-12 17:38:53.000000000 -0500
++++ usr/share/opera/search.ini 2008-06-12 17:40:57.000000000 -0500
+@@ -144,7 +144,7 @@
Query=
- Key=o
+ Key=f
Is post=0
-Has endseparator=0
+Has endseparator=-1
- Encoding=utf-8
- Search Type=11
+ Encoding=
+ Search Type=12
Verbtext=0
-@@ -446,3 +446,55 @@
+@@ -444,3 +444,68 @@
Verbtext=0
Position=-1
Nameid=291960
+
-+[Search Engine 35]
-+Name=Google BS&D
++[Search Engine 32]
++Name=Google BSD
+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+Query=
+Key=d
@@ -27,8 +27,88 @@
+Position=-1
+Nameid=0
+
++[Search Engine 33]
++Name=FreeBSD mail archives
++URL=http://freebsd.rambler.ru/srch?words=%s
++Query=
++Key=m
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 34]
++Name=FreeBSD PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=p
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 35]
++Name=FreshPorts
++URL=http://www.freshports.org/search.php?query=%s
++Query=
++Key=t
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
+[Search Engine 36]
-+Name=FreeBSD &mail archives
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
+--- usr/share/opera/locale/en/search.ini.orig 2008-06-12 17:39:11.000000000 -0500
++++ usr/share/opera/locale/en/search.ini 2008-06-12 17:41:48.000000000 -0500
+@@ -144,7 +144,7 @@
+ Query=
+ Key=f
+ Is post=0
+-Has endseparator=0
++Has endseparator=-1
+ Encoding=
+ Search Type=12
+ Verbtext=0
+@@ -444,3 +444,68 @@
+ Verbtext=0
+ Position=-1
+ Nameid=291960
++
++[Search Engine 32]
++Name=Google BSD
++URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
++Query=
++Key=d
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 33]
++Name=FreeBSD mail archives
+URL=http://freebsd.rambler.ru/srch?words=%s
+Query=
+Key=m
@@ -40,8 +120,8 @@
+Position=-1
+Nameid=0
+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
++[Search Engine 34]
++Name=FreeBSD PRs
+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
+Query=
+Key=p
@@ -53,8 +133,8 @@
+Position=-1
+Nameid=0
+
-+[Search Engine 38]
-+Name=FreshPor&ts
++[Search Engine 35]
++Name=FreshPorts
+URL=http://www.freshports.org/search.php?query=%s
+Query=
+Key=t
@@ -65,3 +145,16 @@
+Verbtext=0
+Position=-1
+Nameid=0
++
++[Search Engine 36]
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
--- /dev/null
+++ www/linux-opera/files/patch-pluginpath.ini
@@ -0,0 +1,82 @@
+--- usr/share/opera/ini/pluginpath.ini.orig 2008-06-12 11:59:40.000000000 -0500
++++ usr/share/opera/ini/pluginpath.ini 2008-06-12 12:02:35.000000000 -0500
+@@ -2,66 +2,26 @@
+ ; Do not edit this file while Opera is running
+ ; This file is stored in UTF-8 encoding
+
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
+-
+ [Paths]
+-$PWD/plugins=1
+-$OPERA_PERSONALDIR/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
+-/opt/opera/lib/opera/plugins=1
++$HOME/.linux-opera/plugins=1
++%%PREFIX%%/share/linux-opera/plugins=1
+
+ ; Adobe Acrobat
+-/usr/local/Adobe/Reader8/Browser/intellinux=1
+-/usr/local/Acrobat7.0/Browsers/intellinux=1
+-/usr/local/Acrobat7/Browsers/intellinux=1
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Adobe/Reader8/Browser/intellinux=1
+-/usr/lib/Acrobat7.0/Browsers/intellinux=1
+-/usr/lib/Acrobat7/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Adobe/Reader8/Browser/intellinux=1
+-/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Adobe/Reader8/Browser/intellinux=1
+-/opt/Acrobat7.0/Browsers/intellinux=1
+-/opt/Acrobat7/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Adobe/Reader8/Browser/intellinux=1
+-/usr/Acrobat7.0/Browsers/intellinux=1
+-/usr/Acrobat7/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+
+ ; Realplayer
+-/usr/lib/RealPlayer8/Plugins=1
+-/usr/lib/realplay/plugins=1
+-/usr/lib/RealPlayer8=1
+-/usr/lib/realplay=1
++%%LOCALBASE%%/lib/RealPlayer=1
++%%LOCALBASE%%/lib/RealPlayer/plugins=1
+
+ ; Flash
+-/usr/lib/flash-plugin=1
+-/usr/lib/flashplugin-nonfree=1
+-
+-; Netscape Plug-in Paths
+-$HOME/.netscape6/plugins=1
+-$HOME/.netscape/plugins=1
+-/opt/netscape/plugins=1
+-/usr/lib/netscape/plugins=1
+-/usr/local/netscape/plugins=1
+-/usr/local/lib/netscape/plugins=1
+-$HOME/.kde/.konqueror/nsplugins=1
++%%LOCALBASE%%/lib/linux-flashplugin6=1
++%%LOCALBASE%%/lib/linux-flashplugin7=1
+
+ ; Since Mozilla supports NS plugins, there might
+ ; be some in the Mozilla plugin directory.
+-/usr/lib/mozilla/plugins=1
+-/usr/X11R6/lib/mozilla/plugins=1
+-/usr/lib64/browser-plugins=1
+-/usr/lib/browser-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
++%%LOCALBASE%%/lib/npapi/symlinks/linux-opera=1
--- www/linux-opera/files/patch-locale::en::search.ini
+++ /dev/null
@@ -1,67 +0,0 @@
---- locale/en/search.ini.orig Wed Apr 11 12:54:55 2007
-+++ locale/en/search.ini Wed Apr 11 12:55:41 2007
-@@ -154,7 +154,7 @@
- Query=
- Key=o
- Is post=0
--Has endseparator=0
-+Has endseparator=-1
- Encoding=utf-8
- Search Type=11
- Verbtext=0
-@@ -446,3 +446,55 @@
- Verbtext=0
- Position=-1
- Nameid=291960
-+
-+[Search Engine 35]
-+Name=Google BS&D
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Query=
-+Key=d
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 36]
-+Name=FreeBSD &mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
-+Query=
-+Key=m
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
-+Query=
-+Key=p
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 38]
-+Name=FreshPor&ts
-+URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=t
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
Index: patch-install.sh
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/files/patch-install.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/linux-opera/files/patch-install.sh -L www/linux-opera/files/patch-install.sh -u -r1.2 -r1.3
--- www/linux-opera/files/patch-install.sh
+++ www/linux-opera/files/patch-install.sh
@@ -1,17 +1,8 @@
---- install.sh.luke Sat Oct 20 11:07:59 2007
-+++ install.sh Sat Oct 20 11:09:39 2007
-@@ -81,7 +81,7 @@
-
- os=`uname -s` || error 'uname'
- case $os in
-- FreeBSD|NetBSD|DragonFly) os=AnyBSD;;
-+ FreeBSD|NetBSD|DragonFly|MidnightBSD) os=AnyBSD;;
- SunOS*) os=SunOS;;
- esac
- case $os in AnyBSD|OpenBSD) str_defaultprefix="/usr/local";; esac
-@@ -805,10 +805,9 @@
+--- install.sh.orig 2008-06-11 15:33:00.000000000 -0500
++++ install.sh 2008-07-02 22:49:18.000000000 -0500
+@@ -832,10 +832,9 @@
case "${machine}:${os}" in
- x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
+ x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
wrapper_ibmjava="
- IBMJava2-142/jre \\
- IBMJava2-141/jre \\
@@ -23,7 +14,7 @@
wrapper_sunjava_machine="i386"
;;
-@@ -838,16 +837,16 @@
+@@ -865,10 +864,19 @@
error 'os'
;;
esac
@@ -32,32 +23,19 @@
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
-+case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=/usr/local/bin/$0;; esac
+ case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
export OPERA_SCRIPT_PATH
-
- # Location of the Opera binaries
--OPERA_BINARYDIR=${str_localdirexec}
-+OPERA_BINARYDIR=/usr/local/share/linux-opera/bin
- export OPERA_BINARYDIR
-
- # Parse commandline parameters
-@@ -890,10 +889,10 @@
-
- # Opera enviroment
- if test \"\${OPERA_DIR}\" = '' ; then
-- if test -d ${str_localdirshare} ; then
-- OPERA_DIR=${str_localdirshare}
-+ if test -d /usr/local/share/linux-opera ; then
-+ OPERA_DIR=/usr/local/share/linux-opera
- else
-- echo \"OPERA_DIR unset and not found at expected location (${str_localdirshare})\"
-+ echo \"OPERA_DIR unset and not found at expected location (/usr/local/share/linux-opera)\"
- exit 1
- fi
- fi
-@@ -901,6 +900,10 @@
+@@ -928,8 +936,12 @@
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
export OPERA_LD_PRELOAD
@@ -66,42 +44,43 @@
+export OPERA_PERSONALDIR
+
# Native Java enviroment
- if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
- INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -908,8 +911,8 @@
- fi
-
- if test ! \"\${OPERA_JAVA_DIR}\"; then
-- if test -f \"\${HOME}/.opera/javapath.txt\"; then
-- INIJAVA=\`cat \${HOME}/.opera/javapath.txt\`
-+ if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-+ INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
- if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
- fi
- fi
-@@ -924,69 +927,16 @@
-
- if test ! \"\${OPERA_JAVA_DIR}\"; then
+-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,85 +962,17 @@
+ if test ! \"\${OPERA_JAVA_DIR}\"
+ then
- PREFIXES=\"
- /usr
- /usr/java
- /usr/lib
- /usr/local
- /opt\"
-+ PREFIXES=\"/usr/local\"
++ 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 \\
-- java-1.5.0-sun-1.5.0.05 \\
-- java-1.5.0-sun-1.5.0.05/jre \\
-- java-1.5.0-sun-1.5.0.04 \\
-- java-1.5.0-sun-1.5.0.04/jre \\
- jre1.5.0_06 \\
- jdk1.5.0_06/jre \\
+- 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 \\
@@ -110,6 +89,7 @@
- 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 \\
@@ -147,6 +127,12 @@
- 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 \\
+ linux-blackdown-jdk1.3.1/jre \\
+ linux-blackdown-jdk1.4.1/jre \\
+ linux-blackdown-jdk1.4.2/jre \\
@@ -154,10 +140,11 @@
+ 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
- if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -1037,11 +987,8 @@
+ for PREFIX in \${PREFIXES}
+ do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
+@@ -1082,11 +1026,7 @@
# Acrobat Reader
for BINDIR in \\
@@ -166,12 +153,21 @@
- /usr/X11R6/lib/Acrobat[45]/bin \\
- /opt/Acrobat[45]/bin \\
- /usr/Acrobat[45]/bin \\
-+ /usr/local/Acrobat5/bin \\
-+ /usr/local/Acrobat5/bin \\
++ %%LOCALBASE%%/Acrobat5/bin \\
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
-@@ -1063,13 +1010,6 @@
+@@ -1099,8 +1039,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}\"
+@@ -1108,13 +1047,6 @@
done"
case "${os}" in
@@ -185,7 +181,7 @@
SunOS)
wrapper_contain="${wrapper_contain}
-@@ -1098,7 +1038,7 @@
+@@ -1143,7 +1075,7 @@
};
// Opera package classes get all permissions
@@ -194,158 +190,166 @@
permission java.security.AllPermission;
};
-@@ -1167,7 +1107,7 @@
+@@ -1260,12 +1192,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"
+@@ -1274,76 +1206,20 @@
+ mkdir $mkdirv $mkdirp $plugin_dir/
+
+ # Wrapper
- backup ${wrapper_dir}/opera opera
+ #backup ${wrapper_dir}/opera opera
-
- # Executable
- debug_msg 1 "Executable"
-@@ -1201,7 +1141,7 @@
+ 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
- # Manual page
- debug_msg 1 "Manual page"
-@@ -1210,7 +1150,7 @@
- chmod $chmodv 755 ${man_dir}
- mkdir $mkdirv $mkdirp ${man_dir}/man1
- chmod $chmodv 755 ${man_dir}/man1
-- cp $cpv $cpf man/opera.1 ${man_dir}/man1
-+ cp $cpv $cpf man/opera.1 ${man_dir}/man1/linux-opera.1
-
- # Documentation
- debug_msg 1 "Documentation"
-@@ -1242,13 +1182,6 @@
- mkdir $mkdirv $mkdirp $share_dir/ini/
- chmod $chmodv 755 $share_dir/ini
- cp $cpv $cpf $cpR ini/* $share_dir/ini/
-- if test -f $share_dir/ini/pluginpath.ini
-- then (
-- echo
-- echo '; locally installed:'
-- echo "${str_localdirplugin}=1"
-- ) >> $share_dir/ini/pluginpath.ini
-- fi
- fi
-
- mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1340,43 +1273,11 @@
-
- if test -z "${OPERADESTDIR}"
+ if test -z "$OPERADESTDIR"
then
- # System wide configuration files
-- config_dir="/etc"
+- 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
-- echo
-- echo "System wide configuration files:"
-- echo " $config_dir/opera6rc"
-- echo " $config_dir/opera6rc.fixed"
-- echo " would be ignored if installed with the prefix \"$prefix\"."
-- if con_firm "Do you want to install them in $config_dir"
+- warn
+- warn "System wide configuration files:"
+- warn " $config_dir/opera6rc"
+- warn " $config_dir/opera6rc.fixed"
+- 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
-- backup $config_dir/opera6rc opera6rc config
-- backup $config_dir/opera6rc.fixed opera6rc.fixed config
-- cp $cpv $cpf config/opera6rc $config_dir
-- cp $cpv $cpf config/opera6rc.fixed $config_dir
+- if [ -f "$config_dir/opera6rc" ]
+- then
+- if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/opera6rc exists: over-write it ?"
+- then
+- backup $config_dir/opera6rc opera6rc config
+- cp $cpv $cpf etc/opera6rc $config_dir
+- fi
+- else cp $cpv $cpf etc/opera6rc $config_dir
+- fi
+- if [ -f "$config_dir/opera6rc.fixed" ]
+- then
+- if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/opera6rc.fixed exists: over-write it ?"
+- then
+- backup $config_dir/opera6rc.fixed opera6rc.fixed config
+- cp $cpv $cpf etc/opera6rc.fixed $config_dir
+- fi
+- else cp $cpv $cpf etc/opera6rc.fixed $config_dir
+- fi
- fi
- else
-- echo
-- echo "User \"${USERNAME}\" does not have write access to $config_dir"
-- echo " System wide configuration files:"
-- echo " $config_dir/opera6rc"
-- echo " $config_dir/opera6rc.fixed"
-- echo " were not installed."
+- warn
+- warn "User \"${USERNAME}\" does not have write access to $config_dir"
+- warn " System wide configuration files:"
+- warn " $config_dir/opera6rc"
+- warn " $config_dir/opera6rc.fixed"
+- 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
-- echo
-- echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
-- con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
+- 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
+ if test "$bool_icons" -ne 0
- then xdg
+ then icons
fi
fi # OPERADESTDIR
-@@ -1428,19 +1329,19 @@
- # arg1 = location
- # arg2 = type
-
-- desktop_file="${1}/opera.desktop"
-+ desktop_file="${1}/linux-opera.desktop"
- desktop_contain='[Desktop Entry]'
-
- if test ${2}; then
- if test "${2}" = "xdg"; then
- desktop_contain="${desktop_contain}
+@@ -1392,21 +1268,21 @@
+ 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"
+-TryExec=opera
++TryExec=linux-opera
+ EOF
fi
-
- desktop_contain="${desktop_contain}
+ cat <<EOF
Encoding=UTF-8
-Name=Opera
+Name=Opera (linux version)
Name[af]=opera
Name[eo]=Opero
Name[zu]=I Opera
-@@ -1464,7 +1365,7 @@
+@@ -1430,7 +1306,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"
+ Terminal=false
+ EOF
- # Application is not a category, according to
-@@ -1479,25 +1380,26 @@
- if test "${2}" = "xdg"; then
- desktop_contain="${desktop_contain}
+@@ -1446,15 +1322,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"
- else
- desktop_contain="${desktop_contain}
--Icon=opera"
-+Icon=linux-opera"
- fi
-
- desktop_contain="${desktop_contain}
- MimeType=text/html;text/xml;application/xhtml+xml"
- else
- desktop_contain="${desktop_contain}
--Name=Opera
--Exec=opera
--Icon=opera.xpm
-+Name=Opera (linux version)
-+Exec=linux-opera
+-Icon=opera.png
+Icon=linux-opera.png
- Terminal=0"
+ EOF
+- else echo 'Icon=opera'
++ else echo 'Icon=linux-opera'
+ fi
+ echo 'MimeType=text/html;text/xml;application/xhtml+xml'
fi
-
- desktop_contain="${desktop_contain}
+ cat <<EOF
Comment=Web Browser
--Type=Application"
-+Type=Application
-+Categories=Application;Network;WebBrowser;"
-
- echo "${desktop_contain}" > ${desktop_file}
- chmod $chmodv 644 ${desktop_file}
-@@ -1528,55 +1430,28 @@
+ Type=Application
++Categories=Application;Network;WebBrowser;
+ EOF
+ }
+
+@@ -1462,7 +1339,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()
+@@ -1487,51 +1364,26 @@
debug_msg 0 "in icons()"
@@ -354,64 +358,58 @@
- if test -w /usr/share
- then
- mkdir $mkdirv $mkdirp /usr/share/icons/
-- chmod $chmodv 755 /usr/share/icons
-- cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+- cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
- fi
- elif test -w /usr/share/icons
-- then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+- then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
- fi
-
- if test ! -d /usr/share/pixmaps
-- then
++ if test ! -d %%LOCALBASE%%/share/pixmaps/
+ then
- if test -w /usr/share
-- then
++ if test -w %%LOCALBASE%%/share
+ then
- mkdir $mkdirv $mkdirp /usr/share/pixmaps/
-- chmod $chmodv 755 /usr/share/pixmaps
-- cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
-- fi
+- 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_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
-- fi
--
+- 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 /usr/local/share/pixmaps/
++ if test ! -d %%LOCALBASE%%/share/applications/
then
- if test -w /etc/X11
-+ if test -w /usr/local/share
++ if test -w %%LOCALBASE%%/share
then
- mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
-- chmod $chmodv 755 /etc/X11/wmconfig
- generate_wmconfig /etc/X11/wmconfig
-+ mkdir $mkdirv $mkdirp /usr/local/share/pixmaps/
-+ chmod $chmodv 755 /usr/local/share/pixmaps
-+ cp $cpv $share_dir/images/opera_48x48.png /usr/local/share/pixmaps/linux-opera.png
- fi
+- fi
- elif test -w /etc/X11/wmconfig/
- then generate_wmconfig /etc/X11/wmconfig
-+ elif test -w /usr/local/share/pixmaps/
-+ then cp $cpv $share_dir/images/opera_48x48.png /usr/local/share/pixmaps/linux-opera.png
- fi
-
+- fi
+-
- if test -d /etc/X11/applnk/
-+ if test ! -d /usr/local/share/applications/
- then
+- then
- if test ! -d /etc/X11/applnk/Internet/
-+ if test -w /usr/local/share
- then
+- then
- if test -w /etc/X11/applnk
- then
- mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
-- chmod $chmodv 755 /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 /usr/local/share/applications/
-+ chmod $chmodv 755 /usr/local/share/applications
-+ generate_desktop /usr/local/share/applications
++ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
++ generate_desktop %%LOCALBASE%%/share/applications
fi
-+ elif test -w /usr/local/share/applications
-+ then generate_desktop /usr/local/share/applications
++ elif test -w %%LOCALBASE%%/share/applications
++ then generate_desktop %%LOCALBASE%%/share/applications
fi
}
--- /dev/null
+++ www/linux-opera/files/linux-opera.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Opera Web Browser
+GenericName=Web Browser
+Comment=Browse the web
+Exec=linux-opera %u
+Icon=@PREFIX@/share/pixmaps/linux-opera.xpm
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;
More information about the Midnightbsd-cvs
mailing list