ports/162464: [UPDATE] www/midori to 0.4.2

[Olivier Duchateau]

>Number:         162464
>Category:       ports
>Synopsis:       [UPDATE] www/midori to 0.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 11 08:50:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
Announce: http://mail.xfce.org/pipermail/xfce/2011-November/029482.html
ChangeLog: http://git.xfce.org/apps/midori/tree/ChangeLog?id=0.4.2

Don't try to compile Midori with GTK3 support, x11-toolkits/unique needs to adjust (wrong *.pc file).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -u /usr/ports/www/midori/Makefile midori/Makefile
--- /usr/ports/www/midori/Makefile	2011-10-23 23:16:14.000000000 +0200
+++ midori/Makefile	2011-11-11 09:20:27.000000000 +0100
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	www xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -46,7 +46,8 @@
 USE_GETTEXT=	yes
 .endif
 
-PLIST_SUB=	VERSION="${PORTVERSION:R}"
+PLIST_SUB=	VERSION="${PORTVERSION:R}" \
+	PORTVERSION="${PORTVERSION}"
 
 OPTIONS=	NLS "Enable Native Language support" on \
 		APIDOCS "Build api documentation" off \
diff -u /usr/ports/www/midori/distinfo midori/distinfo
--- /usr/ports/www/midori/distinfo	2011-10-14 20:23:09.000000000 +0200
+++ midori/distinfo	2011-11-11 09:20:27.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori-0.4.1.tar.bz2) = b3c77ddb6f562a0ea3d2e6fbb756ca0dc158ad8410f4b60f8e5998c2f7305f07
-SIZE (xfce4/midori-0.4.1.tar.bz2) = 905412
+SHA256 (xfce4/midori-0.4.2.tar.bz2) = 2e3f104254fb9a28c77e8acf1cc8ae6dd529499711d558b29146ab0fa915f0a7
+SIZE (xfce4/midori-0.4.2.tar.bz2) = 923897
Common subdirectories: /usr/ports/www/midori/files and midori/files
diff -u /usr/ports/www/midori/pkg-plist midori/pkg-plist
--- /usr/ports/www/midori/pkg-plist	2011-10-14 20:23:09.000000000 +0200
+++ midori/pkg-plist	2011-11-11 09:20:27.000000000 +0100
@@ -1,4 +1,5 @@
 bin/midori
+etc/xdg/midori/extensions/adblock/config
 etc/xdg/midori/search
 include/midori-%%VERSION%%/extensions/history-list.h
 lib/midori/libadblock.so
@@ -26,7 +27,6 @@
 %%DOCSDIR%%/README
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/api-index-full.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/ch01.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/deprecated-api-index.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/home.png
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/index.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/index.sgml
@@ -38,10 +38,12 @@
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-arrayaction.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-http-auth.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-http-cookies.html
+%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-http-cookies-sqlite.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-net.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-separatoraction.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-throbber.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-utils.html
+%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp2
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/left.png
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/right.png
@@ -53,7 +55,6 @@
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/index.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/index.sgml
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/left.png
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/deprecated-api-index.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-GtkIconEntry.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriBrowser.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriExtension.html
@@ -71,6 +72,7 @@
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-socket.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-sokoke.html
+%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori.devhelp
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori.devhelp2
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/right.png
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/style.css
@@ -135,9 +137,10 @@
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
 %%DATADIR%%/res/autosuggestcontrol.css
 %%DATADIR%%/res/autosuggestcontrol.js
+%%DATADIR%%/res/close.png
 %%DATADIR%%/res/error.html
 %%DATADIR%%/res/logo-shade.png
-%%DATADIR%%/res/speeddial-head.html
+%%DATADIR%%/res/speeddial-head-%%PORTVERSION%%.html
 share/vala/vapi/history-list.deps
 share/vala/vapi/history-list.vapi
 @dirrmtry share/vala/vapi
@@ -159,6 +162,8 @@
 @dirrm lib/midori
 @dirrm include/midori-%%VERSION%%/extensions
 @dirrm include/midori-%%VERSION%%
+ at dirrm etc/xdg/midori/extensions/adblock
+ at dirrm etc/xdg/midori/extensions
 @dirrm etc/xdg/midori
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true


>Release-Note:
>Audit-Trail:
>Unformatted: