ports/51136: Maintainer update: www/linux-opera7 fixes stuff
reigncracks at hotmail.com
reigncracks at hotmail.com
Fri Apr 18 20:50:20 UTC 2003
>Number: 51136
>Category: ports
>Synopsis: Maintainer update: www/linux-opera7 fixes stuff
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 18 13:50:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Mezz
>Release: FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 4.7-STABLE FreeBSD 4.7-STABLE #0: Sun Jan 19 23:00:28 CST 2003 mezz at ns1.mezzweb.com:/usr/src/sys/compile/BSDRULZ i386
>Description:
www/linux-opera7 is not same as what I sent, which some stuff
are using from old www/linux-opera. nork must have accident
made some mistakes when he committed it. Here are problems:
1) Java plug-in path aren't correct and out of date
2) pkg-messages aren't there, which broke the Makefile.
3) Two patches aren't there that make Makefile and pkg-plist
aren't right.
>How-To-Repeat:
>Fix:
Here are diff to correct everything what I had before.
--- linux-opera7.diff begins here ---
diff -urN linux-opera7.orig/Makefile linux-opera7/Makefile
--- linux-opera7.orig/Makefile Fri Apr 18 12:17:30 2003
+++ linux-opera7/Makefile Sat Apr 12 00:53:22 2003
diff -urN linux-opera7.orig/files/patch-aa linux-opera7/files/patch-aa
--- linux-opera7.orig/files/patch-aa Tue Mar 11 13:25:14 2003
+++ linux-opera7/files/patch-aa Wed Dec 31 18:00:00 1969
@@ -1,62 +0,0 @@
---- install.sh.orig Wed Mar 5 19:07:59 2003
-+++ install.sh Tue Mar 11 18:37:28 2003
-@@ -765,6 +765,16 @@
- wrapper_sunjava_machine="sparc"
- ;;
-
-+ i386:FreeBSD)
-+ wrapper_plugin_paths="
-+ $prefix/Acrobat[45]/bin \\
-+ $prefix/lib/RealPlayer8/Plugins \\
-+ $prefix/lib/netscape-linux/plugins \\
-+ $prefix/linux-jdk1.3.1/jre/plugin/i386/ns4 \\
-+ $prefix/linux-ibm-jdk1.3.0/jre/bin \\
-+ $prefix/linux-jdk1.4.0b3/jre/plugin/i386/ns4 \\"
-+ ;;
-+
- mips*:Linux)
- wrapper_plugin_paths=''
- ;;
-@@ -890,7 +900,7 @@
-
- # Acrobat Reader
- for BINDIR in \\
-- /usr/local/Acrobat[45]/bin \\
-+ $prefix/Acrobat[45]/bin \\
- /usr/lib/Acrobat[45]/bin \\
- /usr/X11R6/lib/Acrobat[45]/bin \\
- /opt/Acrobat[45]/bin \\
-@@ -1100,8 +1110,9 @@
- ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so
-
- # System wide configuration files
-- config_dir="/etc"
-+ config_dir="$prefix/etc"
- if can_write_to "$config_dir"; then
-+if false; then # XXX
- echo
- echo "System wide configuration files:"
- echo " $config_dir/opera6rc"
-@@ -1128,6 +1139,7 @@
- ;;
- esac
- done
-+fi # XXX
- else
- echo
- echo "User \"${USERNAME}\" does not have write access to $config_dir"
-@@ -1138,10 +1150,10 @@
- fi
-
- # Shorcuts and Icons
-- icons
-- gnome
-- kde2
-- kde
-+# icons
-+# gnome
-+# kde2
-+# kde
-
- # Add uninstallation here
-
diff -urN linux-opera7.orig/files/patch-install.sh linux-opera7/files/patch-install.sh
--- linux-opera7.orig/files/patch-install.sh Wed Dec 31 18:00:00 1969
+++ linux-opera7/files/patch-install.sh Sat Apr 12 01:18:04 2003
@@ -0,0 +1,189 @@
+--- install.sh.orig Sat Apr 12 01:07:58 2003
++++ install.sh Sat Apr 12 01:17:23 2003
+@@ -721,20 +721,13 @@
+ case "${machine}:${os}" in
+ i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+ wrapper_plugin_paths="
+- /usr/local/Acrobat[45]/Browsers/intellinux \\
+- /usr/lib/Acrobat[45]/Browsers/intellinux \\
+- /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\
+- /opt/Acrobat[45]/Browsers/intellinux \\
+- /usr/Acrobat[45]/Browsers/intellinux \\
+- /usr/j2se/jre/plugin/i386/ns4 \\
+- /usr/java/jre1.4.0/plugin/i386/ns4 \\
+- /usr/java/jre1.3.1/plugin/i386/ns4 \\
+- /usr/lib/j2re1.3/plugin/i386/netscape4 \\
+- /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\
+- /usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\"
++ $prefix/lib/RealPlayer8/Plugins \\
++ $prefix/Acrobat[45]/Browsers/intellinux \\
++ $prefix/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
++ $prefix/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
+ wrapper_ibmjava="
+- IBMJava2-14/jre \\
+- IBMJava2-131/jre \\"
++ linux-ibm-jdk1.3.1/jre \\
++ linux-ibm-jdk1.4.0/jre \\"
+ wrapper_sunjava_machine="i386"
+ ;;
+
+@@ -905,7 +898,7 @@
+
+ # Acrobat Reader
+ for BINDIR in \\
+- /usr/local/Acrobat[45]/bin \\
++ $prefix/Acrobat[45]/bin \\
+ /usr/lib/Acrobat[45]/bin \\
+ /usr/X11R6/lib/Acrobat[45]/bin \\
+ /opt/Acrobat[45]/bin \\
+@@ -1106,7 +1099,7 @@
+ mkdir $mkdirv $mkdirp $share_dir/java/
+ chmod $chmodv 755 $share_dir/java
+
+- cp $cpv $cpf $cpp java/lc.jar java/opera.jar $share_dir/java/
++ cp $cpv $cpf $cpp java/opera.jar $share_dir/java/
+ generate_opera_policy
+
+ # Plug-in files
+@@ -1119,8 +1112,9 @@
+ chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so
+
+ # System wide configuration files
+- config_dir="/etc"
++ config_dir="$prefix/etc"
+ if can_write_to "$config_dir"; then
++if false; then # XXX
+ echo
+ echo "System wide configuration files:"
+ echo " $config_dir/opera6rc"
+@@ -1147,6 +1141,7 @@
+ ;;
+ esac
+ done
++fi # XXX
+ else
+ echo
+ echo "User \"${USERNAME}\" does not have write access to $config_dir"
+@@ -1230,22 +1225,22 @@
+
+ debug_msg 0 "in icons()"
+
+- if test ! -d /usr/share/icons; then
+- if test -w /usr/share; then
+- mkdir $mkdirv $mkdirp /usr/share/icons/
+- chmod $chmodv 755 /usr/share/icons
+- cp $cpv $cpp $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
++ if test ! -d %%X11PREFIX%%/share/icons; then
++ if test -w %%X11PREFIX%%/share; then
++ mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/icons/
++ chmod $chmodv 755 %%X11PREFIX%%/share/icons
++ cp $cpv $cpp $share_dir/images/opera.xpm %%X11PREFIX%%/share/icons/opera.xpm
+ fi
+- elif test -w /usr/share/icons; then cp $cpv $cpp $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
++ elif test -w %%X11PREFIX%%/share/icons; then cp $cpv $cpp $share_dir/images/opera.xpm %%X11PREFIX%%/share/icons/opera.xpm
+ fi
+
+- if test ! -d /usr/share/pixmaps; then
+- if test -w /usr/share; then
+- mkdir $mkdirv $mkdirp /usr/share/pixmaps/
+- chmod $chmodv 755 /usr/share/pixmaps
+- cp $cpv $cpp $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++ if test ! -d %%X11PREFIX%%/share/pixmaps; then
++ if test -w %%X11PREFIX%%/share; then
++ mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/pixmaps/
++ chmod $chmodv 755 %%X11PREFIX%%/share/pixmaps
++ cp $cpv $cpp $share_dir/images/opera.xpm %%X11PREFIX%%/share/pixmaps/opera.xpm
+ fi
+- elif test -w /usr/share/pixmaps/; then cp $cpv $cpp $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++ elif test -w %%X11PREFIX%%/share/pixmaps/; then cp $cpv $cpp $share_dir/images/opera.xpm %%X11PREFIX%%/share/pixmaps/opera.xpm
+ fi
+
+ if test ! -d /etc/X11/wmconfig/; then
+@@ -1311,36 +1306,36 @@
+ fi
+ # end /opt/gnome share
+
+- elif test -d /usr/share/gnome/; then
++ elif test -d %%X11PREFIX%%/share/gnome/; then
+
+- # /usr/share/gnome icon
+- if test ! -d /usr/share/gnome/pixmaps/; then
+- if test -w /usr/share/gnome; then
+- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
+- chmod $chmodv 755 /usr/share/gnome/pixmaps
+- cp $cpv $cpp $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
++ # %%X11PREFIX%%/share/gnome icon
++ if test ! -d %%X11PREFIX%%/share/gnome/pixmaps/; then
++ if test -w %%X11PREFIX%%/share/gnome; then
++ mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/gnome/pixmaps/
++ chmod $chmodv 755 %%X11PREFIX%%/share/gnome/pixmaps
++ cp $cpv $cpp $share_dir/images/opera.xpm %%X11PREFIX%%/share/gnome/pixmaps/opera.xpm
+ fi
+- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $cpp $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
++ elif test -w %%X11PREFIX%%/share/gnome/pixmaps; then cp $cpv $cpp $share_dir/images/opera.xpm %%X11PREFIX%%/share/gnome/pixmaps/opera.xpm
+ fi
+- # end /usr/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
++ # %%X11PREFIX%%/share/gnome link
++ if test -d %%X11PREFIX%%/share/gnome/apps/; then
++ if test -d %%X11PREFIX%%/share/gnome/apps/Internet/; then
++ if test -w %%X11PREFIX%%/share/gnome/apps/Internet; then
++ generate_desktop %%X11PREFIX%%/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 %%X11PREFIX%%/share/gnome/apps/Networking/WWW/; then
++ if test -w %%X11PREFIX%%/share/gnome/apps/Networking/WWW; then
++ generate_desktop %%X11PREFIX%%/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 %%X11PREFIX%%/share/gnome/apps; then
++ mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/gnome/apps/Internet/
++ chmod $chmodv 755 %%X11PREFIX%%/share/gnome/apps/Internet
++ generate_desktop %%X11PREFIX%%/share/gnome/apps/Internet
+ fi
+ fi
+- # end /usr/share/gnome link
++ # end %%X11PREFIX%%/share/gnome link
+ fi
+ # Add ximian here
+ }
+@@ -1377,12 +1372,12 @@
+
+ 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 %%X11PREFIX%%/share/applnk/Networking; then
++ if test ! -d %%X11PREFIX%%/share/applnk/Networking/WWW/ -a -w %%X11PREFIX%%/share/applnk/Networking; then
++ mkdir $mkdirv $mkdirp %%X11PREFIX%%/share/applnk/Networking/WWW/
++ chmod $chmodv 755 %%X11PREFIX%%/share/applnk/Networking/WWW
+ fi
+- if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW; fi
++ if test -w %%X11PREFIX%%/share/applnk/Networking/WWW; then generate_desktop %%X11PREFIX%%/share/applnk/Networking/WWW; fi
+ fi
+ }
+
+@@ -1406,8 +1401,8 @@
+ fi
+ if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
+
+- elif test -d /usr/share/applnk/Internet/ -a -w /usr/share/applnk/Internet; then
+- generate_desktop /usr/share/applnk/Internet
++ elif test -d %%X11PREFIX%%/share/applnk/Internet/ -a -w %%X11PREFIX%%/share/applnk/Internet; then
++ generate_desktop %%X11PREFIX%%/share/applnk/Internet
+ fi
+ }
+
diff -urN linux-opera7.orig/files/patch-runme.sh linux-opera7/files/patch-runme.sh
--- linux-opera7.orig/files/patch-runme.sh Wed Dec 31 18:00:00 1969
+++ linux-opera7/files/patch-runme.sh Sat Apr 12 00:16:29 2003
@@ -0,0 +1,11 @@
+--- runme.sh.orig Thu Apr 3 17:31:40 2003
++++ runme.sh Thu Apr 3 18:36:09 2003
+@@ -177,7 +177,7 @@
+ export OPERA_DIR OPERA_PLUGIN_PATH
+
+ # Running Opera
+-${OPERA} "${@}"
++exec ${OPERA} "${@}"
+
+ # Cleanup
+ if test "${_CLEAN_OPERA_POLICY_}" = 'YES'; then
diff -urN linux-opera7.orig/pkg-message linux-opera7/pkg-message
--- linux-opera7.orig/pkg-message Wed Dec 31 18:00:00 1969
+++ linux-opera7/pkg-message Sat Apr 12 00:56:52 2003
@@ -0,0 +1,26 @@
+From: Espen Sand <espen at opera.com>
+Newsgroups: opera.linux,opera.beta
+Subject: Preview 3 of Opera 7.10 for Linux available
+Date: 2003-04-03 03:12:15 PST
+
+This is the first release ever that is synchronized with an Opera
+for windows release. Windows is released as 7.10 Beta 1 today and
+since we share the user interface and most of the other components
+we have jumped to the 7.10 tag as well (thus skipping 7.0). We have
+not has as much time to test this release compared with the windows
+version and we lack some linux specific features so we still name it
+a Technology Preview.
+
+Please discuss this release in the opera.linux newsgroup or opera-
+linux mail list before submitting bugs to our BTS (Bug Tracking
+System). We recommend that you not install it over a current
+version of Opera.
+
+Changelogs for beta 1: http://www.opera.com/linux/changelogs/710/
+
+Before you run Opera7:
+ Since this is a beta it might be a good idea to backup your
+ personal "~/.opera" directory and remove it. This can be done
+ from the command line using "cp -Rp ~/.opera ~/.opera-mybackup"
+ and "rm -rf ~/.opera".
+
--- linux-opera7.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list