Date: Thu, 3 Jun 2004 18:38:19 +0200 From: "Arjan van Leeuwen" <avleeuwen@piwebs.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/67539: Update www/opera to 7.51 Final Message-ID: <1086280699.0@vincent.piwebs.com> Resent-Message-ID: <200406031640.i53GePju008519@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67539
>Category: ports
>Synopsis: Update www/opera to 7.51 Final
>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: Thu Jun 03 09:40:25 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Arjan van Leeuwen
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 5.2-CURRENT #1: Fri May 28 20:32:53 CEST 2004
root@vincent.piwebs.com:/usr/obj/usr/src/sys/AMD760
>Description:
This patch updates Opera (www/opera) to version 7.51 final.
- Updated to 7.51 final (changelog: http://www.opera.com/linux/changelogs/751/)
- Fixed spellchecker bug reported by Randy Pratt (rpratt1950 at earthlink dot net)
- Fix location of shortcuts for KDE (synced with www/linux-opera)
>How-To-Repeat:
>Fix:
--- opera.diff begins here ---
diff -urN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile Sat May 15 01:19:42 2004
+++ opera/Makefile Wed Jun 2 17:41:55 2004
@@ -28,14 +28,15 @@
MAINTAINER= avleeuwen@piwebs.com
COMMENT= A blazingly fast, full-featured, standards-compliant browser
-OPERA_VER= 7.50
+OPERA_VER= 7.51
OPERA_REL= final
-OPERA_DATE= 20040511
+OPERA_DATE= 20040602
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
USE_BZIP2= yes
+WANT_GNOME= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
ONLY_FOR_ARCHS= i386
@@ -49,39 +50,24 @@
LIB_DEPENDS+= c_r.4:${PORTSDIR}/misc/compat4x
.endif
-.if exists(/etc/X11/applnk)
-PLIST_SUB+= APPLNK=""
-.else
-PLIST_SUB+= APPLNK="@comment "
-.endif
-
-.if exists(${X11BASE}/share/gnome)
+.if ${HAVE_GNOME:Mgnomehier}!=""
PLIST_SUB+= GNOME=""
.else
PLIST_SUB+= GNOME="@comment "
.endif
-.if exists(${X11BASE}/share/applnk/Internet)
+.if exists(${LOCALBASE}/bin/kde-config)
PLIST_SUB+= KDE=""
.else
PLIST_SUB+= KDE="@comment "
.endif
-.if exists(${X11BASE}/share/applnk/Networking)
-PLIST_SUB+= KDE2=""
-.else
-PLIST_SUB+= KDE2="@comment "
-.endif
-
-.if exists(${X11BASE}/share/gnome/apps)
-PLIST_SUB+= GNOMELNK=""
-.else
-PLIST_SUB+= GNOMELNK="@comment "
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
- s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/install.sh \
+ ${WRKSRC}/ini/spellcheck.ini
+ @${RM} ${WRKSRC}/ini/spellcheck.ini.*
do-install:
(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
diff -urN /usr/ports/www/opera/distinfo opera/distinfo
--- /usr/ports/www/opera/distinfo Sat May 15 01:19:42 2004
+++ opera/distinfo Wed Jun 2 17:42:09 2004
@@ -1,2 +1,2 @@
-MD5 (opera-7.50-20040511.1-static-qt.i386.freebsd-en.tar.bz2) = 1438a8708cfc8cda9ae9e14c1fc72dd9
-SIZE (opera-7.50-20040511.1-static-qt.i386.freebsd-en.tar.bz2) = 4754897
+MD5 (opera-7.51-20040602.1-static-qt.i386.freebsd-en.tar.bz2) = a5ceba358ddf1f034f69805ae919b6ec
+SIZE (opera-7.51-20040602.1-static-qt.i386.freebsd-en.tar.bz2) = 4757901
diff -urN /usr/ports/www/opera/files/patch-ini::spellcheck.ini opera/files/patch-ini::spellcheck.ini
--- /usr/ports/www/opera/files/patch-ini::spellcheck.ini Thu Jan 1 01:00:00 1970
+++ opera/files/patch-ini::spellcheck.ini Tue Jun 1 19:19:42 2004
@@ -0,0 +1,9 @@
+--- ini/spellcheck.ini.orig Thu May 13 13:51:43 2004
++++ ini/spellcheck.ini Thu May 13 13:52:00 2004
+@@ -3,5 +3,6 @@
+ ; This file is stored in UTF-8 encoding
+
+ [Spell Check]
++Spell Check Engine=%%PREFIX%%/share/opera/bin/spellcheck.so
+ Default Language=en
+ Default Encoding=iso8859-1
diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh
--- /usr/ports/www/opera/files/patch-install.sh Thu Apr 15 22:25:59 2004
+++ opera/files/patch-install.sh Tue Jun 1 19:50:12 2004
@@ -1,5 +1,5 @@
---- install.sh.orig Fri Nov 21 13:52:17 2003
-+++ install.sh Thu Apr 15 13:32:10 2004
+--- install.sh.orig Tue Jun 1 12:35:02 2004
++++ install.sh Tue Jun 1 19:40:04 2004
@@ -760,9 +760,7 @@
wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\
@@ -10,7 +10,7 @@
+ /usr/local/share/opera/plugins \\"
case "${machine}:${os}" in
- i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -817,15 +815,10 @@
;;
esac
@@ -44,7 +44,7 @@
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
-@@ -1245,31 +1235,8 @@
+@@ -1254,36 +1244,13 @@
if test -z "${OPERADESTDIR}"; then
@@ -76,8 +76,16 @@
+ #icons
gnome
kde 3
- kde 2
-@@ -1358,22 +1325,22 @@
+- kde 2
+- kde1
+- mandrake
++ #kde 2
++ #kde1
++ #mandrake
+
+ fi # OPERADESTDIR
+
+@@ -1367,22 +1334,22 @@
debug_msg 0 "in icons()"
@@ -112,12 +120,48 @@
fi
if test ! -d /etc/X11/wmconfig/; then
-@@ -1439,33 +1406,33 @@
- fi
- # end /opt/gnome share
+@@ -1412,72 +1379,36 @@
+
+ debug_msg 1 "in gnome()"
+- if test -d /opt/gnome/; then
+-
+- # /opt/gnome share
+- if test -d /opt/gnome/share; then
+-
+- # /opt/gnome icon
+- if test ! -d /opt/gnome/share/pixmaps/; then
+- if test -w /opt/gnome/share; then
+- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
+- chmod $chmodv 755 /opt/gnome/share/pixmaps
+- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
+- fi
+- elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
+- fi
+- # end /opt/gnome icon
+-
+- # /opt/gnome link
+- if test -d /opt/gnome/share/gnome/apps/; then
+- if test -d /opt/gnome/share/gnome/apps/Internet/; then
+- if test -w /opt/gnome/share/gnome/apps/Internet; then
+- generate_desktop /opt/gnome/share/gnome/apps/Internet
+- fi
+- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
+- if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then
+- generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
+- fi
+- elif test -w /opt/gnome/share/gnome/apps; then
+- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
+- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
+- generate_desktop /opt/gnome/share/gnome/apps/Internet
+- fi
+- fi
+- # end /opt/gnome link
+- fi
+- # end /opt/gnome share
+-
- elif test -d /usr/share/gnome/; then
-+ elif test -d /usr/X11R6/share/gnome/; then
++ if test -d %%X11PREFIX%%/share/gnome/; then
- # /usr/share/gnome icon
- if test ! -d /usr/share/gnome/pixmaps/; then
@@ -125,67 +169,101 @@
- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
- chmod $chmodv 755 /usr/share/gnome/pixmaps
- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
-+ # /usr/X11R6/share/gnome icon
-+ if test ! -d /usr/X11R6/share/gnome/pixmaps/; then
-+ if test -w /usr/X11R6/share/gnome; then
-+ mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/pixmaps/
-+ chmod $chmodv 755 /usr/X11R6/share/gnome/pixmaps
-+ cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm
++ # %%X11PREFIX%%/share/gnome icon
++ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then
++ if test -w %%X11BASE%%/share/gnome; then
++ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
++ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
++ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
fi
- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
-+ elif test -w /usr/X11R6/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm
++ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
fi
- # end /usr/share/gnome icon
-+ # end /usr/X11R6/share/gnome icon
++ # end %%X11PREFIX%%/share/gnome icon
- # /usr/share/gnome link
- if test -d /usr/share/gnome/apps/; then
- if test -d /usr/share/gnome/apps/Internet/; then
- if test -w /usr/share/gnome/apps/Internet; then
- generate_desktop /usr/share/gnome/apps/Internet
-+ # /usr/X11R6/share/gnome link
-+ if test -d /usr/X11R6/share/gnome/apps/; then
-+ if test -d /usr/X11R6/share/gnome/apps/Internet/; then
-+ if test -w /usr/X11R6/share/gnome/apps/Internet; then
-+ generate_desktop /usr/X11R6/share/gnome/apps/Internet
++ # %%X11BASE%%/share/gnome link
++ if test -d %%X11BASE%%/share/gnome/apps/; then
++ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
++ if test -w %%X11BASE%%/share/gnome/apps/Internet; then
++ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
fi
- elif test -d /usr/share/gnome/apps/Networking/WWW/; then
- if test -w /usr/share/gnome/apps/Networking/WWW; then
- generate_desktop /usr/share/gnome/apps/Networking/WWW
-+ elif test -d /usr/X11R6/share/gnome/apps/Networking/WWW/; then
-+ if test -w /usr/X11R6/share/gnome/apps/Networking/WWW; then
-+ generate_desktop /usr/X11R6/share/gnome/apps/Networking/WWW
++ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
++ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
++ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
fi
- elif test -w /usr/share/gnome/apps; then
- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/
- chmod $chmodv 755 /usr/share/gnome/apps/Internet
- generate_desktop /usr/share/gnome/apps/Internet
-+ elif test -w /usr/X11R6/share/gnome/apps; then
-+ mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/apps/Internet/
-+ chmod $chmodv 755 /usr/X11R6/share/gnome/apps/Internet
-+ generate_desktop /usr/X11R6/share/gnome/apps/Internet
++ elif test -w %%X11BASE%%/share/gnome/apps; then
++ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
++ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
++ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
fi
fi
- # end /usr/share/gnome link
-@@ -1505,12 +1472,12 @@
+- # end /usr/share/gnome link
++ # end %%X11BASE%%/share/gnome link
+ fi
+ # Add ximian here
+ }
+@@ -1488,39 +1419,31 @@
+
+ debug_msg 1 "in kde()"
+
+- if test -d /opt/kde${1}/share; then
++ if test -d %%LOCALBASE%%/share; then
+
+- DIR_HI=/opt/kde${1}/share/icons/hicolor
++ DIR_HI=%%LOCALBASE%%/share/icons/hicolor
+ if test -d "$DIR_HI" -a -w "$DIR_HI"; then
+ if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps; then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png; fi
+ if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png; fi
+ if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png; fi
+ fi
+
+- DIR_LO=/opt/kde${1}/share/icons/locolor
++ DIR_LO=%%LOCALBASE%%/share/icons/locolor
+ if test -d $DIR_LO -a -w $DIR_LO; then
+ if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png; fi
+ if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png; fi
+ if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps; then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png; fi
+ fi
+
+- if test -d /opt/kde${1}/share/applnk/; then
+- if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then
+- mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/
+- chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet
++ if test -d %%LOCALBASE%%/share/applnk/; then
++ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then
++ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
++ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
+ fi
+- if test -w /opt/kde${1}/share/applnk/Internet; then generate_desktop /opt/kde${1}/share/applnk/Internet ${1}; fi
++ if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
+ fi
fi
-
+-
- if test -d /usr/share/applnk/Networking; then
- if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
- mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
- chmod $chmodv 755 /usr/share/applnk/Networking/WWW
-+ if test -d /usr/X11R6/share/applnk/Networking; then
-+ if test ! -d /usr/X11R6/share/applnk/Networking/WWW/ -a -w /usr/X11R6/share/applnk/Networking; then
-+ mkdir $mkdirv $mkdirp /usr/X11R6/share/applnk/Networking/WWW/
-+ chmod $chmodv 755 /usr/X11R6/share/applnk/Networking/WWW
- fi
+- fi
- if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
-+ if test -w /usr/X11R6/share/applnk/Networking/WWW; then generate_desktop /usr/X11R6/share/applnk/Networking/WWW ${1}; fi
- fi
+- fi
}
-@@ -1534,8 +1501,8 @@
+ kde1()
+@@ -1543,8 +1466,8 @@
fi
if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
diff -urN /usr/ports/www/opera/pkg-plist opera/pkg-plist
--- /usr/ports/www/opera/pkg-plist Sat May 15 01:19:42 2004
+++ opera/pkg-plist Tue Jun 1 19:47:25 2004
@@ -114,6 +114,8 @@
%%DATADIR%%/styles/user/textonly.css
%%DATADIR%%/styles/user/userstyle.ini
%%DATADIR%%/styles/wml.css
+%%GNOME%%share/gnome/apps/Internet/linux-opera.desktop
+%%GNOME%%share/gnome/pixmaps/linux-opera.xpm
@dirrm %%DATADIR%%/styles/user
@dirrm %%DATADIR%%/styles
@dirrm %%DATADIR%%/skin
@@ -128,9 +130,13 @@
@dirrm %%DATADIR%%/bin
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
+
+%%KDE%%@cwd %%LOCALBASE%%
%%KDE%%share/applnk/Internet/opera.desktop
-%%KDE2%%share/applnk/Networking/WWW/opera.desktop
-%%GNOMELNK%%share/gnome/apps/Internet/opera.desktop
-%%GNOME%%share/gnome/pixmaps/opera.xpm
-%%KDE2%%@dirrm share/applnk/Networking/WWW
-%%APPLNK%%applnk/Internet/opera.desktop
+%%KDE%%share/icons/hicolor/22x22/apps/opera.png
+%%KDE%%share/icons/hicolor/32x32/apps/opera.png
+%%KDE%%share/icons/hicolor/48x48/apps/opera.png
+%%KDE%%share/icons/locolor/16x16/apps/opera.png
+%%KDE%%share/icons/locolor/22x22/apps/opera.png
+%%KDE%%share/icons/locolor/32x32/apps/opera.png
+
--- opera.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1086280699.0>