Index: branches/2016Q3/www/webkit-gtk2/Makefile =================================================================== --- branches/2016Q3/www/webkit-gtk2/Makefile (revision 419204) +++ branches/2016Q3/www/webkit-gtk2/Makefile (revision 419205) @@ -1,107 +1,108 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.11 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 2 toolkit BUILD_DEPENDS= gtkdoc-rebase:textproc/gtk-doc \ p5-Switch>0:lang/p5-Switch \ geoclue>=0:net/geoclue LIB_DEPENDS= libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ libicutu.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libwebp.so:graphics/webp \ libcurl.so:ftp/curl \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limit:1.4.*$$ USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \ perl5 pkgconfig shebangfix sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 introspection:build libxslt USE_GL= gl USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AR=/usr/bin/ar \ ac_cv_path_DOLT_BASH="" INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-gtk=2.0 \ --enable-svg-fonts \ --enable-geolocation \ --enable-introspection \ --disable-webkit2 \ --with-html-dir=${PREFIX}/share/gtk-doc/html/webkit1 MAKEFILE= GNUmakefile MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} CONFIGURE_ARGS+=--disable-egl \ --disable-gles2 SHEBANG_FILES= \ Source/JavaScriptCore/create_hash_table \ Source/JavaScriptCore/inspector/scripts/xxd.pl \ Source/WebCore/css/*.pl \ Source/WebCore/dom/*.pl \ Source/WebCore/make-hash-tools.pl \ Source/WebCore/page/make_settings.pl \ Source/WebCore/platform/text/mac/make-charset-table.pl \ Source/WebKit2/Scripts/generate-forwarding-headers.pl \ Source/WebCore/bindings/scripts/*.p[lm] \ Source/JavaScriptCore/create_hash_table BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_ON= --enable-debug-symbols=yes DEBUG_CONFIGURE_OFF= --disable-debug-symbols .include .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:textproc/flex CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" .endif .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam CXXFLAGS+= -Qunused-arguments .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp # Since ruby 2.2 there is no ruby symlink @${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \ ${STAGEDIR}${PREFIX}/bin/GtkLauncher-1 .include Index: branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css =================================================================== --- branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css (nonexistent) +++ branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css (revision 419205) @@ -0,0 +1,11 @@ +--- Source/WebCore/xml/XMLViewer.css.orig 2016-04-10 06:48:37 UTC ++++ Source/WebCore/xml/XMLViewer.css +@@ -14,7 +14,7 @@ + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, Property changes on: branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.css ___________________________________________________________________ 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: branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js =================================================================== --- branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js (nonexistent) +++ branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js (revision 419205) @@ -0,0 +1,11 @@ +--- Source/WebCore/xml/XMLViewer.js.orig 2015-07-22 12:37:57 UTC ++++ Source/WebCore/xml/XMLViewer.js +@@ -15,7 +15,7 @@ + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, Property changes on: branches/2016Q3/www/webkit-gtk2/files/patch-Source_WebCore_xml_XMLViewer.js ___________________________________________________________________ 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: branches/2016Q3/www/webkit-gtk3/Makefile =================================================================== --- branches/2016Q3/www/webkit-gtk3/Makefile (revision 419204) +++ branches/2016Q3/www/webkit-gtk3/Makefile (revision 419205) @@ -1,117 +1,118 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.11 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit BUILD_DEPENDS= gtkdoc-rebase:textproc/gtk-doc \ p5-Switch>0:lang/p5-Switch \ geoclue>=0:net/geoclue LIB_DEPENDS= libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ libicutu.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libwebp.so:graphics/webp \ libcurl.so:ftp/curl \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limit:1.4.*$$ USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \ perl5 pkgconfig shebangfix sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt USE_GL= gl USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AR=/usr/bin/ar \ ac_cv_path_DOLT_BASH="" INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-gtk=3.0 \ --enable-svg-fonts \ --enable-geolocation \ --enable-webkit2 \ --enable-introspection MAKEFILE= GNUmakefile MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} #CONFIGURE_ARGS+=--disable-silent-rules CONFIGURE_ARGS+=--disable-egl \ --disable-gles2 # --with-acceleration-backend=opengl # clutter broken? # opengl, clutter, none (clutter unsupported) SHEBANG_FILES= \ Source/JavaScriptCore/create_hash_table \ Source/JavaScriptCore/inspector/scripts/xxd.pl \ Source/WebCore/css/*.pl \ Source/WebCore/dom/*.pl \ Source/WebCore/make-hash-tools.pl \ Source/WebCore/page/make_settings.pl \ Source/WebCore/platform/text/mac/make-charset-table.pl \ Source/WebKit2/Scripts/generate-forwarding-headers.pl \ Source/WebCore/bindings/scripts/*.p[lm] \ Source/JavaScriptCore/create_hash_table BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_ON= --enable-debug-symbols=yes DEBUG_CONFIGURE_OFF= --disable-debug-symbols .include .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:textproc/flex CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" .endif .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 CFLAGS+= -march=i586 .endif .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam CXXFLAGS+= -Qunused-arguments .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp # Since ruby 2.2 there is no ruby symlink @${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \ ${STAGEDIR}${PREFIX}/bin/GtkLauncher-3 ${INSTALL_PROGRAM} ${WRKSRC}/Programs/MiniBrowser \ ${STAGEDIR}${PREFIX}/bin/MiniBrowser-3 .include Index: branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css =================================================================== --- branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css (nonexistent) +++ branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css (revision 419205) @@ -0,0 +1,11 @@ +--- Source/WebCore/xml/XMLViewer.css.orig 2016-04-10 06:48:37 UTC ++++ Source/WebCore/xml/XMLViewer.css +@@ -14,7 +14,7 @@ + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, Property changes on: branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.css ___________________________________________________________________ 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: branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js =================================================================== --- branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js (nonexistent) +++ branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js (revision 419205) @@ -0,0 +1,11 @@ +--- Source/WebCore/xml/XMLViewer.js.orig 2015-07-22 12:37:57 UTC ++++ Source/WebCore/xml/XMLViewer.js +@@ -15,7 +15,7 @@ + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS +- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. + * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, Property changes on: branches/2016Q3/www/webkit-gtk3/files/patch-Source_WebCore_xml_XMLViewer.js ___________________________________________________________________ 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: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 419204) +++ branches/2016Q3 (revision 419205) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r419064