Upgrade to 6.0 TP2, which seems much stabler (if not faster) than TP1, no

longer has problems displaying JPG and PNG images, and is distributable.

12 files changed, 30 insertions, 78 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index b6fbec3ee9c2..720e7db5044a 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-OPERAVERSION=	6.0-20011122.1
+OPERAVERSION=	6.0-20011129.1
 PORTVERSION=	${OPERAVERSION:S/-/./}
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/tp1/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/tp1/
+MASTER_SITES=	http://opera.online.no/linux/600/tp2/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/tp2/
 DISTNAME=	${PORTNAME}-${OPERAVERSION}-static_qt.i386
 
 MAINTAINER=	des@FreeBSD.org
@@ -22,8 +22,6 @@ RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 
 ONLY_FOR_ARCHS=	i386
 
-NO_PACKAGE=	"Beta software, do not distribute."
-
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
@@ -38,7 +36,5 @@ do-install:
 	    --docdir=${DOCSDIR} \
 	    --sharedir=${DATADIR} \
 	    --plugindir=${DATADIR}/plugins )
-	${RM} -rf ${DATADIR}/uninst/rollback_${OPERAVERSION}
-	rmdir ${DATADIR}/uninst
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 4f635804aae1..a0600f74fc41 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 694d71d83d3b6cc37b02070cc2c475de
+MD5 (opera-6.0-20011129.1-static_qt.i386.tar.gz) = ab7e54bc483c1d3b4c4663769607f647
diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa
index db78da601a33..9b8027abd8fe 100644
--- a/www/linux-opera-devel/files/patch-aa
+++ b/www/linux-opera-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Thu Nov 22 12:38:09 2001
-+++ install.sh	Tue Nov 27 02:05:55 2001
-@@ -228,7 +228,16 @@
+--- install.sh.orig	Thu Dec  6 12:19:52 2001
++++ install.sh	Thu Dec  6 13:49:56 2001
+@@ -310,7 +310,16 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
  
@@ -18,21 +18,7 @@
  	;;
  
  	i[3456]86:Linux)
-@@ -477,10 +486,10 @@
- 
- # Opera enviroment
- if test \"\${OPERA_DIR}\" = '' ; then 
--  if test -d /usr/share/opera ; then 
--    OPERA_DIR=/usr/share/opera
-+  if test -d %%DATADIR%% ; then 
-+    OPERA_DIR=%%DATADIR%%
-   else
--    echo \"OPERA_DIR unset and not in default location (/usr/share/opera)\"
-+    echo \"OPERA_DIR unset and not in default location (%%DATADIR%%)\"
-     exit 1
-   fi
- fi
-@@ -491,18 +500,11 @@
+@@ -683,18 +692,11 @@
  for DIR in \\
      \"\${HOME}/.opera/plugins\" \\
      ${plugin_dir} \\
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 4c937c31ef1e..cdc05f8d7679 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -313,6 +313,7 @@ share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
 share/opera/plugins/libnpp.so.0.1.5
 share/opera/plugins/operamotifwrapper
+share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -329,6 +330,7 @@ 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/images
 @dirrm share/opera/help
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index b6fbec3ee9c2..720e7db5044a 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-OPERAVERSION=	6.0-20011122.1
+OPERAVERSION=	6.0-20011129.1
 PORTVERSION=	${OPERAVERSION:S/-/./}
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/tp1/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/tp1/
+MASTER_SITES=	http://opera.online.no/linux/600/tp2/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/tp2/
 DISTNAME=	${PORTNAME}-${OPERAVERSION}-static_qt.i386
 
 MAINTAINER=	des@FreeBSD.org
@@ -22,8 +22,6 @@ RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 
 ONLY_FOR_ARCHS=	i386
 
-NO_PACKAGE=	"Beta software, do not distribute."
-
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
@@ -38,7 +36,5 @@ do-install:
 	    --docdir=${DOCSDIR} \
 	    --sharedir=${DATADIR} \
 	    --plugindir=${DATADIR}/plugins )
-	${RM} -rf ${DATADIR}/uninst/rollback_${OPERAVERSION}
-	rmdir ${DATADIR}/uninst
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 4f635804aae1..a0600f74fc41 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 694d71d83d3b6cc37b02070cc2c475de
+MD5 (opera-6.0-20011129.1-static_qt.i386.tar.gz) = ab7e54bc483c1d3b4c4663769607f647
diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa
index db78da601a33..9b8027abd8fe 100644
--- a/www/linux-opera/files/patch-aa
+++ b/www/linux-opera/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Thu Nov 22 12:38:09 2001
-+++ install.sh	Tue Nov 27 02:05:55 2001
-@@ -228,7 +228,16 @@
+--- install.sh.orig	Thu Dec  6 12:19:52 2001
++++ install.sh	Thu Dec  6 13:49:56 2001
+@@ -310,7 +310,16 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
  
@@ -18,21 +18,7 @@
  	;;
  
  	i[3456]86:Linux)
-@@ -477,10 +486,10 @@
- 
- # Opera enviroment
- if test \"\${OPERA_DIR}\" = '' ; then 
--  if test -d /usr/share/opera ; then 
--    OPERA_DIR=/usr/share/opera
-+  if test -d %%DATADIR%% ; then 
-+    OPERA_DIR=%%DATADIR%%
-   else
--    echo \"OPERA_DIR unset and not in default location (/usr/share/opera)\"
-+    echo \"OPERA_DIR unset and not in default location (%%DATADIR%%)\"
-     exit 1
-   fi
- fi
-@@ -491,18 +500,11 @@
+@@ -683,18 +692,11 @@
  for DIR in \\
      \"\${HOME}/.opera/plugins\" \\
      ${plugin_dir} \\
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 4c937c31ef1e..cdc05f8d7679 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -313,6 +313,7 @@ share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
 share/opera/plugins/libnpp.so.0.1.5
 share/opera/plugins/operamotifwrapper
+share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -329,6 +330,7 @@ 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/images
 @dirrm share/opera/help
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index b6fbec3ee9c2..720e7db5044a 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	opera
 PKGNAMEPREFIX=	linux-
-OPERAVERSION=	6.0-20011122.1
+OPERAVERSION=	6.0-20011129.1
 PORTVERSION=	${OPERAVERSION:S/-/./}
 CATEGORIES=	www linux
-MASTER_SITES=	http://opera.online.no/linux/600/tp1/ \
-		ftp://ftp.opera.com/pub/opera/linux/600/tp1/
+MASTER_SITES=	http://opera.online.no/linux/600/tp2/ \
+		ftp://ftp.opera.com/pub/opera/linux/600/tp2/
 DISTNAME=	${PORTNAME}-${OPERAVERSION}-static_qt.i386
 
 MAINTAINER=	des@FreeBSD.org
@@ -22,8 +22,6 @@ RUN_DEPENDS=	${LINUXBASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 
 ONLY_FOR_ARCHS=	i386
 
-NO_PACKAGE=	"Beta software, do not distribute."
-
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
@@ -38,7 +36,5 @@ do-install:
 	    --docdir=${DOCSDIR} \
 	    --sharedir=${DATADIR} \
 	    --plugindir=${DATADIR}/plugins )
-	${RM} -rf ${DATADIR}/uninst/rollback_${OPERAVERSION}
-	rmdir ${DATADIR}/uninst
 
 .include <bsd.port.mk>
diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo
index 4f635804aae1..a0600f74fc41 100644
--- a/www/linux-opera7/distinfo
+++ b/www/linux-opera7/distinfo
@@ -1 +1 @@
-MD5 (opera-6.0-20011122.1-static_qt.i386.tar.gz) = 694d71d83d3b6cc37b02070cc2c475de
+MD5 (opera-6.0-20011129.1-static_qt.i386.tar.gz) = ab7e54bc483c1d3b4c4663769607f647
diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa
index db78da601a33..9b8027abd8fe 100644
--- a/www/linux-opera7/files/patch-aa
+++ b/www/linux-opera7/files/patch-aa
@@ -1,6 +1,6 @@
---- install.sh.orig	Thu Nov 22 12:38:09 2001
-+++ install.sh	Tue Nov 27 02:05:55 2001
-@@ -228,7 +228,16 @@
+--- install.sh.orig	Thu Dec  6 12:19:52 2001
++++ install.sh	Thu Dec  6 13:49:56 2001
+@@ -310,7 +310,16 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
  
@@ -18,21 +18,7 @@
  	;;
  
  	i[3456]86:Linux)
-@@ -477,10 +486,10 @@
- 
- # Opera enviroment
- if test \"\${OPERA_DIR}\" = '' ; then 
--  if test -d /usr/share/opera ; then 
--    OPERA_DIR=/usr/share/opera
-+  if test -d %%DATADIR%% ; then 
-+    OPERA_DIR=%%DATADIR%%
-   else
--    echo \"OPERA_DIR unset and not in default location (/usr/share/opera)\"
-+    echo \"OPERA_DIR unset and not in default location (%%DATADIR%%)\"
-     exit 1
-   fi
- fi
-@@ -491,18 +500,11 @@
+@@ -683,18 +692,11 @@
  for DIR in \\
      \"\${HOME}/.opera/plugins\" \\
      ${plugin_dir} \\
diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist
index 4c937c31ef1e..cdc05f8d7679 100644
--- a/www/linux-opera7/pkg-plist
+++ b/www/linux-opera7/pkg-plist
@@ -313,6 +313,7 @@ share/opera/plugins/libnpp.so.0
 share/opera/plugins/libnpp.so.0.1
 share/opera/plugins/libnpp.so.0.1.5
 share/opera/plugins/operamotifwrapper
+share/opera/skin/foreground.png
 share/opera/styles/OPF.css
 share/opera/styles/about.css
 share/opera/styles/cache.css
@@ -329,6 +330,7 @@ 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/images
 @dirrm share/opera/help