From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 19 19:50:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 618061065674 for ; Sat, 19 May 2012 19:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F21858FC18 for ; Sat, 19 May 2012 19:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4JJo2SR054320 for ; Sat, 19 May 2012 19:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4JJo2Wu054319; Sat, 19 May 2012 19:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 19 May 2012 19:50:02 GMT Resent-Message-Id: <201205191950.q4JJo2Wu054319@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Brovikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E065106566B for ; Sat, 19 May 2012 19:49:46 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 79C1B8FC15 for ; Sat, 19 May 2012 19:49:46 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q4JJnj3r022822 for ; Sat, 19 May 2012 19:49:45 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q4JJnjFV022821; Sat, 19 May 2012 19:49:45 GMT (envelope-from nobody) Message-Id: <201205191949.q4JJnjFV022821@red.freebsd.org> Date: Sat, 19 May 2012 19:49:45 GMT From: Alexander Brovikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/168150: [PATCH] update lang/phantomjs to 1.5.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2012 19:50:03 -0000 >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@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@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 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 -+#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 +@dirrm lib/phantomjs \ No newline at end of file >Release-Note: >Audit-Trail: >Unformatted: