- Update to 2.0.1

- Disable optional KDE component
- Unbreak

PR:		ports/67302
Submitted by:	Stefan Walter <sw@gegenunendlich.de>
Approved by:	maintainer

4 files changed, 52 insertions, 72 deletions

diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index aa1650765e8d..c02aa082e8db 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskjuggler
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.taskjuggler.org/download/
 
@@ -20,9 +20,8 @@ BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date
 		poster:${PORTSDIR}/print/poster \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 
-BROKEN=		"Build fails"
-
-OPTIONS=	KTJVIEW "Build KDE KTJView program (Requires KDE)" off
+# KTJView currently doesn't compile
+#OPTIONS=	KTJVIEW "Build KDE KTJView program (Requires KDE)" off
 
 USE_BZIP2=	yes
 USE_QT_VER=	3
@@ -34,11 +33,12 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_KTJVIEW)
-LIB_DEPENDS+=	kwalletbackend:${PORTSDIR}/x11/kdelibs3
-CONFIGURE_ARGS+=	--with-kde-support=yes
-.include "files/ktjview-plist.mk"
-.endif
+# KTJView currently doesn't compile
+#.if defined(WITH_KTJVIEW)
+#LIB_DEPENDS+=	kwalletbackend:${PORTSDIR}/x11/kdelibs3
+#CONFIGURE_ARGS+=	--with-kde-support=yes
+#.include "files/ktjview-plist.mk"
+#.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
diff --git a/deskutils/taskjuggler/distinfo b/deskutils/taskjuggler/distinfo
index c902ce1a130c..cb2cfa888f4b 100644
--- a/deskutils/taskjuggler/distinfo
+++ b/deskutils/taskjuggler/distinfo
@@ -1,2 +1,2 @@
-MD5 (taskjuggler-2.0.tar.bz2) = bde3128d93595de5fc430f26a25d85e6
-SIZE (taskjuggler-2.0.tar.bz2) = 889124
+MD5 (taskjuggler-2.0.1.tar.bz2) = a7d43e1e7e0baeb777791b1438e7aaac
+SIZE (taskjuggler-2.0.1.tar.bz2) = 888067
diff --git a/deskutils/taskjuggler/files/patch-Testsuite-testdir b/deskutils/taskjuggler/files/patch-Testsuite-testdir
deleted file mode 100644
index 21b8edb7c22c..000000000000
--- a/deskutils/taskjuggler/files/patch-Testsuite-testdir
+++ /dev/null
@@ -1,19 +0,0 @@
-*** TestSuite/testdir	Mon Feb 23 13:10:52 2004
---- TestSuite/testdir.patch	Mon Feb 23 13:11:05 2004
-***************
-*** 12,18 ****
-    export TASKJUGGLER=../$TASKJUGGLER
-  fi
-  
-! function do_testing
-  {
-    f=$1
-    op=$2
---- 12,18 ----
-    export TASKJUGGLER=../$TASKJUGGLER
-  fi
-  
-! do_testing()
-  {
-    f=$1
-    op=$2
diff --git a/deskutils/taskjuggler/pkg-plist b/deskutils/taskjuggler/pkg-plist
index d3bda0de7bcd..b75911220dd1 100644
--- a/deskutils/taskjuggler/pkg-plist
+++ b/deskutils/taskjuggler/pkg-plist
@@ -1,44 +1,43 @@
 bin/taskjuggler
-share/doc/taskjuggler/Examples/FirstProject/Accounting.html
-share/doc/taskjuggler/Examples/FirstProject/Calendar.html
-share/doc/taskjuggler/Examples/FirstProject/Staff-Details.html
-share/doc/taskjuggler/Examples/FirstProject/Staff-Overview.html
-share/doc/taskjuggler/Examples/FirstProject/Status-Report.html
-share/doc/taskjuggler/Examples/FirstProject/Tasks-Details.html
-share/doc/taskjuggler/Examples/FirstProject/Tasks-Overview.html
-share/doc/taskjuggler/Examples/FirstProject/AccountingSoftware.tjp
-share/doc/taskjuggler/Examples/FirstProject/AccountingSoftware.tjx
-share/doc/taskjuggler/Examples/BigProject/Common/Resources.tjsp
-share/doc/taskjuggler/Examples/BigProject/Project1/Project1.html
-share/doc/taskjuggler/Examples/BigProject/Project1/Project1.tjp
-share/doc/taskjuggler/Examples/BigProject/Project1/Project1-Interface.tjsp
-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/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/ShiftTimes-06-03.html
-share/doc/taskjuggler/Examples/ShiftSchedule/ShiftTimes-06-10.html
-share/doc/taskjuggler/Examples/ShiftSchedule/TaskCoverage-Jun.html
-share/doc/taskjuggler/Examples/ShiftSchedule/ShiftSchedule.tjp
 bin/tjx2gantt
-share/doc/taskjuggler/tjx2gantt/README
-share/doc/taskjuggler/tjx2gantt/BUGS
-share/doc/taskjuggler/tjx2gantt/TODO
-share/doc/taskjuggler/tjx2gantt/testProject.tjp
-share/doc/taskjuggler/Examples/FirstProject/acso.eps
-share/doc/taskjuggler/Examples/FirstProject/acso_poster.eps
-@dirrm share/doc/taskjuggler/Examples/FirstProject
-@dirrm share/doc/taskjuggler/Examples/BigProject/Common
-@dirrm share/doc/taskjuggler/Examples/BigProject/Project1
-@dirrm share/doc/taskjuggler/Examples/BigProject/Project2
-@dirrm share/doc/taskjuggler/Examples/BigProject
-@dirrm share/doc/taskjuggler/Examples/ShiftSchedule
-@dirrm share/doc/taskjuggler/Examples
-@dirrm share/doc/taskjuggler/manual
-@dirrm share/doc/taskjuggler/tjx2gantt
-@dirrm share/doc/taskjuggler
+%%DOCSDIR%%/Examples/BigProject/Common/Resources.tjsp
+%%DOCSDIR%%/Examples/BigProject/Project1/Project1-Interface.tjsp
+%%DOCSDIR%%/Examples/BigProject/Project1/Project1.html
+%%DOCSDIR%%/Examples/BigProject/Project1/Project1.tjp
+%%DOCSDIR%%/Examples/BigProject/Project2/Project2.html
+%%DOCSDIR%%/Examples/BigProject/Project2/Project2.tjp
+%%DOCSDIR%%/Examples/BigProject/README
+%%DOCSDIR%%/Examples/FirstProject/Accounting.html
+%%DOCSDIR%%/Examples/FirstProject/AccountingSoftware.tjp
+%%DOCSDIR%%/Examples/FirstProject/AccountingSoftware.tjx
+%%DOCSDIR%%/Examples/FirstProject/Calendar.html
+%%DOCSDIR%%/Examples/FirstProject/Staff-Details.html
+%%DOCSDIR%%/Examples/FirstProject/Staff-Overview.html
+%%DOCSDIR%%/Examples/FirstProject/Status-Report.html
+%%DOCSDIR%%/Examples/FirstProject/Tasks-Details.html
+%%DOCSDIR%%/Examples/FirstProject/Tasks-Overview.html
+%%DOCSDIR%%/Examples/FirstProject/acso.eps
+%%DOCSDIR%%/Examples/FirstProject/acso_poster.eps
+%%DOCSDIR%%/Examples/ShiftSchedule/Calendar-anders.html
+%%DOCSDIR%%/Examples/ShiftSchedule/Calendar-joe.html
+%%DOCSDIR%%/Examples/ShiftSchedule/Calendar-khaled.html
+%%DOCSDIR%%/Examples/ShiftSchedule/Calendar-paul.html
+%%DOCSDIR%%/Examples/ShiftSchedule/Calendar-sally.html
+%%DOCSDIR%%/Examples/ShiftSchedule/ResourceUsage-Jun.html
+%%DOCSDIR%%/Examples/ShiftSchedule/ShiftSchedule.tjp
+%%DOCSDIR%%/Examples/ShiftSchedule/ShiftTimes-06-03.html
+%%DOCSDIR%%/Examples/ShiftSchedule/ShiftTimes-06-10.html
+%%DOCSDIR%%/Examples/ShiftSchedule/TaskCoverage-Jun.html
+%%DOCSDIR%%/tjx2gantt/README
+%%DOCSDIR%%/tjx2gantt/TODO
+%%DOCSDIR%%/tjx2gantt/testProject.tjp
+@dirrm %%DOCSDIR%%/Examples/FirstProject
+@dirrm %%DOCSDIR%%/Examples/BigProject/Common
+@dirrm %%DOCSDIR%%/Examples/BigProject/Project1
+@dirrm %%DOCSDIR%%/Examples/BigProject/Project2
+@dirrm %%DOCSDIR%%/Examples/BigProject
+@dirrm %%DOCSDIR%%/Examples/ShiftSchedule
+@dirrm %%DOCSDIR%%/Examples
+@dirrm %%DOCSDIR%%/manual
+@dirrm %%DOCSDIR%%/tjx2gantt
+@dirrm %%DOCSDIR%%