Index: head/www/midori/Makefile =================================================================== --- head/www/midori/Makefile (revision 372439) +++ head/www/midori/Makefile (revision 372440) @@ -1,110 +1,112 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= midori -PORTVERSION= 0.5.8 -PORTREVISION= 6 +PORTVERSION= 0.5.9 CATEGORIES= www xfce MASTER_SITES= http://www.midori-browser.org/downloads/ DISTNAME= ${PORTNAME}_${PORTVERSION}_all_ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine LICENSE= LGPL21 MIT LICENSE_COMB= multi BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ valac:${PORTSDIR}/lang/vala LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -Wno-return-type CMAKE_ARGS= -DUSE_GCR:BOOL=OFF -#WRKSRC= ${WRKDIR}/${DISTNAME:C/([a-z]*)_([0-9\.]*)(_all_)/\1-\2/} +WRKSRC= ${WRKDIR}/${DISTNAME:C/([a-z]*)_([0-9\.]*)(_all_)/\1-\2/} NO_WRKSUBDIR= yes USE_GNOME= glib20 intltool libxml2 USE_XORG= xscrnsaver INSTALLS_ICONS= yes USE_LDCONFIG= yes USES= desktop-file-utils pkgconfig cmake gettext tar:bzip2 USE_SQLITE= yes PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= DOCS GIR GRANITE ZEITGEIST OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK= GTK2 GTK3 OPTIONS_DEFAULT= GTK2 +# Need x11-toolkits/granite >= 0.3 (Granite.Widgets.LightWindow is deprecated) +OPTIONS_EXCLUDE= GRANITE GIR_DESC= GObject Introspection GRANITE_DESC= Additional GTK widgets (require GTK3) ZEITGEIST_DESC= User logs activities .include .if ${PORT_OPTIONS:MGTK2} LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 USE_GNOME+= gtk20 CMAKE_ARGS+= -DUSE_GTK3:BOOL=OFF PLIST_SUB+= ONLY_WEBKIT1="" .endif .if ${PORT_OPTIONS:MGTK3} LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 USE_GNOME+= gtk30 CMAKE_ARGS+= -DUSE_GTK3:BOOL=ON # Support the new WebKit2 API (>= 1.11.91) .if exists(${LOCALBASE}/libdata/pkgconfig/webkit2gtk-3.0.pc) CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=ON # Some extensions are not yet ported to the new API (WebKit2) PLIST_SUB+= ONLY_WEBKIT1="@comment " .else CMAKE_ARGS+= -DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF PLIST_SUB+= ONLY_WEBKIT1="" .endif .if ${PORT_OPTIONS:MGRANITE} LIB_DEPENDS+= libgranite.so:${PORTSDIR}/x11-toolkits/granite CMAKE_ARGS+= -DUSE_GRANITE:BOOL=ON .else CMAKE_ARGS+= -DUSE_GRANITE:BOOL=OFF .endif .endif .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc CMAKE_ARGS+= -DUSE_APIDOCS:BOOL=ON PLIST_SUB+= APIDOCS="" .else CMAKE_ARGS+= -DUSE_APIDOCS:BOOL=OFF PLIST_SUB+= APIDOCS="@comment " .endif .if ${PORT_OPTIONS:MZEITGEIST} LIB_DEPENDS+= libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=ON .else CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=OFF .endif .if ${PORT_OPTIONS:MGIR} && ${PORT_OPTIONS:MGTK2} USE_GNOME+= introspection:build CMAKE_ARGS+= -DUSE_GIR:BOOL=ON PLIST_SUB+= GIR="" .else CMAKE_ARGS+= -DUSE_GIR:BOOL=OFF PLIST_SUB+= GIR="@comment " .endif post-patch: # Avoid errors with CMake .for dir in config extensions @${RM} ${WRKSRC}/${dir}/*.orig .endfor .include Index: head/www/midori/distinfo =================================================================== --- head/www/midori/distinfo (revision 372439) +++ head/www/midori/distinfo (revision 372440) @@ -1,2 +1,2 @@ -SHA256 (xfce4/midori_0.5.8_all_.tar.bz2) = af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 -SIZE (xfce4/midori_0.5.8_all_.tar.bz2) = 1267130 +SHA256 (xfce4/midori_0.5.9_all_.tar.bz2) = b1a5309d926ea4e394f4a39552023b0427cf23053793d325e3daefceed282ec0 +SIZE (xfce4/midori_0.5.9_all_.tar.bz2) = 1332192 Index: head/www/midori/pkg-plist =================================================================== --- head/www/midori/pkg-plist (revision 372439) +++ head/www/midori/pkg-plist (revision 372440) @@ -1,231 +1,208 @@ bin/midori etc/xdg/midori/extensions/adblock/config etc/xdg/midori/search lib/libmidori-core.so lib/libmidori-core.so.0.0.0 lib/libmidori-core.so.1 +lib/midori/libabout.so lib/midori/libadblock.so %%ONLY_WEBKIT1%%lib/midori/libaddons.so lib/midori/libapps.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so %%ONLY_WEBKIT1%%lib/midori/libcookie-permissions.so lib/midori/libcopy-tabs.so lib/midori/libdelayed-load.so lib/midori/libdevpet.so lib/midori/libdomain-keys.so %%ONLY_WEBKIT1%%lib/midori/libexternal-download-manager.so lib/midori/libfeed-panel.so lib/midori/libflummi.so %%ONLY_WEBKIT1%%lib/midori/libformhistory.so lib/midori/libhistory-list.so lib/midori/libmouse-gestures.so %%ONLY_WEBKIT1%%lib/midori/libnojs.so lib/midori/libnotes.so %%ONLY_WEBKIT1%%lib/midori/libnsplugin-manager.so lib/midori/libopen-with.so lib/midori/libshortcuts.so lib/midori/libstatus-clock.so lib/midori/libstatusbar-features.so lib/midori/libtab-panel.so lib/midori/libtabby.so lib/midori/libtabs-minimized.so lib/midori/libtoolbar-editor.so lib/midori/libtransfers.so +lib/midori/libwebmedia-now-playing.so share/appdata/midori.appdata.xml share/applications/midori-private.desktop share/applications/midori.desktop %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/COPYING %%DOCSDIR%%/ChangeLog %%DOCSDIR%%/EXPAT %%DOCSDIR%%/README %%DOCSDIR%%/faq.css %%DOCSDIR%%/faq.html %%GIR%%share/gir-1.0/Katze-%%VERSION%%.gir %%GIR%%share/gir-1.0/Midori-%%VERSION%%.gir %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/annotation-glossary.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/api-index-full.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/ch01.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/deprecated-api-index.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/home.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/index.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzeArray.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzeCellRendererComboBoxText.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzeItem.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzePreferences.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-gtk3-compat.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-arrayaction.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-http-auth.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-utils.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze.devhelp2 +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/left-insensitive.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/left.png +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/right-insensitive.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/right.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/style.css +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/up-insensitive.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/up.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/annotation-glossary.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/api-index-full.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/ch01.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/deprecated-api-index.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/home.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/index.html +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/left-insensitive.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/left.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriBrowser.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriExtension.html +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriExtensionsColumn.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriPreferences.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-app.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-array.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-bookmarks-db.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-frontend.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-history.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-locationaction.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-panel.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-platform.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-privatedata.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-searchaction.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-session.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-stock.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-view.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-websettings.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-sokoke.html %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori.devhelp2 +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/right-insensitive.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/right.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/style.css +%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/up-insensitive.png %%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/up.png share/icons/hicolor/16x16/apps/midori.png share/icons/hicolor/16x16/categories/extension.png share/icons/hicolor/16x16/status/internet-news-reader.png share/icons/hicolor/22x22/apps/midori.png share/icons/hicolor/22x22/categories/extension.png share/icons/hicolor/22x22/status/internet-news-reader.png share/icons/hicolor/scalable/apps/midori.svg share/icons/hicolor/scalable/categories/extension.svg share/icons/hicolor/scalable/status/internet-news-reader.svg +share/locale/af/LC_MESSAGES/midori.mo share/locale/am/LC_MESSAGES/midori.mo share/locale/ar/LC_MESSAGES/midori.mo share/locale/ast/LC_MESSAGES/midori.mo share/locale/be/LC_MESSAGES/midori.mo share/locale/bg/LC_MESSAGES/midori.mo +share/locale/bn/LC_MESSAGES/midori.mo share/locale/bs/LC_MESSAGES/midori.mo share/locale/ca/LC_MESSAGES/midori.mo share/locale/ckb/LC_MESSAGES/midori.mo share/locale/cs/LC_MESSAGES/midori.mo share/locale/cy/LC_MESSAGES/midori.mo share/locale/da/LC_MESSAGES/midori.mo share/locale/de/LC_MESSAGES/midori.mo share/locale/el/LC_MESSAGES/midori.mo share/locale/en_AU/LC_MESSAGES/midori.mo share/locale/en_CA/LC_MESSAGES/midori.mo share/locale/en_GB/LC_MESSAGES/midori.mo share/locale/eo/LC_MESSAGES/midori.mo share/locale/es/LC_MESSAGES/midori.mo share/locale/et/LC_MESSAGES/midori.mo share/locale/eu/LC_MESSAGES/midori.mo share/locale/fa/LC_MESSAGES/midori.mo share/locale/fi/LC_MESSAGES/midori.mo share/locale/fr/LC_MESSAGES/midori.mo share/locale/gd/LC_MESSAGES/midori.mo share/locale/gl/LC_MESSAGES/midori.mo share/locale/he/LC_MESSAGES/midori.mo +share/locale/hi/LC_MESSAGES/midori.mo share/locale/hr/LC_MESSAGES/midori.mo share/locale/hu/LC_MESSAGES/midori.mo share/locale/ia/LC_MESSAGES/midori.mo share/locale/id/LC_MESSAGES/midori.mo share/locale/it/LC_MESSAGES/midori.mo share/locale/ja/LC_MESSAGES/midori.mo +share/locale/ka/LC_MESSAGES/midori.mo share/locale/kk/LC_MESSAGES/midori.mo share/locale/km/LC_MESSAGES/midori.mo share/locale/ko/LC_MESSAGES/midori.mo share/locale/ky/LC_MESSAGES/midori.mo share/locale/lt/LC_MESSAGES/midori.mo share/locale/lv/LC_MESSAGES/midori.mo share/locale/ml/LC_MESSAGES/midori.mo share/locale/ms/LC_MESSAGES/midori.mo +share/locale/nap/LC_MESSAGES/midori.mo share/locale/nb/LC_MESSAGES/midori.mo share/locale/nl/LC_MESSAGES/midori.mo share/locale/nn/LC_MESSAGES/midori.mo share/locale/no/LC_MESSAGES/midori.mo share/locale/pa/LC_MESSAGES/midori.mo share/locale/pl/LC_MESSAGES/midori.mo share/locale/pt/LC_MESSAGES/midori.mo share/locale/pt_BR/LC_MESSAGES/midori.mo share/locale/ro/LC_MESSAGES/midori.mo share/locale/ru/LC_MESSAGES/midori.mo share/locale/sk/LC_MESSAGES/midori.mo share/locale/sl/LC_MESSAGES/midori.mo share/locale/sq/LC_MESSAGES/midori.mo share/locale/sr/LC_MESSAGES/midori.mo share/locale/sr@latin/LC_MESSAGES/midori.mo share/locale/sv/LC_MESSAGES/midori.mo +share/locale/ta/LC_MESSAGES/midori.mo +share/locale/te/LC_MESSAGES/midori.mo share/locale/th/LC_MESSAGES/midori.mo share/locale/tr/LC_MESSAGES/midori.mo share/locale/ug/LC_MESSAGES/midori.mo share/locale/uk/LC_MESSAGES/midori.mo share/locale/vi/LC_MESSAGES/midori.mo share/locale/zh_CN/LC_MESSAGES/midori.mo share/locale/zh_TW/LC_MESSAGES/midori.mo %%DATADIR%%/res/about.css %%DATADIR%%/res/adblock.list %%DATADIR%%/res/adblock/blocked.png %%DATADIR%%/res/adblock/disabled.png %%DATADIR%%/res/adblock/element_hider.js %%DATADIR%%/res/adblock/enabled.png %%DATADIR%%/res/autosuggestcontrol.css %%DATADIR%%/res/autosuggestcontrol.js %%DATADIR%%/res/bookmarks/Create.sql %%DATADIR%%/res/bookmarks/Import_old_db_bookmarks.sql %%DATADIR%%/res/close.png %%DATADIR%%/res/error.html %%DATADIR%%/res/flummi/Create.sql %%DATADIR%%/res/forms/Create.sql %%DATADIR%%/res/gtk3.css %%DATADIR%%/res/history/Create.sql %%DATADIR%%/res/history/Day.sql %%DATADIR%%/res/logo-shade.png %%DATADIR%%/res/nojs/nojs-statusicon-allowed.png %%DATADIR%%/res/nojs/nojs-statusicon-denied.png %%DATADIR%%/res/nojs/nojs-statusicon-mixed.png %%DATADIR%%/res/notes/Create.sql %%DATADIR%%/res/speeddial-head.html %%DATADIR%%/res/tabby/Create.sql %%DATADIR%%/res/tabby/Update1.sql -@dirrm %%DATADIR%%/res/tabby -@dirrm %%DATADIR%%/res/notes -@dirrm %%DATADIR%%/res/nojs -@dirrm %%DATADIR%%/res/history -@dirrm %%DATADIR%%/res/forms -@dirrm %%DATADIR%%/res/flummi -@dirrm %%DATADIR%%/res/bookmarks -@dirrm %%DATADIR%%/res/adblock -@dirrm %%DATADIR%%/res -@dirrm %%DATADIR%% -@dirrmtry share/locale/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/ky/LC_MESSAGES -@dirrmtry share/locale/ky -@dirrmtry share/locale/km/LC_MESSAGES -@dirrmtry share/locale/km -@dirrmtry share/locale/kk/LC_MESSAGES -@dirrmtry share/locale/kk -@dirrmtry share/locale/ia/LC_MESSAGES -@dirrmtry share/locale/ia -@dirrmtry share/locale/gd/LC_MESSAGES -@dirrmtry share/locale/gd -@dirrmtry share/locale/ckb/LC_MESSAGES -@dirrmtry share/locale/ckb -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -%%APIDOCS%%@dirrm share/gtk-doc/html/midori-%%VERSION%%/midori -%%APIDOCS%%@dirrm share/gtk-doc/html/midori-%%VERSION%%/katze -%%APIDOCS%%@dirrm share/gtk-doc/html/midori-%%VERSION%% -%%APIDOCS%%@dirrmtry share/gtk-doc/html -%%APIDOCS%%@dirrmtry share/gtk-doc -@dirrm %%DOCSDIR%% -@dirrmtry share/appdata -@dirrm lib/midori -@dirrm etc/xdg/midori/extensions/adblock -@dirrm etc/xdg/midori/extensions -@dirrm etc/xdg/midori