[pkgsrc/trunk]: pkgsrc/lang/konoha lang/konoha: Add DragonFly support, kill M...

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/84ba1105d91f
branches:  trunk
changeset: 607472:84ba1105d91f
user:      marino <marino%pkgsrc.org@localhost>
date:      Sun Aug 12 11:23:59 2012 +0000

description:
lang/konoha: Add DragonFly support, kill MySQL detection

* Specific DragonFly configuration was added
* A couple of K_USING_BSD macros were changed to __NetBSD__ along with
  other changes to support FreeBSD and DragonFly
* If MySQL is on the system, CMake will find it and try to use it.
  Problem 1: It's broken, it can't link to libmysql
  Problem 2: If it could, it would affect PLIST

So disable MySQL detection for now, sqlite3 is what's used.
I suspect there are other CMake detection logic that aren't accounted
for yet in Konoha.

diffstat:

 lang/konoha/Makefile                                        |   3 +-
 lang/konoha/distinfo                                        |   9 +++--
 lang/konoha/patches/patch-include_konoha1_konoha__config.h  |  21 ++++++++++++-
 lang/konoha/patches/patch-include_konoha1_konoha__t.h       |   9 ++++-
 lang/konoha/patches/patch-package_konoha.sql_CMakeLists.txt |  19 +++++++++++
 lang/konoha/patches/patch-src_main_evidence.c               |   5 +-
 6 files changed, 56 insertions(+), 10 deletions(-)

diffs (139 lines):

diff -r b4e352e7a94d -r 84ba1105d91f lang/konoha/Makefile
--- a/lang/konoha/Makefile      Sun Aug 12 11:07:11 2012 +0000
+++ b/lang/konoha/Makefile      Sun Aug 12 11:23:59 2012 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/08/07 16:20:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/12 11:23:59 marino Exp $
 #
 
 DISTNAME=      konoha-1.0.0-952
 PKGNAME=       konoha-1.0.0.952
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://konoha.googlecode.com/files/
 
diff -r b4e352e7a94d -r 84ba1105d91f lang/konoha/distinfo
--- a/lang/konoha/distinfo      Sun Aug 12 11:07:11 2012 +0000
+++ b/lang/konoha/distinfo      Sun Aug 12 11:23:59 2012 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.1 2012/08/07 16:06:06 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2012/08/12 11:23:59 marino Exp $
 
 SHA1 (konoha-1.0.0-952.tar.gz) = c4cfdc956bd583f8c3e8e696eeb0316ca78b1389
 RMD160 (konoha-1.0.0-952.tar.gz) = 98eb63382d3877b57606a205ac41cfd3928316b4
 Size (konoha-1.0.0-952.tar.gz) = 5235671 bytes
-SHA1 (patch-include_konoha1_konoha__config.h) = 3ff759fb41f2cea76d92ed091a0e2d78d896ede6
-SHA1 (patch-include_konoha1_konoha__t.h) = a77141b686823aa2dba4a985a6d581ef57dd2df6
-SHA1 (patch-src_main_evidence.c) = c30241d5c7b6ee50253490b480836b74accf34f8
+SHA1 (patch-include_konoha1_konoha__config.h) = 5faf9bb6575ecab19fe78b15959db849ed6943c5
+SHA1 (patch-include_konoha1_konoha__t.h) = b6296dcef752c0c488f9e93def1fb6673d89a9b9
+SHA1 (patch-package_konoha.sql_CMakeLists.txt) = a1a8690f10f40c89feb756eba238f643e136de4d
+SHA1 (patch-src_main_evidence.c) = 58dbce27ac3a3e2a8f8d84d44b68095af13015af
 SHA1 (patch-src_main_os.c) = b939ef713d279c4ab5ba23680dd39e6fb546ebca
 SHA1 (patch-src_main_security.c) = dfbba5ce7ba37f195a8f72e1ae613cbd1288320e
diff -r b4e352e7a94d -r 84ba1105d91f lang/konoha/patches/patch-include_konoha1_konoha__config.h
--- a/lang/konoha/patches/patch-include_konoha1_konoha__config.h        Sun Aug 12 11:07:11 2012 +0000
+++ b/lang/konoha/patches/patch-include_konoha1_konoha__config.h        Sun Aug 12 11:23:59 2012 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-include_konoha1_konoha__config.h,v 1.1 2012/08/07 16:06:06 ryoon Exp $
+$NetBSD: patch-include_konoha1_konoha__config.h,v 1.2 2012/08/12 11:24:00 marino Exp $
 
 * Add NetBSD support
+* Add DragonFly support
 
 --- include/konoha1/konoha_config.h.orig       2012-03-07 06:52:14.000000000 +0000
 +++ include/konoha1/konoha_config.h
@@ -22,3 +23,21 @@
  #if defined(__MINGW32__)  /* mingw */
  #define               K_USING_STDC_       1
  #define               K_USING_SETJMP_     1
+@@ -328,6 +339,17 @@ typedef struct knh_sysinfo_t {
+ 
+ /* experimetally supported */
+ 
++#if defined(__DragonFly__)
++#define K_USING_PTHREAD
++#define K_USING_STDC_       1
++#define K_USING_POSIX_      1
++#define K_USING_BSD_        1
++#define K_USING_BSDSYSCTL_  1
++#define K_USING_ICONV       1
++#define K_USING_SYSLOG      1
++#define K_USING_SQLITE3     1
++#endif
++
+ #if defined(__FreeBSD__) /* FreeBSD */
+ #define               K_USING_STDC_       1
+ #define       K_USING_POSIX_      1
diff -r b4e352e7a94d -r 84ba1105d91f lang/konoha/patches/patch-include_konoha1_konoha__t.h
--- a/lang/konoha/patches/patch-include_konoha1_konoha__t.h     Sun Aug 12 11:07:11 2012 +0000
+++ b/lang/konoha/patches/patch-include_konoha1_konoha__t.h     Sun Aug 12 11:23:59 2012 +0000
@@ -1,17 +1,22 @@
-$NetBSD: patch-include_konoha1_konoha__t.h,v 1.1 2012/08/07 16:06:06 ryoon Exp $
+$NetBSD: patch-include_konoha1_konoha__t.h,v 1.2 2012/08/12 11:24:00 marino Exp $
 
 * Try to support *BSD
+* FreeBSD and DragonFly have NSIG exposed
 
 --- include/konoha1/konoha_t.h.orig    2012-03-07 06:52:14.000000000 +0000
 +++ include/konoha1/konoha_t.h
-@@ -1041,6 +1041,10 @@ typedef struct kcontext_t {
+@@ -1041,6 +1041,14 @@ typedef struct kcontext_t {
        void                           *siginfo;
  #if defined(K_USING_MINGW_)
  #define K_SIGNAL_MAX NSIG
 +#elif defined(K_USING_MACOSX_)
 +#define K_SIGNAL_MAX _POSIX_SIGQUEUE_MAX
 +#elif defined(K_USING_BSD_)
++#ifdef __NetBSD__
 +#define K_SIGNAL_MAX _NSIG /* I am not sure. */
++#else
++#define K_SIGNAL_MAX NSIG
++#endif
  #else
  #define K_SIGNAL_MAX _POSIX_SIGQUEUE_MAX
  #endif
diff -r b4e352e7a94d -r 84ba1105d91f lang/konoha/patches/patch-package_konoha.sql_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/konoha/patches/patch-package_konoha.sql_CMakeLists.txt       Sun Aug 12 11:23:59 2012 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-package_konoha.sql_CMakeLists.txt,v 1.1 2012/08/12 11:24:00 marino Exp $
+
+Konoha automatically detects mysql and tries to support it.
+For one, it breaks during linking.  It must be looking for mysql lib in
+wrong spot.  Secondly, sqlite is already supported and specified in
+the pkgsrc makefile so it's not needed.
+Disable mysql detection until further notice.
+
+--- package/konoha.sql/CMakeLists.txt.orig     2012-03-07 06:52:15.000000000 +0000
++++ package/konoha.sql/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
+ set(CMAKE_BUILD_TYPE ${KONOHA_BUILD_TYPE})
+ 
+ project(sql)
+-find_program(MYSQL_CONFIG NAMES mysql_config)
++find_program(MYSQL_CONFIG NAMES mysql_config__DISABLE_THIS__)
+ 
+ if(MYSQL_CONFIG)
+ 
diff -r b4e352e7a94d -r 84ba1105d91f lang/konoha/patches/patch-src_main_evidence.c
--- a/lang/konoha/patches/patch-src_main_evidence.c     Sun Aug 12 11:07:11 2012 +0000
+++ b/lang/konoha/patches/patch-src_main_evidence.c     Sun Aug 12 11:23:59 2012 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_main_evidence.c,v 1.1 2012/08/07 16:06:06 ryoon Exp $
+$NetBSD: patch-src_main_evidence.c,v 1.2 2012/08/12 11:24:00 marino Exp $
 
 * Resolve conflict of si_code on NetBSD
+* Don't use K_USING_BSD to load sys/siginfo.h.  Fails for DFly/FreeBSD.
 
 --- src/main/evidence.c.orig   2012-03-07 06:52:15.000000000 +0000
 +++ src/main/evidence.c
@@ -8,7 +9,7 @@
  #include<unistd.h>
  #endif
  
-+#if defined(K_USING_BSD_)
++#if defined(__NetBSD__)
 +#include <sys/siginfo.h>
 +#endif
 +