- Update to 9.01, see changelog for details:

	http://www.opera.com/docs/changelogs/linux/901/
- Change the prefix from X11BASE to LOCALBASE, see UPDATING for details.
- Now it installs only one *.desktop for more general desktop such as xfce and
  etc rather than just limit to GNOME/KDE.

5 files changed, 88 insertions, 226 deletions

diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 81014e9ecace..707758b15a91 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,58 +7,41 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	2
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}0/final/en/i386/static/&,}
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.ntua.gr/pub/www/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
 
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
-RUN_DEPENDS=	\
-		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+USE_XLIB=	yes
 USE_BZIP2=	yes
-WANT_GNOME=	yes
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 NO_BUILD=	yes
 
-OPERA_VER=	9.0
-OPERA_DATE=	20060616
-OPERA_BUILD=	344
+OPERA_VER=	9.01
+OPERA_DATE=	20060728
+OPERA_BUILD=	400
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 MAN1=		linux-opera.1
 
-.include <bsd.port.pre.mk>
-
-.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
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
@@ -77,4 +60,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 4ed9c562cc59..33532428b82e 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.0-20060616.1-static-qt.i386-en.tar.bz2) = d027d3e52853ee69362ef0240487bc13
-SHA256 (opera-9.0-20060616.1-static-qt.i386-en.tar.bz2) = f55c65910320a30690850d8bae7e53b1a64b0c99fa8f58e94fdf4c9f40a4e449
-SIZE (opera-9.0-20060616.1-static-qt.i386-en.tar.bz2) = 6694612
+MD5 (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 3dad6ab16f0ccdbd728f3f531dd74e79
+SHA256 (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 38086051d09658d29b325370925219acd875a7cfe159fff98c08df8b674dc702
+SIZE (opera-9.01-20060728.1-static-qt.i386-en.tar.bz2) = 6690353
diff --git a/www/linux-opera/files/patch-install.sh b/www/linux-opera/files/patch-install.sh
index bd913c2284dc..72ead549e1ec 100644
--- a/www/linux-opera/files/patch-install.sh
+++ b/www/linux-opera/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	Fri Jun 16 06:18:52 2006
-+++ install.sh	Sat Jun 24 16:50:01 2006
+--- install.sh.orig	Fri Jul 28 08:10:44 2006
++++ install.sh	Wed Aug  2 19:11:33 2006
 @@ -805,10 +805,9 @@
      case "${machine}:${os}" in
  	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
@@ -169,7 +169,7 @@
  
      # Executable
      debug_msg 1 "Executable"
-@@ -1198,7 +1138,7 @@
+@@ -1201,7 +1141,7 @@
  
      #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
      generate_wrapper
@@ -178,7 +178,7 @@
  
      # Manual page
      debug_msg 1 "Manual page"
-@@ -1207,7 +1147,7 @@
+@@ -1210,7 +1150,7 @@
      chmod $chmodv 755 ${man_dir}
      mkdir $mkdirv $mkdirp ${man_dir}/man1
      chmod $chmodv 755 ${man_dir}/man1
@@ -187,7 +187,7 @@
  
      # Documentation
      debug_msg 1 "Documentation"
-@@ -1239,9 +1179,6 @@
+@@ -1242,9 +1182,6 @@
  	mkdir $mkdirv $mkdirp $share_dir/ini/
  	chmod $chmodv 755 $share_dir/ini
  	cp $cpv $cpf $cpR ini/* $share_dir/ini/
@@ -197,7 +197,7 @@
      fi
  
      mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1328,43 +1265,13 @@
+@@ -1336,43 +1273,11 @@
  
      if test -z "${OPERADESTDIR}"
      then
@@ -238,13 +238,11 @@
 -
  	if test "${bool_icons}" -ne 0
 -	then xdg
-+	then
-+	    gnome
-+	    kde 3
++	then icons
  	fi
  
      fi # OPERADESTDIR
-@@ -1416,19 +1323,19 @@
+@@ -1424,19 +1329,19 @@
      # arg1 = location
      # arg2 = type
  
@@ -267,7 +265,7 @@
  Name[af]=opera
  Name[eo]=Opero
  Name[zu]=I Opera
-@@ -1452,7 +1359,7 @@
+@@ -1460,7 +1365,7 @@
  GenericName[ven]=Buronza ya Webu
  GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
  GenericName[zu]=Umkhangeli zincwadi we Web
@@ -276,7 +274,7 @@
  Terminal=false"
  
  # Application is not a category, according to
-@@ -1467,25 +1374,26 @@
+@@ -1475,25 +1380,26 @@
  	if test "${2}" = "xdg"; then
  	    desktop_contain="${desktop_contain}
  Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
@@ -297,7 +295,7 @@
 -Icon=opera.xpm
 +Name=Opera (linux version)
 +Exec=linux-opera
-+Icon=linux-opera.xpm
++Icon=linux-opera.png
  Terminal=0"
      fi
  
@@ -309,185 +307,73 @@
  
      echo "${desktop_contain}" > ${desktop_file}
      chmod $chmodv 644 ${desktop_file}
-@@ -1573,88 +1481,26 @@
-     # This function searches for common gnome icon paths.
-     debug_msg 1 "in gnome()"
+@@ -1524,55 +1430,28 @@
  
--    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/
+     debug_msg 0 "in icons()"
+ 
+-    if test ! -d /usr/share/icons
 -    then
--        # /usr/share/gnome icon
--        if test ! -d /usr/share/gnome/pixmaps/
+-	if test -w /usr/share
 -	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
--	    fi
--	elif test -w /usr/share/gnome/pixmaps
--	then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
+-	    mkdir $mkdirv $mkdirp /usr/share/icons/
+-	    chmod $chmodv 755 /usr/share/icons
+-	    cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
 -	fi
--	# end /usr/share/gnome icon
+-    elif test -w /usr/share/icons
+-    then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-    fi
 -
--	# /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
--		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
--		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
--	    fi
--	fi
--	# end /usr/share/gnome link
-+    if test -d %%X11BASE%%/share/gnome/; then
-+ 
-+      # %%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/linux-opera.xpm
-+        fi
-+      elif test -w %%X11BASE%%/share/gnome/pixmaps; then
-+        cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/linux-opera.xpm
-+       fi
-+      # end %%X11BASE%%/share/gnome icon
-+ 
-+      # %%X11BASE%%/share/gnome link
-+      if test -d %%X11BASE%%/share/gnome/applications/; then
-+        generate_desktop %%X11BASE%%/share/gnome/applications
-+      fi
-+      # end %%X11BASE%%/share/gnome link
-     fi
--    # Add ximian here
- }
- 
- kde()
-@@ -1662,58 +1508,46 @@
-     # This function searches for common kde2 and kde 3 icon paths.
-     debug_msg 1 "in kde()"
- 
--    if test -d /opt/kde$1/share
-+    if test -d %%LOCALBASE%%/share
+-    if test ! -d /usr/share/pixmaps
++    if test ! -d %%LOCALBASE%%/share/pixmaps/
      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
-+	    then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/linux-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
-+	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/linux-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
-+	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/linux-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
+-	if test -w /usr/share
++	if test -w %%LOCALBASE%%/share
  	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
-+	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/linux-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
-+	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/linux-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
-+	    then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/linux-opera.png
- 	    fi
+-	    mkdir $mkdirv $mkdirp /usr/share/pixmaps/
+-	    chmod $chmodv 755 /usr/share/pixmaps
+-	    cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
++	    chmod $chmodv 755 %%LOCALBASE%%/share/pixmaps
++	    cp $cpv $share_dir/images/opera_48x48.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
  	fi
+-    elif test -w /usr/share/pixmaps/
+-    then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
++    elif test -w %%LOCALBASE%%/share/pixmaps/
++    then cp $cpv $share_dir/images/opera_48x48.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+     fi
  
--	if test -d /opt/kde$1/share/applnk/
-+	if test -d %%LOCALBASE%%/share/applnk/
+-    if test ! -d /etc/X11/wmconfig/
++    if test ! -d %%LOCALBASE%%/share/applications/
+     then
+-	if test -w /etc/X11
++	if test -w %%LOCALBASE%%/share
  	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
- 	    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
- 	    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
- 	    fi
+-	    mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
+-	    chmod $chmodv 755 /etc/X11/wmconfig
+-	    generate_wmconfig /etc/X11/wmconfig
 -	fi
+-    elif test -w /etc/X11/wmconfig/
+-    then generate_wmconfig /etc/X11/wmconfig
 -    fi
 -
--    if test -d /usr/share/applnk/Networking
+-    if test -d /etc/X11/applnk/
 -    then
--	if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking
+-	if test ! -d /etc/X11/applnk/Internet/
 -	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
+-	    if test -w /etc/X11/applnk
+-	    then
+-		mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
+-		chmod $chmodv 755 /etc/X11/applnk/Internet
+-		generate_desktop /etc/X11/applnk/Internet
+-	    fi
+-	elif test -w /etc/X11/applnk/Internet
+-	then generate_desktop /etc/X11/applnk/Internet
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
++	    chmod $chmodv 755 %%LOCALBASE%%/share/applications
++	    generate_desktop %%LOCALBASE%%/share/applications
  	fi
++    elif test -w %%LOCALBASE%%/share/applications
++    then generate_desktop %%LOCALBASE%%/share/applications
      fi
  }
+ 
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index d3b57790713a..c563dd06aa50 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelog for 9.0 Final: http://www.opera.com/docs/changelogs/linux/900/
+Changelog for 9.01 Final: http://www.opera.com/docs/changelogs/linux/901/
 
 If you are upgrade from version 7.x or below, it is recommend for you to
 backup your personal "~/.linux-opera" directory and remove it. As for the
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 57aaa7563c97..1213a09ede0f 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -1,7 +1,6 @@
 bin/linux-opera
+share/applications/linux-opera.desktop
 %%DOCSDIR%%/LICENSE
-%%GNOME:%%share/gnome/applications/linux-opera.desktop
-%%GNOME:%%share/gnome/pixmaps/linux-opera.xpm
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
 %%DATADIR%%/bin/spellcheck.so
@@ -75,11 +74,12 @@ bin/linux-opera
 %%DATADIR%%/svg-sabd.dat
 %%DATADIR%%/svg-se.dat
 %%DATADIR%%/svg-sebd.dat
+share/pixmaps/linux-opera.png
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles/images
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
-@dirrmtry %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/locale/en
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
@@ -87,13 +87,6 @@ bin/linux-opera
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-%%KDE:%%@cwd %%LOCALBASE%%
-%%KDE:%%share/applnk/Internet/linux-opera.desktop
-%%KDE:%%share/icons/hicolor/22x22/apps/linux-opera.png
-%%KDE:%%share/icons/hicolor/32x32/apps/linux-opera.png
-%%KDE:%%share/icons/hicolor/48x48/apps/linux-opera.png
-%%KDE:%%share/icons/locolor/16x16/apps/linux-opera.png
-%%KDE:%%share/icons/locolor/22x22/apps/linux-opera.png
-%%KDE:%%share/icons/locolor/32x32/apps/linux-opera.png
+@dirrmtry share/applications