diff --git a/productivity/taskjuggler/Makefile b/productivity/taskjuggler/Makefile index 9c56570a949..5209e5d4b23 100644 --- a/productivity/taskjuggler/Makefile +++ b/productivity/taskjuggler/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2006/06/12 15:45:51 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2006/10/31 20:56:42 sturm Exp $ COMMENT= "project management tool" -DISTNAME= taskjuggler-2.2.0 -PKGNAME= ${DISTNAME}p1 +DISTNAME= taskjuggler-2.3.0 CATEGORIES= productivity -SHARED_LIBS= taskjuggler 3.3 +SHARED_LIBS= taskjuggler 3.4 HOMEPAGE= http://www.taskjuggler.org/ @@ -35,10 +34,23 @@ CONFIGURE_STYLE=autoconf AUTOCONF_VERSION=2.59 CONFIGURE_ARGS+=${MODKDE_CONFIGURE_ARGS} \ --enable-dependency-tracking \ - --disable-final + --disable-final \ + --with-docdir=${PREFIX}/share/examples/taskjuggler/ CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV} BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::x11/kde/pim3 +# XXX tries building the documentation from XML, which fails +NO_REGRESS= Yes + +# broken test file +post-extract: + @rm ${WRKSRC}/TestSuite/Syntax/Errors/Timezone.tjp + +pre-configure: + @perl -pi -e "s,\@PACKAGES_DIR\@Examples/,\@PACKAGES_DIR\@," \ + ${WRKSRC}/Examples/*/Makefile.in \ + ${WRKSRC}/Examples/*/*/Makefile.in + .include diff --git a/productivity/taskjuggler/distinfo b/productivity/taskjuggler/distinfo index bb98b17e3cc..86a058a27d2 100644 --- a/productivity/taskjuggler/distinfo +++ b/productivity/taskjuggler/distinfo @@ -1,4 +1,4 @@ -MD5 (taskjuggler-2.2.0.tar.bz2) = 0f7a0301a6e1ec82378bbf4e2539af66 -RMD160 (taskjuggler-2.2.0.tar.bz2) = c5221622c236131f4b6efa62a8b9c079f81bdf2b -SHA1 (taskjuggler-2.2.0.tar.bz2) = 5b5b5ef58f0436bedf04eb0de8d03b766bb8cc8c -SIZE (taskjuggler-2.2.0.tar.bz2) = 1231701 +MD5 (taskjuggler-2.3.0.tar.bz2) = c45b95507caf96ba39b7f40065c9f34b +RMD160 (taskjuggler-2.3.0.tar.bz2) = b6e1d9b5fd4e10e01b9297ee1fc1352f3894229a +SHA1 (taskjuggler-2.3.0.tar.bz2) = 4e200b2d993271173dc1d12f5d49a76b316b6b7e +SIZE (taskjuggler-2.3.0.tar.bz2) = 1238644 diff --git a/productivity/taskjuggler/patches/patch-Examples_BigProject_Common_Makefile_in b/productivity/taskjuggler/patches/patch-Examples_BigProject_Common_Makefile_in deleted file mode 100644 index 6a7eddd1de4..00000000000 --- a/productivity/taskjuggler/patches/patch-Examples_BigProject_Common_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Examples_BigProject_Common_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- Examples/BigProject/Common/Makefile.in.orig Mon Dec 12 19:35:39 2005 -+++ Examples/BigProject/Common/Makefile.in Mon Dec 12 19:35:52 2005 -@@ -298,7 +298,7 @@ x_libraries = @x_libraries@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --docprefix = $(prefix)/share/doc/packages/taskjuggler/Examples/BigProject/Common -+docprefix = $(prefix)/share/examples/taskjuggler/BigProject/Common - #>- all: all-am - #>+ 1 - all: docs-am all-am diff --git a/productivity/taskjuggler/patches/patch-Examples_BigProject_Makefile_in b/productivity/taskjuggler/patches/patch-Examples_BigProject_Makefile_in deleted file mode 100644 index 8d5fdefcf25..00000000000 --- a/productivity/taskjuggler/patches/patch-Examples_BigProject_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Examples_BigProject_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- Examples/BigProject/Makefile.in.orig Mon Dec 12 19:34:14 2005 -+++ Examples/BigProject/Makefile.in Mon Dec 12 19:34:35 2005 -@@ -315,7 +315,7 @@ xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ - SUBDIRS = Common Project1 Project2 --docprefix = $(prefix)/share/doc/packages/taskjuggler/Examples/BigProject -+docprefix = $(prefix)/share/examples/taskjuggler/BigProject - #>- all: all-recursive - #>+ 1 - all: docs-am all-recursive diff --git a/productivity/taskjuggler/patches/patch-Examples_BigProject_Project1_Makefile_in b/productivity/taskjuggler/patches/patch-Examples_BigProject_Project1_Makefile_in deleted file mode 100644 index acf24b5ff6f..00000000000 --- a/productivity/taskjuggler/patches/patch-Examples_BigProject_Project1_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Examples_BigProject_Project1_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- Examples/BigProject/Project1/Makefile.in.orig Mon Dec 12 19:45:00 2005 -+++ Examples/BigProject/Project1/Makefile.in Mon Dec 12 19:45:13 2005 -@@ -303,7 +303,7 @@ TJX2GANTT = ../../../tjx2gantt/tjx2gantt - TARGETNAME = Project1 - EXTRA_DIST = *.html *.tjp *.tji - CLEANFILES = *.html *.tji --docprefix = $(prefix)/share/doc/packages/taskjuggler/Examples/BigProject/$(TARGETNAME) -+docprefix = $(prefix)/share/examples/taskjuggler/BigProject/$(TARGETNAME) - #>- all: all-am - #>+ 1 - all: docs-am all-am diff --git a/productivity/taskjuggler/patches/patch-Examples_BigProject_Project2_Makefile_in b/productivity/taskjuggler/patches/patch-Examples_BigProject_Project2_Makefile_in deleted file mode 100644 index 4e256c6e2bc..00000000000 --- a/productivity/taskjuggler/patches/patch-Examples_BigProject_Project2_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Examples_BigProject_Project2_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- Examples/BigProject/Project2/Makefile.in.orig Mon Dec 12 19:45:21 2005 -+++ Examples/BigProject/Project2/Makefile.in Mon Dec 12 19:45:32 2005 -@@ -303,7 +303,7 @@ TJX2GANTT = ../../../tjx2gantt/tjx2gantt - TARGETNAME = Project2 - EXTRA_DIST = *.html *.tjp - CLEANFILES = *.html --docprefix = $(prefix)/share/doc/packages/taskjuggler/Examples/BigProject/$(TARGETNAME) -+docprefix = $(prefix)/share/examples/taskjuggler/BigProject/$(TARGETNAME) - #>- all: all-am - #>+ 1 - all: docs-am all-am diff --git a/productivity/taskjuggler/patches/patch-Examples_FirstProject_Makefile_in b/productivity/taskjuggler/patches/patch-Examples_FirstProject_Makefile_in deleted file mode 100644 index 899ef37e546..00000000000 --- a/productivity/taskjuggler/patches/patch-Examples_FirstProject_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Examples_FirstProject_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- Examples/FirstProject/Makefile.in.orig Mon Dec 12 19:45:44 2005 -+++ Examples/FirstProject/Makefile.in Mon Dec 12 19:45:54 2005 -@@ -302,7 +302,7 @@ TASKJUGGLER = ../../taskjuggler/taskjugg - TARGETNAME = AccountingSoftware - EXTRA_DIST = *.html *.tjp - CLEANFILES = *.html --docprefix = $(prefix)/share/doc/packages/taskjuggler/Examples/FirstProject -+docprefix = $(prefix)/share/examples/taskjuggler/FirstProject - #>- all: all-am - #>+ 1 - all: docs-am all-am diff --git a/productivity/taskjuggler/patches/patch-Examples_ShiftSchedule_Makefile_in b/productivity/taskjuggler/patches/patch-Examples_ShiftSchedule_Makefile_in deleted file mode 100644 index 1769d0e8553..00000000000 --- a/productivity/taskjuggler/patches/patch-Examples_ShiftSchedule_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Examples_ShiftSchedule_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- Examples/ShiftSchedule/Makefile.in.orig Mon Dec 12 19:46:08 2005 -+++ Examples/ShiftSchedule/Makefile.in Mon Dec 12 19:46:19 2005 -@@ -303,7 +303,7 @@ TJX2GANTT = ../../tjx2gantt/tjx2gantt - TARGETNAME = ShiftSchedule - EXTRA_DIST = *.html *.tjp *.tjx - CLEANFILES = *.html *.tjx --docprefix = $(prefix)/share/doc/packages/taskjuggler/Examples/$(TARGETNAME) -+docprefix = $(prefix)/share/examples/taskjuggler/$(TARGETNAME) - #>- all: all-am - #>+ 1 - all: docs-am all-am diff --git a/productivity/taskjuggler/patches/patch-docs_en_Makefile_in b/productivity/taskjuggler/patches/patch-docs_en_Makefile_in deleted file mode 100644 index 0532943790d..00000000000 --- a/productivity/taskjuggler/patches/patch-docs_en_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_en_Makefile_in,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ ---- docs/en/Makefile.in.orig Tue Mar 7 07:54:50 2006 -+++ docs/en/Makefile.in Tue Mar 7 07:55:17 2006 -@@ -300,7 +300,7 @@ xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ - EXTRA_DIST = taskjuggler/*.html --docprefix = /usr/share/doc/packages/taskjuggler/ -+docprefix = $(prefix)/share/doc/taskjuggler/ - kdeprefix = $(prefix)/share/doc/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 diff --git a/productivity/taskjuggler/patches/patch-taskjuggler_ProjectFile_cpp b/productivity/taskjuggler/patches/patch-taskjuggler_ProjectFile_cpp new file mode 100644 index 00000000000..c2cc4756cd6 --- /dev/null +++ b/productivity/taskjuggler/patches/patch-taskjuggler_ProjectFile_cpp @@ -0,0 +1,15 @@ +$OpenBSD: patch-taskjuggler_ProjectFile_cpp,v 1.1 2006/10/31 20:56:43 sturm Exp $ + + Align 'now' date to timing resolution. from svn + +--- taskjuggler/ProjectFile.cpp.orig Mon Oct 23 20:57:57 2006 ++++ taskjuggler/ProjectFile.cpp Mon Oct 23 20:58:42 2006 +@@ -653,6 +653,8 @@ ProjectFile::readProject() + return FALSE; + } + proj->setScheduleGranularity(resolution); ++ ++ proj->setNow(proj->getNow()); + } + else if (token == KW("timezone")) + { diff --git a/productivity/taskjuggler/patches/patch-taskjuggler_Project_cpp b/productivity/taskjuggler/patches/patch-taskjuggler_Project_cpp new file mode 100644 index 00000000000..21e3958f044 --- /dev/null +++ b/productivity/taskjuggler/patches/patch-taskjuggler_Project_cpp @@ -0,0 +1,30 @@ +$OpenBSD: patch-taskjuggler_Project_cpp,v 1.1 2006/10/31 20:56:43 sturm Exp $ + + Align 'now' date to timing resolution. from svn + +--- taskjuggler/Project.cpp.orig Mon Oct 23 20:56:21 2006 ++++ taskjuggler/Project.cpp Mon Oct 23 20:57:13 2006 +@@ -85,7 +85,7 @@ Project::Project() + + start = 0; + end = 0; +- now = time(0); ++ setNow(time(0)); + + minEffort = 0.0; + resourceLimits = 0; +@@ -247,6 +247,14 @@ int + Project::getScenarioIndex(const QString& id) const + { + return scenarioList.getIndex(id); ++} ++ ++void ++Project::setNow(time_t n) ++{ ++ /* Align 'now' time to timing resolution. If the resolution is ++ * changed later, this has to be done again. */ ++ now = (n / scheduleGranularity) * scheduleGranularity; + } + + void diff --git a/productivity/taskjuggler/patches/patch-taskjuggler_Project_h b/productivity/taskjuggler/patches/patch-taskjuggler_Project_h new file mode 100644 index 00000000000..80f370d2727 --- /dev/null +++ b/productivity/taskjuggler/patches/patch-taskjuggler_Project_h @@ -0,0 +1,15 @@ +$OpenBSD: patch-taskjuggler_Project_h,v 1.1 2006/10/31 20:56:43 sturm Exp $ + + Align 'now' date to timing resolution. from svn + +--- taskjuggler/Project.h.orig Mon Oct 23 20:57:21 2006 ++++ taskjuggler/Project.h Mon Oct 23 20:57:43 2006 +@@ -216,7 +216,7 @@ public: + * Set the date that TaskJuggler uses as current date for all + * computations. This mainly affects status reporting and the computation + * of the completion degree of tasks. */ +- void setNow(time_t n) { now = n; } ++ void setNow(time_t n); + /** + * Get the date that TaskJuggler uses as current date. + */ diff --git a/productivity/taskjuggler/patches/patch-taskjuggler_TaskScenario_cpp b/productivity/taskjuggler/patches/patch-taskjuggler_TaskScenario_cpp deleted file mode 100644 index 44afa643d31..00000000000 --- a/productivity/taskjuggler/patches/patch-taskjuggler_TaskScenario_cpp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-taskjuggler_TaskScenario_cpp,v 1.1 2006/04/29 17:12:04 sturm Exp $ ---- taskjuggler/TaskScenario.cpp.orig Sun Dec 4 08:07:45 2005 -+++ taskjuggler/TaskScenario.cpp Sat Apr 29 09:01:06 2006 -@@ -33,6 +33,7 @@ TaskScenario::TaskScenario() - endCredit = -1.0; - reportedCompletion = -1.0; - containerCompletion = -1.0; -+ completionDegree = 0.0; - scheduled = FALSE; - criticalness = pathCriticalness = 0.0; - } diff --git a/productivity/taskjuggler/pkg/PLIST b/productivity/taskjuggler/pkg/PLIST index 38287dd8daa..1eb29c373b7 100644 --- a/productivity/taskjuggler/pkg/PLIST +++ b/productivity/taskjuggler/pkg/PLIST @@ -1,15 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/03/11 14:06:31 sturm Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/10/31 20:56:43 sturm Exp $ %%SHARED%% bin/TaskJugglerUI bin/taskjuggler lib/libtaskjuggler.a lib/libtaskjuggler.la -share/applications/ -share/applications/kde/ share/applications/kde/taskjuggler.desktop -share/apps/ -share/apps/katepart/ -share/apps/katepart/syntax/ share/apps/katepart/syntax/taskjuggler.xml share/apps/taskjuggler/ share/apps/taskjuggler/icons/ @@ -65,10 +60,7 @@ share/apps/taskjuggler/templates/en_US/Blank_Project.tjp share/apps/taskjuggler/templates/en_US/Large_Project.tjp share/apps/taskjuggler/templates/en_US/Simple_Project.tjp share/apps/taskjuggler/tips -share/config/ share/config/taskjugglerrc -share/doc/HTML/ -share/doc/HTML/en/ share/doc/HTML/en/taskjuggler/ share/doc/HTML/en/taskjuggler/ChangeLog.xml share/doc/HTML/en/taskjuggler/Example.xml @@ -109,18 +101,12 @@ share/examples/taskjuggler/ShiftSchedule/ShiftSchedule.tjp share/examples/taskjuggler/ShiftSchedule/ShiftTimes-06-03.html share/examples/taskjuggler/ShiftSchedule/ShiftTimes-06-10.html share/examples/taskjuggler/ShiftSchedule/TaskCoverage-Jun.html -share/icons/ -share/icons/crystalsvg/ -share/icons/crystalsvg/32x32/ -share/icons/crystalsvg/32x32/mimetypes/ share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tji.png share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjp.png share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjx.png -share/icons/hicolor/ share/icons/hicolor/16x16/apps/taskjuggler.png share/icons/hicolor/32x32/apps/taskjuggler.png -share/mimelnk/ -share/mimelnk/application/ +share/locale/tr/LC_MESSAGES/taskjuggler.mo share/mimelnk/application/x-tji.desktop share/mimelnk/application/x-tjp.desktop share/mimelnk/application/x-tjx.desktop