6 files changed, 66 insertions, 48 deletions

diff --git a/lang/phantomjs/files/patch-build.sh b/lang/phantomjs/files/patch-build.sh
new file mode 100644
index 000000000000..cc62f7946a53
--- /dev/null
+++ b/lang/phantomjs/files/patch-build.sh
@@ -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
diff --git a/lang/phantomjs/files/patch-config.tests-fontconfig.pro b/lang/phantomjs/files/patch-config.tests-fontconfig.pro
deleted file mode 100644
index 13a09dbdd692..000000000000
--- a/lang/phantomjs/files/patch-config.tests-fontconfig.pro
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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)
diff --git a/lang/phantomjs/files/patch-configure b/lang/phantomjs/files/patch-configure
index 2eaec84b01e7..94b56701a79f 100644
--- a/lang/phantomjs/files/patch-configure
+++ b/lang/phantomjs/files/patch-configure
@@ -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
diff --git a/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf b/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf
index e08a0ec4d300..c59a2614a79c 100644
--- a/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf
+++ b/lang/phantomjs/files/patch-mkspecs-freebsd-g++-qmake.conf
@@ -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)
diff --git a/lang/phantomjs/files/patch-src-phantomjs.pro b/lang/phantomjs/files/patch-src-phantomjs.pro
index 9e9dc119d741..700b579ffa7f 100644
--- a/lang/phantomjs/files/patch-src-phantomjs.pro
+++ b/lang/phantomjs/files/patch-src-phantomjs.pro
@@ -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 \
diff --git a/lang/phantomjs/files/patch-src-qt-preconfig.sh b/lang/phantomjs/files/patch-src-qt-preconfig.sh
new file mode 100644
index 000000000000..252d74c7703f
--- /dev/null
+++ b/lang/phantomjs/files/patch-src-qt-preconfig.sh
@@ -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 "$@"