[SCM] CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences branch, master, updated. upstream/2006.dfsg.2-39-g3f397bd

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 3f397bdd13290d81b7ff6551fc85a6070451bcee
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 12 07:41:06 2012 +0800

    Try to support kfreebsd.
    
    Fail to past one test: hbook.

diff --git a/debian/add-ons/bin/cernlib.in b/debian/add-ons/bin/cernlib.in
index aa95071..c682659 100755
--- a/debian/add-ons/bin/cernlib.in
+++ b/debian/add-ons/bin/cernlib.in
@@ -95,7 +95,7 @@ find_sysdeps() {
 	fi
 	
 	[ "$ARCH" = "AIX"   ] && SYSLIBS="$SYSLIBS -lld"
-	[ "$ARCH" = "Linux" ] && SYSLIBS="$SYSLIBS -lnsl -lcrypt -ldl -lgfortran"
+	[ "$ARCH" = "Linux" -o "$ARCH" = "GNU/kFreeBSD" ] && SYSLIBS="$SYSLIBS -lnsl -lcrypt -ldl -lgfortran"
 	[ "$ARCH" = "Darwin" ] && SYSLIBS="$SYSLIBS -ldl"
 
 	echo $SYSLIBS
diff --git a/debian/patches/00list b/debian/patches/00list
index 8301baa..1c707de 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -44,6 +44,7 @@
 214-fix-kernnum-funcs-on-64-bit.dpatch
 216-use-cernlib-gamma-not-intrinsic.dpatch
 217-abend-on-mathlib-test-failure.dpatch
+218-support-kfreebsd.dpatch
 300-skip-duplicate-lenocc.dpatch
 302-scripts-comply-with-FHS.dpatch
 303-shadow-passwords-supported.dpatch
diff --git a/debian/patches/218-support-kfreebsd.dpatch b/debian/patches/218-support-kfreebsd.dpatch
new file mode 100755
index 0000000..31ab17e
--- /dev/null
+++ b/debian/patches/218-support-kfreebsd.dpatch
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 218-support-kfreebsd.dpatch by Lifeng Sun <lifongsun at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+ at DPATCH@
+diff --git a/src/packlib/kuip/code_motif/kmfile.c b/src/packlib/kuip/code_motif/kmfile.c
+index 401b177..d887576 100644
+--- a/src/packlib/kuip/code_motif/kmfile.c
++++ b/src/packlib/kuip/code_motif/kmfile.c
+@@ -23,6 +23,9 @@
+ #ifdef CERNLIB_MACOSX
+ #include <regex.h>
+ #endif
++#ifdef __FreeBSD_kernel__
++#include <dirent.h>
++#endif
+ 
+ static char **ftype_list = NULL;
+ static char **class_list = NULL;
+diff --git a/src/packlib/kernlib/kernbit/z268/systems.c b/src/packlib/kernlib/kernbit/z268/systems.c
+index 24af735..17a2a63 100644
+--- a/src/packlib/kernlib/kernbit/z268/systems.c
++++ b/src/packlib/kernlib/kernbit/z268/systems.c
+@@ -203,7 +203,8 @@ int     *ovflw;
+ || defined(_IBMR2) \
+ || defined(__convexc__) \
+ || defined(_OSK) \
+-|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__)
++|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__) \
++|| defined(__FreeBSD_kernel__)
+ 
+   void systems_( command, buf, buflen, l, chars, rc, ovflw )
+ 
+diff --git a/src/packlib/cspack/sysreq/log.c b/src/packlib/cspack/sysreq/log.c
+index 2dac5d2..ff7a31c 100644
+--- a/src/packlib/cspack/sysreq/log.c
++++ b/src/packlib/cspack/sysreq/log.c
+@@ -84,7 +84,8 @@ syslog() {
+ static int pid;                 /* process identifier                   */
+ static int logfd ;              /* logging file descriptor              */
+ #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
+-  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__)
++  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__) \
++  && !defined(__FreeBSD_kernel__)
+ extern int syslog();
+ #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
+ extern char *getenv();
+diff --git a/src/packlib/cspack/tcpaw/tcpaw.c b/src/packlib/cspack/tcpaw/tcpaw.c
+index cd03aad..521dc3e 100644
+--- a/src/packlib/cspack/tcpaw/tcpaw.c
++++ b/src/packlib/cspack/tcpaw/tcpaw.c
+@@ -2590,6 +2590,11 @@ token()
+         return (ID);
+ }
+  
++#if defined(__FreeBSD_kernel__)
++#define COMPAT_43TTY
++#include <sys/ioctl_compat.h>
++#endif
++
+ #if !defined(IBM) && !defined(_WIN32)
+ /* I provide "getpass" myself as standard version truncates to 8 characters */
+ #include <sys/ioctl.h>
+@@ -2697,7 +2702,7 @@ rexec(ahost, rport, name, pass, cmd, fd2p)
+  
+         char **ahost;
+         int rport;
+-        char *name, *pass, *cmd;
++        const char *name, *pass, *cmd;
+         int *fd2p;
+ #endif
+ {

-- 
CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences