diff options
| author | olivierd <olivierd@FreeBSD.org> | 2014-08-09 14:17:29 +0800 |
|---|---|---|
| committer | olivierd <olivierd@FreeBSD.org> | 2014-08-09 14:17:29 +0800 |
| commit | 87e2fe597cb11542f2e838056276c113b4e94dc0 (patch) | |
| tree | fc8ef3cc00c1ba7d9daecdb3a9541a8c21083c14 /www | |
| parent | 3894bede202e2e91ff50cae117559fa7a42c5322 (diff) | |
| download | freebsd-ports-graphics-87e2fe597cb11542f2e838056276c113b4e94dc0.tar.gz freebsd-ports-graphics-87e2fe597cb11542f2e838056276c113b4e94dc0.tar.zst freebsd-ports-graphics-87e2fe597cb11542f2e838056276c113b4e94dc0.zip | |
- GObject Introspection Repository (GIR) files are only build, when
GTK2 is set
- Fix pkg-plist with the new WebKit2 API (some extensions are not yet
ported)
- Bump PORTREVISION
Obtained from: Xfce dev repo
Diffstat (limited to 'www')
| -rw-r--r-- | www/midori/Makefile | 8 | ||||
| -rw-r--r-- | www/midori/pkg-plist | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/www/midori/Makefile b/www/midori/Makefile index 3db553296ba..e6050aa7405 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -3,7 +3,7 @@ PORTNAME= midori PORTVERSION= 0.5.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www xfce MASTER_SITES= http://www.midori-browser.org/downloads/ DISTNAME= ${PORTNAME}_${PORTVERSION}_all_ @@ -50,6 +50,7 @@ ZEITGEIST_DESC= User logs activities 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} @@ -60,8 +61,11 @@ 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} @@ -88,7 +92,7 @@ CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=ON CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=OFF .endif -.if ${PORT_OPTIONS:MGIR} +.if ${PORT_OPTIONS:MGIR} && ${PORT_OPTIONS:MGTK2} USE_GNOME+= introspection:build CMAKE_ARGS+= -DUSE_GIR:BOOL=ON PLIST_SUB+= GIR="" diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist index e543fd9aeab..fc5dc4d59ef 100644 --- a/www/midori/pkg-plist +++ b/www/midori/pkg-plist @@ -5,24 +5,24 @@ lib/libmidori-core.so lib/libmidori-core.so.0.0.0 lib/libmidori-core.so.1 lib/midori/libadblock.so -lib/midori/libaddons.so +%%ONLY_WEBKIT1%%lib/midori/libaddons.so lib/midori/libapps.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so -lib/midori/libcookie-permissions.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 -lib/midori/libexternal-download-manager.so +%%ONLY_WEBKIT1%%lib/midori/libexternal-download-manager.so lib/midori/libfeed-panel.so lib/midori/libflummi.so -lib/midori/libformhistory.so +%%ONLY_WEBKIT1%%lib/midori/libformhistory.so lib/midori/libhistory-list.so lib/midori/libmouse-gestures.so -lib/midori/libnojs.so +%%ONLY_WEBKIT1%%lib/midori/libnojs.so lib/midori/libnotes.so -lib/midori/libnsplugin-manager.so +%%ONLY_WEBKIT1%%lib/midori/libnsplugin-manager.so lib/midori/libopen-with.so lib/midori/libshortcuts.so lib/midori/libstatus-clock.so |