From owner-svn-ports-head@freebsd.org Sun Jan 29 19:11:37 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CADA9CC74C4; Sun, 29 Jan 2017 19:11:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BBA3126; Sun, 29 Jan 2017 19:11:37 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0TJBawA030607; Sun, 29 Jan 2017 19:11:36 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0TJBZb4030599; Sun, 29 Jan 2017 19:11:35 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201701291911.v0TJBZb4030599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 29 Jan 2017 19:11:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432793 - in head/lang/phantomjs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2017 19:11:37 -0000 Author: feld Date: Sun Jan 29 19:11:35 2017 New Revision: 432793 URL: https://svnweb.freebsd.org/changeset/ports/432793 Log: lang/phantomjs: Update to 2.1.1 PR: 213634 Added: head/lang/phantomjs/files/patch-build.py (contents, props changed) head/lang/phantomjs/files/patch-src_qt_qtbase_configure (contents, props changed) head/lang/phantomjs/files/patch-src_qt_qtbase_src_3rdparty_icu__dependency.pri (contents, props changed) head/lang/phantomjs/files/patch-src_qt_qtbase_src_corelib_io_qstorageinfo__unix.cpp (contents, props changed) Deleted: head/lang/phantomjs/files/patch-build.sh head/lang/phantomjs/files/patch-configure head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslcontext.cpp head/lang/phantomjs/files/patch-src_qt_qtbase_src_network_ssl_qsslsocket__openssl__symbols.cpp head/lang/phantomjs/files/patch-src_qt_qtbase_src_tools_qlalr_lalr.cpp Modified: head/lang/phantomjs/Makefile head/lang/phantomjs/distinfo head/lang/phantomjs/files/patch-src-phantomjs.pro head/lang/phantomjs/files/patch-src-qt-preconfig.sh Modified: head/lang/phantomjs/Makefile ============================================================================== --- head/lang/phantomjs/Makefile Sun Jan 29 18:28:45 2017 (r432792) +++ head/lang/phantomjs/Makefile Sun Jan 29 19:11:35 2017 (r432793) @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= phantomjs -PORTVERSION= 2.0.0 -PORTREVISION= 6 +PORTVERSION= 2.1.1 +PORTREVISION= 0 CATEGORIES= lang -MASTER_SITES= https://bitbucket.org/ariya/phantomjs/downloads/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= feld@FreeBSD.org COMMENT= Minimalistic, headless, WebKit-based, JavaScript-driven tool @@ -21,13 +19,18 @@ LIB_DEPENDS= libfreetype.so:print/freety BROKEN_sparc64= does not link on sparc64 -USES= bison:build compiler:c++11-lang gmake gperf jpeg perl5 pkgconfig python:build zip +USES= bison:build compiler:c++11-lang gmake gperf jpeg perl5 pkgconfig python:build ssl sqlite +USE_GNOME+= libxml2 USE_PERL5= build USE_RUBY= yes +USE_GITHUB= yes +GH_ACCOUNT= ariya +GH_TUPLE= Vitallium:phantomjs-3rdparty-win:19051aa:msvc2013/src/qt/3rdparty \ + Vitallium:qtbase:b5cc008:qtbase/src/qt/qtbase \ + Vitallium:qtwebkit:e7b7433:qtwebkit/src/qt/qtwebkit RUBY_NO_RUN_DEPENDS= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= bin/phantomjs -#PATCH_DEBUG= yes NO_CCACHE= yes OPTIONS_DEFINE= X11 @@ -35,24 +38,23 @@ X11_USE= XORG=x11 .include -# NOTE: -# build.sh --qtwebkit=system requires Qt 5.3.x. We cannot use it. - # qmake.conf detection is in src/qt/qtbase/configure script. SPEC= ${WRKSRC}/src/qt/qtbase/mkspecs post-extract: ${MKDIR} ${SPEC}/freebsd-clang cd ${SPEC} && ${SED} -e 's|\.\./\.\./|../|g' unsupported/freebsd-clang/qmake.conf > freebsd-clang/qmake.conf cd ${SPEC} && ${SED} -e 's|\.\./\.\./|../|g' unsupported/freebsd-clang/qplatformdefs.h > freebsd-clang/qplatformdefs.h + ${MKDIR} ${WRKSRC}/src/qt/qtbase/.git + ${MKDIR} ${WRKSRC}/src/qt/qtwebkit/.git + ${RM} ${WRKSRC}/src/qt/qtwebkit/Source/WebCore/DerivedSources.cpp _ENV= CC=${CC} CXX=${CXX} GMAKE=${GMAKE} OSTYPE=freebsd MAKEFLAGS= -#_ENV+= CFLAGS="-g -pipe" -_BLD= bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm +_BLD= ${PYTHON_CMD} build.py --jobs ${MAKE_JOBS_NUMBER} --confirm do-build: .if defined(_PHANTOMJS_USE_QT_SYSTEM) cd ${WRKSRC} && ${SETENV} ${_ENV} PATH=${PATH}:${QT_BINDIR} ${_BLD} --qt=system --qtwebkit=system .else - cd ${WRKSRC} && ${SETENV} ${_ENV} PATH=${PATH} ${_BLD} --qt-config '-no-pch' + cd ${WRKSRC} && ${SETENV} ${_ENV} PATH=${PATH} ${_BLD} .endif do-install: Modified: head/lang/phantomjs/distinfo ============================================================================== --- head/lang/phantomjs/distinfo Sun Jan 29 18:28:45 2017 (r432792) +++ head/lang/phantomjs/distinfo Sun Jan 29 19:11:35 2017 (r432793) @@ -1,2 +1,9 @@ -SHA256 (phantomjs-2.0.0-source.zip) = cc81249eaa059cc138414390cade9cb6509b9d6fa0df16f4f43de70b174b3bfe -SIZE (phantomjs-2.0.0-source.zip) = 110092872 +TIMESTAMP = 1484137497 +SHA256 (ariya-phantomjs-2.1.1_GH0.tar.gz) = bd1e63e9cd48d5a9c8ff1affc254eeae14704304437710729f133cb80cf98cf1 +SIZE (ariya-phantomjs-2.1.1_GH0.tar.gz) = 1880406 +SHA256 (Vitallium-phantomjs-3rdparty-win-19051aa_GH0.tar.gz) = cf097cf098c40f9b60255a5c369d968b0e3e3881e25374f00f0c74c265cfd37e +SIZE (Vitallium-phantomjs-3rdparty-win-19051aa_GH0.tar.gz) = 24611974 +SHA256 (Vitallium-qtbase-b5cc008_GH0.tar.gz) = 9bf66dcaa1b522fe41d74574eae949b740a9bec3cd7f8a69e0555f3ffc2fe6a0 +SIZE (Vitallium-qtbase-b5cc008_GH0.tar.gz) = 46446806 +SHA256 (Vitallium-qtwebkit-e7b7433_GH0.tar.gz) = 76d0bc7430919d7f8c12cbc0cae6dd174543e40777d984a6c14af982a3a71fcc +SIZE (Vitallium-qtwebkit-e7b7433_GH0.tar.gz) = 50630572 Added: head/lang/phantomjs/files/patch-build.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-build.py Sun Jan 29 19:11:35 2017 (r432793) @@ -0,0 +1,16 @@ +--- build.py.orig 2016-01-24 18:24:05 UTC ++++ build.py +@@ -56,6 +56,13 @@ openssl_search_paths = [{ + "-I/opt/local/include", + "-L/opt/local/lib" + ] ++}, { ++ "name": "freebsd", ++ "header": "/usr/local/include/openssl/opensslv.h", ++ "flags": [ ++ "-I/usr/local/include", ++ "-L/usr/local/lib" ++ ] + }] + + # check if path points to an executable Modified: head/lang/phantomjs/files/patch-src-phantomjs.pro ============================================================================== --- head/lang/phantomjs/files/patch-src-phantomjs.pro Sun Jan 29 18:28:45 2017 (r432792) +++ head/lang/phantomjs/files/patch-src-phantomjs.pro Sun Jan 29 19:11:35 2017 (r432793) @@ -1,11 +1,10 @@ ---- src/phantomjs.pro.orig 2015-04-03 17:42:14.245640426 +0900 -+++ src/phantomjs.pro 2015-04-03 17:42:47.482878170 +0900 -@@ -68,7 +68,7 @@ - include(linenoise/linenoise.pri) - include(qcommandline/qcommandline.pri) - --linux*|mac|openbsd* { -+linux*|mac|openbsd*|freebsd* { - INCLUDEPATH += breakpad/src - - SOURCES += breakpad/src/client/minidump_file_writer.cc \ +--- src/phantomjs.pro.orig 2016-01-24 18:24:05 UTC ++++ src/phantomjs.pro +@@ -97,3 +97,7 @@ win32-msvc* { + openbsd* { + LIBS += -L/usr/X11R6/lib + } ++ ++freebsd* { ++ LIBS += -L/usr/local/lib ++} Modified: head/lang/phantomjs/files/patch-src-qt-preconfig.sh ============================================================================== --- head/lang/phantomjs/files/patch-src-qt-preconfig.sh Sun Jan 29 18:28:45 2017 (r432792) +++ head/lang/phantomjs/files/patch-src-qt-preconfig.sh Sun Jan 29 19:11:35 2017 (r432793) @@ -1,6 +1,6 @@ ---- src/qt/preconfig.sh.orig 2015-05-24 22:51:56.181745985 +0900 -+++ src/qt/preconfig.sh 2015-05-25 07:48:59.018524838 +0900 -@@ -182,5 +182,6 @@ +--- src/qt/preconfig.sh.orig 2016-01-24 18:24:05 UTC ++++ src/qt/preconfig.sh +@@ -187,5 +187,6 @@ if [[ -n "$SILENT" ]]; then exec >& /dev/null fi Added: head/lang/phantomjs/files/patch-src_qt_qtbase_configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_configure Sun Jan 29 19:11:35 2017 (r432793) @@ -0,0 +1,40 @@ +--- src/qt/qtbase/configure.orig 2015-12-12 12:58:05 UTC ++++ src/qt/qtbase/configure +@@ -51,6 +51,7 @@ mactests="$relpath/config.tests/mac" + WHICH="$unixtests/which.test" + + PERL=`$WHICH perl 2>/dev/null` ++export CXX=${CXX} + + # find out which awk we want to use, prefer gawk, then nawk, then regular awk + AWK= +@@ -2791,11 +2792,19 @@ if [ -z "$PLATFORM" ]; then + ULTRIX:*) + PLATFORM=ultrix-g++ + ;; ++# FreeBSD:10.[0-9]*) ++# echo "=== ($UNAME_RELEASE) ===" ++# PLATFORM=freebsd-clang ++# ;; + FreeBSD:*) +- PLATFORM=freebsd-g++ ++ PLATFORM=freebsd-clang + PLATFORM_NOTES=" + - Also available for FreeBSD: freebsd-icc + " ++ type g++ >/dev/null && PLATFORM=freebsd-g++ ++ type g++46 >/dev/null && PLATFORM=freebsd-g++46 ++ type g++48 >/dev/null && PLATFORM=freebsd-g++48 ++ type g++49 >/dev/null && PLATFORM=freebsd-g++49 + ;; + OpenBSD:*) + PLATFORM=openbsd-g++ +@@ -6359,7 +6368,7 @@ case "$XPLATFORM" in + ;; + *-g++*) + # Check gcc's version +- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in ++ case "$(${TEST_COMPILER} -dumpversion)" in + 4*|3.4*) + ;; + 3.3*) Added: head/lang/phantomjs/files/patch-src_qt_qtbase_src_3rdparty_icu__dependency.pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_src_3rdparty_icu__dependency.pri Sun Jan 29 19:11:35 2017 (r432793) @@ -0,0 +1,10 @@ +--- src/qt/qtbase/src/3rdparty/icu_dependency.pri.orig 2015-12-12 12:58:05 UTC ++++ src/qt/qtbase/src/3rdparty/icu_dependency.pri +@@ -10,7 +10,4 @@ win32 { + } + } else { + LIBS_PRIVATE += -licui18n -licuuc -licudata +- CONFIG(static) { +- LIBS_PRIVATE += -ldl +- } + } Added: head/lang/phantomjs/files/patch-src_qt_qtbase_src_corelib_io_qstorageinfo__unix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_src_corelib_io_qstorageinfo__unix.cpp Sun Jan 29 19:11:35 2017 (r432793) @@ -0,0 +1,18 @@ +--- src/qt/qtbase/src/corelib/io/qstorageinfo_unix.cpp.orig 2015-12-12 12:58:05 UTC ++++ src/qt/qtbase/src/corelib/io/qstorageinfo_unix.cpp +@@ -506,9 +506,15 @@ void QStorageInfoPrivate::retrieveVolume + valid = true; + ready = true; + ++#if defined(Q_OS_FREEBSD) ++ bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize; ++ bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize; ++ bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize; ++#else + bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize; + bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize; + bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize; ++#endif + #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4) + #if defined(_STATFS_F_FLAGS) + readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;