aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2005-06-19 19:04:08 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2005-06-19 19:04:08 +0000
commit95b7b13ff3d8481552467ebb62b65045f219b20a (patch)
tree2d1144ee19aeaeae09ce97e299f2a826d715647f
parentb2428a738b0964927e89381cc001716c3bb72f54 (diff)
downloadports-95b7b13ff3d8481552467ebb62b65045f219b20a.tar.gz
ports-95b7b13ff3d8481552467ebb62b65045f219b20a.zip
Chase to netchild's recently committed of changes in Linux stuff, some have
changed the prefix like linux-flashplugins*, acroread and etc moved to X11BASE. Teach linux-opera about those changes to ability find the plugins and works again. Bump the PORTREVISION.
Notes
Notes: svn path=/head/; revision=137734
Diffstat
-rw-r--r--www/linux-opera-devel/Makefile2
-rw-r--r--www/linux-opera-devel/files/patch-ini::pluginpath.ini13
-rw-r--r--www/linux-opera-devel/files/patch-install.sh38
-rw-r--r--www/linux-opera/Makefile2
-rw-r--r--www/linux-opera/files/patch-ini::pluginpath.ini13
-rw-r--r--www/linux-opera/files/patch-install.sh38
6 files changed, 70 insertions, 36 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index cf041b08a99a..373d60bedf0b 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
-PORTREVISION= 1
+PORTREVISION= 2
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/ \
diff --git a/www/linux-opera-devel/files/patch-ini::pluginpath.ini b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
index beb796f948cb..725f30efedbd 100644
--- a/www/linux-opera-devel/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera-devel/files/patch-ini::pluginpath.ini
@@ -1,6 +1,6 @@
---- ini/pluginpath.ini.orig Tue Mar 1 16:31:51 2005
-+++ ini/pluginpath.ini Tue Mar 1 16:33:00 2005
-@@ -3,46 +3,24 @@
+--- ini/pluginpath.ini.orig Wed Jun 15 04:17:40 2005
++++ ini/pluginpath.ini Sun Jun 19 00:33:33 2005
+@@ -3,46 +3,31 @@
; This file is stored in UTF-8 encoding
[Paths]
@@ -26,10 +26,13 @@
-/usr/Acrobat5/Browsers/intellinux=1
-/usr/Acrobat4/Browsers/intellinux=1
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%X11BASE%%/Acrobat5/Browsers/intellinux=1
+
+; Flash player
+%%LOCALBASE%%/lib/linux-flashplugin6=1
+%%LOCALBASE%%/lib/linux-flashplugin7=1
++%%X11BASE%%/lib/linux-flashplugin6=1
++%%X11BASE%%/lib/linux-flashplugin7=1
; Realplayer
-/usr/lib/RealPlayer8/Plugins=1
@@ -38,6 +41,8 @@
-/usr/lib/realplay=1
+%%LOCALBASE%%/lib/RealPlayer=1
+%%LOCALBASE%%/lib/RealPlayer/plugins=1
++%%X11BASE%%/lib/RealPlayer=1
++%%X11BASE%%/lib/RealPlayer/plugins=1
; Netscape Plug-in Paths
-$HOME/.netscape6/plugins=1
@@ -48,6 +53,7 @@
-/usr/local/lib/netscape/plugins=1
-$HOME/.kde/.konqueror/nsplugins=1
+%%LOCALBASE%%/lib/netscape-linux/plugins=1
++%%X11BASE%%/lib/netscape-linux/plugins=1
; Since Mozilla supports NS plugins, there might
; be some in the Mozilla plugin directory.
@@ -58,3 +64,4 @@
-[KDE]
-plugins=$HOME/.kde/share/config/kcmnspluginrc
+%%LOCALBASE%%/lib/linux-mozilla/plugins=1
++%%X11BASE%%/lib/linux-mozilla/plugins=1
diff --git a/www/linux-opera-devel/files/patch-install.sh b/www/linux-opera-devel/files/patch-install.sh
index cd797aa76587..97d5a58c31e1 100644
--- a/www/linux-opera-devel/files/patch-install.sh
+++ b/www/linux-opera-devel/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig Tue Apr 19 13:21:58 2005
-+++ install.sh Tue Apr 19 13:36:51 2005
+--- install.sh.orig Wed Jun 15 04:17:40 2005
++++ install.sh Sun Jun 19 01:39:11 2005
@@ -761,10 +761,9 @@
case "${machine}:${os}" in
i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -116,8 +116,8 @@
- /usr/X11R6/lib/Acrobat[45]/bin \\
- /opt/Acrobat[45]/bin \\
- /usr/Acrobat[45]/bin \\
-+ %%LOCALBASE%%/Acrobat4/bin \\
+ %%LOCALBASE%%/Acrobat5/bin \\
++ %%X11BASE%%/Acrobat5/bin \\
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
@@ -148,7 +148,17 @@
# Documentation
debug_msg 1 "Documentation"
-@@ -1222,27 +1185,6 @@
+@@ -1153,9 +1116,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 ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
+- fi
+ fi
+
+ # Support old way
+@@ -1222,27 +1182,6 @@
mkdir $mkdirv $mkdirp $plugin_dir/
chmod $chmodv 755 $plugin_dir
@@ -176,7 +186,7 @@
if test -f plugins/operamotifwrapper-3
then
cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
-@@ -1250,13 +1192,6 @@
+@@ -1250,13 +1189,6 @@
plugin_support='yes'
fi
@@ -190,7 +200,7 @@
if test -f plugins/libnpp.so
then
cp $cpv $cpf plugins/libnpp.so $plugin_dir/
-@@ -1293,36 +1228,13 @@
+@@ -1293,36 +1225,13 @@
if test -z "${OPERADESTDIR}"; then
@@ -231,7 +241,7 @@
fi # OPERADESTDIR
-@@ -1367,15 +1279,16 @@
+@@ -1367,15 +1276,16 @@
{
# arg1 = location
@@ -253,16 +263,16 @@
echo "${desktop_contain}" > ${desktop_file}
chmod $chmodv 644 ${desktop_file}
-@@ -1451,74 +1364,26 @@
+@@ -1451,74 +1361,26 @@
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
@@ -302,10 +312,10 @@
+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm
fi
- # end /opt/gnome share
+-
+- elif test -d /usr/share/gnome/; then
+ # end %%X11BASE%%/share/gnome icon
-- elif test -d /usr/share/gnome/; then
--
- # /usr/share/gnome icon
- if test ! -d /usr/share/gnome/pixmaps/; then
- if test -w /usr/share/gnome; then
@@ -345,7 +355,7 @@
}
kde()
-@@ -1527,39 +1392,31 @@
+@@ -1527,39 +1389,31 @@
debug_msg 1 "in kde()"
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index cf041b08a99a..373d60bedf0b 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
-PORTREVISION= 1
+PORTREVISION= 2
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/ \
diff --git a/www/linux-opera/files/patch-ini::pluginpath.ini b/www/linux-opera/files/patch-ini::pluginpath.ini
index beb796f948cb..725f30efedbd 100644
--- a/www/linux-opera/files/patch-ini::pluginpath.ini
+++ b/www/linux-opera/files/patch-ini::pluginpath.ini
@@ -1,6 +1,6 @@
---- ini/pluginpath.ini.orig Tue Mar 1 16:31:51 2005
-+++ ini/pluginpath.ini Tue Mar 1 16:33:00 2005
-@@ -3,46 +3,24 @@
+--- ini/pluginpath.ini.orig Wed Jun 15 04:17:40 2005
++++ ini/pluginpath.ini Sun Jun 19 00:33:33 2005
+@@ -3,46 +3,31 @@
; This file is stored in UTF-8 encoding
[Paths]
@@ -26,10 +26,13 @@
-/usr/Acrobat5/Browsers/intellinux=1
-/usr/Acrobat4/Browsers/intellinux=1
+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
++%%X11BASE%%/Acrobat5/Browsers/intellinux=1
+
+; Flash player
+%%LOCALBASE%%/lib/linux-flashplugin6=1
+%%LOCALBASE%%/lib/linux-flashplugin7=1
++%%X11BASE%%/lib/linux-flashplugin6=1
++%%X11BASE%%/lib/linux-flashplugin7=1
; Realplayer
-/usr/lib/RealPlayer8/Plugins=1
@@ -38,6 +41,8 @@
-/usr/lib/realplay=1
+%%LOCALBASE%%/lib/RealPlayer=1
+%%LOCALBASE%%/lib/RealPlayer/plugins=1
++%%X11BASE%%/lib/RealPlayer=1
++%%X11BASE%%/lib/RealPlayer/plugins=1
; Netscape Plug-in Paths
-$HOME/.netscape6/plugins=1
@@ -48,6 +53,7 @@
-/usr/local/lib/netscape/plugins=1
-$HOME/.kde/.konqueror/nsplugins=1
+%%LOCALBASE%%/lib/netscape-linux/plugins=1
++%%X11BASE%%/lib/netscape-linux/plugins=1
; Since Mozilla supports NS plugins, there might
; be some in the Mozilla plugin directory.
@@ -58,3 +64,4 @@
-[KDE]
-plugins=$HOME/.kde/share/config/kcmnspluginrc
+%%LOCALBASE%%/lib/linux-mozilla/plugins=1
++%%X11BASE%%/lib/linux-mozilla/plugins=1
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index cd797aa76587..97d5a58c31e1 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig Tue Apr 19 13:21:58 2005
-+++ install.sh Tue Apr 19 13:36:51 2005
+--- install.sh.orig Wed Jun 15 04:17:40 2005
++++ install.sh Sun Jun 19 01:39:11 2005
@@ -761,10 +761,9 @@
case "${machine}:${os}" in
i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -116,8 +116,8 @@
- /usr/X11R6/lib/Acrobat[45]/bin \\
- /opt/Acrobat[45]/bin \\
- /usr/Acrobat[45]/bin \\
-+ %%LOCALBASE%%/Acrobat4/bin \\
+ %%LOCALBASE%%/Acrobat5/bin \\
++ %%X11BASE%%/Acrobat5/bin \\
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
@@ -148,7 +148,17 @@
# Documentation
debug_msg 1 "Documentation"
-@@ -1222,27 +1185,6 @@
+@@ -1153,9 +1116,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 ${str_localdirplugin} >> $share_dir/ini/pluginpath.ini
+- fi
+ fi
+
+ # Support old way
+@@ -1222,27 +1182,6 @@
mkdir $mkdirv $mkdirp $plugin_dir/
chmod $chmodv 755 $plugin_dir
@@ -176,7 +186,7 @@
if test -f plugins/operamotifwrapper-3
then
cp $cpv $cpf plugins/operamotifwrapper-3 $plugin_dir/
-@@ -1250,13 +1192,6 @@
+@@ -1250,13 +1189,6 @@
plugin_support='yes'
fi
@@ -190,7 +200,7 @@
if test -f plugins/libnpp.so
then
cp $cpv $cpf plugins/libnpp.so $plugin_dir/
-@@ -1293,36 +1228,13 @@
+@@ -1293,36 +1225,13 @@
if test -z "${OPERADESTDIR}"; then
@@ -231,7 +241,7 @@
fi # OPERADESTDIR
-@@ -1367,15 +1279,16 @@
+@@ -1367,15 +1276,16 @@
{
# arg1 = location
@@ -253,16 +263,16 @@
echo "${desktop_contain}" > ${desktop_file}
chmod $chmodv 644 ${desktop_file}
-@@ -1451,74 +1364,26 @@
+@@ -1451,74 +1361,26 @@
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
@@ -302,10 +312,10 @@
+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm
fi
- # end /opt/gnome share
+-
+- elif test -d /usr/share/gnome/; then
+ # end %%X11BASE%%/share/gnome icon
-- elif test -d /usr/share/gnome/; then
--
- # /usr/share/gnome icon
- if test ! -d /usr/share/gnome/pixmaps/; then
- if test -w /usr/share/gnome; then
@@ -345,7 +355,7 @@
}
kde()
-@@ -1527,39 +1392,31 @@
+@@ -1527,39 +1389,31 @@
debug_msg 1 "in kde()"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 22:57:08 +0000