- Integrate a patch from Piotr Smyrak (piotr.smyrak@heron,pl)

  that installs a correct opera desktop entry (points to opera-devel
  instead of opera, and fixes conflict with www/opera's desktop entry)
- Add SIZE to distinfo
- Portrevision not bumped, because functionality hasn't changed

PR:		ports/62884
Submitted by:	maintainer

While I'm here:
- Remove unnecessary ':' from PLIST substitutions
- Remove blank lines from pkg-plist and pkg-message to satisfy portlint

5 files changed, 57 insertions, 25 deletions

diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index ab39cb12f16c..0ec1cef1332a 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -40,33 +40,33 @@ LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 .endif
 
 .if exists(/etc/X11/applnk)
-PLIST_SUB+=	APPLNK:=""
+PLIST_SUB+=	APPLNK=""
 .else
-PLIST_SUB+=	APPLNK:="@comment "
+PLIST_SUB+=	APPLNK="@comment "
 .endif
 
 .if exists(${X11BASE}/share/gnome)
-PLIST_SUB+=	GNOME:=""
+PLIST_SUB+=	GNOME=""
 .else
-PLIST_SUB+=	GNOME:="@comment "
+PLIST_SUB+=	GNOME="@comment "
 .endif
 
 .if exists(${X11BASE}/share/applnk/Internet)
-PLIST_SUB+=	KDE:=""
+PLIST_SUB+=	KDE=""
 .else
-PLIST_SUB+=	KDE:="@comment "
+PLIST_SUB+=	KDE="@comment "
 .endif
 
 .if exists(${X11BASE}/share/applnk/Networking)
-PLIST_SUB+=	KDE2:=""
+PLIST_SUB+=	KDE2=""
 .else
-PLIST_SUB+=	KDE2:="@comment "
+PLIST_SUB+=	KDE2="@comment "
 .endif
 
 .if exists(${X11BASE}/share/gnome/apps)
-PLIST_SUB+=	GNOMELNK:=""
+PLIST_SUB+=	GNOMELNK=""
 .else
-PLIST_SUB+=	GNOMELNK:="@comment "
+PLIST_SUB+=	GNOMELNK="@comment "
 .endif
 
 post-patch:
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
index 2ce2781adcb8..6552b56aef0f 100644
--- a/www/opera-devel/distinfo
+++ b/www/opera-devel/distinfo
@@ -1 +1,2 @@
 MD5 (opera-7.50-20031219.1-static-qt.i386.freebsd-en.tar.bz2) = 6b47e5bc28d863b18c7a43487ea7d62c
+SIZE (opera-7.50-20031219.1-static-qt.i386.freebsd-en.tar.bz2) = 4789887
diff --git a/www/opera-devel/files/patch-install.sh b/www/opera-devel/files/patch-install.sh
index 71a9c6efb7b5..668dd35cf5b1 100644
--- a/www/opera-devel/files/patch-install.sh
+++ b/www/opera-devel/files/patch-install.sh
@@ -1,5 +1,5 @@
 --- install.sh.orig	Fri Dec 19 14:45:42 2003
-+++ install.sh	Wed Dec 31 14:59:00 2003
++++ install.sh	Sun Feb 15 21:02:32 2004
 @@ -108,8 +108,8 @@
  
      if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then
@@ -115,6 +115,39 @@
       # Shorcuts and Icons
  	icons
  	gnome
+@@ -1305,13 +1275,13 @@
+ {
+     # arg1 = location
+ 
+-    wmconfig_file="${1}/opera"
++    wmconfig_file="${1}/opera-devel"
+ 
+-    wmconfig_contain='opera name "Opera"
++    wmconfig_contain='opera name "Opera Beta"
+ opera description "Opera Web Browser"
+ opera icon "opera.xpm"
+ opera mini-icon "opera.xpm"
+-opera exec "opera &"
++opera exec "opera-devel &"
+ opera group "Internet"'
+ 
+     echo "${wmconfig_contain}" > ${wmconfig_file}
+@@ -1322,12 +1292,12 @@
+ {
+     # arg1 = location
+ 
+-    desktop_file="${1}/opera.desktop"
++    desktop_file="${1}/opera-devel.desktop"
+ 
+     desktop_contain='[Desktop Entry]
+-Name=Opera
++Name=Opera Beta
+ Comment=Web Browser
+-Exec=opera
++Exec=opera-devel
+ Icon=opera.xpm
+ Terminal=0
+ Type=Application'
 @@ -1361,22 +1331,22 @@
  
      debug_msg 0 "in icons()"
diff --git a/www/opera-devel/pkg-message b/www/opera-devel/pkg-message
index 5a34086ac40d..c296549fac2b 100644
--- a/www/opera-devel/pkg-message
+++ b/www/opera-devel/pkg-message
@@ -1,4 +1,4 @@
-
+***
 This port will use the ~/.opera-devel directory to save its personal settings.
 
 If you are running FreeBSD 5.x and are experiencing a core dump when starting
@@ -6,4 +6,4 @@ Opera, try updating the compat4x port.
 
 *** THIS IS AN UNSTABLE PREVIEW VERSION OF OPERA. PLEASE DO NOT REPORT ***
 ***                   BUGS TO THE PORT MAINTAINER.                     ***
-
+***
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
index 70ecd980d1f6..b9fa5b703792 100644
--- a/www/opera-devel/pkg-plist
+++ b/www/opera-devel/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/opera-devel
 %%DOCSDIR%%/LICENSE
 %%DOCSDIR%%/help
@@ -44,6 +45,7 @@ bin/opera-devel
 %%DATADIR%%/help/toc.html
 %%DATADIR%%/help/toolbars.html
 %%DATADIR%%/help/windows.html
+%%DATADIR%%/hhd.ssr
 %%DATADIR%%/images/background.gif
 %%DATADIR%%/images/blank.gif
 %%DATADIR%%/images/drive.gif
@@ -72,10 +74,10 @@ bin/opera-devel
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/jsconsole.html
 %%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/english.lng
 %%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
@@ -110,7 +112,6 @@ bin/opera-devel
 %%DATADIR%%/styles/user/textonly.css
 %%DATADIR%%/styles/user/userstyle.ini
 %%DATADIR%%/styles/wml.css
-%%DATADIR%%/hhd.ssr
 @dirrm %%DATADIR%%/styles/user
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
@@ -125,14 +126,11 @@ bin/opera-devel
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-
-%%KDE:%%share/applnk/Internet/opera.desktop
-%%KDE2:%%share/applnk/Networking/WWW/opera.desktop
-%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
-%%GNOME:%%share/gnome/pixmaps/opera.xpm
-%%KDE2:%%@dirrm share/applnk/Networking/WWW
-
+%%KDE%%share/applnk/Internet/opera-devel.desktop
+%%KDE2%%share/applnk/Networking/WWW/opera-devel.desktop
+%%GNOMELNK%%share/gnome/apps/Internet/opera-devel.desktop
+%%GNOME%%share/gnome/pixmaps/opera.xpm
+%%KDE2%%@dirrm share/applnk/Networking/WWW
 @cwd /etc/X11
-wmconfig/opera
-%%APPLNK:%%applnk/Internet/opera.desktop
-
+wmconfig/opera-devel
+%%APPLNK%%applnk/Internet/opera-devel.desktop