From 09d15c0de3043d12050babddd6df343de38d7e66 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 10 Dec 2017 00:23:08 -0500 Subject: [PATCH] TI-91: Timewarrior does not compile on DragonFly - Thanks to Michael Neumann. --- AUTHORS | 1 + CMakeLists.txt | 6 +++--- ChangeLog | 3 +++ cmake.h.in | 1 + cmake/CXXSniffer.cmake | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9617cca..b134bc2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,6 +11,7 @@ The following submitted code, packages or analysis, and deserve special thanks: Ben Boeckel ilove zfs Paul Fenwick + Michael Neumann Thanks to the following, who submitted detailed bug reports and excellent suggestions: diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c8d72a..083c61a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,11 @@ set (PACKAGE_TARNAME "${PACKAGE}") set (PACKAGE_VERSION "${VERSION}") set (PACKAGE_STRING "${PACKAGE} ${VERSION}") -if (FREEBSD) +if (FREEBSD OR DRAGONFLY) SET (TASKSH_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1") -else (FREEBSD) +else (FREEBSD OR DRAGONFLY) SET (TASKSH_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1") -endif (FREEBSD) +endif (FREEBSD OR DRAGONFLY) SET (TASKSH_DOCDIR share/doc/tasksh CACHE STRING "Installation directory for doc files") SET (TASKSH_RCDIR "${TASKSH_DOCDIR}/rc" CACHE STRING "Installation directory for configuration files") SET (TASKSH_BINDIR bin CACHE STRING "Installation directory for the binary") diff --git a/ChangeLog b/ChangeLog index a698044..7ad38f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1.3.0 () - +- TI-91 Timewarrior does not compile on DragonFly + (thanks to Michael Neumann). + ------ current release --------------------------- 1.2.0 (2017-05-10) 3f4b2284ad19beacd30e202e6c700a36c2b65c60 diff --git a/cmake.h.in b/cmake.h.in index e905598..b1c400e 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -32,6 +32,7 @@ #cmakedefine FREEBSD #cmakedefine OPENBSD #cmakedefine NETBSD +#cmakedefine DRAGONFLY #cmakedefine HAIKU #cmakedefine SOLARIS #cmakedefine KFREEBSD diff --git a/cmake/CXXSniffer.cmake b/cmake/CXXSniffer.cmake index 9606226..b6aa56d 100644 --- a/cmake/CXXSniffer.cmake +++ b/cmake/CXXSniffer.cmake @@ -33,6 +33,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") set (OPENBSD true) elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") set (NETBSD true) +elseif (${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") + set (DRAGONFLY true) elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") set (SOLARIS true) elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")