From owner-svn-ports-all@FreeBSD.ORG Tue Dec 31 12:26:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F382CA0; Tue, 31 Dec 2013 12:26:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7FC451D86; Tue, 31 Dec 2013 12:26:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVCQa6s081021; Tue, 31 Dec 2013 12:26:36 GMT (envelope-from kuriyama@svn.freebsd.org) Received: (from kuriyama@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBVCQZVn081017; Tue, 31 Dec 2013 12:26:35 GMT (envelope-from kuriyama@svn.freebsd.org) Message-Id: <201312311226.rBVCQZVn081017@svn.freebsd.org> From: Jun Kuriyama Date: Tue, 31 Dec 2013 12:26:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338283 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2013 12:26:36 -0000 Author: kuriyama Date: Tue Dec 31 12:26:35 2013 New Revision: 338283 URL: http://svnweb.freebsd.org/changeset/ports/338283 Log: - Unbreak on 10.0 by USE_GCC=4.2+. This may change dependencies other than 10.x environment, so bump PORTREVISION for safety. Added: head/lang/phantomjs/files/patch-config.tests-fontconfig.pro (contents, props changed) head/lang/phantomjs/files/patch-configure (contents, props changed) head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf (contents, props changed) Modified: head/lang/phantomjs/Makefile Modified: head/lang/phantomjs/Makefile ============================================================================== --- head/lang/phantomjs/Makefile Tue Dec 31 11:52:41 2013 (r338282) +++ head/lang/phantomjs/Makefile Tue Dec 31 12:26:35 2013 (r338283) @@ -2,7 +2,7 @@ PORTNAME= phantomjs PORTVERSION= 1.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -17,12 +17,13 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig PROJECTHOST= phantomjs -USES= gmake dos2unix +USE_GCC= 4.2+ +USES= gmake dos2unix pkgconfig USE_ZIP= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-build: - cd ${WRKSRC} && ${SETENV} OSTYPE=freebsd MAKEFLAGS= bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm + cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} OSTYPE=freebsd MAKEFLAGS= PATH=${PATH} bash -x build.sh --jobs ${MAKE_JOBS_NUMBER} --confirm do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/phantomjs ${STAGEDIR}${PREFIX}/bin/ Added: head/lang/phantomjs/files/patch-config.tests-fontconfig.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-config.tests-fontconfig.pro Tue Dec 31 12:26:35 2013 (r338283) @@ -0,0 +1,8 @@ +--- src/qt/config.tests/x11/fontconfig/fontconfig.pro.orig 2013-12-31 13:08:24.457123877 +0900 ++++ src/qt/config.tests/x11/fontconfig/fontconfig.pro 2013-12-31 13:08:35.878125769 +0900 +@@ -1,5 +1,4 @@ + SOURCES = fontconfig.cpp +-CONFIG += x11 + CONFIG -= qt + LIBS += -lfreetype -lfontconfig + include(../../unix/freetype/freetype.pri) Added: head/lang/phantomjs/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-configure Tue Dec 31 12:26:35 2013 (r338283) @@ -0,0 +1,50 @@ +--- 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 @@ + ULTRIX:*) + PLATFORM=ultrix-g++ + ;; ++# FreeBSD:10.[0-9]*) ++# echo "=== ($UNAME_RELEASE) ===" ++# PLATFORM=freebsd-clang ++# ;; + FreeBSD:*) + PLATFORM=freebsd-g++ + 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/,,"` + 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 + CFG_USE_FLOATMATH=yes +@@ -7665,7 +7670,7 @@ + ;; + *-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-mkspecs-freebsd-g++-qmake.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf Tue Dec 31 12:26:35 2013 (r338283) @@ -0,0 +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 @@ + 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) + load(qt_config)