Index: head/www/opera/Makefile
===================================================================
--- head/www/opera/Makefile	(revision 124152)
+++ head/www/opera/Makefile	(revision 124153)
@@ -1,91 +1,94 @@
 # New ports collection makefile for:		opera
 # Date created:					November 5th 2000
 # Whom:						des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://opera.nsc.no/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		ftp://files.downloadthat.com/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/&,} \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/
+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/ \
+		ftp://opera.nsc.no/pub/opera/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/ \
+		ftp://files.downloadthat.com/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=	7.54
+OPERA_MINVER=	u1
 OPERA_REL=	final
-OPERA_DATE=	20040803
+OPERA_DATE=	20041210
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 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
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
 LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 .endif
 
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME=""
 .else
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
 .if exists(${LOCALBASE}/bin/kde-config)
 PLIST_SUB+=	KDE=""
 .else
 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
+
+pre-patch:
+	@${REINPLACE_CMD} -e 's|
||' ${WRKSRC}/ini/pluginpath.ini
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
 			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
 			${WRKSRC}/ini/spellcheck.ini ${WRKSRC}/config/opera6rc
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/opera/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/www/opera/distinfo
===================================================================
--- head/www/opera/distinfo	(revision 124152)
+++ head/www/opera/distinfo	(revision 124153)
@@ -1,2 +1,2 @@
-MD5 (opera-7.54-20040803.1-static-qt.i386.freebsd-en.tar.bz2) = e9c38837138db091b1a54ddc11c34364
-SIZE (opera-7.54-20040803.1-static-qt.i386.freebsd-en.tar.bz2) = 4772388
+MD5 (opera-7.54-20041210.1-static-qt.i386.freebsd-en.tar.bz2) = 4977bb6e4b445942c370070f88f7d377
+SIZE (opera-7.54-20041210.1-static-qt.i386.freebsd-en.tar.bz2) = 4782184

Property changes on: head/www/opera/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/www/opera/files/patch-ini::pluginpath.ini
===================================================================
--- head/www/opera/files/patch-ini::pluginpath.ini	(revision 124152)
+++ head/www/opera/files/patch-ini::pluginpath.ini	(revision 124153)
@@ -1,50 +1,46 @@
---- ini/pluginpath.ini.orig	Mon Jul 19 22:54:02 2004
-+++ ini/pluginpath.ini	Mon Jul 19 22:57:21 2004
-@@ -1,31 +1,16 @@
--Opera Preferences version 2.0
--; Do not edit this file while Opera is running
--; This file is stored in UTF-8 encoding
--
--[Paths]
--$HOME/.opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/local/lib/opera/plugins=1
--/opt/lib/opera/plugins=1
--
--/usr/local/Acrobat5/Browsers/intellinux=1
--/usr/local/Acrobat4/Browsers/intellinux=1
--/usr/lib/Acrobat5/Browsers/intellinux=1
--/usr/lib/Acrobat4/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
--/opt/Acrobat5/Browsers/intellinux=1
--/opt/Acrobat4/Browsers/intellinux=1
--/usr/Acrobat5/Browsers/intellinux=1
--/usr/Acrobat4/Browsers/intellinux=1
--
--/usr/lib/RealPlayer8/Plugins=1
--/usr/lib/realplay/plugins=1
--/usr/lib/RealPlayer8=1
--/usr/lib/realplay=1
--$HOME/.netscape/plugins=1
--/opt/netscape/plugins=1
--/usr/lib/netscape/plugins=1
--/usr/local/netscape/plugins=1
--/usr/local/lib/netscape/plugins=1
-+Opera Preferences version 2.0
-+; Do not edit this file while Opera is running
-+; This file is stored in UTF-8 encoding
-+
-+[Paths]
-+$HOME/.opera/plugins=1
+--- ini/pluginpath.ini.orig	Thu Dec 16 05:03:15 2004
++++ ini/pluginpath.ini	Thu Dec 16 05:01:12 2004
+@@ -3,36 +3,14 @@
+ ; This file is stored in UTF-8 encoding
+ 
+ [Paths]
+-$PWD/plugins=1
+ $HOME/.opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
 +%%PREFIX%%/share/opera/plugins=1
 +%%LOCALBASE%%/share/opera/plugins=1
-+
+ 
+-; Adobe Acrobat
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
 +%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
-+
+ 
+-; Realplayer
+-/usr/lib/RealPlayer8/Plugins=1
+-/usr/lib/realplay/plugins=1
+-/usr/lib/RealPlayer8=1
+-/usr/lib/realplay=1
+-
+-; Netscape Plug-in Paths
+-$HOME/.netscape6/plugins=1
 +%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
 +%%X11BASE%%/lib/browser_plugins=1
-+$HOME/.netscape/plugins=1
+ $HOME/.netscape/plugins=1
+-/opt/netscape/plugins=1
+-/usr/lib/netscape/plugins=1
+-/usr/local/netscape/plugins=1
+-/usr/local/lib/netscape/plugins=1
+-$HOME/.kde/.konqueror/nsplugins=1
 +%%LOCALBASE%%/lib/netscape-linux/plugins=1

Property changes on: head/www/opera/files/patch-ini::pluginpath.ini
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/www/opera/files/patch-install.sh
===================================================================
--- head/www/opera/files/patch-install.sh	(revision 124152)
+++ head/www/opera/files/patch-install.sh	(revision 124153)
@@ -1,286 +1,260 @@
---- install.sh.orig	Mon Jul 19 22:19:01 2004
-+++ install.sh	Mon Jul 19 22:52:26 2004
+--- install.sh.orig	Fri Dec 10 13:53:57 2004
++++ install.sh	Wed Dec 15 15:35:18 2004
 @@ -373,7 +373,7 @@
  	    mvv=''    # SunOS mv (no -v verbose option)
  	;;
  
 -	i[3456]86:FreeBSD|i[3456]86:NetBSD)
 +	i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD)
  		cpf='-f'
  		if test "$verbose" -gt '1'; then
  		    chmodv='-v'
-@@ -760,12 +760,10 @@
+@@ -873,47 +873,12 @@
  
-     wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
-     ${str_localdirplugin} \\
--    /usr/lib/opera/plugins \\
--    /usr/local/lib/opera/plugins \\
--    /opt/lib/opera/plugins \\"
-+    %%LOCALBASE%%/share/opera/plugins \\"
- 
-     case "${machine}:${os}" in
--	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
-+	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
- 	    wrapper_plugin_paths="
-     /usr/local/Acrobat[45]/Browsers/intellinux \\
-     /usr/lib/Acrobat[45]/Browsers/intellinux \\
-@@ -817,15 +815,10 @@
- 	;;
-     esac
-     wrapper_netscape_plugin_paths="
--    /usr/lib/RealPlayer8/Plugins \\
--    /usr/lib/realplay/plugins \\
--    /usr/lib/RealPlayer8 \\
--    /usr/lib/realplay \\
-+    %%LOCALBASE%%/lib/RealPlayer8/Plugins \\
-+    %%X11BASE%%/lib/browser_plugins \\
-     \"\${HOME}/.netscape/plugins\" \\
--    /opt/netscape/plugins \\
--    /usr/lib/netscape/plugins \\
--    /usr/local/netscape/plugins \\
--    /usr/local/lib/netscape/plugins \\"
-+    %%LOCALBASE%%/lib/netscape-linux/plugins \\"
- 
-     wrapper_file="${wrapper_dir}/opera"
-     
-@@ -887,39 +880,12 @@
- 
  if test ! \"\${OPERA_JAVA_DIR}\"; then
  
 -    PREFIXES=\"
 -	/usr
 -	/usr/java
 -	/usr/lib
 -	/usr/local
 -	/opt\"
 +    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	j2re1.4.2_04 \\
+-	j2sdk1.4.2_04/jre \\
+-	j2re1.4.2_03 \\
+-	j2sdk1.4.2_03/jre \\
+-	j2re1.4.2_02 \\
+-	j2sdk1.4.2_02/jre \\
 -	j2re1.4.2_01 \\
 -	j2sdk1.4.2_01/jre \\
 -	j2re1.4.2 \\
 -	j2sdk1.4.2/jre \\
 -	j2re1.4.1_01 \\
 -	j2re1.4.1 \\
 -	SUNJava2-1.4.1 \\
 -	BlackdownJava2-1.4.1/jre \\
 -	j2re1.4.0_01 \\
 -	j2sdk1.4.0_01/jre \\
 -	j2re1.4.0 \\
 -	jre1.4.0 \\
 -	j2se/1.4/jre \\
 -	j2se/1.3/jre \\
 -	j2se/jre \\
 -	jre1.3.1_02 \\
 -	jre1.3.1_01 \\
 -	j2re1.3.1 \\
 -	jre1.3.1 \\
 -	j2re1.3 \\
 -	j2se/1.3/jre \\
+-	SunJava2-1.3/jre \\
 -	java2re \\
  	jdk1.2.2/jre \\
 -	jdk1.2/jre \\
 -	jre \\
+-	java \\
 +	jdk1.3.1/jre \\
 +	jdk1.4.2/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
-@@ -983,11 +949,8 @@
+@@ -962,11 +927,8 @@
  
  # Acrobat Reader
  for BINDIR in \\
 -    /usr/local/Acrobat[45]/bin \\
 -    /usr/lib/Acrobat[45]/bin \\
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
 +    %%LOCALBASE%%/Acrobat4/bin \\
 +    %%LOCALBASE%%/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1278,36 +1241,13 @@
+@@ -1281,36 +1243,13 @@
  
  	if test -z "${OPERADESTDIR}"; then
  
 -	# System wide configuration files
 -	config_dir='/usr/local/etc'
 -	if can_write_to "$config_dir"; then
 -	    echo
 -	    echo "System wide configuration files:"
 -	    echo "  $config_dir/opera6rc"
 -	    echo "  $config_dir/opera6rc.fixed"
 -	    echo " cannot be prefixed"
 -	    if con_firm "Do you want to install them"; then
 -		backup $config_dir/opera6rc opera6rc config
 -		backup $config_dir/opera6rc.fixed opera6rc.fixed config
 -		cp $cpv $cpf config/opera6rc $config_dir
 -		cp $cpv $cpf config/opera6rc.fixed $config_dir
 -	    fi
 -	else
 -	    echo
 -	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
 -	    echo " System wide configuration files:"
 -	    echo "  $config_dir/opera6rc"
 -	    echo "  $config_dir/opera6rc.fixed"
 -	    echo " were not installed"
 -	fi
 -
       # Shorcuts and Icons
 -	icons
 +	#icons
  	gnome
  	kde 3
 -	kde 2
 -	kde1
 -	mandrake
 +	#kde 2
 +	#kde1
 +	#mandrake
  
  	fi # OPERADESTDIR
  
-@@ -1436,72 +1376,36 @@
+@@ -1439,72 +1378,36 @@
  
      debug_msg 1 "in gnome()"
  
 -    if test -d /opt/gnome/; then
 -
 -      # /opt/gnome share
 -      if test -d /opt/gnome/share; then
 -
 -        # /opt/gnome icon
 -        if test ! -d /opt/gnome/share/pixmaps/; then
 -	  if test -w /opt/gnome/share; then
 -	    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
 -	  fi
 -	elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
 -	fi
 -	# end /opt/gnome icon
 -
 -	# /opt/gnome link
 -	if test -d /opt/gnome/share/gnome/apps/; then
 -          if test -d /opt/gnome/share/gnome/apps/Internet/; then
 -            if test -w /opt/gnome/share/gnome/apps/Internet; then
 -              generate_desktop /opt/gnome/share/gnome/apps/Internet
 -	    fi
 -          elif test -d /opt/gnome/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
 -	    fi
 -	  elif test -w /opt/gnome/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
 -          fi
 -	fi
 -	# end /opt/gnome link
 -      fi
 -      # end /opt/gnome share
 -
 -    elif test -d /usr/share/gnome/; then
 +    if test -d %%X11BASE%%/share/gnome/; then
  
 -        # /usr/share/gnome icon
 -        if test ! -d /usr/share/gnome/pixmaps/; then
 -	  if test -w /usr/share/gnome; then
 -	    mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
 -	    chmod $chmodv 755 /usr/share/gnome/pixmaps
 -	    cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
 +        # %%X11BASE%%/share/gnome icon
 +        if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then
 +	  if test -w %%X11BASE%%/share/gnome; then
 +	    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 /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/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 /usr/share/gnome icon
 +	# end %%X11BASE%%/share/gnome icon
  
 -	# /usr/share/gnome link
 -	if test -d /usr/share/gnome/apps/; then
 -          if test -d /usr/share/gnome/apps/Internet/; then
 -            if test -w /usr/share/gnome/apps/Internet; then
 -              generate_desktop /usr/share/gnome/apps/Internet
 +	# %%X11BASE%%/share/gnome link
 +	if test -d %%X11BASE%%/share/gnome/apps/; then
 +          if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
 +            if test -w %%X11BASE%%/share/gnome/apps/Internet; then
 +              generate_desktop %%X11BASE%%/share/gnome/apps/Internet
  	    fi
 -          elif test -d /usr/share/gnome/apps/Networking/WWW/; then
 -            if test -w /usr/share/gnome/apps/Networking/WWW; then
 -	     generate_desktop /usr/share/gnome/apps/Networking/WWW
 +          elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
 +            if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
 +	     generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
  	    fi
 -	  elif test -w /usr/share/gnome/apps; then
 -	    mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/
 -	    chmod $chmodv 755 /usr/share/gnome/apps/Internet
 -            generate_desktop /usr/share/gnome/apps/Internet
 +	  elif test -w %%X11BASE%%/share/gnome/apps; then
 +	    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 /usr/share/gnome link
 +	# end %%X11BASE%%/share/gnome link
     fi
     # Add ximian here
  }
-@@ -1512,39 +1416,31 @@
+@@ -1515,39 +1418,31 @@
  
      debug_msg 1 "in kde()"
  
 -    if test -d /opt/kde${1}/share; then
 +    if test -d %%LOCALBASE%%/share; then
  
 -      DIR_HI=/opt/kde${1}/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; then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png; fi
          if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps; then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png; fi
          if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png; fi
        fi
  
 -      DIR_LO=/opt/kde${1}/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; then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png; fi
          if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps; then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png; fi
          if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps; then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png; fi
        fi
  
 -      if test -d /opt/kde${1}/share/applnk/; then
 -        if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then
 -	    mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/
 -	    chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet
 +      if test -d %%LOCALBASE%%/share/applnk/; then
 +        if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then
 +	    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}; fi
 +	if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
        fi
  
      fi  
 -    
 -    if test -d /usr/share/applnk/Networking; then
 -      if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
 -	    mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
 -	    chmod $chmodv 755 /usr/share/applnk/Networking/WWW
 -      fi
 -      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
 -    fi
  }
  
  kde1()

Property changes on: head/www/opera/files/patch-install.sh
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/www/opera/pkg-plist
===================================================================
--- head/www/opera/pkg-plist	(revision 124152)
+++ head/www/opera/pkg-plist	(revision 124153)
@@ -1,142 +1,142 @@
 @comment $FreeBSD$
 bin/opera
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/help
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
 %%DATADIR%%/bin/spellcheck.so
 %%DATADIR%%/bin/works
 %%DATADIR%%/chartables.bin
 %%DATADIR%%/config/opera6rc
 %%DATADIR%%/config/opera6rc.fixed
 %%DATADIR%%/help/advertising.html
 %%DATADIR%%/help/background.png
 %%DATADIR%%/help/chat.html
 %%DATADIR%%/help/dialogs.html
 %%DATADIR%%/help/filetypes.html
 %%DATADIR%%/help/fonts.html
 %%DATADIR%%/help/glossary.html
 %%DATADIR%%/help/help.css
 %%DATADIR%%/help/history.html
-%%DATADIR%%/help/hotlist.html
 %%DATADIR%%/help/index.html
 %%DATADIR%%/help/input.html
 %%DATADIR%%/help/keyboard.html
 %%DATADIR%%/help/languages.html
 %%DATADIR%%/help/layout.html
 %%DATADIR%%/help/license.txt
 %%DATADIR%%/help/m2.html
 %%DATADIR%%/help/mail.html
 %%DATADIR%%/help/menus.html
 %%DATADIR%%/help/mouse.html
 %%DATADIR%%/help/multimedia.html
 %%DATADIR%%/help/network.html
 %%DATADIR%%/help/page.html
 %%DATADIR%%/help/panels.html
 %%DATADIR%%/help/paths.html
 %%DATADIR%%/help/personal.html
 %%DATADIR%%/help/preferences.html
 %%DATADIR%%/help/privacy.html
 %%DATADIR%%/help/search.html
 %%DATADIR%%/help/security.html
 %%DATADIR%%/help/skin.html
 %%DATADIR%%/help/sounds.html
 %%DATADIR%%/help/start.html
 %%DATADIR%%/help/toc.html
 %%DATADIR%%/help/toolbars.html
 %%DATADIR%%/help/windows.html
 %%DATADIR%%/hhd.ssr
+%%DATADIR%%/html40_entities.dtd
 %%DATADIR%%/images/background.gif
 %%DATADIR%%/images/blank.gif
 %%DATADIR%%/images/drive.gif
 %%DATADIR%%/images/file.gif
 %%DATADIR%%/images/folder.gif
 %%DATADIR%%/images/link.gif
 %%DATADIR%%/images/opera.xpm
 %%DATADIR%%/images/opera_16x16.png
 %%DATADIR%%/images/opera_22x22.png
 %%DATADIR%%/images/opera_32x32.png
 %%DATADIR%%/images/opera_48x48.png
 %%DATADIR%%/images/operabanner.png
 %%DATADIR%%/images/shared.gif
 %%DATADIR%%/images/splash.png
 %%DATADIR%%/images/startup1.png
 %%DATADIR%%/images/startup2.png
 %%DATADIR%%/ini/dialog.ini
 %%DATADIR%%/ini/fastforward.ini
 %%DATADIR%%/ini/filehandler.ini
 %%DATADIR%%/ini/pluginpath.ini
 %%DATADIR%%/ini/spellcheck.ini
 %%DATADIR%%/ini/standard_keyboard.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
 %%DATADIR%%/ini/standard_toolbar.ini
 %%DATADIR%%/ini/unix_keyboard.ini
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
 %%DATADIR%%/locale/en/default.adr
 %%DATADIR%%/locale/en/lngcode.txt
 %%DATADIR%%/locale/en/search.ini
 %%DATADIR%%/locale/english.lng
 %%DATADIR%%/opera6.adr
 %%DATADIR%%/plugins/libnpp.so
 %%DATADIR%%/plugins/operamotifwrapper-1
 %%DATADIR%%/plugins/operamotifwrapper-2
 %%DATADIR%%/plugins/operaplugincleaner
 %%DATADIR%%/search.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/windows_skin.zip
 %%DATADIR%%/styles/OPF.css
 %%DATADIR%%/styles/about.css
 %%DATADIR%%/styles/cache.css
 %%DATADIR%%/styles/csr.css
 %%DATADIR%%/styles/dir.css
 %%DATADIR%%/styles/drives.css
 %%DATADIR%%/styles/email.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/info.css
 %%DATADIR%%/styles/mime.css
 %%DATADIR%%/styles/mimehead.css
 %%DATADIR%%/styles/opf.css
 %%DATADIR%%/styles/plugins.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/contrastbw.css
 %%DATADIR%%/styles/user/contrastwb.css
 %%DATADIR%%/styles/user/debugwithoutline.css
 %%DATADIR%%/styles/user/disabletables.css
 %%DATADIR%%/styles/user/hidecertainsizes.css
 %%DATADIR%%/styles/user/hidenonlinkimages.css
 %%DATADIR%%/styles/user/imageandlinkonly.css
 %%DATADIR%%/styles/user/nostalgia.css
 %%DATADIR%%/styles/user/showstructure.css
 %%DATADIR%%/styles/user/textonly.css
 %%DATADIR%%/styles/user/userstyle.ini
 %%DATADIR%%/styles/wml.css
 %%GNOME%%share/gnome/apps/Internet/opera.desktop
 %%GNOME%%share/gnome/pixmaps/opera.xpm
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/locale/en
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/ini
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 
 %%KDE%%@cwd %%LOCALBASE%%
 %%KDE%%share/applnk/Internet/opera.desktop
 %%KDE%%share/icons/hicolor/22x22/apps/opera.png
 %%KDE%%share/icons/hicolor/32x32/apps/opera.png
 %%KDE%%share/icons/hicolor/48x48/apps/opera.png
 %%KDE%%share/icons/locolor/16x16/apps/opera.png
 %%KDE%%share/icons/locolor/22x22/apps/opera.png
 %%KDE%%share/icons/locolor/32x32/apps/opera.png

Property changes on: head/www/opera/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.20
\ No newline at end of property
+1.21
\ No newline at end of property