Update to 0.3.6.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15962 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 11 insertions, 37 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index ed07d45e5..60789970d 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/midori/Makefile,v 1.29 2011/03/07 10:20:55 kwm Exp $
+#   $MCom: ports/www/midori/Makefile,v 1.21 2010/04/05 21:56:26 kwm Exp $
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.3.6
 CATEGORIES=	www xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -22,6 +21,7 @@ LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
 		notify.4:${PORTSDIR}/devel/libnotify
 BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
 		valac:${PORTSDIR}/lang/vala
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -31,6 +31,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS+=--disable-libidn \
 		--enable-libnotify \
 		--enable-addons \
+		--enable-docs \
 		--jobs=${MAKE_JOBS_NUMBER}
 
 MAKE_JOBS_SAFE=	yes
@@ -48,7 +49,6 @@ USE_GETTEXT=	yes
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
 OPTIONS=	NLS "Enable Native Language support" on \
-		USERDOCS "Build user documentation" off \
 		APIDOCS "Build api documentation" off \
 		UNIQUE "Enable single instance support" off
 
@@ -64,15 +64,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_USERDOCS)
-BUILD_DEPENDS+=rst2html:${PORTSDIR}/textproc/py-docutils
-CONFIGURE_ARGS+=--enable-userdocs
-PLIST_SUB+=	USERDOCS=""
-.else
-CONFIGURE_ARGS+=--disable-userdocs
-PLIST_SUB+=	USERDOCS="@comment "
-.endif
-
 .if defined(WITH_APIDOCS)
 BUILD_DEPENDS+=	gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-apidocs
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 8494241f3..79eebc6ad 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori-0.3.2.tar.bz2) = 9316803fdd68842c43f06afe645ec4fa45206f142796f6131d2761ba3415e2bc
-SIZE (xfce4/midori-0.3.2.tar.bz2) = 826287
+SHA256 (xfce4/midori-0.3.6.tar.bz2) = 5fb290ffde81e5e6b39a54d286f5732496bfda10ff65019189cc6bf8408f2410
+SIZE (xfce4/midori-0.3.6.tar.bz2) = 904370
diff --git a/www/midori/files/patch-wscript b/www/midori/files/patch-wscript
index 232a99069..dba5d9789 100644
--- a/www/midori/files/patch-wscript
+++ b/www/midori/files/patch-wscript
@@ -1,19 +1,6 @@
---- wscript.orig	2011-02-20 00:00:26.000000000 +0100
-+++ wscript	2011-02-20 10:27:54.000000000 +0100
-@@ -99,10 +99,9 @@
-     conf.check_tool ('glib2')
- 
-     if option_enabled ('userdocs'):
--        conf.find_program ('rst2html.py', var='RST2HTML')
--        # debian renames the executable, check that as well :(
-+        conf.find_program ('rst2html', var='RST2HTML')
-         if not conf.env['RST2HTML']:
--            conf.find_program ('rst2html', var='RST2HTML')
-+            conf.find_program ('rst2html.py', var='RST2HTML')
-         if conf.env['RST2HTML']:
-             user_docs = 'yes'
-         else:
-@@ -261,8 +260,7 @@
+--- wscript.orig	2011-03-13 23:03:35.000000000 +0100
++++ wscript	2011-03-14 06:45:15.000000000 +0100
+@@ -248,8 +248,7 @@
      if not conf.env['HAVE_UNIQUE']:
          if Options.platform == 'win32':
              conf.check (lib='ws2_32')
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index f9ad202ff..b4cf0d882 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -10,7 +10,6 @@ lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
 lib/midori/libhistory-list.so
 lib/midori/libmouse-gestures.so
-lib/midori/libpage-holder.so
 lib/midori/libshortcuts.so
 lib/midori/libstatus-clock.so
 lib/midori/libstatusbar-features.so
@@ -73,7 +72,8 @@ share/applications/midori.desktop
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/right.png
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/style.css
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/up.png
-%%USERDOCS%%%%DOCSDIR%%/user/midori.html
+%%DOCSDIR%%/faq.css
+%%DOCSDIR%%/faq.html
 share/icons/hicolor/16x16/apps/midori.png
 share/icons/hicolor/16x16/categories/extension.png
 share/icons/hicolor/16x16/status/news-feed.png
@@ -136,7 +136,6 @@ share/icons/hicolor/scalable/status/news-feed.svg
 %%DATADIR%%/res/logo-shade.png
 %%DATADIR%%/res/mootools.js
 %%DATADIR%%/res/speeddial-head.html
-%%DATADIR%%/res/speeddial.json
 share/vala/vapi/history-list.deps
 share/vala/vapi/history-list.vapi
 @dirrmtry share/vala/vapi
@@ -154,13 +153,10 @@ share/vala/vapi/history-list.vapi
 %%APIDOCS%%@dirrm %%DOCSDIR%%/api/katze/html
 %%APIDOCS%%@dirrm %%DOCSDIR%%/api/katze
 %%APIDOCS%%@dirrm %%DOCSDIR%%/api
-%%USERDOCS%%@dirrm %%DOCSDIR%%/user
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrm lib/midori
 @dirrm include/midori-%%VERSION%%/extensions
 @dirrm include/midori-%%VERSION%%
 @dirrm etc/xdg/midori
-@dirrmtry etc/xdg
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true