FreeBSD Bugzilla – Attachment 79663 Details for
Bug 114411
Update port: deskutils/taskjuggler to 2.4.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 8.56 KB, created by
tkato432
on 2007-07-08 19:10:09 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2007-07-08 19:10:09 UTC
Size:
8.56 KB
patch
obsolete
>diff -urN /usr/ports/deskutils/taskjuggler/Makefile deskutils/taskjuggler/Makefile >--- /usr/ports/deskutils/taskjuggler/Makefile Sun May 20 05:01:53 2007 >+++ deskutils/taskjuggler/Makefile Mon Jul 9 01:03:43 2007 >@@ -6,33 +6,35 @@ > # > > PORTNAME= taskjuggler >-PORTVERSION= 2.3.0 >-PORTREVISION= 1 >+PORTVERSION= 2.4.0 > CATEGORIES= deskutils > MASTER_SITES= http://www.taskjuggler.org/download/ > > 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 \ >+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker \ >+ ${SITE_PERL}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \ > ${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 >-RUN_DEPENDS+= ${BUILD_DEPENDS} >+ poster:${PORTSDIR}/print/poster \ >+ bash:${PORTSDIR}/shells/bash \ >+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser >+RUN_DEPENDS= ${BUILD_DEPENDS} > > OPTIONS= DOCS "Build documentation" on \ > KDE "Build KDE frontend" on > > USE_BZIP2= yes >-USE_GMAKE= yes > USE_QT_VER= 3 >+USE_GNOME= gnometarget > USE_PERL5_RUN= yes >+USE_GMAKE= yes >+USE_AUTOTOOLS= autoconf:259:env automake:19:env libtool:15:env >+GNU_CONFIGURE= yes >+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ >+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" >+CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include > USE_LDCONFIG= yes >-USE_AUTOTOOLS= libtool:15 >-CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include >-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" >-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} > > .include <bsd.port.pre.mk> > >@@ -60,16 +62,24 @@ > BROKEN= please unset SESSION_MANAGER > .endif > >-pre-configure: >- @${SETENV} TZ=UTC ${TOUCH} -t 200512041507.49 ${WRKSRC}/Makefile.am.in >- @${SETENV} TZ=UTC ${TOUCH} -t 200512041507.52 ${WRKSRC}/Makefile.am >- @${SETENV} TZ=UTC ${TOUCH} -t 200609051627.51 ${WRKSRC}/subdirs >- ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ >- ${WRKSRC}/configure >- ${REINPLACE_CMD} -e 's|exit 1|${ECHO_CMD} "*** Error detected - continue anyway ***"|' \ >+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} \ >+ @${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} >diff -urN /usr/ports/deskutils/taskjuggler/distinfo deskutils/taskjuggler/distinfo >--- /usr/ports/deskutils/taskjuggler/distinfo Sat Sep 23 07:37:04 2006 >+++ deskutils/taskjuggler/distinfo Thu Jul 5 16:57:19 2007 >@@ -1,3 +1,3 @@ >-MD5 (taskjuggler-2.3.0.tar.bz2) = c45b95507caf96ba39b7f40065c9f34b >-SHA256 (taskjuggler-2.3.0.tar.bz2) = 2c5c0ee8724058b8c1421d889dff23e6b8d0ceb5ccef835303f5a93c4e24da30 >-SIZE (taskjuggler-2.3.0.tar.bz2) = 1238644 >+MD5 (taskjuggler-2.4.0.tar.bz2) = d9076b5a1d2601f93ea4bc07780b7297 >+SHA256 (taskjuggler-2.4.0.tar.bz2) = 5b7f31abecafa9b3a617045303789d7da306fa92ac468e89cf26db624ba4fd16 >+SIZE (taskjuggler-2.4.0.tar.bz2) = 1264660 >diff -urN /usr/ports/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp >--- /usr/ports/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp Sat Sep 23 07:37:04 2006 >+++ deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp Thu Jan 1 09:00:00 1970 >@@ -1,11 +0,0 @@ >---- TestSuite/Misc/export/projectReference_a_1.tjp.orig Tue Sep 5 18:27:47 2006 >-+++ TestSuite/Misc/export/projectReference_a_1.tjp Mon Sep 18 23:38:32 2006 >-@@ -1,7 +1,7 @@ >- /* >- * For details about TaskJuggler see http://www.taskjuggler.org >- */ >--project test "Test" "$Id" 2000-01-01-00:00:00-MST 2000-03-09-23:59:59-MST { >-+project test "Test" "$Id" 2000-01-01-00:00:00-UTC 2000-03-09-23:59:59-UTC { >- extend task { >- text UserText "User Text" >- reference UserRef "User Reference" >diff -urN /usr/ports/deskutils/taskjuggler/files/patch-TestSuite_runtests deskutils/taskjuggler/files/patch-TestSuite_runtests >--- /usr/ports/deskutils/taskjuggler/files/patch-TestSuite_runtests Sat Sep 23 07:37:04 2006 >+++ deskutils/taskjuggler/files/patch-TestSuite_runtests Thu Jan 1 09:00:00 1970 >@@ -1,10 +0,0 @@ >---- TestSuite/runtests.orig Tue Sep 5 18:27:48 2006 >-+++ TestSuite/runtests Tue Sep 19 22:05:13 2006 >-@@ -24,5 +24,6 @@ >- done >- >- echo $errors errors detected! >--exit $errors >-+# FreeBSD: don't stop package building when a test fails! >-+exit 0 >- >diff -urN /usr/ports/deskutils/taskjuggler/pkg-plist deskutils/taskjuggler/pkg-plist >--- /usr/ports/deskutils/taskjuggler/pkg-plist Sat Sep 23 07:37:04 2006 >+++ deskutils/taskjuggler/pkg-plist Sun Jul 8 03:41:14 2007 >@@ -1,6 +1,5 @@ > %%WITH_KDE%%bin/TaskJugglerUI > bin/taskjuggler >-lib/libtaskjuggler.a > lib/libtaskjuggler.la > lib/libtaskjuggler.so > lib/libtaskjuggler.so.3 >@@ -57,31 +56,31 @@ > %%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%%%%WITH_KDE%%share/doc/HTML/en/taskjuggler/index.cache.bz2 >+%%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 >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/Accounting.html >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/Calendar.html >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/Status-Report.html >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/AccountingSoftware.tjp >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/README > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Common/Resources.tji >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1-Interface.tji > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1.tjp >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project1/Project1-Interface.tji > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project2/AccountingReport.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project2/Project2.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/Project2/Project2.tjp >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/BigProject/README >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/Accounting.html >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/AccountingSoftware.tjp >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/Calendar.html >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/FirstProject/Status-Report.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-anders.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-joe.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-khaled.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-paul.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/Calendar-sally.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/ResourceUsage-Jun.html >+%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftSchedule.tjp > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftTimes-06-03.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftTimes-06-10.html > %%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/TaskCoverage-Jun.html >-%%PORTDOCS%%%%EXAMPLESDIR%%/Examples/ShiftSchedule/ShiftSchedule.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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 114411
: 79663