Index: Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/taskwarrior/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 6 Dec 2009 12:32:40 -0000 1.10 +++ Makefile 6 Feb 2010 12:55:31 -0000 @@ -6,10 +6,10 @@ # PORTNAME= taskwarrior -PORTVERSION= 1.8.5 +DISTVERSION= 1.9.0.beta1 CATEGORIES= deskutils MASTER_SITES= http://taskwarrior.org/download/ -DISTNAME= task-${PORTVERSION} +DISTNAME= task-${DISTVERSION} MAINTAINER= gahr@FreeBSD.org COMMENT= A framework for supercharged task and contact management @@ -19,15 +19,15 @@ GNU_CONFIGURE= yes MAN1= task.1 -MAN5= taskrc.5 task-tutorial.5 +MAN5= taskrc.5 task-faq.5 task-color.5 task-tutorial.5 + +CONFIGURE_ARGS+=--datadir=${DATADIR} --docdir=${DOCSDIR} .include post-patch: - ${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|; s|%%DATADIR%%|${DATADIR}|' \ - ${WRKSRC}/Makefile.in .if defined(NOPORTDOCS) - ${REINPLACE_CMD} -e '342,349d' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e '376,386d' ${WRKSRC}/Makefile.in .endif .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/deskutils/taskwarrior/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 6 Dec 2009 12:32:40 -0000 1.6 +++ distinfo 4 Feb 2010 19:35:47 -0000 @@ -1,3 +1,3 @@ -MD5 (task-1.8.5.tar.gz) = b7e5ab3abf624027068d9a01bf684035 -SHA256 (task-1.8.5.tar.gz) = f43670b4267d98d48a344ab9ded4fc12c8e4150a85eb8416083d477c1af58f01 -SIZE (task-1.8.5.tar.gz) = 212961 +MD5 (task-1.9.0.beta1.tar.gz) = 2303f3b3a8fbf1574a08753cf189e4e7 +SHA256 (task-1.9.0.beta1.tar.gz) = c8e0d71ee7217b5c8667775b3df8c78255b8ee9b2f2abaa03185fd04625e920a +SIZE (task-1.9.0.beta1.tar.gz) = 246925 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/deskutils/taskwarrior/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 22 Jul 2009 15:43:54 -0000 1.2 +++ pkg-plist 6 Feb 2010 13:09:47 -0000 @@ -1,9 +1,21 @@ bin/task +%%DATADIR%%/doc/task-1.9.0.beta1/AUTHORS +%%DATADIR%%/doc/task-1.9.0.beta1/ChangeLog +%%DATADIR%%/doc/task-1.9.0.beta1/COPYING +%%DATADIR%%/doc/task-1.9.0.beta1/NEWS +%%DATADIR%%/doc/task-1.9.0.beta1/README +%%DATADIR%%/doc/rc/holidays-US.rc +%%DATADIR%%/doc/rc/holidays-SE.rc +%%DATADIR%%/doc/rc/dark-16.theme +%%DATADIR%%/doc/rc/dark-256.theme +%%DATADIR%%/doc/rc/light-16.theme +%%DATADIR%%/doc/rc/light-256.theme %%DATADIR%%/scripts/bash/task_completion.sh -%%DATADIR%%/scripts/vim/ftdetect/task.vim %%DATADIR%%/scripts/vim/README +%%DATADIR%%/scripts/vim/ftdetect/task.vim %%DATADIR%%/scripts/vim/syntax/taskdata.vim %%DATADIR%%/scripts/vim/syntax/taskedit.vim +%%DATADIR%%/scripts/vim/syntax/taskrc.vim %%DATADIR%%/scripts/zsh/_task %%DATADIR%%/i18n/strings.de-DE %%DATADIR%%/i18n/strings.en-US @@ -14,17 +26,14 @@ %%DATADIR%%/i18n/tips.de-DE %%DATADIR%%/i18n/tips.en-US %%DATADIR%%/i18n/tips.sv-SE -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/scripts/bash +@dirrm %%DATADIR%%/scripts/zsh @dirrm %%DATADIR%%/scripts/vim/syntax @dirrm %%DATADIR%%/scripts/vim/ftdetect @dirrm %%DATADIR%%/scripts/vim -@dirrm %%DATADIR%%/scripts/zsh +@dirrm %%DATADIR%%/scripts/bash @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/i18n +@dirrm %%DATADIR%%/doc/task-1.9.0.beta1 +@dirrm %%DATADIR%%/doc/rc +@dirrm %%DATADIR%%/doc @dirrm %%DATADIR%% Index: files/patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/deskutils/taskwarrior/files/patch-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile.in --- files/patch-Makefile.in 22 Jul 2009 15:43:55 -0000 1.1 +++ files/patch-Makefile.in 4 Feb 2010 19:39:17 -0000 @@ -1,19 +1,7 @@ ---- Makefile.in.orig 2009-07-21 22:49:24.000000000 +0200 -+++ Makefile.in 2009-07-22 12:01:39.000000000 +0200 -@@ -153,9 +153,9 @@ - bindir = @bindir@ - build_alias = @build_alias@ - builddir = @builddir@ --datadir = @datadir@ -+datadir = %%DATADIR%% - datarootdir = @datarootdir@ --docdir = $(datadir)/doc/${PACKAGE}-${VERSION} -+docdir = %%DOCSDIR%% - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host_alias = @host_alias@ -@@ -185,13 +185,13 @@ - dist_man_MANS = doc/man/task.1 doc/man/taskrc.5 doc/man/task-tutorial.5 +--- Makefile.in.orig 2010-02-04 20:38:27.000000000 +0100 ++++ Makefile.in 2010-02-04 20:39:07.000000000 +0100 +@@ -231,15 +231,15 @@ + dist_man_MANS = doc/man/task.1 doc/man/taskrc.5 doc/man/task-tutorial.5 doc/man/task-faq.5 doc/man/task-color.5 doc_DATA = AUTHORS ChangeLog COPYING NEWS README EXTRA_DIST = INSTALL -bashscriptsdir = $(docdir) @@ -24,9 +12,12 @@ nobase_dist_zshscripts_DATA = scripts/zsh/_task -vimscriptsdir = $(docdir) +vimscriptsdir = $(datadir) - nobase_dist_vimscripts_DATA = scripts/vim/README scripts/vim/ftdetect/task.vim scripts/vim/syntax/taskdata.vim scripts/vim/syntax/taskedit.vim + nobase_dist_vimscripts_DATA = scripts/vim/README scripts/vim/ftdetect/task.vim scripts/vim/syntax/taskdata.vim scripts/vim/syntax/taskedit.vim scripts/vim/syntax/taskrc.vim -i18ndir = $(docdir) +i18ndir = $(datadir) nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE +-rcfiledir = $(docdir) ++rcfiledir = $(datadir) + nobase_dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-SE.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme all: auto.h $(MAKE) $(AM_MAKEFLAGS) all-recursive