5 files changed, 138 insertions, 58 deletions

diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 4aec69f3253b..69e6cb3bb6e7 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -6,50 +6,64 @@
 #
 
 PORTNAME=	taskjuggler
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.taskjuggler.org/download/
 
-MAINTAINER=	povey@wedgetail.com
+MAINTAINER=	ports@freebsd.org
 COMMENT=	A project management tool for UNIX based operating systems
 
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
 		${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker \
 		${SITE_PERL}/PostScript/Simple.pm:${PORTSDIR}/print/p5-PostScript-Simple \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		poster:${PORTSDIR}/print/poster \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+		poster:${PORTSDIR}/print/poster
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 
-BROKEN=		Does not build
-
-# KTJView currently doesn't compile
-#OPTIONS=	KTJVIEW "Build KDE KTJView program (Requires KDE)" off
+OPTIONS=	DOCS "Build documentation" on \
+		KDE "Build KDE frontend" on
 
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_QT_VER=	3
-USE_XLIB=	yes
 USE_PERL5_RUN=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-# 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
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_DOCS)
+# do nada
+.else
+NOPORTDOCS=	true
+.endif
+
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt
+.else
+CONFIGURE_ARGS+=--disable-docs
+.endif
+
+.if !defined(WITHOUT_KDE)
+LIB_DEPENDS+=	kimproxy:${PORTSDIR}/x11/kdelibs3
+PLIST_SUB+=	WITH_KDE=""
+.else
+CONFIGURE_ARGS+=--with-kde-support=no
+PLIST_SUB+=	WITH_KDE="@comment "
+.endif
+
 .if ${PERL_LEVEL} < 500600
-BROKEN=		"Perl > 5.6 is required."
+BROKEN=		Perl > 5.6 is required.
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
-		${REINPLACE_CMD} -e 's|share/doc/packages/|share/doc/|g'
+	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
+		${REINPLACE_CMD} -e 's|/usr/share/doc/packages/taskjuggler|${DOCSDIR}|g' \
+		-e 's|$$(prefix)/share/doc/packages/taskjuggler|${DOCSDIR}|g'
+	@${SETENV} TZ=UTC ${TOUCH} -t 200512041507.49 ${WRKSRC}/Makefile.am.in
+	@${SETENV} TZ=UTC ${TOUCH} -t 200512041507.52 ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/taskjuggler/distinfo b/deskutils/taskjuggler/distinfo
index 8cb5168a856e..0d2a93d6d7ba 100644
--- a/deskutils/taskjuggler/distinfo
+++ b/deskutils/taskjuggler/distinfo
@@ -1,3 +1,3 @@
-MD5 (taskjuggler-2.0.1.tar.bz2) = a7d43e1e7e0baeb777791b1438e7aaac
-SHA256 (taskjuggler-2.0.1.tar.bz2) = 94604f333fdaa22987b7edf069e521c21cafed6da5170e2c99a3bd716af9eabb
-SIZE (taskjuggler-2.0.1.tar.bz2) = 888067
+MD5 (taskjuggler-2.2.0.tar.bz2) = 0f7a0301a6e1ec82378bbf4e2539af66
+SHA256 (taskjuggler-2.2.0.tar.bz2) = 1499174951cbf4857bb98728b6bb4069112fc28d074149bd3efb61fcb5c98d2e
+SIZE (taskjuggler-2.2.0.tar.bz2) = 1231701
diff --git a/deskutils/taskjuggler/files/ktjview-plist.mk b/deskutils/taskjuggler/files/ktjview-plist.mk
deleted file mode 100644
index c484d48e7bcd..000000000000
--- a/deskutils/taskjuggler/files/ktjview-plist.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-PLIST_FILES+=	bin/ktjview \
-		lib/kde3/libktjviewpart.so \
-		lib/kde3/libktjviewpart.la \
-		share/icons/hicolor/16x16/apps/ktjview.png \
-		share/icons/hicolor/32x32/apps/ktjview.png \
-		share/icons/hicolor/48x48/apps/ktjview.png \
-		share/icons/locolor/16x16/apps/ktjview.png \
-		share/icons/locolor/32x32/apps/ktjview.png \
-		share/services/ktjview.desktop \
-		share/apps/ktjviewpart/ktjview_part.rc \
-		share/apps/ktjview/ktjview_shell.rc \
-
-PLIST_DIRS+=	share/apps/ktjviewpart \
-		share/apps/ktjview
diff --git a/deskutils/taskjuggler/files/patch-TaskJugglerUI_TjGanttChart.cpp b/deskutils/taskjuggler/files/patch-TaskJugglerUI_TjGanttChart.cpp
new file mode 100644
index 000000000000..a370ee927f72
--- /dev/null
+++ b/deskutils/taskjuggler/files/patch-TaskJugglerUI_TjGanttChart.cpp
@@ -0,0 +1,11 @@
+--- TjGanttChart.cpp.orig	Sun Apr 30 01:56:22 2006
++++ TjGanttChart.cpp	Sun Apr 30 02:01:40 2006
+@@ -994,7 +994,7 @@
+         {
+             const Task* t = static_cast<const Task*>
+                 ((*it)->getCoreAttributes());
+-            drawTask(t, false);
++            drawTask(t, (const Resource*)false);
+ 
+             drawDependencies(t, collisionDetector);
+         }
diff --git a/deskutils/taskjuggler/pkg-plist b/deskutils/taskjuggler/pkg-plist
index b75911220dd1..6baa49556c86 100644
--- a/deskutils/taskjuggler/pkg-plist
+++ b/deskutils/taskjuggler/pkg-plist
@@ -1,23 +1,77 @@
+%%WITH_KDE%%bin/TaskJugglerUI
 bin/taskjuggler
-bin/tjx2gantt
-%%DOCSDIR%%/Examples/BigProject/Common/Resources.tjsp
-%%DOCSDIR%%/Examples/BigProject/Project1/Project1-Interface.tjsp
+lib/libtaskjuggler.a
+lib/libtaskjuggler.la
+lib/libtaskjuggler.so
+lib/libtaskjuggler.so.3
+%%WITH_KDE%%share/applications/kde/taskjuggler.desktop
+%%WITH_KDE%%share/apps/katepart/syntax/taskjuggler.xml
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/16x16/actions/tj_modified.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/16x16/actions/tj_not_ok.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/16x16/actions/tj_ok.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_milestone.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_resource.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_schedule.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_task.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_task_group.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_account.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_account_group.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_account_report.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_calendar_report.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_csv_reports.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_editor.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_error.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_export_reports.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_file_list.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_file_tji.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_file_tjp.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_html_reports.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_ical_reports.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_interactive_reports.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_keyword_help.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_next_problem.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_note.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_previous_problem.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_report.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_report_list.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_resource.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_resource_group.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_resource_report.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_status_report.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_task_report.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_tutorial.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_warning.png
+%%WITH_KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_xml_reports.png
+%%WITH_KDE%%share/apps/taskjuggler/katefiletyperc
+%%WITH_KDE%%share/apps/taskjuggler/taskjugglerui.rc
+%%WITH_KDE%%share/apps/taskjuggler/templates/en_US/Blank_File.tji
+%%WITH_KDE%%share/apps/taskjuggler/templates/en_US/Blank_Project.tjp
+%%WITH_KDE%%share/apps/taskjuggler/templates/en_US/Large_Project.tjp
+%%WITH_KDE%%share/apps/taskjuggler/templates/en_US/Simple_Project.tjp
+%%WITH_KDE%%share/apps/taskjuggler/tips
+%%WITH_KDE%%share/config/taskjugglerrc
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/ChangeLog.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/Example.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/FirstProject.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/GenPropertyReference.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/PropertyReference.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/SyntaxReference.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/UsageGuide.xml
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/index.cache.bz2
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/index.docbook
+%%PORTDOCS%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/taskjuggler.xml
+%%DOCSDIR%%/Examples/BigProject/Common/Resources.tji
+%%DOCSDIR%%/Examples/BigProject/Project1/Project1-Interface.tji
 %%DOCSDIR%%/Examples/BigProject/Project1/Project1.html
 %%DOCSDIR%%/Examples/BigProject/Project1/Project1.tjp
+%%DOCSDIR%%/Examples/BigProject/Project2/AccountingReport.html
 %%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
@@ -28,16 +82,31 @@ bin/tjx2gantt
 %%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
+%%WITH_KDE%%share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tji.png
+%%WITH_KDE%%share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjp.png
+%%WITH_KDE%%share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjx.png
+%%WITH_KDE%%share/icons/hicolor/16x16/apps/taskjuggler.png
+%%WITH_KDE%%share/icons/hicolor/32x32/apps/taskjuggler.png
+%%WITH_KDE%%share/mimelnk/application/x-tji.desktop
+%%WITH_KDE%%share/mimelnk/application/x-tjp.desktop
+%%WITH_KDE%%share/mimelnk/application/x-tjx.desktop
+@dirrm %%DOCSDIR%%/Examples/ShiftSchedule
 @dirrm %%DOCSDIR%%/Examples/FirstProject
-@dirrm %%DOCSDIR%%/Examples/BigProject/Common
-@dirrm %%DOCSDIR%%/Examples/BigProject/Project1
 @dirrm %%DOCSDIR%%/Examples/BigProject/Project2
+@dirrm %%DOCSDIR%%/Examples/BigProject/Project1
+@dirrm %%DOCSDIR%%/Examples/BigProject/Common
 @dirrm %%DOCSDIR%%/Examples/BigProject
-@dirrm %%DOCSDIR%%/Examples/ShiftSchedule
 @dirrm %%DOCSDIR%%/Examples
-@dirrm %%DOCSDIR%%/manual
-@dirrm %%DOCSDIR%%/tjx2gantt
 @dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%WITH_KDE%%@dirrm share/doc/HTML/en/taskjuggler
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/templates/en_US
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/templates
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/32x32/actions
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/32x32
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/22x22/actions
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/22x22
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/16x16/actions
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/16x16
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg
+%%WITH_KDE%%@dirrm share/apps/taskjuggler/icons
+%%WITH_KDE%%@dirrm share/apps/taskjuggler