aboutsummaryrefslogtreecommitdiffstats
path: root/www/linux-opera
diff options
context:
space:
mode:
authormezz <mezz@FreeBSD.org>2004-07-21 01:38:59 +0800
committermezz <mezz@FreeBSD.org>2004-07-21 01:38:59 +0800
commitf631150b6985befa48419f3b527db85a4e098691 (patch)
tree8619bccc43af67ac36e62dc44031f66f7b03f9ac /www/linux-opera
parente43eb31ab4614a33bf31146a6f02a562a5ca608c (diff)
downloadfreebsd-ports-gnome-f631150b6985befa48419f3b527db85a4e098691.tar.gz
freebsd-ports-gnome-f631150b6985befa48419f3b527db85a4e098691.tar.zst
freebsd-ports-gnome-f631150b6985befa48419f3b527db85a4e098691.zip
-Update both www/opera and www/linux-opera to 7.53.
www/opera: - The maintainer has asked me to babysitting this while he's away for vacation. He is gone for about five weeks started last Thursday. - Some tweak with the plugins, I have added jdk13 and jdk14 support but I have no idea if they will work since I don't have any FreeBSD 4.x to test. Please let me know if there has any issue. - Does the spellcheck feature works in FreeBSD 4.x? Please, contract me on this one too. If it works, then I will need to add a dependency of aspell with a new WITHOUT_ASPELL knob. - See the changelog for detail: http://www.opera.com/freebsd/changelogs/753/ www/linux-opera: - I didn't update it to 7.52, because it still doesn't fix the security and the plugins was broke. The 7.53 has solved all of this to allow me to update it. - Please read in pkg-message about the changes of search.ini if you have a custom of it. You will have to edit it or it will not work. - See the changelog for detail: 7.52 = http://www.opera.com/linux/changelogs/752/ 7.53 = http://www.opera.com/linux/changelogs/753/
Diffstat (limited to 'www/linux-opera')
-rw-r--r--www/linux-opera/Makefile29
-rw-r--r--www/linux-opera/distinfo4
-rw-r--r--www/linux-opera/files/patch-install.sh53
-rw-r--r--www/linux-opera/pkg-message12
-rw-r--r--www/linux-opera/pkg-plist4
5 files changed, 59 insertions, 43 deletions
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index e544c0d9162a..e4c8012d6754 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,21 +6,20 @@
#
PORTNAME= opera
-PORTVERSION= 7.51.20040602
-PORTREVISION= 1
+PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
CATEGORIES= www linux
-MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/751/final/en/i386/static/ \
- ftp://ftp.sunet.se/pub/www/clients/Opera/linux/751/final/en/i386/static/ \
- ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/751/final/en/i386/static/ \
- ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/751/final/en/i386/static/ \
- ftp://ftp.ntua.gr/pub/www/Opera/linux/751/final/en/i386/static/ \
- http://mirrors.pmmf.hu/mirror/opera/linux/751/final/en/i386/static/ \
- ftp://ftp.task.gda.pl/pub/opera/linux/751/final/en/i386/static/ \
- ftp://ftp.planetmirror.com/pub/opera/linux/751/final/en/i386/static/ \
- http://gd.tuwien.ac.at/infosys/browsers/opera/linux/751/final/en/i386/static/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/751/final/en/i386/static/&,}
+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/ \
+ ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+ ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+ ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+ http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+ ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+ ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+ 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}-${PORTVERSION:S/.2004/-2004/}.1-static-qt.i386-en
+DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
MAINTAINER= mezz@FreeBSD.org
COMMENT= A blazingly fast, full-featured, standards-compliant browser
@@ -36,6 +35,8 @@ ONLY_FOR_ARCHS= i386
NO_BUILD= yes
NO_FILTER_SHLIBS=yes
+OPERA_VER= 7.53
+OPERA_DATE= 20040716
DATADIR= ${PREFIX}/share/${UNIQUENAME}
DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME}
@@ -77,6 +78,8 @@ post-patch:
s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
+ @${FIND} ${WRKSRC} -name '*.orig' -delete
+ @${FIND} ${WRKSRC} -name '*.bak' -delete
do-install:
@(cd ${WRKSRC} && ./install.sh \
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index a32c6a54fd18..a47366f79101 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,2 +1,2 @@
-MD5 (opera-7.51-20040602.1-static-qt.i386-en.tar.bz2) = c3266835c2b8e3b54598775802b4e7eb
-SIZE (opera-7.51-20040602.1-static-qt.i386-en.tar.bz2) = 4852011
+MD5 (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 293ae0b0fb87a5b5fac7ef5572795dc8
+SIZE (opera-7.53-20040716.1-static-qt.i386-en.tar.bz2) = 4870722
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index 97ec647ab316..e3fc1c4b1169 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig Wed Jun 2 05:13:50 2004
-+++ install.sh Sun Jun 6 01:48:11 2004
+--- install.sh.orig Fri Jul 16 07:39:52 2004
++++ install.sh Tue Jul 20 00:34:42 2004
@@ -758,25 +758,21 @@
debug_msg 0 "in generate_wrapper()"
@@ -134,7 +134,7 @@
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
-@@ -1086,7 +1054,7 @@
+@@ -1089,7 +1057,7 @@
chop "${OPERADESTDIR}" "str_localdirshare"
chop "${OPERADESTDIR}" "str_localdirplugin"
@@ -143,7 +143,7 @@
# Executable
debug_msg 1 "Executable"
-@@ -1121,7 +1089,7 @@
+@@ -1124,7 +1092,7 @@
#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
generate_wrapper
@@ -152,16 +152,21 @@
# Documentation
debug_msg 1 "Documentation"
-@@ -1155,7 +1123,7 @@
- if test -d ini; then
- mkdir $mkdirv $mkdirp $share_dir/ini/
- chmod $chmodv 755 $share_dir/ini
-- cp $cpv $cpf $cpR ini/* $share_dir/ini/
-+ cp $cpv $cpf $cpR ini/*.ini $share_dir/ini/
- if test -f $share_dir/ini/pluginpath.ini; then
- echo ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
- fi
-@@ -1255,8 +1223,9 @@
+@@ -1223,13 +1191,6 @@
+ plugin_support='yes'
+ fi
+
+- if test -f plugins/operamotifwrapper-1
+- then
+- cp $cpv $cpf plugins/operamotifwrapper-1 $plugin_dir/
+- chmod $chmodv 755 $plugin_dir/operamotifwrapper-1
+- plugin_support='yes'
+- fi
+-
+ if test -f plugins/operamotifwrapper-2
+ then
+ cp $cpv $cpf plugins/operamotifwrapper-2 $plugin_dir/
+@@ -1279,8 +1240,9 @@
if test -z "${OPERADESTDIR}"; then
# System wide configuration files
@@ -172,7 +177,7 @@
echo
echo "System wide configuration files:"
echo " $config_dir/opera6rc"
-@@ -1268,6 +1237,7 @@
+@@ -1292,6 +1254,7 @@
cp $cpv $cpf config/opera6rc $config_dir
cp $cpv $cpf config/opera6rc.fixed $config_dir
fi
@@ -180,7 +185,7 @@
else
echo
echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1281,9 +1251,9 @@
+@@ -1305,9 +1268,9 @@
icons
gnome
kde 3
@@ -193,7 +198,7 @@
fi # OPERADESTDIR
-@@ -1328,13 +1298,13 @@
+@@ -1352,13 +1315,13 @@
{
# arg1 = location
@@ -211,7 +216,7 @@
Terminal=0
Type=Application'
-@@ -1367,42 +1337,13 @@
+@@ -1391,42 +1354,13 @@
debug_msg 0 "in icons()"
@@ -260,16 +265,16 @@
fi
}
-@@ -1412,72 +1353,36 @@
+@@ -1436,72 +1370,36 @@
debug_msg 1 "in gnome()"
- if test -d /opt/gnome/; then
-+ if test -d %%X11BASE%%/share/gnome/; then
-
+-
- # /opt/gnome share
- if test -d /opt/gnome/share; then
--
++ if test -d %%X11BASE%%/share/gnome/; then
+
- # /opt/gnome icon
- if test ! -d /opt/gnome/share/pixmaps/; then
- if test -w /opt/gnome/share; then
@@ -305,7 +310,7 @@
- generate_desktop /opt/gnome/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
++ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
fi
- elif test -w /opt/gnome/share/gnome/apps; then
- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
@@ -355,7 +360,7 @@
fi
# Add ximian here
}
-@@ -1488,39 +1393,31 @@
+@@ -1512,39 +1410,31 @@
debug_msg 1 "in kde()"
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index 1704fa3015f2..ad2d2e6dac4c 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,5 +1,5 @@
##
-Changelog for 7.51 Final: http://www.opera.com/linux/changelogs/751/
+Changelog for 7.53 Final: http://www.opera.com/linux/changelogs/753/
The name of the the binary, data directory, personal "~/.opera" directory,
etc., have been renamed from "opera" to "linux-opera." This means that
@@ -10,4 +10,14 @@ toolbars, options, etc., have changed from previous versions, and are not
recommend to transferred from the old configuration. The mail format will be
converted to the new format automatically when the new linux-opera is run for
the first time.
+
+*** IMPORTANT: users with custom search.ini ***
+
+If you have a custom search.ini and you've used opera 7.51 or an earlier
+version before this upgrade, edit ~/.opera/search.ini _before_ running the
+upgraded Opera for the first time, and change the file version to 4. It should
+look like this:
+
+[Version]
+File Version=4
##
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 420b4c48cdbc..6a34e007f9ae 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -9,9 +9,7 @@ share/linux-opera/bin/spellcheck.so
share/linux-opera/bin/works
share/linux-opera/chartables.bin
share/linux-opera/config/opera6rc
-share/linux-opera/config/opera6rc.bak
share/linux-opera/config/opera6rc.fixed
-share/linux-opera/config/opera6rc.orig
share/linux-opera/help/advertising.html
share/linux-opera/help/background.png
share/linux-opera/help/chat.html
@@ -85,7 +83,7 @@ share/linux-opera/locale/en/search.ini
share/linux-opera/locale/english.lng
share/linux-opera/opera6.adr
share/linux-opera/plugins/libnpp.so
-share/linux-opera/plugins/operamotifwrapper
+share/linux-opera/plugins/operamotifwrapper-2
share/linux-opera/plugins/operamotifwrapper-3
share/linux-opera/plugins/operaplugincleaner
share/linux-opera/search.ini