* Update to 2.4.1.

* Attempt to fix documentation paths.
* Replace US/Mountain with America/Denver in tests. DragonFly and FreeBSD
  don't accept historic timezone names.

See http://www.taskjuggler.org/manual-2.4.1/change_log.html for upstream
changelog.

5 files changed, 76 insertions, 64 deletions

diff --git a/misc/taskjuggler/Makefile b/misc/taskjuggler/Makefile
index 86eafdbd349..7826931d20c 100644
--- a/misc/taskjuggler/Makefile
+++ b/misc/taskjuggler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/09/18 09:12:42 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/03/19 09:44:58 hasso Exp $
 #
 
-DISTNAME=	taskjuggler-2.3.1
-PKGREVISION=	4
+DISTNAME=	taskjuggler-2.4.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.taskjuggler.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,11 +13,23 @@ COMMENT=	Project management tool
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/taskjuggler
+CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/taskjuggler/
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	perl msgfmt
 
+REPLACE_SH=	TestSuite/runtests
+
+SUBST_CLASSES+=		tz
+SUBST_STAGE.tz=		post-patch
+SUBST_FILES.tz=		TestSuite/Misc/export/project_a.tjp \
+			TestSuite/Misc/export/project_b1.tjp \
+			TestSuite/Misc/export/project_b2.tjp \
+			TestSuite/Misc/export/project_b3.tjp \
+			TestSuite/Misc/export/projectReference_a_1.tjp
+SUBST_MESSAGE.tz=	Fixing old timezone names.
+SUBST_SED.tz=		-e "s|timezone \"US/Mountain\"|timezone \"America/Denver\"|"
+
 pre-build:
 	# I have no idea why this test fails, and it is undocumented.
 	# The log file also doesn't provide any useful information.
diff --git a/misc/taskjuggler/PLIST b/misc/taskjuggler/PLIST
index 9bc8b4ed271..cfc7668ca28 100644
--- a/misc/taskjuggler/PLIST
+++ b/misc/taskjuggler/PLIST
@@ -1,40 +1,40 @@
-@comment $NetBSD: PLIST,v 1.2 2007/04/01 09:32:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/03/19 09:44:58 hasso Exp $
 bin/TaskJugglerUI
 bin/taskjuggler
 lib/libtaskjuggler.la
 share/applications/kde/taskjuggler.desktop
-share/doc/HTML/en/taskjuggler/ChangeLog.xml
-share/doc/HTML/en/taskjuggler/Example.xml
-share/doc/HTML/en/taskjuggler/FirstProject.xml
-share/doc/HTML/en/taskjuggler/GenPropertyReference.xml
-share/doc/HTML/en/taskjuggler/PropertyReference.xml
-share/doc/HTML/en/taskjuggler/SyntaxReference.xml
-share/doc/HTML/en/taskjuggler/UsageGuide.xml
-share/doc/HTML/en/taskjuggler/index.cache.bz2
-share/doc/HTML/en/taskjuggler/index.docbook
-share/doc/HTML/en/taskjuggler/taskjuggler.xml
-share/doc/taskjugglerExamples/BigProject/Common/Resources.tji
-share/doc/taskjugglerExamples/BigProject/Project1/Project1-Interface.tji
-share/doc/taskjugglerExamples/BigProject/Project1/Project1.html
-share/doc/taskjugglerExamples/BigProject/Project1/Project1.tjp
-share/doc/taskjugglerExamples/BigProject/Project2/AccountingReport.html
-share/doc/taskjugglerExamples/BigProject/Project2/Project2.html
-share/doc/taskjugglerExamples/BigProject/Project2/Project2.tjp
-share/doc/taskjugglerExamples/BigProject/README
-share/doc/taskjugglerExamples/FirstProject/Accounting.html
-share/doc/taskjugglerExamples/FirstProject/AccountingSoftware.tjp
-share/doc/taskjugglerExamples/FirstProject/Calendar.html
-share/doc/taskjugglerExamples/FirstProject/Status-Report.html
-share/doc/taskjugglerExamples/ShiftSchedule/Calendar-anders.html
-share/doc/taskjugglerExamples/ShiftSchedule/Calendar-joe.html
-share/doc/taskjugglerExamples/ShiftSchedule/Calendar-khaled.html
-share/doc/taskjugglerExamples/ShiftSchedule/Calendar-paul.html
-share/doc/taskjugglerExamples/ShiftSchedule/Calendar-sally.html
-share/doc/taskjugglerExamples/ShiftSchedule/ResourceUsage-Jun.html
-share/doc/taskjugglerExamples/ShiftSchedule/ShiftSchedule.tjp
-share/doc/taskjugglerExamples/ShiftSchedule/ShiftTimes-06-03.html
-share/doc/taskjugglerExamples/ShiftSchedule/ShiftTimes-06-10.html
-share/doc/taskjugglerExamples/ShiftSchedule/TaskCoverage-Jun.html
+share/doc/kde/HTML/en/taskjuggler/ChangeLog.xml
+share/doc/kde/HTML/en/taskjuggler/Example.xml
+share/doc/kde/HTML/en/taskjuggler/FirstProject.xml
+share/doc/kde/HTML/en/taskjuggler/GenPropertyReference.xml
+share/doc/kde/HTML/en/taskjuggler/PropertyReference.xml
+share/doc/kde/HTML/en/taskjuggler/SyntaxReference.xml
+share/doc/kde/HTML/en/taskjuggler/UsageGuide.xml
+share/doc/kde/HTML/en/taskjuggler/index.cache.bz2
+share/doc/kde/HTML/en/taskjuggler/index.docbook
+share/doc/kde/HTML/en/taskjuggler/taskjuggler.xml
+share/doc/taskjuggler/Examples/BigProject/Common/Resources.tji
+share/doc/taskjuggler/Examples/BigProject/Project1/Project1-Interface.tji
+share/doc/taskjuggler/Examples/BigProject/Project1/Project1.html
+share/doc/taskjuggler/Examples/BigProject/Project1/Project1.tjp
+share/doc/taskjuggler/Examples/BigProject/Project2/AccountingReport.html
+share/doc/taskjuggler/Examples/BigProject/Project2/Project2.html
+share/doc/taskjuggler/Examples/BigProject/Project2/Project2.tjp
+share/doc/taskjuggler/Examples/BigProject/README
+share/doc/taskjuggler/Examples/FirstProject/Accounting.html
+share/doc/taskjuggler/Examples/FirstProject/AccountingSoftware.tjp
+share/doc/taskjuggler/Examples/FirstProject/Calendar.html
+share/doc/taskjuggler/Examples/FirstProject/Status-Report.html
+share/doc/taskjuggler/Examples/ShiftSchedule/Calendar-anders.html
+share/doc/taskjuggler/Examples/ShiftSchedule/Calendar-joe.html
+share/doc/taskjuggler/Examples/ShiftSchedule/Calendar-khaled.html
+share/doc/taskjuggler/Examples/ShiftSchedule/Calendar-paul.html
+share/doc/taskjuggler/Examples/ShiftSchedule/Calendar-sally.html
+share/doc/taskjuggler/Examples/ShiftSchedule/ResourceUsage-Jun.html
+share/doc/taskjuggler/Examples/ShiftSchedule/ShiftSchedule.tjp
+share/doc/taskjuggler/Examples/ShiftSchedule/ShiftTimes-06-03.html
+share/doc/taskjuggler/Examples/ShiftSchedule/ShiftTimes-06-10.html
+share/doc/taskjuggler/Examples/ShiftSchedule/TaskCoverage-Jun.html
 share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tji.png
 share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjp.png
 share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjx.png
@@ -107,13 +107,13 @@ share/locale/tr/LC_MESSAGES/taskjuggler.mo
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in kde: @dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/doc/taskjugglerExamples/ShiftSchedule
-@dirrm share/doc/taskjugglerExamples/FirstProject
-@dirrm share/doc/taskjugglerExamples/BigProject/Project2
-@dirrm share/doc/taskjugglerExamples/BigProject/Project1
-@dirrm share/doc/taskjugglerExamples/BigProject/Common
-@dirrm share/doc/taskjugglerExamples/BigProject
-@dirrm share/doc/taskjugglerExamples
+@dirrm share/doc/taskjuggler/Examples/ShiftSchedule
+@dirrm share/doc/taskjuggler/Examples/FirstProject
+@dirrm share/doc/taskjuggler/Examples/BigProject/Project2
+@dirrm share/doc/taskjuggler/Examples/BigProject/Project1
+@dirrm share/doc/taskjuggler/Examples/BigProject/Common
+@dirrm share/doc/taskjuggler/Examples/BigProject
+@dirrm share/doc/taskjuggler/Examples
 @dirrm share/doc/taskjuggler
-@dirrm share/doc/HTML/en/taskjuggler
+@dirrm share/doc/kde/HTML/en/taskjuggler
 @comment in kde: @dirrm share/applications/kde
diff --git a/misc/taskjuggler/distinfo b/misc/taskjuggler/distinfo
index 9bfcac2e541..55b650af328 100644
--- a/misc/taskjuggler/distinfo
+++ b/misc/taskjuggler/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/04/04 18:07:16 joerg Exp $
+$NetBSD: distinfo,v 1.3 2009/03/19 09:44:58 hasso Exp $
 
-SHA1 (taskjuggler-2.3.1.tar.bz2) = fce20fcfae51e6cf2100d2fe82554d82d89fc823
-RMD160 (taskjuggler-2.3.1.tar.bz2) = add000206b40e275a2778935148ba0650c29f57a
-Size (taskjuggler-2.3.1.tar.bz2) = 1261818 bytes
-SHA1 (patch-aa) = 82e0b1222404cc5167b12a0d92325885bfc40b19
-SHA1 (patch-ab) = d4f791ea3d65b80f206149726a0a5400a6981fba
+SHA1 (taskjuggler-2.4.1.tar.bz2) = f690e57554488b85375ad96cd6a7635bd4ff6507
+RMD160 (taskjuggler-2.4.1.tar.bz2) = e1648e818610776efd0f7f9241e987b92a5413ef
+Size (taskjuggler-2.4.1.tar.bz2) = 1559892 bytes
+SHA1 (patch-aa) = 0fc96885cfc9fe70d271d4b4f1034537dedf2d5d
+SHA1 (patch-ab) = cda635b649e4300666a9df057be1a95d69ae8b66
diff --git a/misc/taskjuggler/patches/patch-aa b/misc/taskjuggler/patches/patch-aa
index 3289db208f9..4c6908b0ce9 100644
--- a/misc/taskjuggler/patches/patch-aa
+++ b/misc/taskjuggler/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/22 17:15:19 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2009/03/19 09:44:58 hasso Exp $
 
 --- TaskJugglerUI/Makefile.in.orig	2007-03-22 17:54:38.000000000 +0100
 +++ TaskJugglerUI/Makefile.in	2007-03-22 17:53:15.000000000 +0100
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/22 17:15:19 rillig Exp $
 +taskjugglerview.o: MainWidget.h TemplateSelector.h
 +ReportManager.o: MainWidget.h
 +FileManager.o: TjDatePicker.h
-+TjReport.o: RichTextDisplay.h
++TjReport.o: RichTextDisplay.h ReportController.h
diff --git a/misc/taskjuggler/patches/patch-ab b/misc/taskjuggler/patches/patch-ab
index a9f620a43e7..0b429717e7e 100644
--- a/misc/taskjuggler/patches/patch-ab
+++ b/misc/taskjuggler/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2007/04/04 18:07:41 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2009/03/19 09:44:58 hasso Exp $
 
---- taskjuggler/XMLReport.cpp.orig	2007-04-04 17:44:57.000000000 +0000
-+++ taskjuggler/XMLReport.cpp
-@@ -13,6 +13,7 @@
- #include "XMLReport.h"
- 
- #include <config.h>
-+#include <unistd.h>
- #include <zlib.h>
- 
- #include <qfile.h>
+--- docs/en/Makefile.in.orig	2009-03-18 21:38:20 +0200
++++ docs/en/Makefile.in	2009-03-18 21:38:32 +0200
+@@ -301,7 +301,7 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ EXTRA_DIST = taskjuggler/*.html 
+ docprefix = @PACKAGES_DIR@
+-kdeprefix = $(prefix)/share/doc/HTML/en/taskjuggler/
++kdeprefix = $(prefix)/share/doc/kde/HTML/en/taskjuggler/
+ SGMLSOURCES = taskjuggler.xml ChangeLog.xml FirstProject.xml UsageGuide.xml Example.xml SyntaxReference.xml GenPropertyReference.xml index.docbook
+ CLEANFILES = *.log *.aux *.dvi *.ps *.tex taskjuggler.xml GenPropertyReference.xml Example.xml taskjuggler.log CATALOG.local
+ #>- all: all-am