update to 7.54u1 (20041210).

|This is a security update.
http://www.opera.com/freebsd/changelogs/754u1/index.dml

PR:		75116
Submitted by:	maintainer
This commit is contained in:
FUJISHIMA Satsuki 2004-12-15 20:13:25 +00:00
parent 1f2099efbe
commit 7ce179ce8c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=124153
5 changed files with 77 additions and 104 deletions

View File

@ -7,31 +7,31 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://opera.nsc.no/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
ftp://files.downloadthat.com/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/&,} \
ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/
MASTER_SITES= http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://opera.nsc.no/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
ftp://files.downloadthat.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/&,} \
ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/
DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
MAINTAINER= avleeuwen@piwebs.com
COMMENT= A blazingly fast, full-featured, standards-compliant browser
OPERA_VER= 7.54
OPERA_MINVER= u1
OPERA_REL= final
OPERA_DATE= 20040803
OPERA_DATE= 20041210
DATADIR= ${PREFIX}/share/${PORTNAME}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}
@ -74,6 +74,9 @@ pre-everything::
@${ECHO_CMD} '===> Define WITHOUT_ASPELL to not install aspell.'
.endif
pre-patch:
@${REINPLACE_CMD} -e 's| ||' ${WRKSRC}/ini/pluginpath.ini
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \

View File

@ -1,2 +1,2 @@
MD5 (opera-7.54-20040803.1-static-qt.i386.freebsd-en.tar.bz2) = e9c38837138db091b1a54ddc11c34364
SIZE (opera-7.54-20040803.1-static-qt.i386.freebsd-en.tar.bz2) = 4772388
MD5 (opera-7.54-20041210.1-static-qt.i386.freebsd-en.tar.bz2) = 4977bb6e4b445942c370070f88f7d377
SIZE (opera-7.54-20041210.1-static-qt.i386.freebsd-en.tar.bz2) = 4782184

View File

@ -1,50 +1,46 @@
--- ini/pluginpath.ini.orig Mon Jul 19 22:54:02 2004
+++ ini/pluginpath.ini Mon Jul 19 22:57:21 2004
@@ -1,31 +1,16 @@
-Opera Preferences version 2.0
-; Do not edit this file while Opera is running
-; This file is stored in UTF-8 encoding
-
-[Paths]
-$HOME/.opera/plugins=1
-/usr/lib/opera/plugins=1
-/usr/lib/opera/plugins=1
-/usr/local/lib/opera/plugins=1
-/opt/lib/opera/plugins=1
-
-/usr/local/Acrobat5/Browsers/intellinux=1
-/usr/local/Acrobat4/Browsers/intellinux=1
-/usr/lib/Acrobat5/Browsers/intellinux=1
-/usr/lib/Acrobat4/Browsers/intellinux=1
-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
-/opt/Acrobat5/Browsers/intellinux=1
-/opt/Acrobat4/Browsers/intellinux=1
-/usr/Acrobat5/Browsers/intellinux=1
-/usr/Acrobat4/Browsers/intellinux=1
-
-/usr/lib/RealPlayer8/Plugins=1
-/usr/lib/realplay/plugins=1
-/usr/lib/RealPlayer8=1
-/usr/lib/realplay=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
+Opera Preferences version 2.0
+; Do not edit this file while Opera is running
+; This file is stored in UTF-8 encoding
+
+[Paths]
+$HOME/.opera/plugins=1
--- ini/pluginpath.ini.orig Thu Dec 16 05:03:15 2004
+++ ini/pluginpath.ini Thu Dec 16 05:01:12 2004
@@ -3,36 +3,14 @@
; This file is stored in UTF-8 encoding
[Paths]
-$PWD/plugins=1
$HOME/.opera/plugins=1
-/usr/lib/opera/plugins=1
-/usr/lib/opera/plugins=1
-/usr/local/lib/opera/plugins=1
-/opt/lib/opera/plugins=1
+%%PREFIX%%/share/opera/plugins=1
+%%LOCALBASE%%/share/opera/plugins=1
+
-; Adobe Acrobat
-/usr/local/Acrobat5/Browsers/intellinux=1
-/usr/local/Acrobat4/Browsers/intellinux=1
-/usr/lib/Acrobat5/Browsers/intellinux=1
-/usr/lib/Acrobat4/Browsers/intellinux=1
-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
-/opt/Acrobat5/Browsers/intellinux=1
-/opt/Acrobat4/Browsers/intellinux=1
-/usr/Acrobat5/Browsers/intellinux=1
-/usr/Acrobat4/Browsers/intellinux=1
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
+
-; Realplayer
-/usr/lib/RealPlayer8/Plugins=1
-/usr/lib/realplay/plugins=1
-/usr/lib/RealPlayer8=1
-/usr/lib/realplay=1
-
-; Netscape Plug-in Paths
-$HOME/.netscape6/plugins=1
+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
+%%X11BASE%%/lib/browser_plugins=1
+$HOME/.netscape/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/netscape-linux/plugins=1

View File

@ -1,5 +1,5 @@
--- install.sh.orig Mon Jul 19 22:19:01 2004
+++ install.sh Mon Jul 19 22:52:26 2004
--- install.sh.orig Fri Dec 10 13:53:57 2004
+++ install.sh Wed Dec 15 15:35:18 2004
@@ -373,7 +373,7 @@
mvv='' # SunOS mv (no -v verbose option)
;;
@ -9,41 +9,7 @@
cpf='-f'
if test "$verbose" -gt '1'; then
chmodv='-v'
@@ -760,12 +760,10 @@
wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\
${str_localdirplugin} \\
- /usr/lib/opera/plugins \\
- /usr/local/lib/opera/plugins \\
- /opt/lib/opera/plugins \\"
+ %%LOCALBASE%%/share/opera/plugins \\"
case "${machine}:${os}" in
- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
wrapper_plugin_paths="
/usr/local/Acrobat[45]/Browsers/intellinux \\
/usr/lib/Acrobat[45]/Browsers/intellinux \\
@@ -817,15 +815,10 @@
;;
esac
wrapper_netscape_plugin_paths="
- /usr/lib/RealPlayer8/Plugins \\
- /usr/lib/realplay/plugins \\
- /usr/lib/RealPlayer8 \\
- /usr/lib/realplay \\
+ %%LOCALBASE%%/lib/RealPlayer8/Plugins \\
+ %%X11BASE%%/lib/browser_plugins \\
\"\${HOME}/.netscape/plugins\" \\
- /opt/netscape/plugins \\
- /usr/lib/netscape/plugins \\
- /usr/local/netscape/plugins \\
- /usr/local/lib/netscape/plugins \\"
+ %%LOCALBASE%%/lib/netscape-linux/plugins \\"
wrapper_file="${wrapper_dir}/opera"
@@ -887,39 +880,12 @@
@@ -873,47 +873,12 @@
if test ! \"\${OPERA_JAVA_DIR}\"; then
@ -56,6 +22,12 @@
+ PREFIXES=\"%%LOCALBASE%%\"
for SUNJAVA in \\
- 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 \\
@ -77,16 +49,18 @@
- 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 \\
; 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
@@ -983,11 +949,8 @@
@@ -962,11 +927,8 @@
# Acrobat Reader
for BINDIR in \\
@ -100,7 +74,7 @@
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
@@ -1278,36 +1241,13 @@
@@ -1281,36 +1243,13 @@
if test -z "${OPERADESTDIR}"; then
@ -141,7 +115,7 @@
fi # OPERADESTDIR
@@ -1436,72 +1376,36 @@
@@ -1439,72 +1378,36 @@
debug_msg 1 "in gnome()"
@ -236,7 +210,7 @@
fi
# Add ximian here
}
@@ -1512,39 +1416,31 @@
@@ -1515,39 +1418,31 @@
debug_msg 1 "in kde()"

View File

@ -18,7 +18,6 @@ bin/opera
%%DATADIR%%/help/glossary.html
%%DATADIR%%/help/help.css
%%DATADIR%%/help/history.html
%%DATADIR%%/help/hotlist.html
%%DATADIR%%/help/index.html
%%DATADIR%%/help/input.html
%%DATADIR%%/help/keyboard.html
@ -46,6 +45,7 @@ bin/opera
%%DATADIR%%/help/toolbars.html
%%DATADIR%%/help/windows.html
%%DATADIR%%/hhd.ssr
%%DATADIR%%/html40_entities.dtd
%%DATADIR%%/images/background.gif
%%DATADIR%%/images/blank.gif
%%DATADIR%%/images/drive.gif