Date: Tue, 17 Dec 2002 23:17:04 +0000 From: AMAKAWA Shuhei <sa264@cam.ac.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: des@FreeBSD.org Subject: ports/46335: update www/linux-opera to 6.11 Message-ID: <E18OQxU-000650-00@m218-3.phy.cam.ac.uk>
next in thread | raw e-mail | index | archive | help
>Number: 46335 >Category: ports >Synopsis: update www/linux-opera to 6.11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Dec 17 15:20:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: AMAKAWA Shuhei >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD m218-3.phy.cam.ac.uk 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Dec 2 01:34:35 GMT 2002 sa264@m218-3.phy.cam.ac.uk:/usr/obj/usr/src/sys/KERNCONF i386 >Description: update www/linux-opera to 6.11 >How-To-Repeat: >Fix: diff -uNr /usr/ports/www/linux-opera/Makefile linux-opera/Makefile --- /usr/ports/www/linux-opera/Makefile Sun Sep 15 17:02:10 2002 +++ linux-opera/Makefile Sun Dec 15 14:24:42 2002 @@ -6,12 +6,12 @@ # PORTNAME= opera -PORTVERSION= 6.03.20020813 +PORTVERSION= 6.11.20021129 CATEGORIES= www linux -MASTER_SITES= http://opera.online.no/linux/603/final/en/qt_static/ \ - ftp://ftp.opera.com/pub/opera/linux/603/final/en/qt_static/ +MASTER_SITES= http://opera.online.no/linux/611/final/en/i386/static/ \ + ftp://ftp.opera.com/pub/opera/linux/611/final/en/i386/static/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/03./03-/}.1-static-qt.i386 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386 MAINTAINER= des@FreeBSD.org @@ -20,23 +20,12 @@ USE_BZIP2= yes USE_LINUX= yes -USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_FILTER_SHLIBS=yes -do-configure: - ${REINPLACE_CMD} -e \ - 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ - ${WRKSRC}/install.sh - do-install: - (cd ${WRKSRC} && ./install.sh \ - --exec_prefix=${DATADIR}/bin \ - --wrapperdir=${PREFIX}/bin \ - --docdir=${DOCSDIR} \ - --sharedir=${DATADIR} \ - --plugindir=${DATADIR}/plugins ) + (cd ${WRKSRC} && ./install.sh --prefix="${PREFIX}") .include <bsd.port.mk> diff -uNr /usr/ports/www/linux-opera/distinfo linux-opera/distinfo --- /usr/ports/www/linux-opera/distinfo Sun Sep 15 17:02:10 2002 +++ linux-opera/distinfo Wed Dec 11 07:46:04 2002 @@ -1 +1 @@ -MD5 (opera-6.03-20020813.1-static-qt.i386.tar.bz2) = aa8ebc7d5edf4c47f56ed72725f10f80 +MD5 (opera-6.11-20021129.1-static-qt.i386.tar.bz2) = 2d6a3301f9d83902543a26ec33615ad8 diff -uNr /usr/ports/www/linux-opera/files/patch-aa linux-opera/files/patch-aa --- /usr/ports/www/linux-opera/files/patch-aa Sun Jul 28 22:02:47 2002 +++ linux-opera/files/patch-aa Sun Dec 15 09:34:27 2002 @@ -1,82 +1,62 @@ ---- install.sh.orig Mon Jul 1 14:06:31 2002 -+++ install.sh Sun Jul 14 21:10:25 2002 -@@ -751,6 +751,16 @@ - /usr/lib/j2re1.3/plugin/i386/netscape4 \\" +--- install.sh.orig Fri Nov 29 12:19:46 2002 ++++ install.sh Sun Dec 15 09:33:47 2002 +@@ -762,6 +762,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 \\" ++ $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='' ;; -@@ -813,7 +823,7 @@ +@@ -887,7 +897,7 @@ # Acrobat Reader for BINDIR in \\ - /usr/local/Acrobat[45]/bin \\ -+ %%PREFIX%%/Acrobat[45]/bin \\ ++ $prefix/Acrobat[45]/bin \\ /usr/lib/Acrobat[45]/bin \\ /usr/X11R6/lib/Acrobat[45]/bin \\ /opt/Acrobat[45]/bin \\ -@@ -938,47 +948,17 @@ +@@ -1081,8 +1091,9 @@ ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so # System wide configuration files -- if can_write_to "/etc"; then -- echo -- echo "System wide configuration files:" -- echo " /etc/opera6rc" -- echo " /etc/opera6rc.fixed" -- echo " cannot be prefixed" -- echo "Do you want to install them [y,n | yes,no]?" -- while true; do -- read install_config -- case "${install_config}" in -- -- ''|y|Y|yes|YES) -- backup /etc/opera6rc opera6rc config -- backup /etc/opera6rc.fixed opera6rc.fixed config -- cp $cpv $cpf $cpp config/opera6rc /etc -- cp $cpv $cpf $cpp config/opera6rc.fixed /etc -- break -- ;; -- -- n|N|no|NO) -- break -- ;; -- *) -- echo 'Invalid answer, try again:' -- ;; -- esac -- done -+ if can_write_to "%%PREFIX%%/etc"; then -+ cp $cpv $cpf $cpp config/opera6rc %%PREFIX%%/etc -+ cp $cpv $cpf $cpp config/opera6rc.fixed %%PREFIX%%/etc +- 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" +@@ -1109,6 +1120,7 @@ + ;; + esac + done ++fi # XXX else echo -- echo "User \"${USERNAME}\" does not have write access to /etc" -+ echo "User \"${USERNAME}\" does not have write access to %%PREFIX%%/etc" - echo " System wide configuration files:" -- echo " /etc/opera6rc" -- echo " /etc/opera6rc.fixed" -+ echo " %%PREFIX%%/etc/opera6rc" -+ echo " %%PREFIX%%/etc/opera6rc.fixed" - echo " were not installed" + echo "User \"${USERNAME}\" does not have write access to $config_dir" +@@ -1119,10 +1131,10 @@ fi -- -- # Shorcuts and Icons + + # Shorcuts and Icons - icons - gnome - kde2 - kde ++# icons ++# gnome ++# kde2 ++# kde # Add uninstallation here diff -uNr /usr/ports/www/linux-opera/pkg-plist linux-opera/pkg-plist --- /usr/ports/www/linux-opera/pkg-plist Sun Jul 7 02:11:07 2002 +++ linux-opera/pkg-plist Sun Dec 15 09:30:45 2002 @@ -1,6 +1,4 @@ bin/opera -etc/opera6rc -etc/opera6rc.fixed share/doc/opera/LICENSE share/doc/opera/help share/opera/bin/opera @@ -354,12 +352,16 @@ share/opera/images/splash.png share/opera/images/startup1.png share/opera/images/startup2.png +share/opera/java/lc.jar +share/opera/java/opera.jar +share/opera/java/opera.policy share/opera/opera6.adr share/opera/plugins/libnpp.so share/opera/plugins/libnpp.so.0 share/opera/plugins/libnpp.so.0.1 share/opera/plugins/libnpp.so.0.1.8 share/opera/plugins/operamotifwrapper +share/opera/plugins/operaplugincleaner share/opera/skin/foreground.png share/opera/styles/OPF.css share/opera/styles/about.css @@ -375,11 +377,11 @@ share/opera/styles/opf.css share/opera/styles/plugins.css share/opera/styles/wml.css -share/opera/unicode.dat @dirrm share/opera/styles @dirrm share/opera/skin @dirrm share/opera/plugins @dirrm share/opera/locale +@dirrm share/opera/java @dirrm share/opera/images @dirrm share/opera/help @dirrm share/opera/config >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E18OQxU-000650-00>