Jaguar patches from Ben Hines, plus ready for ivtools-1.0.7

Patch:    ivtools-021126-johnston-076
For:      ivtools-1.0.6
Author:   [email protected]
Subject:  Jaguar patches from Ben Hines, plus ready for ivtools-1.0.7
Requires:

This is an intermediate patch to ivtools-1.0.6.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

         patch -p0 <ThisFile

Summary of Changes:

- apply diffs generated by Ben Hines in creating a fink package for
Jaguar (MacOS X 10.2)

- get ready for 1.0.7

Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.1 config_ivtools/params.def:1.2
*** config_ivtools/params.def:1.1       Fri Sep 13 09:54:34 2002
--- config/params.def   Tue Nov 26 15:29:30 2002
***************
*** 27,33 ****
    * Name of the software release
    */
   #ifndef Release
! #define       Release ivtools-1.0.6
   #endif

      RELEASE = Release
--- 27,33 ----
    * Name of the software release
    */
   #ifndef Release
! #define       Release ivtools-1.0.7
   #endif

      RELEASE = Release
***************
*** 36,42 ****
    * VersionNumber
    */
   #ifndef Version
! #define       Version 1.0.6
   #endif

      VERSION = Version
--- 36,42 ----
    * VersionNumber
    */
   #ifndef Version
! #define       Version 1.0.7
   #endif

      VERSION = Version
Index: config_ivtools/rules.def
diff -c config_ivtools/rules.def:1.1 config_ivtools/rules.def:1.2
*** config_ivtools/rules.def:1.1        Fri Sep 13 09:54:35 2002
--- config/rules.def    Tue Nov 26 15:29:31 2002
***************
*** 1093,1105 ****
--- 1093,1115 ----
   #define InstallSymLink(dir, file) /**/
   #else
   #if !defined(SVR4)
+ #if defined(DARWIN)
   #define InstallSymLink(dir, file)                                     @@\
   install::                                                             @@\
         MakeDir(dir)                                                    @@\
+       cp -f file dir                                                  @@\
+                                                                       @@\
+ uninstall::                                                           @@\
+       $(RM) dir/file
+ #else
+ #define InstallSymLink(dir, file)                                     @@\
+ install::                                                             @@\
+       MakeDir(dir)                                                    @@\
         cp -fd file dir                                                 @@\
                                                                         @@\
   uninstall::                                                           @@\
         $(RM) dir/file
+ #endif
   #else
   #define InstallSymLink(dir, file)                                     @@\
   install::                                                             @@\
Index: include_std/version.h
diff -c include_std/version.h:1.1 include_std/version.h:1.2
*** include_std/version.h:1.1   Fri Sep 13 09:53:15 2002
--- src/include/ivstd/version.h Tue Nov 26 15:29:20 2002
***************
*** 1,3 ****
! #define IvtoolsVersion 1.0.6
! #define VersionString "1.0.6"
! #define ReleaseString "ivtools-1.0.6"
--- 1,3 ----
! #define IvtoolsVersion 1.0.7
! #define VersionString "1.0.7"
! #define ReleaseString "ivtools-1.0.7"
Index: include_x11/xraster.h
diff -c include_x11/xraster.h:1.2 include_x11/xraster.h:1.3
*** include_x11/xraster.h:1.2   Sat Nov 16 09:02:25 2002
--- src/include/IV-X11/xraster.h        Tue Nov 26 15:29:07 2002
***************
*** 30,36 ****
   #define iv_xraster_h

   // should be defined externally
! #if !defined(__CYGWIN__)&&!defined(__APPLE__)
   #define XSHM
   #endif

--- 30,36 ----
   #define iv_xraster_h

   // should be defined externally
! #if !defined(__CYGWIN__)&&(!defined(__APPLE__)||__GNUC__>2)
   #define XSHM
   #endif

Index: src_os/string.c
diff -c src_os/string.c:1.1 src_os/string.c:1.2
*** src_os/string.c:1.1 Fri Sep 13 09:48:23 2002
--- src/OS/string.c     Tue Nov 26 15:28:15 2002
***************
*** 33,39 ****
    */

   extern "C" {
! #ifdef __APPLE__
   #ifndef tolower
       extern wchar_t tolower(wchar_t);
   #endif
--- 33,39 ----
    */

   extern "C" {
! #if defined(__APPLE__)&&__GNUC__<3
   #ifndef tolower
       extern wchar_t tolower(wchar_t);
   #endif
Index: Time/Date.h
diff -c Time/Date.h:1.1 Time/Date.h:1.2
*** Time/Date.h:1.1     Fri Sep 13 09:48:50 2002
--- src/Time/Date.h     Tue Nov 26 15:28:20 2002
***************
*** 36,41 ****
--- 36,42 ----
   */

   #include <OS/types.h>
+ #include <time.h>
   #include <iostream.h>

   #define NO_NESTED_TYPES 1
Index: Time/Time.h
diff -c Time/Time.h:1.1 Time/Time.h:1.2
*** Time/Time.h:1.1     Fri Sep 13 09:48:50 2002
--- src/Time/Time.h     Tue Nov 26 15:28:20 2002
***************
*** 48,53 ****
--- 48,57 ----

   #if defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__) || 
defined(__APPLE__)

+ #if defined(__APPLE__)
+ #include_next <time.h>
+ #endif
+
   #include <sys/time.h>
     #if defined(__NetBSD__)
       #include </usr/include/sys/time.h>
***************
*** 79,86 ****
--- 83,95 ----
   */

   #include <OS/types.h>
+ #if !defined(__APPLE_)
   #include <iostream.h>
   #include_next <time.h>
+ #else
+ #include <iosfwd>
+ #include <iostream>
+ #endif

   #define NO_NESTED_TYPES 1

*** /dev/null    Tue Nov 26 15:29:36 PST 2002
--- patches/ivtools-021126-johnston-076
*************** patches/ivtools-021126-johnston-076
*** 0 ****
--- 1 ----
+ ivtools-021126-johnston-076


-------------------------------------------------------
This SF.net email is sponsored by: Get the new Palm Tungsten T 
handheld. Power & Color in a compact size! 
http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0002en