On Wed, Apr 29, 2015 at 12:50:38AM +0100, Stuart Henderson wrote:
> This is an issue with the current version of binutils, it affects a
> number of ports. (other issues: very high memory use, a real problem on
> i386, and poor assembler support for recent opcodes, which is probably a
> bigger problem on amd64 and arm).
>
> Using gcc4.8 is fine with me, though (and in general, not just here)
> I would prefer a comment explaining why it was chosen ("needs c++11;
> linker issues wth clang" would be plenty good enough).
Updated diff below; only change since the previous version is the
comment above MODULES. Ok to commit?
Index: Makefile
===================================================================
RCS file: /work/cvsroot/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.13
diff -p -u -r1.13 Makefile
--- Makefile 15 Jan 2015 15:47:05 -0000 1.13
+++ Makefile 29 Apr 2015 14:13:37 -0000
@@ -2,7 +2,7 @@
COMMENT = command line todo list manager
-VERSION = 2.4.0
+VERSION = 2.4.3
DISTNAME = task-${VERSION}
PKGNAME = taskwarrior-${VERSION}
CATEGORIES = productivity
@@ -16,11 +16,16 @@ MASTER_SITES = ${HOMEPAGE}/download/
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/cmake \
- lang/lua
+# Needs C++11; linker issues with clang
+MODULES = gcc4 \
+ devel/cmake \
+ lang/lua \
+ lang/python
+MODGCC4_LANGS = c++
+MODGCC4_ARCHS = *
MODLUA_SA = Yes
-WANTLIB += c gnutls m ncurses pthread readline stdc++ uuid
+WANTLIB += c gnutls m pthread uuid
LIB_DEPENDS = security/gnutls \
sysutils/e2fsprogs>=1.42.7
@@ -39,10 +44,13 @@ NO_TEST = Yes
pre-configure:
@perl -pi -e 's|share/doc/task/|share/taskwarrior/|g' \
${WRKSRC}/doc/man/task-color.5.in \
- ${WRKSRC}/doc/man/task-tutorial.5.in \
${WRKSRC}/doc/man/taskrc.5.in \
${WRKSRC}/src/Config.cpp
@perl -pi -e 's|share/doc/task-VERSION/|share/taskwarrior/|g' \
${WRKSRC}/scripts/vim/README
+
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/share/taskwarrior/scripts/add-ons
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /work/cvsroot/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.7
diff -p -u -r1.7 distinfo
--- distinfo 15 Jan 2015 15:47:05 -0000 1.7
+++ distinfo 29 Apr 2015 14:08:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (task-2.4.0.tar.gz) = b6WV9bD99u6AMdo56NAJdxvaE18mXV97Wd+ARv/ZEZ4=
-SIZE (task-2.4.0.tar.gz) = 841000
+SHA256 (task-2.4.3.tar.gz) = uwK4+ob+ITouarCToEU4Ovur4g5Z3QsPXdZDDZ3ga9I=
+SIZE (task-2.4.3.tar.gz) = 2334424
Index: pkg/PLIST
===================================================================
RCS file: /work/cvsroot/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.6
diff -p -u -r1.6 PLIST
--- pkg/PLIST 15 Jan 2015 15:47:05 -0000 1.6
+++ pkg/PLIST 29 Apr 2015 14:08:40 -0000
@@ -75,9 +75,11 @@ share/taskwarrior/scripts/add-ons/export
share/taskwarrior/scripts/add-ons/export-html.pl
share/taskwarrior/scripts/add-ons/export-ical.pl
share/taskwarrior/scripts/add-ons/export-sql.py
+share/taskwarrior/scripts/add-ons/export-sql.pyc
share/taskwarrior/scripts/add-ons/export-tsv.pl
share/taskwarrior/scripts/add-ons/export-xml.pl
share/taskwarrior/scripts/add-ons/export-xml.py
+share/taskwarrior/scripts/add-ons/export-xml.pyc
share/taskwarrior/scripts/add-ons/export-xml.rb
share/taskwarrior/scripts/add-ons/export-yad.pl
share/taskwarrior/scripts/add-ons/export-yaml.pl
