ports/154904: [UPDATE] www/midori to 0.3.2
Olivier Duchateau
duchateau.olivier at gmail.com
Sun Feb 20 10:30:10 UTC 2011
>Number: 154904
>Category: ports
>Synopsis: [UPDATE] www/midori to 0.3.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 20 10:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.1-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Announce: http://foo-projects.org/pipermail/xfce/2011-February/028375.html
- Add new option, UNIQUE (enable single instance) "off" by default.
- Fixe « warning » with rst2html
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/www/midori/Makefile midori/Makefile
--- /usr/ports/www/midori/Makefile 2011-02-08 13:34:38.000000000 +0100
+++ midori/Makefile 2011-02-20 11:05:24.000000000 +0100
@@ -7,16 +7,16 @@
#
PORTNAME= midori
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.2
CATEGORIES= www xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= kwm at FreeBSD.org
COMMENT= Lightweight web browser using WebKit browser engine
-LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \
+LIB_DEPENDS= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
notify.1:${PORTSDIR}/devel/libnotify
BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
@@ -27,8 +27,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--disable-unique \
- --disable-libidn \
+CONFIGURE_ARGS+=--disable-libidn \
--enable-libnotify \
--enable-addons \
--jobs=${MAKE_JOBS_NUMBER}
@@ -49,7 +48,8 @@
OPTIONS= NLS "Enable Native Language support" on \
USERDOCS "Build user documentation" off \
- APIDOCS "Build api documentation" off
+ APIDOCS "Build api documentation" off \
+ UNIQUE "Enable single instance support" off
.include <bsd.port.pre.mk>
@@ -81,6 +81,13 @@
PLIST_SUB+= APIDOCS="@comment "
.endif
+.if defined(WITH_UNIQUE)
+LIB_DEPENDS+= unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+CONFIGURE_ARGS+=--enable-unique
+.else
+CONFIGURE_ARGS+=--disable-unique
+.endif
+
post-install:
@-update-desktop-database
.if defined(WITH_APIDOCS)
diff -urN /usr/ports/www/midori/distinfo midori/distinfo
--- /usr/ports/www/midori/distinfo 2011-02-08 13:34:38.000000000 +0100
+++ midori/distinfo 2011-02-20 11:05:30.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori-0.3.0.tar.bz2) = 56860b2eb2e5f223af0e64d103eef66c4b3574f4ed9a3cfd1ca20844563f0ae7
-SIZE (xfce4/midori-0.3.0.tar.bz2) = 819092
+SHA256 (xfce4/midori-0.3.2.tar.bz2) = 9316803fdd68842c43f06afe645ec4fa45206f142796f6131d2761ba3415e2bc
+SIZE (xfce4/midori-0.3.2.tar.bz2) = 826287
diff -urN /usr/ports/www/midori/files/patch-wscript midori/files/patch-wscript
--- /usr/ports/www/midori/files/patch-wscript 2010-05-28 10:10:54.000000000 +0200
+++ midori/files/patch-wscript 2011-02-20 11:05:39.000000000 +0100
@@ -1,6 +1,19 @@
---- wscript.orig 2010-05-26 12:34:09.000000000 +0200
-+++ wscript 2010-05-26 12:35:30.000000000 +0200
-@@ -267,8 +267,7 @@
+--- 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 @@
if not conf.env['HAVE_UNIQUE']:
if Options.platform == 'win32':
conf.check (lib='ws2_32')
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list