-Update to 8.54.

-Remove USE_REINPLACE.
-Convert to OPTIONS.

PR:		ports/95471
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)

8 files changed, 98 insertions, 88 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 08ca5a9e7cfe..916cf59d854a 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -8,29 +8,29 @@
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/&,} \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/
+MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/&,} \
+		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-OPERA_VER=	8.51
+OPERA_VER=	8.54
 OPERA_MINVER=	#
 OPERA_REL=	final
-OPERA_DATE=	20051114
+OPERA_DATE=	20060330
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
@@ -38,15 +38,12 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 USE_BZIP2=	yes
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-.ifndef(WITHOUT_ASPELL)
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
-.endif
+OPTIONS=	ASPELL	"Support spelling checker"	off
 
 .include <bsd.port.pre.mk>
 
@@ -58,6 +55,10 @@ LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 LIB_DEPENDS+=	z.2:${PORTSDIR}/misc/compat5x
 .endif
 
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
+.endif
+
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME=""
 .else
@@ -70,13 +71,6 @@ PLIST_SUB+=	KDE=""
 PLIST_SUB+=	KDE="@comment "
 .endif
 
-pre-everything::
-.if !defined(WITHOUT_ASPELL)
-	@${ECHO_CMD} '===> The following options are available for this port:'
-	@${ECHO_CMD} '===>'
-	@${ECHO_CMD} '===> Define WITHOUT_ASPELL to not install aspell.'
-.endif
-
 post-patch:
 	@${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
diff --git a/www/opera/distinfo b/www/opera/distinfo
index fc8dcd36cfe7..f5839890cde1 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 28fb74b43b24f0a29b3e4a9ddb79d9b6
-SHA256 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 0631248764d5bb039bc9d1b6d098adb6f6ad1e991ac7a82863201f755145ff30
-SIZE (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 5572512
+MD5 (opera-8.54-20060330.1-static-qt.i386.freebsd-en.tar.bz2) = 3278224c6f3988a03ac87f7606dba232
+SHA256 (opera-8.54-20060330.1-static-qt.i386.freebsd-en.tar.bz2) = c44cef042168158de2f9ef3558552924aad898d00541d9b415c25b1071355486
+SIZE (opera-8.54-20060330.1-static-qt.i386.freebsd-en.tar.bz2) = 5563667
diff --git a/www/opera/files/patch-config::opera6rc b/www/opera/files/patch-config_opera6rc
index 420f1fa0bbfa..420f1fa0bbfa 100644
--- a/www/opera/files/patch-config::opera6rc
+++ b/www/opera/files/patch-config_opera6rc
diff --git a/www/opera/files/patch-ini::pluginpath.ini b/www/opera/files/patch-ini_pluginpath.ini
index a3fed160132d..a3fed160132d 100644
--- a/www/opera/files/patch-ini::pluginpath.ini
+++ b/www/opera/files/patch-ini_pluginpath.ini
diff --git a/www/opera/files/patch-ini::spellcheck.ini b/www/opera/files/patch-ini_spellcheck.ini
index a2ec7c7ccb2e..a2ec7c7ccb2e 100644
--- a/www/opera/files/patch-ini::spellcheck.ini
+++ b/www/opera/files/patch-ini_spellcheck.ini
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index 697a95052768..ed8dddbf5a9b 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Mon Nov 14 14:51:18 2005
-+++ install.sh	Wed Jan 25 18:59:13 2006
+--- install.sh.orig	Fri Feb 24 09:55:34 2006
++++ install.sh	Wed Mar  1 12:46:33 2006
 @@ -381,7 +381,7 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
@@ -9,7 +9,7 @@
  		cpf='-f'
  		if test "$verbose" -gt '1'
  		then
-@@ -757,7 +757,7 @@
+@@ -771,7 +771,7 @@
      debug_msg 0 "in generate_wrapper()"
  
      case "${machine}:${os}" in
@@ -18,7 +18,7 @@
  	    wrapper_ibmjava="
  	    IBMJava2-142/jre \\
  	    IBMJava2-141/jre \\
-@@ -796,10 +796,19 @@
+@@ -810,10 +810,19 @@
  
      wrapper_contain="#!/bin/sh
  
@@ -37,8 +37,8 @@
 +
  # Parse commandline parameters
  toset=
- for arg
-@@ -844,6 +853,9 @@
+ _QTSTYLE_FROM_CMDLINE_='NO'
+@@ -865,6 +874,9 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -48,7 +48,7 @@
  # Native Java enviroment
  if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
      INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -867,65 +879,12 @@
+@@ -888,69 +900,12 @@
  
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
@@ -58,13 +58,17 @@
 -	/usr/lib
 -	/usr/local
 -	/opt\"
-+    PREFIXES=\"%%LOCALBASE%%\"
++	PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	java-1.5.0-sun-1.5.0.06 \\
+-	java-1.5.0-sun-1.5.0.06/jre \\
 -	java-1.5.0-sun-1.5.0.05 \\
 -	java-1.5.0-sun-1.5.0.05/jre \\
 -	java-1.5.0-sun-1.5.0.04 \\
 -	java-1.5.0-sun-1.5.0.04/jre \\
+-	jre1.5.0_06 \\
+-	jdk1.5.0_06/jre \\
 -	jre1.5.0_05 \\
 -	jdk1.5.0_05/jre \\
 -	jre1.5.0_04 \\
@@ -108,16 +112,17 @@
 -	j2se/1.3/jre \\
 -	SunJava2-1.3/jre \\
 -	java2re \\
- 	jdk1.2.2/jre \\
+-	jdk1.2.2/jre \\
 -	jdk1.2/jre \\
 -	jre \\
 -	java \\
 +	jdk1.3.1/jre \\
 +	jdk1.4.2/jre \\
++	jdk1.5.0/jre \\
  	; do
  	for PREFIX in \${PREFIXES}; do
  	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -976,11 +935,8 @@
+@@ -1001,11 +956,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -126,12 +131,12 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+    %%LOCALBASE%%/Acrobat4/bin \\
-+    %%LOCALBASE%%/Acrobat5/bin \\
++	%%LOCALBASE%%/Acrobat4/bin \\
++	%%LOCALBASE%%/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -991,12 +947,13 @@
+@@ -1016,12 +968,13 @@
  LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
  export LD_LIBRARY_PATH
  
@@ -146,8 +151,8 @@
 +    if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then
          LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
      fi
- done
-@@ -1086,7 +1043,7 @@
+ done"
+@@ -1123,7 +1076,7 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
@@ -156,7 +161,7 @@
  
      # Executable
      debug_msg 1 "Executable"
-@@ -1300,49 +1257,13 @@
+@@ -1338,44 +1291,13 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -197,16 +202,13 @@
 -
  	if test "${bool_icons}" -ne 0
  	then
--	    icons
- 	    gnome
- 	    kde 3
--	    kde 2
--	    kde1
--	    mandrake
+-	    xdg
++		gnome
++		kde 3
  	fi
  
      fi # OPERADESTDIR
-@@ -1487,48 +1408,43 @@
+@@ -1582,48 +1504,42 @@
      # This function searches for common gnome icon paths.
      debug_msg 1 "in gnome()"
  
@@ -218,8 +220,8 @@
 -	then
 -	    # /opt/gnome icon
 -	    if test ! -d /opt/gnome/share/pixmaps/
-+	    # %%X11BASE%%/share/gnome icon
-+	    if test ! -d %%X11BASE%%/share/gnome/pixmaps/;
++	   # %%X11BASE%%/share/gnome icon
++           if test ! -d %%X11BASE%%/share/gnome/pixmaps
  	    then
 -		if test -w /opt/gnome/share
 +		if test -w %%X11BASE%%/share/gnome;
@@ -227,58 +229,58 @@
 -		    mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
 -		    chmod $chmodv 755 /opt/gnome/share/pixmaps
 -		    cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+		    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
-+		    chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
-+		    cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
++                   mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
++                   chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
++                   cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
  		fi
 -	    elif test -w /opt/gnome/share/pixmaps
 -	    then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+	    elif test -w %%X11BASE%%/share/gnome/pixmaps
-+	    then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
++           elif test -w %%X11BASE%%/share/gnome/pixmaps
++           then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
  	    fi
 -	    # end /opt/gnome icon
-+	    # end %%X11BASE%%/share/gnome icon
- 
+-
 -	    # /opt/gnome link
 -	    if test -d /opt/gnome/share/gnome/apps/
-+	    # %%X11BASE%%/share/gnome link
-+	    if test -d %%X11BASE%%/share/gnome/apps/
++           # end %%X11BASE%%/share/gnome icon
++           # %%X11BASE%%/share/gnome link
++           if test -d %%X11BASE%%/share/gnome/apps/
  	    then
 -		if test -d /opt/gnome/share/gnome/apps/Internet/
-+		if test -d %%X11BASE%%/share/gnome/apps/Internet/
++               if test -d %%X11BASE%%/share/gnome/apps/Internet/
  		then
 -		    if test -w /opt/gnome/share/gnome/apps/Internet
 -		    then generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    if test -w %%X11BASE%%/share/gnome/apps/Internet
-+		    then generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++                   if test -w %%X11BASE%%/share/gnome/apps/Internet
++                   then generate_desktop %%X11BASE%%/share/gnome/apps/Internet
  		    fi
 -		elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/
-+		elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/
++               elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/
  		then
 -		    if test -w /opt/gnome/share/gnome/apps/Networking/WWW
 -		    then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
-+		    if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW
-+		    then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
++                   if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW
++                   then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
  		    fi
 -		elif test -w /opt/gnome/share/gnome/apps
-+		elif test -w %%X11BASE%%/share/gnome/apps
++               elif test -w %%X11BASE%%/share/gnome/apps
  		then
 -		    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
 -		    chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
 -		    generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
-+		    chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
-+		    generate_desktop %%X11BASE%%/share/gnome/apps/Internet
++                   mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
++                   chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
++                   generate_desktop %%X11BASE%%/share/gnome/apps/Internet
  		fi
  	    fi
 -	    # end /opt/gnome link
 -	fi
 -	# end /opt/gnome share
-+	    # end %%X11BASE%%/share/gnome link
++           # end %%X11BASE%%/share/gnome link
  
      elif test -d /usr/share/gnome/
      then
-@@ -1576,9 +1492,9 @@
+@@ -1671,9 +1587,9 @@
      # This function searches for common kde2 and kde 3 icon paths.
      debug_msg 1 "in kde()"
  
@@ -286,38 +288,51 @@
 +    if test -d %%LOCALBASE%%/share;
      then
 -	DIR_HI=/opt/kde$1/share/icons/hicolor
-+	DIR_HI=%%LOCALBASE%%/share/icons/hicolor
++        DIR_HI=%%LOCALBASE%%/share/icons/hicolor
  	if test -d "$DIR_HI" -a -w "$DIR_HI"
  	then
  	    if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
-@@ -1592,7 +1508,7 @@
+@@ -1687,7 +1603,7 @@
  	    fi
  	fi
  
 -	DIR_LO=/opt/kde$1/share/icons/locolor
-+	DIR_LO=%%LOCALBASE%%/share/icons/locolor
++        DIR_LO=%%LOCALBASE%%/share/icons/locolor
  	if test -d $DIR_LO -a -w $DIR_LO
  	then
  	    if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
-@@ -1606,15 +1522,15 @@
+@@ -1701,15 +1617,15 @@
  	    fi
  	fi
  
 -	if test -d /opt/kde$1/share/applnk/
-+	if test -d %%LOCALBASE%%/share/applnk/
++        if test -d %%LOCALBASE%%/share/applnk/
  	then
 -	    if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk
-+	    if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
++            if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
  	    then
 -		mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/
 -		chmod $chmodv 755 /opt/kde$1/share/applnk/Internet
-+		mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
-+		chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
++                mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
++                chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
  	    fi
 -	    if test -w /opt/kde$1/share/applnk/Internet
 -	    then generate_desktop /opt/kde$1/share/applnk/Internet $1
-+	    if test -w %%LOCALBASE%%/share/applnk/Internet
-+	    then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
++            if test -w %%LOCALBASE%%/share/applnk/Internet
++            then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
  	    fi
  	fi
      fi
+@@ -1799,12 +1715,8 @@
+ 	generate_desktop ${SHORTCUT_DIR} xdg
+ 	update-desktop-database
+     else
+-	icons
+ 	gnome
+ 	kde 3
+-	kde 2
+-	kde1
+-	mandrake
+     fi
+ }
+ 
diff --git a/www/opera/pkg-message b/www/opera/pkg-message
index 8a1a3998eacd..83a2cc531e3b 100644
--- a/www/opera/pkg-message
+++ b/www/opera/pkg-message
@@ -1,5 +1,8 @@
+###########################################################################
+
 If you are running FreeBSD 5.x or 6.x and are experiencing a core dump when 
 starting Opera, try updating the compat4x port.
 
 Plugins do not work in FreeBSD 5.x or higher - please disable them.
 
+###########################################################################
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 172434a4eaaf..40f04aec9e2b 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -41,8 +41,6 @@ bin/opera
 %%DATADIR%%/locale/english.lng
 %%DATADIR%%/opera6.adr
 %%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operamotifwrapper-1
-%%DATADIR%%/plugins/operamotifwrapper-2
 %%DATADIR%%/plugins/operamotifwrapper-3
 %%DATADIR%%/plugins/operaplugincleaner
 %%DATADIR%%/search.ini