ports/67302: [PATCH] deskutils/taskjuggler: unbreak/update to 2.0.1

[Stefan Walter]

>Number:         67302
>Category:       ports
>Synopsis:       [PATCH] deskutils/taskjuggler: unbreak/update to 2.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 28 10:40:08 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Walter
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Infinity Approximation Task Force
>Environment:
System: FreeBSD kyuzo.dunkelkammer.void 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Apr 22 20:41:18 CEST 2004
>Description:
- Unbreak build by updating to 2.0.1
- Sort pkg-plist and use %%DOCSDIR%%
- Comment out the optional KDE dependency. KTJView didn't compile with
  me; I didn't really try to fix it. My suggestion is to commit the
  attached patch with the optional KDE dependency commented out, so that
  the port is usable again. KTJView could still be fixed.

Port maintainer (povey at wedgetail.com) is cc'd. (Please reply/followup to
approve/comment on this PR. Thanks!)

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- taskjuggler-2.0.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/deskutils/taskjuggler.old/Makefile /usr/ports/deskutils/taskjuggler/Makefile
--- /usr/ports/deskutils/taskjuggler.old/Makefile	Fri May 28 17:54:22 2004
+++ /usr/ports/deskutils/taskjuggler/Makefile	Fri May 28 19:07:05 2004
@@ -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 @@
 		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 @@
 
 .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 -ruN --exclude=CVS /usr/ports/deskutils/taskjuggler.old/distinfo /usr/ports/deskutils/taskjuggler/distinfo
--- /usr/ports/deskutils/taskjuggler.old/distinfo	Fri May 28 17:54:22 2004
+++ /usr/ports/deskutils/taskjuggler/distinfo	Fri May 28 17:55:06 2004
@@ -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 -ruN --exclude=CVS /usr/ports/deskutils/taskjuggler.old/files/patch-Testsuite-testdir /usr/ports/deskutils/taskjuggler/files/patch-Testsuite-testdir
--- /usr/ports/deskutils/taskjuggler.old/files/patch-Testsuite-testdir	Fri May 28 17:54:22 2004
+++ /usr/ports/deskutils/taskjuggler/files/patch-Testsuite-testdir	Thu Jan  1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/deskutils/taskjuggler.old/pkg-plist /usr/ports/deskutils/taskjuggler/pkg-plist
--- /usr/ports/deskutils/taskjuggler.old/pkg-plist	Fri May 28 17:54:22 2004
+++ /usr/ports/deskutils/taskjuggler/pkg-plist	Fri May 28 18:35:46 2004
@@ -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
- at dirrm share/doc/taskjuggler/Examples/FirstProject
- at dirrm share/doc/taskjuggler/Examples/BigProject/Common
- at dirrm share/doc/taskjuggler/Examples/BigProject/Project1
- at dirrm share/doc/taskjuggler/Examples/BigProject/Project2
- at dirrm share/doc/taskjuggler/Examples/BigProject
- at dirrm share/doc/taskjuggler/Examples/ShiftSchedule
- at dirrm share/doc/taskjuggler/Examples
- at dirrm share/doc/taskjuggler/manual
- at dirrm share/doc/taskjuggler/tjx2gantt
- at 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
+ at dirrm %%DOCSDIR%%/Examples/FirstProject
+ at dirrm %%DOCSDIR%%/Examples/BigProject/Common
+ at dirrm %%DOCSDIR%%/Examples/BigProject/Project1
+ at dirrm %%DOCSDIR%%/Examples/BigProject/Project2
+ at dirrm %%DOCSDIR%%/Examples/BigProject
+ at dirrm %%DOCSDIR%%/Examples/ShiftSchedule
+ at dirrm %%DOCSDIR%%/Examples
+ at dirrm %%DOCSDIR%%/manual
+ at dirrm %%DOCSDIR%%/tjx2gantt
+ at dirrm %%DOCSDIR%%
--- taskjuggler-2.0.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: