Update to 6.02:

* New preferences look.
* Tons of unnoticeable bug fixes.

Install both opera6rc and opera6rc.fixed.
Move sync DNS lookup disable to opera6rc.fixed.
This commit is contained in:
naddy 2002-07-03 20:37:36 +00:00
parent fd659df6df
commit 376bb50bc8
8 changed files with 66 additions and 36 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.10 2002/05/28 15:03:03 naddy Exp $
# $OpenBSD: Makefile,v 1.11 2002/07/03 20:37:36 naddy Exp $
ONLY_FOR_ARCHS= i386
COMMENT= "fast and customizable WWW browser"
PKGNAME= opera-6.01
DISTNAME= opera-6.01-20020523.1-static-qt.i386
PKGNAME= opera-6.02
DISTNAME= opera-6.02-20020701.1-static-qt.i386
CATEGORIES= www
NEED_VERSION= 1.522
HOMEPAGE= http://www.opera.com/
@ -30,7 +30,7 @@ MASTER_SITES_OPERA= ftp://ftp.opera.com/pub/opera/ \
ftp://ftp.rge.com/pub/infosystems/opera/ \
http://www.rge.com/pub/infosystems/opera/
MASTER_SITES= ${MASTER_SITES_OPERA:=linux/601/final/en/qt_static/}
MASTER_SITES= ${MASTER_SITES_OPERA:=linux/602/final/en/qt_static/}
EXTRACT_SUFX= .tar.bz2
RUN_DEPENDS= :redhat_base->=6.2p1:emulators/redhat/base \
@ -44,10 +44,13 @@ do-install:
--prefix=${PREFIX} \
--exec_prefix=${PREFIX}/libexec \
--plugindir=${PREFIX}/lib/opera/plugins
cd ${PREFIX}/share/doc/opera; \
cd ${PREFIX}/share/doc/opera && \
ln -sf ../../opera/help .
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/opera
${INSTALL_DATA} ${FILESDIR}/operarc ${PREFIX}/share/examples/opera
${INSTALL_DATA} ${FILESDIR}/operarc \
${PREFIX}/share/examples/opera/opera6rc
${INSTALL_DATA} ${FILESDIR}/operarc.fixed \
${PREFIX}/share/examples/opera/opera6rc.fixed
sed -e 's:@PREFIX@:${TRUEPREFIX}:g' \
-e 's:@LOCALBASE@:${LOCALBASE}:g' \
${FILESDIR}/opera.sh >${PREFIX}/bin/opera

View File

@ -1,3 +1,3 @@
MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd
RMD160 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = 90e33b68067cbc38b58a9c26ac358ebb38e78fea
SHA1 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = ace68d45df4deab1fca9978ed48bf5c7766919f9
MD5 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = 3e2679ff4bbe6a17f5ab33db72020596
RMD160 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = 3c858363af8fb39f1e346d0147bbbdcc6994c3e6
SHA1 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = e0411c2743c4ec8616a592dac3ce7b5ad5684e7f

View File

@ -1,4 +1,4 @@
; $OpenBSD: operarc,v 1.5 2002/04/23 15:44:43 naddy Exp $
; $OpenBSD: operarc,v 1.6 2002/07/03 20:37:37 naddy Exp $
;
; Put any default settings here that are overridable by users
;
[Performance]
Synchronous DNS Lookup=1

View File

@ -0,0 +1,6 @@
; $OpenBSD: operarc.fixed,v 1.1 2002/07/03 20:37:37 naddy Exp $
;
; Put any settings here that are not overridable by users
;
[Performance]
Synchronous DNS Lookup=1

View File

@ -1,18 +1,27 @@
$OpenBSD: patch-install_sh,v 1.4 2002/05/16 12:55:21 naddy Exp $
--- install.sh.orig Fri May 10 15:36:21 2002
+++ install.sh Thu May 16 00:25:05 2002
@@ -922,10 +922,10 @@ run_install()
ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major
$OpenBSD: patch-install_sh,v 1.5 2002/07/03 20:37:37 naddy Exp $
--- install.sh.orig Wed Jul 3 21:16:45 2002
+++ install.sh Wed Jul 3 21:18:32 2002
@@ -938,7 +938,7 @@ run_install()
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
+ if false can_write_to "/etc"; then
echo
echo "System wide configuration files:"
echo " /etc/opera6rc"
@@ -975,10 +975,10 @@ run_install()
fi
# Shorcuts and Icons
- icons
- gnome
- kde2
- kde
+# icons
+# gnome
+# kde2
+# kde
+ : icons
+ : gnome
+ : kde2
+ : kde
# Add uninstallation here

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.5 2002/04/23 15:44:43 naddy Exp $
# $OpenBSD: DEINSTALL,v 1.6 2002/07/03 20:37:37 naddy Exp $
#
# De-installation setup of Opera
@ -8,7 +8,8 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=/etc/opera6rc # hardcoded to /etc
CONFIG_FILE=/etc/opera6rc # hardcoded to /etc
CONFIG_FILE_FIXED=/etc/opera6rc.fixed # hardcoded to /etc
# Function: tell the user what they need to do to delete the port completely
#
@ -19,7 +20,7 @@ do_notice()
echo "| To completely deinstall the $1 package you need to perform"
echo "| these steps as root:"
echo "|"
echo "| rm -f ${CONFIG_FILE}"
echo "| rm -f ${CONFIG_FILE} ${CONFIG_FILE_FIXED}"
echo "|"
echo "| Do not do this if you plan on re-installing $1"
echo "| at some future time."
@ -38,7 +39,7 @@ fi
#
case $2 in
DEINSTALL)
if [ -f ${CONFIG_FILE} ]; then
if [ -f ${CONFIG_FILE} -o -f ${CONFIG_FILE_FIXED} ]; then
do_notice "$1"
fi
;;

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.5 2002/04/23 15:44:43 naddy Exp $
# $OpenBSD: INSTALL,v 1.6 2002/07/03 20:37:37 naddy Exp $
#
# Pre/post-installation setup of Opera
@ -8,7 +8,8 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_FILE=/etc/opera6rc # hardcoded to /etc
CONFIG_FILE=/etc/opera6rc # hardcoded to /etc
CONFIG_FILE_FIXED=/etc/opera6rc.fixed # hardcoded to /etc
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/opera
# Function: tell the user what they need to do to use the port just installed
@ -17,8 +18,12 @@ do_notice()
{
echo
echo "+---------------"
echo "| The existing $1 configuration file, ${CONFIG_FILE},"
echo "| has NOT been changed. You may want to compare it to the"
echo "| The existing $1 configuration files,"
echo "|"
echo "| ${CONFIG_FILE}"
echo "| ${CONFIG_FILE_FIXED}"
echo "|"
echo "| have NOT been changed. You may want to compare them to the"
echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
echo "| and update your configuration as needed."
echo "+---------------"
@ -29,12 +34,17 @@ do_notice()
#
do_install()
{
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/operarc ${CONFIG_FILE}
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/opera6rc ${CONFIG_FILE}
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/opera6rc.fixed ${CONFIG_FILE_FIXED}
echo
echo "+---------------"
echo "| The $1 configuration file, ${CONFIG_FILE},"
echo "| has been installed. Please view this file and change"
echo "| the configuration to meet your needs"
echo "| The $1 configuration files,"
echo "|"
echo "| ${CONFIG_FILE}"
echo "| ${CONFIG_FILE_FIXED}"
echo "|"
echo "| have been installed. Please view these files and change"
echo "| the configuration to meet your needs."
echo "+---------------"
echo
}
@ -53,7 +63,7 @@ case $2 in
: nothing to pre-install for this port
;;
POST-INSTALL)
if [ -f ${CONFIG_FILE} ]; then
if [ -f ${CONFIG_FILE} -o -f ${CONFIG_FILE_FIXED} ]; then
do_notice "$1"
else
do_install "$1"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2002/04/23 15:44:43 naddy Exp $
@comment $OpenBSD: PLIST,v 1.8 2002/07/03 20:37:37 naddy Exp $
bin/opera
lib/opera/plugins/libnpp.so
lib/opera/plugins/libnpp.so.0
@ -8,7 +8,8 @@ lib/opera/plugins/operamotifwrapper
libexec/opera
share/doc/opera/LICENSE
share/doc/opera/help
share/examples/opera/operarc
share/examples/opera/opera6rc
share/examples/opera/opera6rc.fixed
share/opera/buttons/DefSmall
share/opera/buttons/Default
share/opera/buttons/ReadMe.txt