From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 19 02:40:03 2009 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 155061065670 for ; Mon, 19 Jan 2009 02:40: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 E61FF8FC1B for ; Mon, 19 Jan 2009 02:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0J2e2eV040054 for ; Mon, 19 Jan 2009 02:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0J2e2tB040053; Mon, 19 Jan 2009 02:40:02 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jan 2009 02:40:02 GMT Resent-Message-Id: <200901190240.n0J2e2tB040053@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, Shane Bell Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90E13106564A for ; Mon, 19 Jan 2009 02:36:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 757A68FC0C for ; Mon, 19 Jan 2009 02:36:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n0J2aNkW038765 for ; Mon, 19 Jan 2009 02:36:23 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n0J2aNXW038764; Mon, 19 Jan 2009 02:36:23 GMT (envelope-from nobody) Message-Id: <200901190236.n0J2aNXW038764@www.freebsd.org> Date: Mon, 19 Jan 2009 02:36:23 GMT From: Shane Bell To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/130725: [UPDATE]: www/arora, update to 0.4 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: Mon, 19 Jan 2009 02:40:03 -0000 >Number: 130725 >Category: ports >Synopsis: [UPDATE]: www/arora, update to 0.4 >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: Mon Jan 19 02:40:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Shane Bell >Release: >Organization: >Environment: >Description: - Update to 0.4 - Update WWW >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/www/arora/Makefile arora/Makefile --- /usr/ports/www/arora/Makefile 2008-09-23 15:02:01.000000000 +1200 +++ arora/Makefile 2009-01-18 23:21:02.000000000 +1300 @@ -5,40 +5,45 @@ # $FreeBSD: ports/www/arora/Makefile,v 1.2 2008/09/21 08:50:25 miwi Exp $ PORTNAME= arora -PORTVERSION= 0.3 -PORTREVISION= 1 +PORTVERSION= 0.4 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE MAINTAINER= andy@athame.co.uk COMMENT= Simple Qt4 based browser USE_QT_VER= 4 QT_COMPONENTS= network webkit qmake_build moc_build uic_build rcc_build \ - imageformats + imageformats gui HAS_CONFIGURE= yes QMAKE_ARGS+= -unix -recursive PREFIX=${PREFIX} MAN1= arora.1 -.if !defined(WITHOUT_NLS) +.if defined(WITHOUT_NLS) +PLIST_SUB+= NLS="@comment " +.else QT_COMPONENTS+= linguist_build PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " .endif do-configure: .if defined(WITHOUT_NLS) @${REINPLACE_CMD} -e "/INSTALLS/s|translations||" \ - -e "/PRE_TARGETDEPS/s|compiler_updateqm_make_all||" \ ${WRKSRC}/src/src.pro + @${REINPLACE_CMD} -e "/PRE_TARGETDEPS/s|compiler_updateqm_make_all||" \ + ${WRKSRC}/src/locale/locale.pri .endif + @${REINPLACE_CMD} -e "/INSTALLS/s|man man-compress||" \ + ${WRKSRC}/src/src.pro + @${REINPLACE_CMD} -e "/else/s|lrelease|lrelease-qt4|" \ + ${WRKSRC}/src/locale/locale.pri cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS} post-configure: - @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \ - 's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|' + ${REINPLACE_CMD} -e \ + 's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|' \ + ${WRKSRC}/src/Makefile post-install: ${INSTALL_MAN} ${WRKSRC}/src/data/arora.1 ${PREFIX}/man/man1/ diff -ruN /usr/ports/www/arora/distinfo arora/distinfo --- /usr/ports/www/arora/distinfo 2008-08-10 09:03:44.000000000 +1200 +++ arora/distinfo 2009-01-18 20:08:42.000000000 +1300 @@ -1,3 +1,3 @@ -MD5 (arora-0.3.tar.gz) = 6da3c659f99775cee38b38b1ca85e173 -SHA256 (arora-0.3.tar.gz) = c632a6a75f7fe22ad5cdad2a58f1bc4ed50bb8827c299f89add9f03967634afe -SIZE (arora-0.3.tar.gz) = 644516 +MD5 (arora-0.4.tar.gz) = 702d29d021f7ac2c4e3ace3252876071 +SHA256 (arora-0.4.tar.gz) = 113bf82e6adfd7116b2990ef948f0065b24ac24b9d0a700d99eac611634bda86 +SIZE (arora-0.4.tar.gz) = 673838 diff -ruN /usr/ports/www/arora/files/patch-src_src.pri arora/files/patch-src_src.pri --- /usr/ports/www/arora/files/patch-src_src.pri 2008-08-10 09:03:44.000000000 +1200 +++ arora/files/patch-src_src.pri 2009-01-19 15:07:22.000000000 +1300 @@ -1,11 +1,12 @@ ---- ./src/src.pri.orig 2008-08-05 00:21:54.000000000 +0400 -+++ ./src/src.pri 2008-08-09 00:11:30.000000000 +0400 -@@ -14,8 +14,6 @@ - - QT += webkit network - --GITVERSION=$$system(git log -n1 --pretty=format:%h) --GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l) - DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\" - DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\" +--- src.pri.orig 2009-01-19 15:05:40.000000000 +1300 ++++ src/src.pri 2009-01-19 15:05:49.000000000 +1300 +@@ -19,9 +19,7 @@ + DEFINES += GITCHANGENUMBER=0 + } + !win32 { +- GITVERSION=$$system(git log -n1 --pretty=format:%h) + DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\" +- GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l) + DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\" + } diff -ruN /usr/ports/www/arora/files/patch-src_src.pro arora/files/patch-src_src.pro --- /usr/ports/www/arora/files/patch-src_src.pro 2008-08-10 09:03:44.000000000 +1200 +++ arora/files/patch-src_src.pro 1970-01-01 12:00:00.000000000 +1200 @@ -1,20 +0,0 @@ ---- ./src/src.pro.orig 2008-08-05 00:21:54.000000000 +0400 -+++ ./src/src.pro 2008-08-09 00:10:20.000000000 +0400 -@@ -15,7 +15,7 @@ - - isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe -- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease -+ else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4 - } - - TRANSLATIONS += \ -@@ -45,7 +45,7 @@ - PRE_TARGETDEPS += compiler_updateqm_make_all - - unix { -- INSTALLS += target translations desktop iconxpm iconsvg icon16 icon32 icon128 man man-compress -+ INSTALLS += target translations desktop iconxpm iconsvg icon16 icon32 icon128 - - target.path = $$BINDIR - diff -ruN /usr/ports/www/arora/pkg-descr arora/pkg-descr --- /usr/ports/www/arora/pkg-descr 2008-08-10 09:03:44.000000000 +1200 +++ arora/pkg-descr 2009-01-18 21:25:07.000000000 +1300 @@ -8,4 +8,4 @@ the QtWebKit component and find API issues and bugs before the release. -WWW: http://code.google.com/p/arora/ +WWW: http://www.arora-browser.org diff -ruN /usr/ports/www/arora/pkg-plist arora/pkg-plist --- /usr/ports/www/arora/pkg-plist 2008-08-10 09:03:44.000000000 +1200 +++ arora/pkg-plist 2009-01-18 22:14:07.000000000 +1300 @@ -5,9 +5,12 @@ %%NLS%%share/arora/locale/de.qm %%NLS%%share/arora/locale/en.qm %%NLS%%share/arora/locale/es.qm +%%NLS%%share/arora/locale/es_CR.qm %%NLS%%share/arora/locale/et.qm %%NLS%%share/arora/locale/fr_CA.qm %%NLS%%share/arora/locale/fr_FR.qm +%%NLS%%share/arora/locale/gl.qm +%%NLS%%share/arora/locale/he.qm %%NLS%%share/arora/locale/hu.qm %%NLS%%share/arora/locale/it.qm %%NLS%%share/arora/locale/nl.qm @@ -15,7 +18,6 @@ %%NLS%%share/arora/locale/pt_BR.qm %%NLS%%share/arora/locale/ru.qm %%NLS%%share/arora/locale/tr.qm -%%NLS%%share/arora/locale/zh_CN.qm share/icons/hicolor/128x128/apps/arora.png share/icons/hicolor/16x16/apps/arora.png share/icons/hicolor/32x32/apps/arora.png >Release-Note: >Audit-Trail: >Unformatted: