Date: Sun, 5 Aug 2012 02:31:53 +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: r302042 - in head/lang/phantomjs: . files Message-ID: <201208050231.q752VrvF025340@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kuriyama Date: Sun Aug 5 02:31:53 2012 New Revision: 302042 URL: http://svn.freebsd.org/changeset/ports/302042 Log: - Upgrade to 1.6.1. PR based on: ports/168150 Submitted by: Alexander Brovikov <alexander@brovikov.ru> Added: head/lang/phantomjs/files/patch-build.sh (contents, props changed) head/lang/phantomjs/files/patch-mongoose-pri (contents, props changed) head/lang/phantomjs/pkg-plist (contents, props changed) Modified: head/lang/phantomjs/Makefile head/lang/phantomjs/distinfo head/lang/phantomjs/files/patch-src-mongoose-mongoose.c Modified: head/lang/phantomjs/Makefile ============================================================================== --- head/lang/phantomjs/Makefile Sun Aug 5 01:56:58 2012 (r302041) +++ head/lang/phantomjs/Makefile Sun Aug 5 02:31:53 2012 (r302042) @@ -6,8 +6,7 @@ # PORTNAME= phantomjs -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.6.1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -15,18 +14,28 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-sou MAINTAINER= kuriyama@FreeBSD.org COMMENT= Minimalistic, headless, WebKit-based, JavaScript-driven tool +LICENSE= BSD + +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash + PROJECTHOST= phantomjs +USE_ZIP= YES USE_GMAKE= YES USE_DOS2UNIX= YES USE_QT4= moc qmake gui webkit rcc -PLIST_FILES= bin/phantomjs WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-build: - cd ${WRKSRC}/src/ && ${QMAKE} phantomjs.pro -o Makefile.phantomjs && ${REINPLACE_CMD} -e 's|-ldl||g' Makefile.phantomjs - cd ${WRKSRC}/src/ && ${GMAKE} -f Makefile.phantomjs all + cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|!/|!/usr/local/|g' build.sh + cd ${WRKSRC}/src/qt && ${REINPLACE_CMD} -e 's|!/|!/usr/local/|g' preconfig.sh + cd ${WRKSRC} && ${LOCALBASE}/bin/bash -x build.sh --jobs 2 do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/phantomjs ${PREFIX}/bin/ + ${MKDIR} ${PREFIX}/lib/phantomjs/ + cd ${WRKSRC} && ${INSTALL_LIB} src/qt/lib/libQtWebKit.so.4 ${PREFIX}/lib/phantomjs/ + cd ${WRKSRC} && ${INSTALL_LIB} src/qt/lib/libQtGui.so.4 ${PREFIX}/lib/phantomjs/ + cd ${WRKSRC} && ${INSTALL_LIB} src/qt/lib/libQtNetwork.so.4 ${PREFIX}/lib/phantomjs/ + cd ${WRKSRC} && ${INSTALL_LIB} src/qt/lib/libQtCore.so.4 ${PREFIX}/lib/phantomjs/ .include <bsd.port.mk> Modified: head/lang/phantomjs/distinfo ============================================================================== --- head/lang/phantomjs/distinfo Sun Aug 5 01:56:58 2012 (r302041) +++ head/lang/phantomjs/distinfo Sun Aug 5 02:31:53 2012 (r302042) @@ -1,2 +1,2 @@ -SHA256 (phantomjs-1.4.1-source.tar.gz) = 93df6e2125d560c10519a79b5502833b37a4986a2bc9fc42cc6d65e3536d20a4 -SIZE (phantomjs-1.4.1-source.tar.gz) = 497856 +SHA256 (phantomjs-1.6.1-source.zip) = e3e0020a6b3b9c3ff747aa2ab865998f7759faa4e0cb894aa01bb957510217c2 +SIZE (phantomjs-1.6.1-source.zip) = 39443796 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 Sun Aug 5 02:31:53 2012 (r302042) @@ -0,0 +1,52 @@ +$FreeBSD$ + +--- build.sh.orig 2012-07-30 01:56:37.113285721 +0900 ++++ build.sh 2012-07-30 06:42:31.502288222 +0900 +@@ -7,27 +7,27 @@ + COMPILE_JOBS=1 + MAKEFLAGS_JOBS='' + +-if [[ "$MAKEFLAGS" != "" ]]; then +- MAKEFLAGS_JOBS=$(echo $MAKEFLAGS | egrep -o '\-j[0-9]+' | egrep -o '[0-9]+') +-fi ++#if [[ "$MAKEFLAGS" != "" ]]; then ++# MAKEFLAGS_JOBS=$(echo $MAKEFLAGS | egrep -o '\-j[0-9]+' | egrep -o '[0-9]+') ++#fi + +-if [[ "$MAKEFLAGS_JOBS" != "" ]]; then +- # user defined number of jobs in MAKEFLAGS, re-use that number +- COMPILE_JOBS=$MAKEFLAGS_JOBS +-elif [[ $OSTYPE = darwin* ]]; then +- # We only support modern Mac machines, they are at least using +- # hyperthreaded dual-core CPU. +- COMPILE_JOBS=4 +-else +- CPU_CORES=`grep -c ^processor /proc/cpuinfo` +- if [[ "$CPU_CORES" -gt 1 ]]; then +- COMPILE_JOBS=$CPU_CORES +- if [[ "$COMPILE_JOBS" -gt 8 ]]; then +- # Safety net. +- COMPILE_JOBS=8 +- fi +- fi +-fi ++#if [[ "$MAKEFLAGS_JOBS" != "" ]]; then ++# # user defined number of jobs in MAKEFLAGS, re-use that number ++# COMPILE_JOBS=$MAKEFLAGS_JOBS ++#elif [[ $OSTYPE = darwin* ]]; then ++# # We only support modern Mac machines, they are at least using ++# # hyperthreaded dual-core CPU. ++# COMPILE_JOBS=4 ++#else ++# CPU_CORES=`grep -c ^processor /proc/cpuinfo` ++# if [[ "$CPU_CORES" -gt 1 ]]; then ++# COMPILE_JOBS=$CPU_CORES ++# if [[ "$COMPILE_JOBS" -gt 8 ]]; then ++# # Safety net. ++# COMPILE_JOBS=8 ++# fi ++# fi ++#fi + + until [ -z "$1" ]; do + case $1 in Added: head/lang/phantomjs/files/patch-mongoose-pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/files/patch-mongoose-pri Sun Aug 5 02:31:53 2012 (r302042) @@ -0,0 +1,10 @@ +$FreeBSD$ + +--- src/mongoose/mongoose.pri.orig 2012-05-16 01:39:25.000000000 +0600 ++++ src/mongoose/mongoose.pri 2012-05-16 03:08:39.000000000 +0600 +@@ -3,5 +3,4 @@ + + SOURCES += mongoose.c + HEADERS += mongoose.h +-unix:LIBS += -ldl + win32:LIBS += -lWs2_32 Modified: head/lang/phantomjs/files/patch-src-mongoose-mongoose.c ============================================================================== --- head/lang/phantomjs/files/patch-src-mongoose-mongoose.c Sun Aug 5 01:56:58 2012 (r302041) +++ head/lang/phantomjs/files/patch-src-mongoose-mongoose.c Sun Aug 5 02:31:53 2012 (r302042) @@ -1,13 +0,0 @@ ---- src/mongoose/mongoose.c.orig 2012-01-08 11:06:17.000000000 +0800 -+++ src/mongoose/mongoose.c 2012-01-08 11:08:32.000000000 +0800 -@@ -18,6 +18,10 @@ - // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - // THE SOFTWARE. - -+#if defined(__FreeBSD__) -+#include <sys/socket.h> -+#endif -+ - #if defined(_WIN32) - #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005 - #else \ No newline at end of file Added: head/lang/phantomjs/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/phantomjs/pkg-plist Sun Aug 5 02:31:53 2012 (r302042) @@ -0,0 +1,7 @@ +@comment $FreeBSD$ +bin/phantomjs +lib/phantomjs/libQtWebKit.so.4 +lib/phantomjs/libQtGui.so.4 +lib/phantomjs/libQtNetwork.so.4 +lib/phantomjs/libQtCore.so.4 +@dirrm lib/phantomjs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208050231.q752VrvF025340>