Your message dated Tue, 16 May 2006 15:47:20 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#340431: fixed in genesis 2.2.1-7
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: genesis
Version: 2.2.1-5
Severity: important
Tags: patch

Hi,

the current version of genesis fails to build on GNU/kFreeBSD.

Please find attached patch to fix that. 
It would be nice if it could be included in the next upload.

Thanks in advance,

        Petr
only in patch2:
unchanged:
--- genesis-2.2.1.orig/src/shell/shell_tty.c
+++ genesis-2.2.1/src/shell/shell_tty.c
@@ -112,7 +112,8 @@
 */
 #ifdef TERMIO
 
-#if defined(sgi) || defined(__FreeBSD__)
+#if defined(sgi) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/ioctl.h>
 #include <termios.h>
 #include <curses.h>
 #include <term.h>
@@ -120,7 +121,7 @@
 #include <termio.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 struct termios old_tty_stdin, old_tty_stdout, new_tty_stdin, new_tty_stdout;
 #else
 struct termio old_tty_stdin, old_tty_stdout, new_tty_stdin, new_tty_stdout;
@@ -439,7 +440,7 @@
      * reset the terminal parameters to their original state
      */
 #ifdef TERMIO
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     tcsetattr(fileno(stdin), TCSANOW, &old_tty_stdin);
     tcsetattr(fileno(stdout), TCSANOW, &old_tty_stdout);
 #else
@@ -485,7 +486,7 @@
      * save the old terminal parameters
      */
 #ifdef TERMIO
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     tcgetattr(fileno(stdin), &old_tty_stdin);
     tcgetattr(fileno(stdout), &old_tty_stdout);
 #else
@@ -651,7 +652,7 @@
     /*
      * set the new parameters
      */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     tcsetattr(fileno(stdin), TCSANOW, &new_tty_stdin);
 #else
     ioctl(fileno(stdin), TCSETA, &new_tty_stdin);
only in patch2:
unchanged:
--- genesis-2.2.1.orig/src/sim/sim_func_ext.h
+++ genesis-2.2.1/src/sim/sim_func_ext.h
@@ -89,16 +89,6 @@
 extern char                            *ftoa();
 extern char                            *itoa();
 
-/* 1999-07-16 <[EMAIL PROTECTED]>
- * This fix for Red Hat Linux 6.0 is courtesy of Mike Vanier
- * <[EMAIL PROTECTED]>.  
- */
-#ifdef linux
-extern char                             *strchr __P ((__const char *__s, int 
__c));
-#else
-extern char                            *strchr();
-#endif
-
 extern int             ClearPinfo();
 extern int             LocateOp();
 extern char            *GetIdent();
diff -u genesis-2.2.1/src/shell/shell_func_ext.h 
genesis-2.2.1/src/shell/shell_func_ext.h
--- genesis-2.2.1/src/shell/shell_func_ext.h
+++ genesis-2.2.1/src/shell/shell_func_ext.h
@@ -232,13 +232,2 @@
 
-/* 1999-07-16 <[EMAIL PROTECTED]>
- * This fix for Red Hat Linux 6.0 is courtesy of Mike Vanier
- * <[EMAIL PROTECTED]>.  
- */
-#ifdef linux
-extern char     *strchr __P ((__const char *__s, int __c));
-#else
-extern char    *strchr();
-#endif
-
-
 #endif /* SHELL_FUNC_EXT_H */

--- End Message ---
--- Begin Message ---
Source: genesis
Source-Version: 2.2.1-7

We believe that the bug you reported is fixed in the latest version of
genesis, which is due to be installed in the Debian FTP archive:

genesis-data_2.2.1-7_all.deb
  to pool/main/g/genesis/genesis-data_2.2.1-7_all.deb
genesis_2.2.1-7.diff.gz
  to pool/main/g/genesis/genesis_2.2.1-7.diff.gz
genesis_2.2.1-7.dsc
  to pool/main/g/genesis/genesis_2.2.1-7.dsc
genesis_2.2.1-7_i386.deb
  to pool/main/g/genesis/genesis_2.2.1-7_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sam Hocevar (Debian packages) <[EMAIL PROTECTED]> (supplier of updated genesis 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 16 May 2006 23:47:43 +0200
Source: genesis
Binary: genesis-data genesis
Architecture: source i386 all
Version: 2.2.1-7
Distribution: unstable
Urgency: low
Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
Changed-By: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
Description: 
 genesis    - general-purpose neural simulator
 genesis-data - scripts and documentation for genesis
Closes: 340431
Changes: 
 genesis (2.2.1-7) unstable; urgency=low
 .
   * debian/control:
     + Set policy to 3.7.2.
     + Removed the genesis/genesis-data dependency loop.
   * debian/compat:
     + Set version to 4.
   * debian/genesis-data.preinst debian/genesis.postinst:
     + Smooth transition for the genesis/genesis-data /usr/share/doc swap.
 .
   * src/shell/shell_tty.c src/sim/sim_func_ext.h src/shell/shell_func_ext.h:
     + Patch by Petr Salinger to fix a kFreeBSD FTBFS (Closes: #340431).
Files: 
 a50416fd578faaf7d5a66fdaa5620b25 680 science extra genesis_2.2.1-7.dsc
 f4b9138cb6f89d03e8fb48fb2b6e7b9f 49182 science extra genesis_2.2.1-7.diff.gz
 ca660dfd54e3171d960ece42fa58bcc6 1503128 science extra 
genesis-data_2.2.1-7_all.deb
 659efbb4ac36d3060d0fe73f94ab539c 2050864 science extra genesis_2.2.1-7_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFEak8bfPP1rylJn2ERAr6cAKCF33ax4P9GFCrw7EHm5QG1zCMHxQCfRiz0
NNQFLiVviEn/3OA4NUIKVVY=
=xSTC
-----END PGP SIGNATURE-----


--- End Message ---

Reply via email to