4 files changed, 48 insertions, 2 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 0094ba821456..f1cfa5024682 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/ \
@@ -98,7 +99,8 @@ post-patch:
 		s|opera)|${UNIQUENAME})|g ; \
 		s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \
 		s|^.*rmdir.*mime/packages.*||g ; \
-		s|^.*GX - bin/uninstall-opera@.*||g' \
+		s|^.*GX - bin/uninstall-opera@.*||g ; \
+		s|[$$]tempdir/damaged|${WRKSRC}/damaged|g' \
 			${WRKSRC}/install
 	@${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \
 		/Exec/s|opera|${UNIQUENAME}|g ; \
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index cf9ed9dcd189..f39bcf482417 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -379,6 +379,27 @@ share/mime/packages/linux-opera-widget.xml
 @dirrm %%DATADIR%%/extra
 @dirrm %%DATADIR%%/defaults
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/scalable/mimetypes
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/mimetypes
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/mimetypes
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/mimetypes
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/mimetypes
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/mimetypes
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/mimetypes
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
 @dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm lib/linux-opera/plugins
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 0094ba821456..f1cfa5024682 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/ \
@@ -98,7 +99,8 @@ post-patch:
 		s|opera)|${UNIQUENAME})|g ; \
 		s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \
 		s|^.*rmdir.*mime/packages.*||g ; \
-		s|^.*GX - bin/uninstall-opera@.*||g' \
+		s|^.*GX - bin/uninstall-opera@.*||g ; \
+		s|[$$]tempdir/damaged|${WRKSRC}/damaged|g' \
 			${WRKSRC}/install
 	@${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \
 		/Exec/s|opera|${UNIQUENAME}|g ; \
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index cf9ed9dcd189..f39bcf482417 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -379,6 +379,27 @@ share/mime/packages/linux-opera-widget.xml
 @dirrm %%DATADIR%%/extra
 @dirrm %%DATADIR%%/defaults
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/scalable/mimetypes
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/mimetypes
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/mimetypes
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/mimetypes
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/mimetypes
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/mimetypes
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/mimetypes
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
 @dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm lib/linux-opera/plugins