Date: 3 Jul 2002 16:26:41 -0000 From: "Øyvind" Kolbu <oyvind@kebab.gaffel.nu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40152: Update linux-opera to 6.02 Message-ID: <20020703162641.83338.qmail@kebab.gaffel.nu>
next in thread | raw e-mail | index | archive | help
>Number: 40152 >Category: ports >Synopsis: Update linux-opera to 6.02 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jul 03 09:30:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Øyvind Kolbu >Release: FreeBSD 4.6-RC i386 >Organization: >Environment: System: FreeBSD kebab.gaffel.nu 4.6-RC FreeBSD 4.6-RC #0: Sat May 25 23:43:30 CEST 2002 oyvind@kebab.gaffel.nu:/usr/obj/usr/src/sys/kebab i386 Opera 6.02 >Description: Update linux-opera port 6.02. Added USE_REINPlACE while updating. >How-To-Repeat: Use the patch below. >Fix: --- opera-patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/linux-opera/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 2002/05/28 04:20:04 1.30 +++ Makefile 2002/07/03 16:15:58 @@ -6,12 +6,12 @@ # PORTNAME= opera -PORTVERSION= 6.01.20020523 +PORTVERSION= 6.02.20020701 CATEGORIES= www linux -MASTER_SITES= http://opera.online.no/linux/601/final/en/qt_static/ \ - ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/ +MASTER_SITES= http://opera.online.no/linux/602/final/en/qt_static/ \ + ftp://ftp.opera.com/pub/opera/linux/602/final/en/qt_static/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/02./02-/}.1-static-qt.i386 MAINTAINER= des@FreeBSD.org @@ -20,13 +20,14 @@ USE_BZIP2= yes USE_LINUX= yes +USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_FILTER_SHLIBS=yes do-configure: - ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ ${WRKSRC}/install.sh do-install: Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/linux-opera/distinfo,v retrieving revision 1.15 diff -u -r1.15 distinfo --- distinfo 2002/05/28 04:20:04 1.15 +++ distinfo 2002/07/03 16:15:58 @@ -1 +1 @@ -MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd +MD5 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = 3e2679ff4bbe6a17f5ab33db72020596 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/linux-opera/pkg-plist,v retrieving revision 1.13 diff -u -r1.13 pkg-plist --- pkg-plist 2002/04/20 15:03:26 1.13 +++ pkg-plist 2002/07/03 16:15:58 @@ -1,4 +1,6 @@ bin/opera +etc/opera6rc +etc/opera6rc.fixed share/doc/opera/LICENSE share/doc/opera/help share/opera/bin/opera Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/www/linux-opera/files/patch-aa,v retrieving revision 1.13 diff -u -r1.13 patch-aa --- files/patch-aa 2002/05/28 04:20:04 1.13 +++ files/patch-aa 2002/07/03 16:15:58 @@ -1,6 +1,6 @@ ---- install.sh.orig Thu May 23 13:34:04 2002 -+++ install.sh Mon May 27 14:25:51 2002 -@@ -737,6 +737,16 @@ +--- install.sh.orig Wed Jul 3 18:05:43 2002 ++++ install.sh Wed Jul 3 18:06:06 2002 +@@ -751,6 +751,16 @@ /usr/lib/j2re1.3/plugin/i386/netscape4 \\" ;; @@ -17,7 +17,7 @@ mips*:Linux) wrapper_plugin_paths='' ;; -@@ -799,7 +809,7 @@ +@@ -813,7 +823,7 @@ # Acrobat Reader for BINDIR in \\ @@ -26,3 +26,49 @@ /usr/lib/Acrobat[45]/bin \\ /usr/X11R6/lib/Acrobat[45]/bin \\ /opt/Acrobat[45]/bin \\ +@@ -938,39 +948,15 @@ + 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 + 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" + fi + --- opera-patch ends here --- >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?20020703162641.83338.qmail>