Date: Wed, 17 Mar 2010 20:12:32 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/144830: [UPDATE] www/midori to 0.2.4 Message-ID: <201003172012.o2HKCWwj085593@www.freebsd.org> Resent-Message-ID: <201003172020.o2HKK2Z2045940@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144830 >Category: ports >Synopsis: [UPDATE] www/midori to 0.2.4 >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: Wed Mar 17 20:20:02 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: - Delete some dependancies already selected by webkit-gtk2. - Use python (waf script) instead of GNU Makefile - 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 /usr/ports/www/midori/Makefile midori/Makefile --- /usr/ports/www/midori/Makefile 2010-02-05 12:44:59.000000000 +0100 +++ midori/Makefile 2010-03-17 21:04:17.000000000 +0100 @@ -1,43 +1,49 @@ -# New ports collection makefile for: midori -# Date created: 2007-10-21 -# Whom: Michael Johnson <ahze@FreeBSD.org> +# New ports collection makefile for: midori +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD: ports/www/midori/Makefile,v 1.12 2010/02/05 11:44:59 dinoex Exp $ # $MCom: ports/www/midori/Makefile,v 1.19 2009/10/22 21:20:56 kwm Exp $ # PORTNAME= midori -PORTVERSION= 0.2.2 -PORTREVISION= 1 -CATEGORIES= www +PORTVERSION= 0.2.4 +CATEGORIES= www xfce MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/ +DIST_SUBDIR= xfce4 MAINTAINER= ahze@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine -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 \ +RUN_DEPENDS= python:${PORTSDIR}/lang/python + +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} - -MAKE_JOBS_SAFE= yes -HAS_CONFIGURE= yes -USE_GMAKE= yes +LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \ + notify.1:${PORTSDIR}/devel/libnotify + +CONFIGURE_ARGS+= --prefix=${LOCALBASE} \ + --disable-unique \ + --disable-libidn \ + --enable-sqlite \ + --enable-libnotify \ + --enable-addons \ + --disable-hildon + USE_BZIP2= yes +USE_PYTHON= yes +USE_OPENSSL= yes USE_GNOME= glib20 gtk20 intltool libxml2 pkgconfig -INSTALLS_ICONS= yes USE_LDCONFIG= yes +INSTALLS_ICONS= yes + +OPTIONS= NLS "Enable Native Language support" on .include <bsd.port.pre.mk> # WAF needs that -CONFIGURE_ENV+= CC=${CC} +CONFIGURE_ENV+= CC="${CC}" .if !defined(WITHOUT_NLS) USE_GETTEXT= yes @@ -47,4 +53,25 @@ 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 + +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 <bsd.port.post.mk> diff -urN /usr/ports/www/midori/distinfo midori/distinfo --- /usr/ports/www/midori/distinfo 2009-12-21 01:01:28.000000000 +0100 +++ midori/distinfo 2010-03-15 20:27:18.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (midori-0.2.2.tar.bz2) = 14f81a7a10f80a173da1b5e88713400b -SHA256 (midori-0.2.2.tar.bz2) = bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07 -SIZE (midori-0.2.2.tar.bz2) = 613546 +MD5 (midori-0.2.4.tar.bz2) = ccd2ae162993c2c92c9e0eac7778c62d +SHA256 (midori-0.2.4.tar.bz2) = 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f +SIZE (midori-0.2.4.tar.bz2) = 645554 diff -urN /usr/ports/www/midori/files/patch-data_search midori/files/patch-data_search --- /usr/ports/www/midori/files/patch-data_search 1970-01-01 01:00:00.000000000 +0100 +++ 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 /usr/ports/www/midori/files/patch-wscript midori/files/patch-wscript --- /usr/ports/www/midori/files/patch-wscript 1970-01-01 01:00:00.000000000 +0100 +++ 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 /usr/ports/www/midori/pkg-plist midori/pkg-plist --- /usr/ports/www/midori/pkg-plist 2009-12-14 02:36:03.000000000 +0100 +++ midori/pkg-plist 2010-03-17 19:45:04.000000000 +0100 @@ -3,7 +3,6 @@ lib/midori/libadblock.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so -lib/midori/libdnsprefetch.so lib/midori/libfeed-panel.so lib/midori/libformhistory.so lib/midori/libmouse-gestures.so @@ -20,6 +19,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 @@ -68,23 +68,33 @@ %%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 +@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/32x32/status +@dirrmtry share/icons/hicolor/32x32/categories +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/24x24/status +@dirrmtry share/icons/hicolor/24x24/categories +@dirrmtry share/icons/hicolor/24x24/apps +@dirrmtry share/icons/hicolor/22x22/status +@dirrmtry share/icons/hicolor/22x22/categories +@dirrmtry share/icons/hicolor/22x22/apps +@dirrmtry share/icons/hicolor/16x16/status +@dirrmtry share/icons/hicolor/16x16/categories +@dirrmtry share/icons/hicolor/16x16/apps +%%DOCUTILS%%@dirrmtry %%DOCSDIR%%/user @dirrm %%DOCSDIR%% -@dirrmtry share/applications @dirrm lib/midori @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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003172012.o2HKCWwj085593>