- Update to 0.4

- Update WWW
- Current maintainer doesn't have access to FreeBSD desktop box ATB, so pass maintainership to submitter

PR:		130725
Submitted by:	Shane Bell <decept0 at gmail dot com>
Approved by:	Andy Fawcett <andy at athame dot co dot uk> (maintainer)

6 files changed, 34 insertions, 46 deletions

diff --git a/www/arora/Makefile b/www/arora/Makefile
index 3fc230931013..cf212bced26e 100644
--- a/www/arora/Makefile
+++ b/www/arora/Makefile
@@ -5,40 +5,45 @@
 # $FreeBSD$
 
 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
+MAINTAINER=	decept0@gmail.com
 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 --git a/www/arora/distinfo b/www/arora/distinfo
index 956b9aae116d..4daf21c6cac0 100644
--- a/www/arora/distinfo
+++ b/www/arora/distinfo
@@ -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 --git a/www/arora/files/patch-src_src.pri b/www/arora/files/patch-src_src.pri
index f44e73293a7c..73e788e317a4 100644
--- a/www/arora/files/patch-src_src.pri
+++ b/www/arora/files/patch-src_src.pri
@@ -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 --git a/www/arora/files/patch-src_src.pro b/www/arora/files/patch-src_src.pro
deleted file mode 100644
index d22108f1708f..000000000000
--- a/www/arora/files/patch-src_src.pro
+++ /dev/null
@@ -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 --git a/www/arora/pkg-descr b/www/arora/pkg-descr
index 96d446e7339d..feb2ddc55194 100644
--- a/www/arora/pkg-descr
+++ b/www/arora/pkg-descr
@@ -8,4 +8,4 @@ library. It was originally created as a demo for Qt to help test
 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 --git a/www/arora/pkg-plist b/www/arora/pkg-plist
index bd20a3b375a4..974767aa8992 100644
--- a/www/arora/pkg-plist
+++ b/www/arora/pkg-plist
@@ -5,9 +5,12 @@ share/applications/arora.desktop
 %%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 @@ share/applications/arora.desktop
 %%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