10 files changed, 25 insertions, 276 deletions

diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index 287596d668bb..45511b93e1e2 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -1,94 +1,27 @@
-# New ports collection makefile for: taskjuggler
-# Date created:	23 February 2004
-# Whom:	 	Dean Povey <povey@wedgetail.com>
-#
+# Created by: Dean Povey <povey@wedgetail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	taskjuggler
-PORTVERSION=	2.4.3
-PORTREVISION=	6
+PORTVERSION=	3.4.0
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.taskjuggler.org/download/
+MASTER_SITES=	RG
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A project management tool for UNIX based operating systems
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-PostScript-Simple>=0:${PORTSDIR}/print/p5-PostScript-Simple \
-		poster:${PORTSDIR}/print/poster \
-		bash:${PORTSDIR}/shells/bash \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LICENSE=	GPLv2
 
-DEPRECATED=	Depends on QT3; unmaintained
-EXPIRATION_DATE=	2013-07-01
+RUN_DEPENDS=	rubygem-mail>=2.4.3:${PORTSDIR}/mail/rubygem-mail \
+		rubygem-term-ansicolor>=1.0.7:${PORTSDIR}/devel/rubygem-term-ansicolor
 
-OPTIONS_DEFINE=	DOCS KDE3
-OPTIONS_DEFAULT=	KDE3
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=	yes
 
-USE_BZIP2=	yes
-USE_QT_VER=	3
-USE_PERL5_RUN=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:env automake:env libtool
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
-CONFIGURE_ARGS=	--with-docdir=${EXAMPLESDIR}/
-USE_LDCONFIG=	yes
+.include <bsd.port.pre.mk>
 
-AUTOTOOLSFILES=	admin/cvs.sh
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt
-.else
-CONFIGURE_ARGS+=--disable-docs
-.endif
-
-.if ${PORT_OPTIONS:MKDE3}
-LIB_DEPENDS+=	kimproxy:${PORTSDIR}/x11/kdelibs3 \
-		kcal.2:${PORTSDIR}/deskutils/kdepim3
-PLIST_SUB+=	KDE=""
-.else
-CONFIGURE_ARGS+=--with-kde-support=no
-PLIST_SUB+=	KDE="@comment "
-.endif
-
-.if defined(SESSION_MANAGER)
-BROKEN=		please unset SESSION_MANAGER
+.if ${RUBY_VER} == 1.8
+IGNORE=	requires Ruby 1.9.3
 .endif
 
-post-patch:
-	@cd ${WRKSRC}/admin && ${REINPLACE_CMD} -e \
-		's|="autoconf"|="${AUTOCONF:T}"|g ; \
-		 s|="autoheader"|="${AUTOHEADER:T}"|g ; \
-		 s|="autom4te"|="${AUTOM4TE:T}"|g ; \
-		 s|="automake"|="${AUTOMAKE:T}"|g ; \
-		 s|="aclocal"|="${ACLOCAL:T}"|g' detect-autoconf.sh
-	@${REINPLACE_CMD} -e 's| /bin/bash| ${LOCALBASE}/bin/bash|g ; \
-		 s|^exit $$errors|exit 0|g' ${WRKSRC}/TestSuite/runtests
-	@${REINPLACE_CMD} -e 's|exit 1|${ECHO_CMD} "*** Error detected - continue anyway ***"|' \
-		${WRKSRC}/TestSuite/Misc/export/runtest
-	@${FIND} ${WRKSRC}/TestSuite -name testdir | ${XARGS} \
-			${REINPLACE_CMD} -e 's|exit $$errors|exit 0|'
-
-pre-configure:
-	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
-	@cd ${WRKSRC}/admin && ${RM} -f libtool.m4.in && ${CP} -f ${LIBTOOL_M4}  libtool.m4.in
-	@cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common
-
-post-build:
-	@${RMDIR} -p ~/.kde/share/config ~/.qt 2>/dev/null || ${TRUE}
-
-post-install:
-	@${RMDIR} -p ${EXAMPLESDIR} 2>/dev/null || ${TRUE}
-
-regression-test:
-	@(cd ${BUILD_WRKSRC}/TestSuite;	\
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/taskjuggler/distinfo b/deskutils/taskjuggler/distinfo
index 13d9b851b496..a46b003f13fb 100644
--- a/deskutils/taskjuggler/distinfo
+++ b/deskutils/taskjuggler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (taskjuggler-2.4.3.tar.bz2) = 540ea467a98a45c15f6c168392f02a9f907af4dd6a39e7ce2f303abe85eaf391
-SIZE (taskjuggler-2.4.3.tar.bz2) = 1625933
+SHA256 (rubygem/taskjuggler-3.4.0.gem) = 0486d0844a5b34cb74f9eb92f8e0f3c127c805aa5770ffd7b61ce73157b2179e
+SIZE (rubygem/taskjuggler-3.4.0.gem) = 817152
diff --git a/deskutils/taskjuggler/files/patch-TaskJugglerUI_TjGanttChart.cpp b/deskutils/taskjuggler/files/patch-TaskJugglerUI_TjGanttChart.cpp
deleted file mode 100644
index a6842b91f726..000000000000
--- a/deskutils/taskjuggler/files/patch-TaskJugglerUI_TjGanttChart.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- TaskJugglerUI/TjGanttChart.cpp.orig	Sun Apr 30 01:56:22 2006
-+++ TaskJugglerUI/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/files/patch-TaskJugglerUI_main.cpp b/deskutils/taskjuggler/files/patch-TaskJugglerUI_main.cpp
deleted file mode 100644
index 435b98fe20e6..000000000000
--- a/deskutils/taskjuggler/files/patch-TaskJugglerUI_main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- TaskJugglerUI/main.cpp.orig	Sat Jul  8 14:30:32 2006
-+++ TaskJugglerUI/main.cpp	Sat Jul  8 14:30:39 2006
-@@ -22,6 +22,7 @@
- #include <kaboutdata.h>
- #include <kcmdlineargs.h>
- #include <klocale.h>
-+#include <pthread.h>
- 
- static const char description[] =
-     I18N_NOOP("A Project Management Software for Linux");
-@@ -36,6 +37,7 @@
- 
- int main(int argc, char **argv)
- {
-+    pthread_yield();
-     KAboutData about("taskjuggler", I18N_NOOP("TaskJuggler"), version,
-                      description,
-                      KAboutData::License_GPL,
diff --git a/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp
deleted file mode 100644
index 6abbd98751c9..000000000000
--- a/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp
+++ /dev/null
@@ -1,8 +0,0 @@
---- TestSuite/Misc/export/project_a.tjp.orig	Tue Sep  5 18:27:47 2006
-+++ TestSuite/Misc/export/project_a.tjp	Mon Sep 18 23:40:15 2006
-@@ -1,4 +1,4 @@
--project test "Test" "$Id" 2000-01-01-00:00:00-MST 2000-03-10-00:00:00-MST {
-+project test "Test" "$Id" 2000-01-01-00:00:00-UTC 2000-03-10-00:00:00-UTC {
- 	timezone "US/Mountain"
- 	extend task {
- 		text UserText "User Text"
diff --git a/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_b1.tjp b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_b1.tjp
deleted file mode 100644
index b942d07f3dc1..000000000000
--- a/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_b1.tjp
+++ /dev/null
@@ -1,8 +0,0 @@
---- TestSuite/Misc/export/project_b1.tjp.orig	Tue Sep  5 18:27:47 2006
-+++ TestSuite/Misc/export/project_b1.tjp	Mon Sep 18 23:41:15 2006
-@@ -1,4 +1,4 @@
--project test "Test" "$Id" 2000-01-01-00:00:00-MST 2000-02-31-00:00:00-MST {
-+project test "Test" "$Id" 2000-01-01-00:00:00-UTC 2000-02-31-00:00:00-UTC {
-   timezone "US/Mountain"
- }
- 
diff --git a/deskutils/taskjuggler/files/patch-admin_cvs.sh b/deskutils/taskjuggler/files/patch-admin_cvs.sh
deleted file mode 100644
index e29083c6402f..000000000000
--- a/deskutils/taskjuggler/files/patch-admin_cvs.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- admin/cvs.sh.orig	2009-07-15 01:33:20.000000000 -0700
-+++ admin/cvs.sh	2012-04-24 09:22:32.000000000 -0700
-@@ -65,8 +65,3 @@
- case $AUTOMAKE_STRING in
--  automake*1.5d* | automake*1.5* | automake*1.5-* )
--    echo "*** YOU'RE USING $AUTOMAKE_STRING."
--    echo "*** KDE requires automake $required_automake_version"
--    exit 1
--    ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) : ;;
-+  automake*%%AUTOMAKE_VERSION%%* ) : ;;
-   "" )
diff --git a/deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in b/deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in
deleted file mode 100644
index 194d1a9a86b6..000000000000
--- a/deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- i18n/TaskJugglerUI/Makefile.in.orig	Tue Sep  5 18:28:09 2006
-+++ i18n/TaskJugglerUI/Makefile.in	Fri Sep 22 23:34:38 2006
-@@ -511,7 +511,10 @@
- 
- #>+ 10
- install-nls:
--	@for base in tr ; do \
-+	if test -z "${kde_locale}"; then \
-+	  kde_locale='${datadir}/locale' ;\
-+	fi ;\
-+	for base in tr ; do \
- 	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
- 	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
- 	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
diff --git a/deskutils/taskjuggler/files/patch-subdirs b/deskutils/taskjuggler/files/patch-subdirs
deleted file mode 100644
index 69f9ca49610d..000000000000
--- a/deskutils/taskjuggler/files/patch-subdirs
+++ /dev/null
@@ -1,10 +0,0 @@
---- subdirs.orig	Tue Sep  5 18:27:51 2006
-+++ subdirs	Tue Sep 19 23:59:16 2006
-@@ -2,7 +2,6 @@
- Contrib
- Examples
- TaskJugglerUI
--TestSuite
- docs
- i18n
- man
diff --git a/deskutils/taskjuggler/pkg-plist b/deskutils/taskjuggler/pkg-plist
index b9d6f89ade07..c228099b4715 100644
--- a/deskutils/taskjuggler/pkg-plist
+++ b/deskutils/taskjuggler/pkg-plist
@@ -1,113 +1,10 @@
-%%KDE%%bin/TaskJugglerUI
-bin/taskjuggler
-lib/libtaskjuggler.a
-lib/libtaskjuggler.la
-lib/libtaskjuggler.so
-lib/libtaskjuggler.so.3
-%%KDE%%share/applications/kde/taskjuggler.desktop
-%%KDE%%share/apps/katepart/syntax/taskjuggler.xml
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/16x16/actions/tj_modified.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/16x16/actions/tj_not_ok.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/16x16/actions/tj_ok.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_milestone.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_resource.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_schedule.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_task.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/22x22/actions/tj_task_group.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_account.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_account_group.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_account_report.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_calendar_report.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_csv_reports.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_editor.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_error.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_export_reports.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_file_list.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_file_tji.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_file_tjp.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_html_reports.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_ical_reports.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_interactive_reports.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_keyword_help.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_next_problem.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_note.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_previous_problem.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_report.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_report_list.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_resource.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_resource_group.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_resource_report.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_status_report.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_task_report.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_tutorial.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_warning.png
-%%KDE%%share/apps/taskjuggler/icons/crystalsvg/32x32/actions/tj_xml_reports.png
-%%KDE%%share/apps/taskjuggler/katefiletyperc
-%%KDE%%share/apps/taskjuggler/taskjugglerui.rc
-%%KDE%%share/apps/taskjuggler/templates/en_US/Blank_File.tji
-%%KDE%%share/apps/taskjuggler/templates/en_US/Blank_Project.tjp
-%%KDE%%share/apps/taskjuggler/templates/en_US/Large_Project.tjp
-%%KDE%%share/apps/taskjuggler/templates/en_US/Simple_Project.tjp
-%%KDE%%share/apps/taskjuggler/tips
-%%KDE%%share/config/taskjugglerrc
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/ChangeLog.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/Example.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/FirstProject.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/GenPropertyReference.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/PropertyReference.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/SyntaxReference.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/UsageGuide.xml
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/index.docbook
-%%PORTDOCS%%share/doc/HTML/en/taskjuggler/taskjuggler.xml
-%%EXAMPLESDIR%%/Examples/BigProject/Common/Resources.tji
-%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1-Interface.tji
-%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1.html
-%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1.tjp
-%%EXAMPLESDIR%%/Examples/BigProject/Project2/AccountingReport.html
-%%EXAMPLESDIR%%/Examples/BigProject/Project2/Project2.html
-%%EXAMPLESDIR%%/Examples/BigProject/Project2/Project2.tjp
-%%EXAMPLESDIR%%/Examples/BigProject/README
-%%EXAMPLESDIR%%/Examples/FirstProject/Accounting.html
-%%EXAMPLESDIR%%/Examples/FirstProject/AccountingSoftware.tjp
-%%EXAMPLESDIR%%/Examples/FirstProject/Calendar.html
-%%EXAMPLESDIR%%/Examples/FirstProject/Status-Report.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-anders.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-joe.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-khaled.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-paul.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-sally.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/ResourceUsage-Jun.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftSchedule.tjp
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftTimes-06-03.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftTimes-06-10.html
-%%EXAMPLESDIR%%/Examples/ShiftSchedule/TaskCoverage-Jun.html
-%%KDE%%share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tji.png
-%%KDE%%share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjp.png
-%%KDE%%share/icons/crystalsvg/32x32/mimetypes/taskjuggler_tjx.png
-%%KDE%%share/icons/hicolor/16x16/apps/taskjuggler.png
-%%KDE%%share/icons/hicolor/32x32/apps/taskjuggler.png
-%%KDE%%share/locale/tr/LC_MESSAGES/taskjuggler.mo
-%%KDE%%share/mimelnk/application/x-tji.desktop
-%%KDE%%share/mimelnk/application/x-tjp.desktop
-%%KDE%%share/mimelnk/application/x-tjx.desktop
-@dirrm %%EXAMPLESDIR%%/Examples/ShiftSchedule
-@dirrm %%EXAMPLESDIR%%/Examples/FirstProject
-@dirrm %%EXAMPLESDIR%%/Examples/BigProject/Project2
-@dirrm %%EXAMPLESDIR%%/Examples/BigProject/Project1
-@dirrm %%EXAMPLESDIR%%/Examples/BigProject/Common
-@dirrm %%EXAMPLESDIR%%/Examples/BigProject
-@dirrm %%EXAMPLESDIR%%/Examples
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm share/doc/HTML/en/taskjuggler
-%%KDE%%@dirrm share/apps/taskjuggler/templates/en_US
-%%KDE%%@dirrm share/apps/taskjuggler/templates
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/32x32/actions
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/32x32
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/22x22/actions
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/22x22
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/16x16/actions
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg/16x16
-%%KDE%%@dirrm share/apps/taskjuggler/icons/crystalsvg
-%%KDE%%@dirrm share/apps/taskjuggler/icons
-%%KDE%%@dirrm share/apps/taskjuggler
+bin/tj3
+bin/tj3client
+bin/tj3d
+bin/tj3man
+bin/tj3ss_receiver
+bin/tj3ss_sender
+bin/tj3ts_receiver
+bin/tj3ts_sender
+bin/tj3ts_summary
+bin/tj3webd