Index: head/www/webkit-qt5/Makefile =================================================================== --- head/www/webkit-qt5/Makefile (revision 372955) +++ head/www/webkit-qt5/Makefile (revision 372956) @@ -1,84 +1,76 @@ # $FreeBSD$ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt WebKit implementation LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libicui18n.so:${PORTSDIR}/devel/icu \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.so:${PORTSDIR}/graphics/png \ libwebp.so:${PORTSDIR}/graphics/webp BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex USE_GL= gl USE_GNOME= libxml2 libxslt USE_PERL5= build USE_QT5= core gui network opengl printsupport qml quick sql \ testlib widgets buildtools_build QT_DIST= ${PORTNAME} USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes USE_SQLITE= 3 USE_XORG= x11 xcomposite xrender USES= bison gmake gperf perl5 pkgconfig python:build qmake:outsource -# Keep make(1) from descending into obj/ subdirectories during tests. -CONFIGURE_ENV= MAKEOBJDIR=. # Use flex(1) from ports. MAKE_ENV= PATH="${LOCALBASE}/bin:${PATH}" -# Probably required. +# "all" builds many more targets. The default one is called "first" in +# QtWebKit, and is invoked by default when make is called without arguments. ALL_TARGET= first USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT=GSTREAMER GSTREAMER_USE= GNOME=glib20 GSTREAMER=yes .include # Base ld(1) segfaults on PowerPC (inherited from Qt 4): # http://bugs.freebsd.org/173042 .if ${ARCH} == "powerpc" BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils .endif post-patch: ${REINPLACE_CMD} -e 's,python,${PYTHON_VERSION},g' \ -e 's,$$$${PYTHON},${PYTHON_VERSION},g' \ ${WRKSRC}/Source/WebCore/DerivedSources.make \ ${WRKSRC}/Source/WebCore/DerivedSources.pri \ ${WRKSRC}/Source/WebKit2/DerivedSources.make \ ${WRKSRC}/Source/WebKit2/DerivedSources.pri \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.make \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \ ${WRKSRC}/Tools/qmake/mkspecs/features/configure.prf pre-configure: -# Write a clean installation procedure to avoid the installation of -# the file during the build stage. - @${REINPLACE_CMD} -e 's|\[QT_INSTALL_PLUGINS]|{ROOT_BUILD_DIR}/plugins|' \ - ${WRKSRC}/Source/WebKit/qt/examples/platformplugin/platformplugin.pro - @${ECHO_CMD} "target.path = ${PREFIX}/${QT_PLUGINDIR_REL}/webkit" \ - >> ${WRKSRC}/Source/WebKit/qt/examples/platformplugin/platformplugin.pro - @${ECHO_CMD} "INSTALLS += target" \ - >> ${WRKSRC}/Source/WebKit/qt/examples/platformplugin/platformplugin.pro @${REINPLACE_CMD} -Ee 's|linux-?\*|unix|g' \ ${WRKSRC}/Source/JavaScriptCore/DerivedSources.pri \ ${WRKSRC}/Source/JavaScriptCore/JavaScriptCore.pri \ ${WRKSRC}/Source/JavaScriptCore/Target.pri \ ${WRKSRC}/Source/WebCore/WebCore.pri \ ${WRKSRC}/Tools/qmake/mkspecs/features/features.prf .if ! ${PORT_OPTIONS:MGSTREAMER} @${REINPLACE_CMD} -e 's|packagesExist.*gstreamer.*|false {|' \ ${WRKSRC}/Tools/qmake/mkspecs/features/features.prf .endif .include Index: head/www/webkit-qt5/files/patch-Source__QtWebKit.pro =================================================================== --- head/www/webkit-qt5/files/patch-Source__QtWebKit.pro (nonexistent) +++ head/www/webkit-qt5/files/patch-Source__QtWebKit.pro (revision 372956) @@ -0,0 +1,17 @@ +Do not go into the examples/ directory, which contains only platformplugin/. + +Even though it is not part of the default target, it is included in `make +install', and platformplugin's .pro file has a DESTDIR setting that causes the +file system to be touched even though there is nothing to build or install. +--- a/Source/QtWebKit.pro ++++ b/Source/QtWebKit.pro +@@ -38,9 +38,4 @@ build?(webkit1) { + tests.file = tests.pri + SUBDIRS += tests + } +- +- examples.file = WebKit/qt/examples/examples.pro +- examples.CONFIG += no_default_target +- examples.makefile = Makefile +- SUBDIRS += examples + } Property changes on: head/www/webkit-qt5/files/patch-Source__QtWebKit.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-qt5/pkg-plist =================================================================== --- head/www/webkit-qt5/pkg-plist (revision 372955) +++ head/www/webkit-qt5/pkg-plist (revision 372956) @@ -1,112 +1,111 @@ %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/bytearraytestdata.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qhttpheader_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquicknetworkreply_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquicknetworkrequest_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickurlschemedelegate_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebpage_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebpage_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebview_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qquickwebview_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qrawwebview_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qrawwebview_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qtwebsecurityorigin_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdatabase_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdownloaditem_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebdownloaditem_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebelement_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebhistory_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebiconimageprovider_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebkittest_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebloadrequest_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebnavigationhistory_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebnavigationhistory_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebnavigationrequest_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebpermissionrequest_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebplugindatabase_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebpreferences_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebpreferences_p_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebscriptworld.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebscriptworld_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/qwebsecurityorigin_p.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/testwindow.h %%QT_INCDIR%%/QtWebKit/%%FULLVER%%/QtWebKit/private/util.h %%QT_INCDIR%%/QtWebKit/QWebDatabase %%QT_INCDIR%%/QtWebKit/QWebElement %%QT_INCDIR%%/QtWebKit/QWebElementCollection %%QT_INCDIR%%/QtWebKit/QWebFullScreenVideoHandler %%QT_INCDIR%%/QtWebKit/QWebHapticFeedbackPlayer %%QT_INCDIR%%/QtWebKit/QWebHistory %%QT_INCDIR%%/QtWebKit/QWebHistoryInterface %%QT_INCDIR%%/QtWebKit/QWebHistoryItem %%QT_INCDIR%%/QtWebKit/QWebKitPlatformPlugin %%QT_INCDIR%%/QtWebKit/QWebNotificationData %%QT_INCDIR%%/QtWebKit/QWebNotificationPresenter %%QT_INCDIR%%/QtWebKit/QWebPluginFactory %%QT_INCDIR%%/QtWebKit/QWebSecurityOrigin %%QT_INCDIR%%/QtWebKit/QWebSelectData %%QT_INCDIR%%/QtWebKit/QWebSelectMethod %%QT_INCDIR%%/QtWebKit/QWebSettings %%QT_INCDIR%%/QtWebKit/QWebSpellChecker %%QT_INCDIR%%/QtWebKit/QWebTouchModifier %%QT_INCDIR%%/QtWebKit/QtWebKit %%QT_INCDIR%%/QtWebKit/QtWebKitDepends %%QT_INCDIR%%/QtWebKit/QtWebKitVersion %%QT_INCDIR%%/QtWebKit/qtwebkitversion.h %%QT_INCDIR%%/QtWebKit/qwebdatabase.h %%QT_INCDIR%%/QtWebKit/qwebelement.h %%QT_INCDIR%%/QtWebKit/qwebhistory.h %%QT_INCDIR%%/QtWebKit/qwebhistoryinterface.h %%QT_INCDIR%%/QtWebKit/qwebkitglobal.h %%QT_INCDIR%%/QtWebKit/qwebkitplatformplugin.h %%QT_INCDIR%%/QtWebKit/qwebpluginfactory.h %%QT_INCDIR%%/QtWebKit/qwebsecurityorigin.h %%QT_INCDIR%%/QtWebKit/qwebsettings.h %%QT_INCDIR%%/QtWebKitWidgets/%%FULLVER%%/QtWebKitWidgets/private/qwebframe_p.h %%QT_INCDIR%%/QtWebKitWidgets/%%FULLVER%%/QtWebKitWidgets/private/qwebinspector_p.h %%QT_INCDIR%%/QtWebKitWidgets/%%FULLVER%%/QtWebKitWidgets/private/qwebpage_p.h %%QT_INCDIR%%/QtWebKitWidgets/%%FULLVER%%/QtWebKitWidgets/private/qwebviewaccessible_p.h %%QT_INCDIR%%/QtWebKitWidgets/QGraphicsWebView %%QT_INCDIR%%/QtWebKitWidgets/QWebFrame %%QT_INCDIR%%/QtWebKitWidgets/QWebHitTestResult %%QT_INCDIR%%/QtWebKitWidgets/QWebInspector %%QT_INCDIR%%/QtWebKitWidgets/QWebPage %%QT_INCDIR%%/QtWebKitWidgets/QWebView %%QT_INCDIR%%/QtWebKitWidgets/QtWebKitWidgets %%QT_INCDIR%%/QtWebKitWidgets/QtWebKitWidgetsDepends %%QT_INCDIR%%/QtWebKitWidgets/QtWebKitWidgetsVersion %%QT_INCDIR%%/QtWebKitWidgets/qgraphicswebview.h %%QT_INCDIR%%/QtWebKitWidgets/qtwebkitwidgetsversion.h %%QT_INCDIR%%/QtWebKitWidgets/qwebframe.h %%QT_INCDIR%%/QtWebKitWidgets/qwebinspector.h %%QT_INCDIR%%/QtWebKitWidgets/qwebpage.h %%QT_INCDIR%%/QtWebKitWidgets/qwebview.h %%QT_LIBDIR%%/cmake/Qt5WebKit/Qt5WebKitConfig.cmake %%QT_LIBDIR%%/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake %%QT_LIBDIR%%/libQt5WebKit.prl %%QT_LIBDIR%%/libQt5WebKit.so %%QT_LIBDIR%%/libQt5WebKit.so.5 %%QT_LIBDIR%%/libQt5WebKit.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt5WebKitWidgets.prl %%QT_LIBDIR%%/libQt5WebKitWidgets.so %%QT_LIBDIR%%/libQt5WebKitWidgets.so.5 %%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5WebKitWidgets.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_webkit.pri %%QT_MKSPECDIR%%/modules/qt_lib_webkit_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_webkitwidgets_private.pri -%%QT_PLUGINDIR%%/webkit/libplatformplugin.so %%QT_QMLDIR%%/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so %%QT_QMLDIR%%/QtWebKit/experimental/qmldir %%QT_QMLDIR%%/QtWebKit/libqmlwebkitplugin.so %%QT_QMLDIR%%/QtWebKit/plugins.qmltypes %%QT_QMLDIR%%/QtWebKit/qmldir libdata/pkgconfig/Qt5WebKit.pc libdata/pkgconfig/Qt5WebKitWidgets.pc %%QT_LIBEXECDIR%%/QtWebPluginProcess %%QT_LIBEXECDIR%%/QtWebProcess