From 1c336d5a783670173c417045b4f65ab5f11047f5 Mon Sep 17 00:00:00 2001 From: thierry Date: Fri, 22 Sep 2006 22:37:04 +0000 Subject: - Upgrade to 2.3.0; - Move tests to regression-test target; - Various fixes. Changelog available at . --- deskutils/taskjuggler/Makefile | 37 ++++++---- deskutils/taskjuggler/distinfo | 6 +- ...-TestSuite_Misc_export_projectReference_a_1.tjp | 11 +++ .../patch-TestSuite_Misc_export_project_a.tjp | 8 +++ .../patch-TestSuite_Misc_export_project_b1.tjp | 8 +++ .../taskjuggler/files/patch-TestSuite_runtests | 10 +++ .../files/patch-i18n_TaskJugglerUI_Makefile.in | 14 ++++ deskutils/taskjuggler/files/patch-subdirs | 10 +++ deskutils/taskjuggler/pkg-plist | 81 +++++++++++----------- 9 files changed, 130 insertions(+), 55 deletions(-) create mode 100644 deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp create mode 100644 deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp create mode 100644 deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_b1.tjp create mode 100644 deskutils/taskjuggler/files/patch-TestSuite_runtests create mode 100644 deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in create mode 100644 deskutils/taskjuggler/files/patch-subdirs (limited to 'deskutils') diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index eb025f798eb5..cd535029ad0b 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -6,18 +6,13 @@ # PORTNAME= taskjuggler -PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTVERSION= 2.3.0 CATEGORIES= deskutils MASTER_SITES= http://www.taskjuggler.org/download/ MAINTAINER= ports@FreeBSD.org COMMENT= A project management tool for UNIX based operating systems -BROKEN= fails to install -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2006-12-01 - 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 \ @@ -32,6 +27,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_QT_VER= 3 USE_PERL5_RUN= yes +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" @@ -45,6 +41,7 @@ NOPORTDOCS= true .if !defined(NOPORTDOCS) BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt +CONFIGURE_ARGS+=--with-docdir=${EXAMPLESDIR}/ .else CONFIGURE_ARGS+=--disable-docs .endif @@ -59,16 +56,32 @@ PLIST_SUB+= WITH_KDE="@comment " .endif .if ${PERL_LEVEL} < 500600 -IGNORE= Perl > 5.6 is required. +IGNORE= Perl > 5.6 is required +.endif + +.if defined(SESSION_MANAGER) +BROKEN= please unset SESSION_MANAGER .endif -post-patch: - ${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' +pre-configure: @${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' \ + @${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 ***"|' \ + ${WRKSRC}/TestSuite/Misc/export/runtest + ${FIND} ${WRKSRC}/TestSuite -name testdir | ${XARGS} \ + ${REINPLACE_CMD} -e 's|exit $$errors|exit 0|' + +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 diff --git a/deskutils/taskjuggler/distinfo b/deskutils/taskjuggler/distinfo index 0d2a93d6d7ba..d00d60262104 100644 --- a/deskutils/taskjuggler/distinfo +++ b/deskutils/taskjuggler/distinfo @@ -1,3 +1,3 @@ -MD5 (taskjuggler-2.2.0.tar.bz2) = 0f7a0301a6e1ec82378bbf4e2539af66 -SHA256 (taskjuggler-2.2.0.tar.bz2) = 1499174951cbf4857bb98728b6bb4069112fc28d074149bd3efb61fcb5c98d2e -SIZE (taskjuggler-2.2.0.tar.bz2) = 1231701 +MD5 (taskjuggler-2.3.0.tar.bz2) = c45b95507caf96ba39b7f40065c9f34b +SHA256 (taskjuggler-2.3.0.tar.bz2) = 2c5c0ee8724058b8c1421d889dff23e6b8d0ceb5ccef835303f5a93c4e24da30 +SIZE (taskjuggler-2.3.0.tar.bz2) = 1238644 diff --git a/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp new file mode 100644 index 000000000000..791d7372ea74 --- /dev/null +++ b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_projectReference_a_1.tjp @@ -0,0 +1,11 @@ +--- 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 --git a/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp new file mode 100644 index 000000000000..6abbd98751c9 --- /dev/null +++ b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_a.tjp @@ -0,0 +1,8 @@ +--- 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 new file mode 100644 index 000000000000..b942d07f3dc1 --- /dev/null +++ b/deskutils/taskjuggler/files/patch-TestSuite_Misc_export_project_b1.tjp @@ -0,0 +1,8 @@ +--- 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-TestSuite_runtests b/deskutils/taskjuggler/files/patch-TestSuite_runtests new file mode 100644 index 000000000000..aed0cdd3c230 --- /dev/null +++ b/deskutils/taskjuggler/files/patch-TestSuite_runtests @@ -0,0 +1,10 @@ +--- 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 --git a/deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in b/deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in new file mode 100644 index 000000000000..194d1a9a86b6 --- /dev/null +++ b/deskutils/taskjuggler/files/patch-i18n_TaskJugglerUI_Makefile.in @@ -0,0 +1,14 @@ +--- 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 new file mode 100644 index 000000000000..69f9ca49610d --- /dev/null +++ b/deskutils/taskjuggler/files/patch-subdirs @@ -0,0 +1,10 @@ +--- 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 6baa49556c86..b6bf51277da4 100644 --- a/deskutils/taskjuggler/pkg-plist +++ b/deskutils/taskjuggler/pkg-plist @@ -50,55 +50,56 @@ lib/libtaskjuggler.so.3 %%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%%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%%%%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/Calendar.html -%%DOCSDIR%%/Examples/FirstProject/Status-Report.html -%%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 +%%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.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/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/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 %%WITH_KDE%%share/icons/hicolor/16x16/apps/taskjuggler.png %%WITH_KDE%%share/icons/hicolor/32x32/apps/taskjuggler.png +%%WITH_KDE%%share/locale/tr/LC_MESSAGES/taskjuggler.mo %%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/Project2 -@dirrm %%DOCSDIR%%/Examples/BigProject/Project1 -@dirrm %%DOCSDIR%%/Examples/BigProject/Common -@dirrm %%DOCSDIR%%/Examples/BigProject -@dirrm %%DOCSDIR%%/Examples -@dirrm %%DOCSDIR%% -%%PORTDOCS%%%%WITH_KDE%%@dirrm share/doc/HTML/en/taskjuggler +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples/ShiftSchedule +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples/FirstProject +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples/BigProject/Project2 +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples/BigProject/Project1 +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples/BigProject/Common +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples/BigProject +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Examples +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@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 -- cgit