Attachment 113940 Details for Bug 155557 – file.diff

[patch] file.diff

file.diff (text/plain), 4.14 KB, created by Olivier Duchateau on 2011-03-14 19:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2011-03-14 19:30:12 UTC

Size: 4.14 KB

patch

obsolete

>diff -uNr /usr/ports/www/midori/Makefile midori/Makefile
>--- /usr/ports/www/midori/Makefile	2011-02-25 12:08:41.000000000 +0100
>+++ midori/Makefile	2011-03-14 19:34:07.000000000 +0100
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	midori
>-PORTVERSION=	0.3.2
>+PORTVERSION=	0.3.3
> CATEGORIES=	www xfce
> MASTER_SITES=	${MASTER_SITE_XFCE}
> MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
>@@ -21,6 +21,7 @@
> 		notify.1:${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
>@@ -30,6 +31,7 @@
> CONFIGURE_ARGS+=--disable-libidn \
> 		--enable-libnotify \
> 		--enable-addons \
>+		--enable-docs \
> 		--jobs=${MAKE_JOBS_NUMBER}
> 
> MAKE_JOBS_SAFE=	yes
>@@ -47,7 +49,6 @@
> 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
> 
>@@ -63,15 +64,6 @@
> 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 -uNr /usr/ports/www/midori/distinfo midori/distinfo
>--- /usr/ports/www/midori/distinfo	2011-02-25 12:08:41.000000000 +0100
>+++ midori/distinfo	2011-03-14 19:34:07.000000000 +0100
>@@ -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.3.tar.bz2) = 236770d134e2eb9c44776e233903fc0afa760cd3b8b87d12316e1b25afe2d3fe
>+SIZE (xfce4/midori-0.3.3.tar.bz2) = 848720
>diff -uNr /usr/ports/www/midori/files/patch-wscript midori/files/patch-wscript
>--- /usr/ports/www/midori/files/patch-wscript	2011-02-25 12:08:42.000000000 +0100
>+++ midori/files/patch-wscript	2011-03-14 19:34:07.000000000 +0100
>@@ -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 -uNr /usr/ports/www/midori/pkg-plist midori/pkg-plist
>--- /usr/ports/www/midori/pkg-plist	2011-02-08 13:34:38.000000000 +0100
>+++ midori/pkg-plist	2011-03-14 19:34:07.000000000 +0100
>@@ -73,7 +73,8 @@
> %%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
>@@ -154,13 +155,10 @@
> %%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

Actions: View | Diff

Attachments on bug 155557: 113940