ports/168150: [PATCH] update lang/phantomjs to 1.5.0

[Alexander Brovikov]

>Number:         168150
>Category:       ports
>Synopsis:       [PATCH] update lang/phantomjs to 1.5.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 19 19:50:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Brovikov
>Release:        8.3-RELEASE
>Organization:
>Environment:
FreeBSD hostname 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr  9 21:47:23 UTC 2012     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
- update to 1.5.0
-> phantomjs now shipped with bundled qt & webkit, so build takes roughly 30 min.
- added LICENSE in Makefile
- shared Qt libs are installed in lib/phantomjs
- removed files/patch-src-mongoose-mongoose.c
- added files/patch-mongoose-pri
- added pkg-plist

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/lang/phantomjs.orig/Makefile /usr/ports/lang/phantomjs/Makefile
--- /usr/ports/lang/phantomjs.orig/Makefile	2012-01-09 07:53:59.000000000 +0600
+++ /usr/ports/lang/phantomjs/Makefile	2012-05-19 16:49:02.000000000 +0600
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phantomjs
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -14,19 +14,27 @@
 MAINTAINER=	kuriyama at FreeBSD.org
 COMMENT=	Minimalistic, headless, WebKit-based, JavaScript-driven tool
 
+LICENSE=	BSD
+
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+
 PROJECTHOST=	phantomjs
-USE_QT_VER=	4
 USE_GMAKE=	YES
 USE_DOS2UNIX=	YES
-QT_COMPONENTS=	moc qmake gui webkit rcc
-PLIST_FILES=	bin/phantomjs
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_LDCONFIG=	${PREFIX}/lib/phantomjs
 
 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} && ./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>
diff -urN /usr/ports/lang/phantomjs.orig/distinfo /usr/ports/lang/phantomjs/distinfo
--- /usr/ports/lang/phantomjs.orig/distinfo	2012-01-09 07:53:59.000000000 +0600
+++ /usr/ports/lang/phantomjs/distinfo	2012-05-18 16:55:25.000000000 +0600
@@ -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.5.0-source.tar.gz) = 71de74bf4e6551708cd84dd75b99125b144ea52dcc6e236eb51e5df3b35fbf52
+SIZE (phantomjs-1.5.0-source.tar.gz) = 24232725
diff -urN /usr/ports/lang/phantomjs.orig/files/patch-mongoose-pri /usr/ports/lang/phantomjs/files/patch-mongoose-pri
--- /usr/ports/lang/phantomjs.orig/files/patch-mongoose-pri	1970-01-01 05:00:00.000000000 +0500
+++ /usr/ports/lang/phantomjs/files/patch-mongoose-pri	2012-05-16 03:09:28.000000000 +0600
@@ -0,0 +1,8 @@
+--- 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
diff -urN /usr/ports/lang/phantomjs.orig/files/patch-src-mongoose-mongoose.c /usr/ports/lang/phantomjs/files/patch-src-mongoose-mongoose.c
--- /usr/ports/lang/phantomjs.orig/files/patch-src-mongoose-mongoose.c	2012-01-09 07:53:59.000000000 +0600
+++ /usr/ports/lang/phantomjs/files/patch-src-mongoose-mongoose.c	1970-01-01 05:00:00.000000000 +0500
@@ -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
diff -urN /usr/ports/lang/phantomjs.orig/pkg-plist /usr/ports/lang/phantomjs/pkg-plist
--- /usr/ports/lang/phantomjs.orig/pkg-plist	1970-01-01 05:00:00.000000000 +0500
+++ /usr/ports/lang/phantomjs/pkg-plist	2012-05-19 16:42:19.000000000 +0600
@@ -0,0 +1,6 @@
+bin/phantomjs
+lib/phantomjs/libQtWebKit.so.4
+lib/phantomjs/libQtGui.so.4
+lib/phantomjs/libQtNetwork.so.4
+lib/phantomjs/libQtCore.so.4
+ at dirrm lib/phantomjs
\ No newline at end of file


>Release-Note:
>Audit-Trail:
>Unformatted: