Date: Wed, 2 Sep 2015 02:08:27 +0000 (UTC) From: Jun Kuriyama <kuriyama@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395816 - in head/lang/phantomjs: . files Message-ID: <201509020208.t8228Rxq031601@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kuriyama Date: Wed Sep 2 02:08:26 2015 New Revision: 395816 URL: https://svnweb.freebsd.org/changeset/ports/395816 Log: - Upgrade to 2.0.0. Added: head/lang/phantomjs/files/patch-build.sh (contents, props changed) head/lang/phantomjs/files/patch-src-qt-preconfig.sh (contents, props changed) Deleted: head/lang/phantomjs/files/patch-config.tests-fontconfig.pro Modified: head/lang/phantomjs/Makefile head/lang/phantomjs/distinfo head/lang/phantomjs/files/patch-configure head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf head/lang/phantomjs/files/patch-src-phantomjs.pro Modified: head/lang/phantomjs/Makefile ============================================================================== --- head/lang/phantomjs/Makefile Wed Sep 2 01:46:15 2015 (r395815) +++ head/lang/phantomjs/Makefile Wed Sep 2 02:08:26 2015 (r395816) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= phantomjs -PORTVERSION= 1.9.8 -#PORTREVISION= 0 +PORTVERSION= 2.0.0 CATEGORIES= lang MASTER_SITES= https://bitbucket.org/ariya/phantomjs/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -12,19 +11,46 @@ COMMENT= Minimalistic, headless, WebKit- LICENSE= BSD3CLAUSE -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ + python:${PORTSDIR}/lang/python LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libicui18n.so:${PORTSDIR}/devel/icu \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng.so:${PORTSDIR}/graphics/png PROJECTHOST= phantomjs -USES= gmake dos2unix pkgconfig zip -USE_GCC= any +USES= bison:build compiler gmake perl5 pkgconfig python:build zip +USE_PERL5= build +USE_RUBY= yes +RUBY_NO_RUN_DEPENDS= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= bin/phantomjs +#PATCH_DEBUG= yes +# 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: + cd ${SPEC} && ${CP} -r freebsd-g++46 freebsd-g++48 + cd ${SPEC} && ${CP} -r freebsd-g++46 freebsd-g++49 + cd ${SPEC} && ${REINPLACE_CMD} -e 's|46|48|' freebsd-g++48/qmake.conf + cd ${SPEC} && ${REINPLACE_CMD} -e 's|46|49|' freebsd-g++49/qmake.conf + ${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 + +_ENV= CC=${CC} CXX=${CXX} GMAKE=${GMAKE} OSTYPE=freebsd MAKEFLAGS= +#_ENV+= CFLAGS="-g -pipe" +_BLD= bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm do-build: - cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} OSTYPE=freebsd MAKEFLAGS= PATH=${PATH} bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm \ - --qt-config '-no-pch' +.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' +.endif do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/phantomjs ${STAGEDIR}${PREFIX}/bin/ Modified: head/lang/phantomjs/distinfo ============================================================================== --- head/lang/phantomjs/distinfo Wed Sep 2 01:46:15 2015 (r395815) +++ head/lang/phantomjs/distinfo Wed Sep 2 02:08:26 2015 (r395816) @@ -1,2 +1,2 @@ -SHA256 (phantomjs-1.9.8-source.zip) = 37e53b2907bf37d2b6a43f08d38bb4a15596bba337822179e647efd60c2261bf -SIZE (phantomjs-1.9.8-source.zip) = 40965044 +SHA256 (phantomjs-2.0.0-source.zip) = cc81249eaa059cc138414390cade9cb6509b9d6fa0df16f4f43de70b174b3bfe +SIZE (phantomjs-2.0.0-source.zip) = 110092872 Added: head/lang/phantomjs/files/patch-build.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-build.sh Wed Sep 2 02:08:26 2015 (r395816) @@ -0,0 +1,26 @@ +--- build.sh.orig 2015-05-24 22:42:43.825783273 +0900 ++++ build.sh 2015-05-27 15:04:32.203956214 +0900 +@@ -152,12 +152,12 @@ + + if [[ "$QTCORE" == "bundled" ]]; then + export QMAKE=$PWD/src/qt/qtbase/bin/qmake +- ( cd src/qt && ./preconfig.sh $QTDEPLIBS $QT_CFG ) ++ ( cd src/qt && bash -x ./preconfig.sh $QTDEPLIBS $QT_CFG ) + + echo + echo "Building Qt..." + echo +- ( cd src/qt/qtbase && make -j$COMPILE_JOBS $MAKE_S ) ++ ( cd src/qt/qtbase && ${GMAKE} -j$COMPILE_JOBS $MAKE_S ) + else + export QMAKE=qmake + # some Linux distros (e.g. Debian) allow you to parallel-install +@@ -189,7 +189,7 @@ + + ( cd src/qt/qtwebkit && + $QMAKE "WEBKIT_CONFIG -= $WEBKIT_DISABLE" $QMAKE_ARGS && +- make -j$COMPILE_JOBS $MAKE_S ) ++ ${GMAKE} -j$COMPILE_JOBS $MAKE_S ) + fi + + echo Modified: head/lang/phantomjs/files/patch-configure ============================================================================== --- head/lang/phantomjs/files/patch-configure Wed Sep 2 01:46:15 2015 (r395815) +++ head/lang/phantomjs/files/patch-configure Wed Sep 2 02:08:26 2015 (r395816) @@ -1,17 +1,6 @@ ---- src/qt/configure.orig 2013-12-31 18:16:16.149123834 +0900 -+++ src/qt/configure 2013-12-31 18:21:26.989125910 +0900 -@@ -2707,8 +2707,8 @@ - ShadowMkspecs() - { - rm -rf "$outpath/mkspecs/$1" -- find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p -- find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done -+ find -s "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p -+ find -s "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done - } - - # Special case for mkspecs/features directory. -@@ -2880,6 +2880,10 @@ +--- src/qt/qtbase/configure.orig 2015-05-24 22:39:30.864797690 +0900 ++++ src/qt/qtbase/configure 2015-08-29 19:51:35.227904574 +0900 +@@ -2617,11 +2617,19 @@ ULTRIX:*) PLATFORM=ultrix-g++ ;; @@ -20,26 +9,27 @@ +# PLATFORM=freebsd-clang +# ;; FreeBSD:*) - PLATFORM=freebsd-g++ +- PLATFORM=freebsd-g++ ++ PLATFORM=freebsd-clang PLATFORM_NOTES=" -@@ -3017,7 +3021,7 @@ - CFG_SM=no - PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"` - else -- PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"` -+ PLATFORMS=`find -s "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"` + - 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++ +@@ -3971,6 +3979,7 @@ + fi fi - [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM" -@@ -5118,6 +5122,7 @@ - # tests that need qmake - #------------------------------------------------------------------------------- - +export CXX="${CXX}" # detect availability of float math.h functions - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then + if compileTest unix/floatmath "floatmath"; then CFG_USE_FLOATMATH=yes -@@ -7665,7 +7670,7 @@ +@@ -5793,7 +5802,7 @@ ;; *-g++*) # Check gcc's version Modified: head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf ============================================================================== --- head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf Wed Sep 2 01:46:15 2015 (r395815) +++ head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf Wed Sep 2 02:08:26 2015 (r395816) @@ -1,11 +1,11 @@ ---- src/qt/mkspecs/freebsd-g++/qmake.conf.orig 2013-12-23 19:04:54.234123703 +0900 -+++ src/qt/mkspecs/freebsd-g++/qmake.conf 2013-12-23 23:55:19.434123270 +0900 -@@ -51,4 +51,8 @@ +--- src/qt/qtbase/mkspecs/freebsd-g++/qmake.conf.orig 2015-01-24 11:19:52.000000000 +0900 ++++ src/qt/qtbase/mkspecs/freebsd-g++/qmake.conf 2015-09-02 10:38:29.496373596 +0900 +@@ -33,4 +33,8 @@ include(../common/unix.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) -+QMAKE_CC = $$(CC) -+QMAKE_CXX = $$(CXX) -+#QMAKE_LINK_SHLIB = $$(CXX) -+QMAKE_LINK = $$(CXX) ++#QMAKE_CC = $(CC) ++#QMAKE_CXX = $(CXX) ++#QMAKE_LINK_SHLIB = $(CXX) ++#QMAKE_LINK = $(CXX) load(qt_config) Modified: head/lang/phantomjs/files/patch-src-phantomjs.pro ============================================================================== --- head/lang/phantomjs/files/patch-src-phantomjs.pro Wed Sep 2 01:46:15 2015 (r395815) +++ head/lang/phantomjs/files/patch-src-phantomjs.pro Wed Sep 2 02:08:26 2015 (r395816) @@ -1,11 +1,11 @@ ---- src/phantomjs.pro.orig 2013-10-01 10:49:57.204247173 +0900 -+++ src/phantomjs.pro 2013-10-01 10:50:42.830414131 +0900 -@@ -60,7 +60,7 @@ +--- 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 { -+linux*|mac|freebsd* { +-linux*|mac|openbsd* { ++linux*|mac|openbsd*|freebsd* { INCLUDEPATH += breakpad/src SOURCES += breakpad/src/client/minidump_file_writer.cc \ Added: head/lang/phantomjs/files/patch-src-qt-preconfig.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-src-qt-preconfig.sh Wed Sep 2 02:08:26 2015 (r395816) @@ -0,0 +1,10 @@ +--- 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 @@ + exec >& /dev/null + fi + ++export CXX=${CXX} + cd qtbase +-exec ./configure -prefix $PWD $QT_CFG "$@" ++exec bash -x ./configure -prefix $PWD $QT_CFG "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509020208.t8228Rxq031601>