dawn/dawn-3.88a-no-interactive.patch

   1 --- configure_min.orig  2008-04-02 22:58:34.504868912 +0100
   2 +++ configure_min       2008-04-02 23:47:56.967829265 +0100
   3 @@ -13,22 +13,22 @@
   4  #----- C++ compiler name
   5  echo "Input C++ compiler name (e.g. g++, no default)."
   6  echo -n " :"
   7 -set cpp_compiler=$<
   8 +set cpp_compiler=
   9
  10  #----- Optimization option of the C++ compiler
  11  echo     "Input optimization option (e.g. -O2, no default)"
  12  echo -n  " :"
  13 -set optimize=$<
  14 +set optimize=
  15
  16  #----- Input Tcl/Tk window shell name
  17  echo    "Input Tcl/Tk window shell name"
  18  echo -n "  (e.g. wish, no default): "
  19 -set wish=$<
  20 +set wish=wish
  21
  22  #----- Input directory name to install dawn and DAWN_GUI
  23  echo    "Input directory to install executable files"
  24  echo -n "  (e.g. /usr/local/bin, no default ): "
  25 -set install_dir=$<
  26 +set install_dir=
  27
  28
  29  ##### DELETE #####
  30 @@ -57,14 +57,14 @@
  31
  32  echo "### C++ compiler"                                >> Makefile
  33  #echo "ifndef CXX"                                     >> Makefile
  34 -echo "CC = $cpp_compiler"                              >> Makefile
  35 +#echo "CC = $cpp_compiler"                              >> Makefile
  36  #echo "else"                                           >> Makefile
  37 -#echo 'CC = $(CXX)'                                    >> Makefile
  38 +echo 'CC = $(CXX)'                                    >> Makefile
  39  #echo "endif"                                          >> Makefile
  40  echo ""                                                >> Makefile
  41
  42  echo "### Optimization"                                >> Makefile
  43 -echo "OPTIMIZE = $optimize"                            >> Makefile
  44 +echo 'OPTIMIZE = $(CXXFLAGS)'                          >> Makefile
  45  echo ""                                                >> Makefile
  46
  47  echo "### Waring level"                                >> Makefile
  48 @@ -78,7 +78,7 @@
  49
  50
  51  echo "### Directory where to install executable files" >> Makefile
  52 -echo "INSTALL_DIR = $install_dir"                      >> Makefile
  53 +echo 'INSTALL_DIR = $(DESTDIR)/usr/bin'                >> Makefile
  54  echo ""                                                >> Makefile
  55
  56  echo ""                                                >> Makefile
  57 --- configure.orig      2008-04-02 22:58:23.660250913 +0100
  58 +++ configure   2008-04-03 00:06:20.081610809 +0100
  59 @@ -17,19 +17,19 @@
  60  #----- C++ compiler name
  61  echo "Input C++ compiler name (e.g. g++, no default)."
  62  echo -n " : "
  63 -set cpp_compiler=$<
  64 +set cpp_compiler=
  65  echo ""
  66
  67  #----- Optimization option of the C++ compiler
  68  echo     "Input optimization option (e.g. -O2, no default)"
  69  echo -n  " : "
  70 -set optimize=$<
  71 +set optimize=
  72  echo ""
  73
  74  #----- Input Tcl/Tk window shell name
  75  echo    "Input Tcl/Tk window shell name"
  76  echo -n "  (e.g. wish, no default): "
  77 -set wish=$<
  78 +set wish=wish
  79  echo ""
  80
  81  #-----
  82 @@ -37,7 +37,7 @@
  83  echo    "  (e.g. -I/usr/X11R6/include) "
  84  echo    "   Hit return key if path is already set properly.            )"
  85  echo -n " : "
  86 -set xlib_inc=$<
  87 +set xlib_inc=
  88  echo ""
  89
  90
  91 @@ -46,7 +46,7 @@
  92  echo    "  (e.g. -L/usr/X11R6/lib) "
  93  echo    "   Hit return key if path is already set properly.)"
  94  echo -n " : "
  95 -set xlib_lib=$<
  96 +set xlib_lib=
  97  echo ""
  98
  99
 100 @@ -55,7 +55,7 @@
 101  echo    "  (e.g. -I/usr/X11R6/include) "
 102  echo    "   Hit return key if path is already set properly.            )"
 103  echo -n " : "
 104 -set openglinc=$<
 105 +set openglinc=
 106  echo ""
 107
 108  #-----
 109 @@ -63,7 +63,7 @@
 110  echo    "  (e.g. -I/usr/X11R6/include/GL "
 111  echo    "   Hit return key if path is already set properly.            )"
 112  echo -n " : "
 113 -set openglinc2=$<
 114 +set openglinc2=
 115  echo ""
 116
 117
 118 @@ -72,24 +72,24 @@
 119  echo    "  (e.g. -L/usr/X11R6/lib "
 120  echo    "   Hit return key if path is already set properly.)"
 121  echo -n " : "
 122 -set opengllib=$<
 123 +set opengllib=
 124  echo ""
 125
 126  #-----
 127  echo -n  "Select OpenGL/Mesa or old Masa (0: OpenGL/Mesa , 1: Old Mesa (ver.3.0)): "
 128 -set opengl_type=$<
 129 +set opengl_type=0
 130  echo ""
 131
 132
 133  #----- Input directory name to install dawn and DAWN_GUI
 134  echo    "Input directory to install executable files"
 135  echo -n "  (e.g. /usr/local/bin, no default ): "
 136 -set install_dir=$<
 137 +set install_dir=
 138  echo ""
 139
 140  #----- Input system name
 141  echo -n  "Select a system (0: Defalut, 1: AIX, 2: IRIX, 3: Solaris, 4: RedHat/FedoraCore): "
 142 -set sysid=$<
 143 +set sysid=0
 144  switch ($sysid)
 145     case "0":
 146      set sysname = "Default"
 147 @@ -116,7 +116,7 @@
 148  echo     "Do you use remote-visualization function? (y/n, no default)"
 149  echo     " (Select n if your compilation fails for FRClientServer.cc)"
 150  echo  -n " : "
 151 -set ynflag_socket=$<
 152 +set ynflag_socket=n
 153  switch ($ynflag_socket)
 154     case "y":
 155      set macro_socket = '#define USE_SOCKET'
 156 @@ -159,14 +159,14 @@
 157
 158  echo "### C++ compiler"                                >> Makefile
 159  #echo "ifndef CXX"                                     >> Makefile
 160 -echo "CC = $cpp_compiler"                              >> Makefile
 161 +#echo "CC = $cpp_compiler"                              >> Makefile
 162  #echo "else"                                           >> Makefile
 163 -#echo 'CC = $(CXX)'                                    >> Makefile
 164 +echo 'CC = $(CXX)'                                     >> Makefile
 165  #echo "endif"                                          >> Makefile
 166  echo ""                                                >> Makefile
 167
 168  echo "### Optimization"                                >> Makefile
 169 -echo "OPTIMIZE = $optimize"                            >> Makefile
 170 +echo 'OPTIMIZE = $(CXXFLAGS)'                          >> Makefile
 171  echo ""                                                >> Makefile
 172
 173  echo "### Waring level"                                >> Makefile
 174 @@ -224,7 +224,7 @@
 175  echo ""                                                >> Makefile
 176
 177  echo "### Directory where to install executable files" >> Makefile
 178 -echo "INSTALL_DIR = $install_dir"                      >> Makefile
 179 +echo 'INSTALL_DIR = $(DESTDIR)/usr/bin'                >> Makefile
 180  echo ""                                                >> Makefile
 181
 182  echo "### Socket libraries to be linked "              >> Makefile
 183 @@ -313,6 +313,6 @@
 184  echo ""
 185  echo 'After compilation, type  "make install" for installation.'
 186  echo 'Then four executable files "dawn", "DAWN_GUI",'
 187 -echo '"dawnunixd", and "dawninetd"  will be installed to '
 188 +echo '"dawnunixd", and "dawninetd"  will be installed'
 189  echo "$install_dir."
 190  echo ""
 191 --- configure_xwin.orig 2008-04-02 22:58:44.973465484 +0100
 192 +++ configure_xwin      2008-04-03 00:02:15.950190359 +0100
 193 @@ -16,17 +16,17 @@
 194  #----- C++ compiler name
 195  echo "Input C++ compiler name (e.g. g++, no default)."
 196  echo -n " :"
 197 -set cpp_compiler=$<
 198 +set cpp_compiler=
 199
 200  #----- Optimization option of the C++ compiler
 201  echo     "Input optimization option (e.g. -O2, no default)"
 202  echo -n  " :"
 203 -set optimize=$<
 204 +set optimize=
 205
 206  #----- Input Tcl/Tk window shell name
 207  echo    "Input Tcl/Tk window shell name"
 208  echo -n "  (e.g. wish, no default): "
 209 -set wish=$<
 210 +set wish=wish
 211
 212
 213  #-----
 214 @@ -34,7 +34,7 @@
 215  echo    "  (e.g. -I/usr/X11R6/include) "
 216  echo    "   Hit return key if path is already set properly.            )"
 217  echo -n " : "
 218 -set xlib_inc=$<
 219 +set xlib_inc=
 220  echo ""
 221
 222
 223 @@ -43,17 +43,17 @@
 224  echo    "  (e.g. -L/usr/X11R6/lib) "
 225  echo    "   Hit return key if path is already set properly.)"
 226  echo -n " : "
 227 -set xlib_lib=$<
 228 +set xlib_lib=
 229  echo ""
 230
 231  #----- Input directory name to install dawn and DAWN_GUI
 232  echo    "Input directory to install executable files"
 233  echo -n "  (e.g. /usr/local/bin, no default ): "
 234 -set install_dir=$<
 235 +set install_dir=
 236
 237  #----- Input system name
 238  echo -n  "Select a system (0: Defalut, 1: AIX, 2: IRIX, 3: Solaris, 4: RedHat/FedoraCore): "
 239 -set sysid=$<
 240 +set sysid=0
 241  switch ($sysid)
 242     case "0":
 243      set sysname = "Default"
 244 @@ -80,7 +80,7 @@
 245  echo     "Do you use remote-visualization function? (y/n, no default)"
 246  echo     " (Select n if your compilation fails for FRClientServer.cc)"
 247  echo  -n " : "
 248 -set ynflag_socket=$<
 249 +set ynflag_socket=n
 250  switch ($ynflag_socket)
 251     case "y":
 252      set macro_socket = '#define USE_SOCKET'
 253 @@ -123,14 +123,14 @@
 254
 255  echo "### C++ compiler"                                >> Makefile
 256  #echo "ifndef CXX"                                      >> Makefile
 257 -echo "CC = $cpp_compiler"                              >> Makefile
 258 +#echo "CC = $cpp_compiler"                              >> Makefile
 259  #echo "else"                                            >> Makefile
 260 -#echo 'CC = $(CXX)'                                     >> Makefile
 261 +echo 'CC = $(CXX)'                                     >> Makefile
 262  #echo "endif"                                           >> Makefile
 263  echo ""                                                >> Makefile
 264
 265  echo "### Optimization"                                >> Makefile
 266 -echo "OPTIMIZE = $optimize"                            >> Makefile
 267 +echo 'OPTIMIZE = $(CXXFLAGS)'                            >> Makefile
 268  echo ""                                                >> Makefile
 269
 270  echo "### Waring level"                                >> Makefile
 271 @@ -152,7 +152,7 @@
 272  echo ""                                                >> Makefile
 273
 274  echo "### Directory where to install executable files" >> Makefile
 275 -echo "INSTALL_DIR = $install_dir"                      >> Makefile
 276 +echo 'INSTALL_DIR = $(DESTDIR)/usr/bin'                      >> Makefile
 277  echo ""                                                >> Makefile
 278
 279  echo "### Socket libraries to be linked "              >> Makefile
 280 --- FRSocketMacro.h.orig        2008-04-02 23:58:51.126518123 +0100
 281 +++ FRSocketMacro.h     2008-04-02 23:59:03.443220012 +0100
 282 @@ -14,8 +14,8 @@
 283  #elif defined SOCKET_REDHAT61
 284         #define         CLIENT_ADDR_LENGTH    socklen_t
 285  #else
 286 -       #define         CLIENT_ADDR_LENGTH    int
 287 -//     #define         CLIENT_ADDR_LENGTH    size_t
 288 +//     #define         CLIENT_ADDR_LENGTH    int
 289 +       #define         CLIENT_ADDR_LENGTH    size_t
 290  #endif
 291
 292         //----- gethostname