diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/webkit-gtk2/Makefile | 15 | ||||
| -rw-r--r-- | www/webkit-gtk2/pkg-plist | 2 | ||||
| -rw-r--r-- | www/webkit-gtk3/Makefile | 10 | ||||
| -rw-r--r-- | www/webkit-gtk3/pkg-plist | 4 |
4 files changed, 16 insertions, 15 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 9c72ed92b..f080a66fc 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -1,10 +1,10 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/www/webkit-gtk2/Makefile 18610 2013-06-30 16:33:05Z marcus $ +# $MCom$ PORTNAME= webkit PORTVERSION= 1.8.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 @@ -12,9 +12,12 @@ PKGNAMESUFFIX= -gtk2 MAINTAINER= gnome@FreeBSD.org COMMENT= An opensource browser engine -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ - ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ - gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc +# Use the port>=0 form or the system versions of flex and gperf +# will be detected instead, breaking the build. + +BUILD_DEPENDS= flex>=0:${PORTSDIR}/textproc/flex \ + gperf>=0:${PORTSDIR}/devel/gperf \ + gtkdoc-check:${PORTSDIR}/textproc/gtk-doc LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ libicutu.so:${PORTSDIR}/devel/icu \ libcurl.so:${PORTSDIR}/ftp/curl \ @@ -22,7 +25,7 @@ LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ USE_GSTREAMER= yes USE_XORG= xt -USES= bison gettext gmake libtool:keepla perl5 pkgconfig tar:xz +USES= bison gettext gmake libtool perl5 pkgconfig tar:xz USE_GNOME= gtk20 libxslt introspection:build USE_SQLITE= yes USE_LDCONFIG= yes diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index db35e202d..2a290a67c 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -276,11 +276,9 @@ include/webkitgtk-1.0/webkit2/WebKitWindowProperties.h include/webkitgtk-1.0/webkit2/webkit2.h lib/girepository-1.0/JSCore-1.0.typelib lib/girepository-1.0/WebKit-1.0.typelib -lib/libjavascriptcoregtk-1.0.la lib/libjavascriptcoregtk-1.0.so lib/libjavascriptcoregtk-1.0.so.0 lib/libjavascriptcoregtk-1.0.so.0.13.4 -lib/libwebkitgtk-1.0.la lib/libwebkitgtk-1.0.so lib/libwebkitgtk-1.0.so.0 lib/libwebkitgtk-1.0.so.0.13.4 diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile index 22c4d86ba..fdc64d29d 100644 --- a/www/webkit-gtk3/Makefile +++ b/www/webkit-gtk3/Makefile @@ -4,6 +4,7 @@ PORTNAME= webkit PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk3 @@ -12,7 +13,10 @@ DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit -BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ +# Use the port>=0 form or the system gperf version will get +# detected instead, breaking the build. + +BUILD_DEPENDS= gperf>=0:${PORTSDIR}/devel/gperf \ gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \ geoclue>=0:${PORTSDIR}/net/geoclue LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ @@ -26,7 +30,7 @@ RUN_DEPENDS= geoclue>=0:${PORTSDIR}/net/geoclue USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite -USES= bison gettext gmake libtool:keepla perl5 pkgconfig \ +USES= bison gettext gmake libtool perl5 pkgconfig \ shebangfix tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes @@ -115,7 +119,7 @@ BUILD_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch .endif .if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" .endif diff --git a/www/webkit-gtk3/pkg-plist b/www/webkit-gtk3/pkg-plist index 9e50a9af7..b3655aad3 100644 --- a/www/webkit-gtk3/pkg-plist +++ b/www/webkit-gtk3/pkg-plist @@ -256,19 +256,15 @@ lib/girepository-1.0/JavaScriptCore-3.0.typelib lib/girepository-1.0/WebKit-3.0.typelib lib/girepository-1.0/WebKit2-3.0.typelib lib/girepository-1.0/WebKit2WebExtension-3.0.typelib -lib/libjavascriptcoregtk-3.0.la lib/libjavascriptcoregtk-3.0.so lib/libjavascriptcoregtk-3.0.so.0 lib/libjavascriptcoregtk-3.0.so.0.16.12 -lib/libwebkit2gtk-3.0.la lib/libwebkit2gtk-3.0.so lib/libwebkit2gtk-3.0.so.25 lib/libwebkit2gtk-3.0.so.25.10.7 -lib/libwebkitgtk-3.0.la lib/libwebkitgtk-3.0.so lib/libwebkitgtk-3.0.so.0 lib/libwebkitgtk-3.0.so.0.22.10 -lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.la lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-3.0.pc libdata/pkgconfig/webkit2gtk-3.0.pc |