diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2013-05-27 22:32:14 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2013-05-27 22:32:14 +0000 |
commit | a3312a1051ab6a116e1e0d34e3305a6a9fe8dfd1 (patch) | |
tree | 09121a3a1f210e96526910bfeaf2a56ecd7f1604 /lang/phantomjs | |
parent | - Fix incorrect portmaster instructions for ruby update (diff) |
- Upgrade to 1.9.0.
Submitted by: L Campbell lcampbell@uncod.in
Notes
Notes:
svn path=/head/; revision=319287
Diffstat (limited to 'lang/phantomjs')
-rw-r--r-- | lang/phantomjs/Makefile | 6 | ||||
-rw-r--r-- | lang/phantomjs/distinfo | 4 | ||||
-rw-r--r-- | lang/phantomjs/files/patch-build.sh | 68 | ||||
-rw-r--r-- | lang/phantomjs/files/patch-mongoose-pri | 10 |
4 files changed, 4 insertions, 84 deletions
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile index 065d162651df..b24919482315 100644 --- a/lang/phantomjs/Makefile +++ b/lang/phantomjs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phantomjs -PORTVERSION= 1.8.1 +PORTVERSION= 1.9.0 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -21,9 +21,7 @@ USE_QT4= moc qmake gui webkit rcc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} do-build: - 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 + cd ${WRKSRC} && ${SETENV} OSTYPE=freebsd MAKEFLAGS= bash -x build.sh --jobs 2 --confirm do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/phantomjs ${PREFIX}/bin/ diff --git a/lang/phantomjs/distinfo b/lang/phantomjs/distinfo index 2d80ec10cda5..1e91123536fd 100644 --- a/lang/phantomjs/distinfo +++ b/lang/phantomjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (phantomjs-1.8.1-source.zip) = 16e10bd9cde1bd7a6edbeeaa88ee0e91c4f60b236e541676a5328611df4bfa6a -SIZE (phantomjs-1.8.1-source.zip) = 40626032 +SHA256 (phantomjs-1.9.0-source.zip) = f51ebd98df9fd628544b719b41bb5b42a180afa603888c62a04e5e5ace588d0b +SIZE (phantomjs-1.9.0-source.zip) = 40903639 diff --git a/lang/phantomjs/files/patch-build.sh b/lang/phantomjs/files/patch-build.sh deleted file mode 100644 index 037058fad7c1..000000000000 --- a/lang/phantomjs/files/patch-build.sh +++ /dev/null @@ -1,68 +0,0 @@ -$FreeBSD$ - ---- build.sh.orig 2013-01-15 07:48:35.556438142 +0900 -+++ build.sh 2013-01-15 07:50:27.581439602 +0900 -@@ -8,27 +8,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_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" != "" ]]; 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 - - until [ -z "$1" ]; do - case $1 in -@@ -78,10 +78,10 @@ - EOF - - echo "Do you want to continue (y/n)?" -- read continue -- if [[ "$continue" != "y" ]]; then -- exit 1 -- fi -+# read continue -+# if [[ "$continue" != "y" ]]; then -+# exit 1 -+# fi - echo - echo - fi diff --git a/lang/phantomjs/files/patch-mongoose-pri b/lang/phantomjs/files/patch-mongoose-pri deleted file mode 100644 index 067aa888b2c5..000000000000 --- a/lang/phantomjs/files/patch-mongoose-pri +++ /dev/null @@ -1,10 +0,0 @@ -$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 |