From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 18 17:40:06 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EC661065672 for ; Tue, 18 May 2010 17:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 009508FC1A for ; Tue, 18 May 2010 17:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4IHe59a018454 for ; Tue, 18 May 2010 17:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4IHe5Sf018452; Tue, 18 May 2010 17:40:05 GMT (envelope-from gnats) Resent-Date: Tue, 18 May 2010 17:40:05 GMT Resent-Message-Id: <201005181740.o4IHe5Sf018452@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olivier Duchateau Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DE7A1065673 for ; Tue, 18 May 2010 17:35:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 4137F8FC23 for ; Tue, 18 May 2010 17:35:19 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IHZJZS044166 for ; Tue, 18 May 2010 17:35:19 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o4IHZIJB044165; Tue, 18 May 2010 17:35:18 GMT (envelope-from nobody) Message-Id: <201005181735.o4IHZIJB044165@www.freebsd.org> Date: Tue, 18 May 2010 17:35:18 GMT From: Olivier Duchateau To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/146710: [UPDATE] www/midori to 0.2.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 17:40:06 -0000 >Number: 146710 >Category: ports >Synopsis: [UPDATE] www/midori to 0.2.5 >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: Tue May 18 17:40:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.0-RELEASE-p2 >Organization: >Environment: FreeBSD orval.errements.net 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan 5 16:02:27 UTC 2010 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Use python (waf script) instead of GNU Makefile - Delete some dependancies already selected by webkit-gtk2 - Fix OpenSSL in wscript 'patch-data_search' is patch file for searching directly package on FreshPorts. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN midori/Makefile /usr/ports/www/midori/Makefile --- midori/Makefile 2010-05-17 19:16:36.000000000 +0200 +++ /usr/ports/www/midori/Makefile 2010-05-17 22:55:24.000000000 +0200 @@ -7,32 +7,42 @@ # PORTNAME= midori -PORTVERSION= 0.2.4 +PORTVERSION= 0.2.5 CATEGORIES= www -MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/ +MASTER_SITES= http://archive.xfce.org/src/%SUBDIR%/ +MASTER_SITE_SUBDIR= apps/${PORTNAME}/${PORTVERSION:R} +DIST_SUBDIR= xfce4 MAINTAINER= ahze@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine +RUN_DEPENDS= python:${PORTSDIR}/lang/python + LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - soup-2.4:${PORTSDIR}/devel/libsoup -BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + notify.1:${PORTSDIR}/devel/libnotify + +BUILD_DEPENDS= ${RUN_DEPENDS} \ rsvg-convert:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--disable-unique \ - --jobs=${MAKE_JOBS_NUMBER} +CONFIGURE_ARGS+= --prefix=${LOCALBASE} \ + --disable-unique \ + --disable-libidn \ + --enable-sqlite \ + --enable-libnotify \ + --enable-addons \ + --disable-hildon \ -MAKE_JOBS_SAFE= yes -HAS_CONFIGURE= yes -USE_GMAKE= yes USE_BZIP2= yes USE_GNOME= glib20 gtk20 intltool libxml2 pkgconfig INSTALLS_ICONS= yes USE_LDCONFIG= yes +PLIST_SUB= VERSION="${PORTVERSION:R}" + +OPTIONS= NLS "Enable Native Language support" on + .include # WAF needs that @@ -46,4 +56,34 @@ PLIST_SUB+= NLS="@comment " .endif +.if exists(${LOCALBASE}/bin/rst2html) +CONFIGURE_ARGS+= --enable-userdocs \ + --enable-apidocs +PLIST_SUB+= DOCUTILS="" +.else +CONFIGURE_ARGS+= --disable-userdocs \ + --disable-apidocs +PLIST_SUB+= DOCUTILS="@comment " +.endif + +# Support for « external applications » (see ChangeLog) with Vala +.if exists(${LOCALBASE}/bin/valac) +PLIST_SUB+= VALAC="" +.else +PLIST_SUB+= VALAC="@comment " +.endif + +do-configure: + @cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf configure \ + ${CONFIGURE_ARGS} && ${TRUE} + +do-build: + @cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf build && ${TRUE} + +do-install: + @cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf install && ${TRUE} + +post-install: + @-update-desktop-database + .include diff -urN midori/distinfo /usr/ports/www/midori/distinfo --- midori/distinfo 2010-05-17 19:16:36.000000000 +0200 +++ /usr/ports/www/midori/distinfo 2010-05-17 19:59:02.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (midori-0.2.4.tar.bz2) = ccd2ae162993c2c92c9e0eac7778c62d -SHA256 (midori-0.2.4.tar.bz2) = 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f -SIZE (midori-0.2.4.tar.bz2) = 645554 +MD5 (xfce4/midori-0.2.5.tar.bz2) = 3aeacd04d4d3e5c3bc16824696ff57b2 +SHA256 (xfce4/midori-0.2.5.tar.bz2) = 88247235f3873d11f00e653adfbcc34b836e188b96b5d8a1c54d4de6fd940f2a +SIZE (xfce4/midori-0.2.5.tar.bz2) = 705277 diff -urN midori/files/patch-data_search /usr/ports/www/midori/files/patch-data_search --- midori/files/patch-data_search 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/www/midori/files/patch-data_search 2009-10-25 12:20:31.000000000 +0100 @@ -0,0 +1,16 @@ +--- data/search.orig 2009-09-12 00:09:38.000000000 +0200 ++++ data/search 2009-10-05 16:37:43.000000000 +0200 +@@ -6,6 +6,13 @@ + icon= + token=g + ++[FreshPorts] ++name=FreshPorts ++text=The change made to the FreeBSD ports tree ++uri=http://www.freshports.org/search.php?stype=name&method=match&query=%s&num=10&orderby=category&orderbyuptodown=asc&search=Search ++icon= ++token=fp ++ + [Wikipedia] + name=Wikipedia + text=The free encyclopedia diff -urN midori/files/patch-wscript /usr/ports/www/midori/files/patch-wscript --- midori/files/patch-wscript 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/www/midori/files/patch-wscript 2010-03-15 22:55:20.000000000 +0100 @@ -0,0 +1,12 @@ +--- wscript.orig 2010-03-07 22:23:04.000000000 +0100 ++++ wscript 2010-03-15 22:55:02.000000000 +0100 +@@ -252,8 +252,7 @@ + if not conf.env['HAVE_UNIQUE']: + if Options.platform == 'win32': + conf.check (lib='ws2_32') +- check_pkg ('openssl', mandatory=False) +- conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1]) ++ conf.define ('HAVE_OPENSSL', [0,1][conf.check (header_name='openssl/opensslv.h')]) + conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')]) + conf.check (header_name='sys/wait.h') + conf.check (header_name='sys/select.h') diff -urN midori/pkg-plist /usr/ports/www/midori/pkg-plist --- midori/pkg-plist 2010-05-17 19:16:36.000000000 +0200 +++ /usr/ports/www/midori/pkg-plist 2010-05-17 22:25:33.000000000 +0200 @@ -1,13 +1,17 @@ bin/midori etc/xdg/midori/search +%%VALAC%%include/midori-%%VERSION%%/extensions/external-applications.h lib/midori/libadblock.so +lib/midori/libaddons.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so +%%VALAC%%lib/midori/libexternal-applications.so lib/midori/libfeed-panel.so lib/midori/libformhistory.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 lib/midori/libtab-panel.so lib/midori/libtab-switcher.so @@ -19,6 +23,7 @@ %%DOCSDIR%%/ChangeLog %%DOCSDIR%%/EXPAT %%DOCSDIR%%/README +%%DOCUTILS%%%%DOCSDIR%%/user/midori.html share/icons/hicolor/16x16/apps/midori.png share/icons/hicolor/16x16/categories/extension.png share/icons/hicolor/16x16/status/news-feed.png @@ -47,6 +52,7 @@ %%NLS%%share/locale/fr/LC_MESSAGES/midori.mo %%NLS%%share/locale/gl/LC_MESSAGES/midori.mo %%NLS%%share/locale/he/LC_MESSAGES/midori.mo +%%NLS%%share/locale/hr/LC_MESSAGES/midori.mo %%NLS%%share/locale/hu/LC_MESSAGES/midori.mo %%NLS%%share/locale/id/LC_MESSAGES/midori.mo %%NLS%%share/locale/it/LC_MESSAGES/midori.mo @@ -54,6 +60,7 @@ %%NLS%%share/locale/ko/LC_MESSAGES/midori.mo %%NLS%%share/locale/nl/LC_MESSAGES/midori.mo %%NLS%%share/locale/no/LC_MESSAGES/midori.mo +%%NLS%%share/locale/pa/LC_MESSAGES/midori.mo %%NLS%%share/locale/pl/LC_MESSAGES/midori.mo %%NLS%%share/locale/pt/LC_MESSAGES/midori.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo @@ -67,23 +74,47 @@ %%NLS%%share/locale/uk/LC_MESSAGES/midori.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo -%%DATADIR%%/res/autosuggestcontrol.css -%%DATADIR%%/res/autosuggestcontrol.js -%%DATADIR%%/res/error.html -%%DATADIR%%/res/logo-shade.png -%%DATADIR%%/res/mootools.js -%%DATADIR%%/res/speeddial-head.html -%%DATADIR%%/res/speeddial.json -@dirrm %%DATADIR%%/res -@dirrm %%DATADIR%% -%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sr@latin -%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ast +share/midori/res/autosuggestcontrol.css +share/midori/res/autosuggestcontrol.js +share/midori/res/error.html +share/midori/res/logo-shade.png +share/midori/res/mootools.js +share/midori/res/speeddial-head.html +share/midori/res/speeddial.json +%%VALAC%%share/vala/vapi/external-applications.deps +%%VALAC%%share/vala/vapi/external-applications.vapi +%%VALAC%%@dirrmtry share/vala/vapi +%%VALAC%%@dirrmtry share/vala +@dirrm share/midori/res +@dirrm share/midori +@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true +@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true +@dirrmtry share/icons/hicolor/48x48/status +@dirrmtry share/icons/hicolor/48x48/categories +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/status +@dirrmtry share/icons/hicolor/32x32/categories +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/24x24/status +@dirrmtry share/icons/hicolor/24x24/categories +@dirrmtry share/icons/hicolor/24x24/apps +@dirrmtry share/icons/hicolor/24x24 +@dirrmtry share/icons/hicolor/22x22/status +@dirrmtry share/icons/hicolor/22x22/categories +@dirrmtry share/icons/hicolor/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/status +@dirrmtry share/icons/hicolor/16x16/categories +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@exec mkdir -p %D/share/gir-1.0 +%%VALAC%%@dirrmtry share/gir-1.0 +%%DOCUTILS%%@dirrmtry %%DOCSDIR%%/user @dirrm %%DOCSDIR%% -@dirrmtry share/applications @dirrm lib/midori +%%VALAC%%@dirrm include/midori-%%VERSION%%/extensions +%%VALAC%%@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 >Release-Note: >Audit-Trail: >Unformatted: