1--- misc/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp.orig 2007-08-10 12:18:20.000000000 -0400 2+++ misc/build/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp 2011-07-29 06:16:23.000000000 -0400 3@@ -43,6 +43,7 @@ 4 */ 5 6 #include <map> 7+#include <cstddef> 8 9 /* May well already be declared, but can't hurt. */ 10 11--- misc/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp.orig 2011-12-23 10:36:33.000000000 -0500 12+++ misc/build/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp 2011-12-23 10:41:57.000000000 -0500 13@@ -1665,10 +1665,6 @@ 14 } 15 sprintf(generalPrint + strlen(generalPrint), 16 "Build Date: %s \n", __DATE__); 17-#ifdef CBC_SVN_REV 18- sprintf(generalPrint + strlen(generalPrint), 19- "Revision Number: %d \n", CBC_SVN_REV); 20-#endif 21 generalMessageHandler->message(CLP_GENERAL, generalMessages) 22 << generalPrint 23 << CoinMessageEol; 24 25--- misc/CoinMP-1.6.0/Cbc/ltmain.sh 2010-06-14 02:52:10.000000000 +0900 26+++ misc/build/CoinMP-1.6.0/Cbc/ltmain.sh 2012-02-14 12:43:54.000000000 +0900 27@@ -3186,12 +3186,12 @@ 28 # which has an extra 1 added just for fun 29 # 30 case $version_type in 31- darwin|linux|osf|windows) 32+ darwin|linux|osf|windows|freebsd-elf) 33 current=`expr $number_major + $number_minor` 34 age="$number_minor" 35 revision="$number_revision" 36 ;; 37- freebsd-aout|freebsd-elf|sunos) 38+ freebsd-aout|sunos) 39 current="$number_major" 40 revision="$number_minor" 41 age="0" 42@@ -3267,8 +3267,8 @@ 43 ;; 44 45 freebsd-elf) 46- major=".$current" 47- versuffix=".$current"; 48+ major=.`expr $current - $age` 49+ versuffix="$major" 50 ;; 51 52 irix | nonstopux) 53--- misc/CoinMP-1.6.0/Cgl/ltmain.sh 2010-06-14 02:52:57.000000000 +0900 54+++ misc/build/CoinMP-1.6.0/Cgl/ltmain.sh 2012-02-14 12:47:44.000000000 +0900 55@@ -3186,12 +3186,12 @@ 56 # which has an extra 1 added just for fun 57 # 58 case $version_type in 59- darwin|linux|osf|windows) 60+ darwin|linux|osf|windows|freebsd-elf) 61 current=`expr $number_major + $number_minor` 62 age="$number_minor" 63 revision="$number_revision" 64 ;; 65- freebsd-aout|freebsd-elf|sunos) 66+ freebsd-aout|sunos) 67 current="$number_major" 68 revision="$number_minor" 69 age="0" 70@@ -3267,8 +3267,8 @@ 71 ;; 72 73 freebsd-elf) 74- major=".$current" 75- versuffix=".$current"; 76+ major=.`expr $current - $age` 77+ versuffix="$major" 78 ;; 79 80 irix | nonstopux) 81--- misc/CoinMP-1.6.0/Clp/ltmain.sh 2010-06-14 02:53:25.000000000 +0900 82+++ misc/build/CoinMP-1.6.0/Clp/ltmain.sh 2012-02-14 12:47:52.000000000 +0900 83@@ -3186,12 +3186,12 @@ 84 # which has an extra 1 added just for fun 85 # 86 case $version_type in 87- darwin|linux|osf|windows) 88+ darwin|linux|osf|windows|freebsd-elf) 89 current=`expr $number_major + $number_minor` 90 age="$number_minor" 91 revision="$number_revision" 92 ;; 93- freebsd-aout|freebsd-elf|sunos) 94+ freebsd-aout|sunos) 95 current="$number_major" 96 revision="$number_minor" 97 age="0" 98@@ -3267,8 +3267,8 @@ 99 ;; 100 101 freebsd-elf) 102- major=".$current" 103- versuffix=".$current"; 104+ major=.`expr $current - $age` 105+ versuffix="$major" 106 ;; 107 108 irix | nonstopux) 109--- misc/CoinMP-1.6.0/CoinMP/ltmain.sh 2011-08-08 00:09:46.000000000 +0900 110+++ misc/build/CoinMP-1.6.0/CoinMP/ltmain.sh 2012-02-14 12:48:03.000000000 +0900 111@@ -3186,12 +3186,12 @@ 112 # which has an extra 1 added just for fun 113 # 114 case $version_type in 115- darwin|linux|osf|windows) 116+ darwin|linux|osf|windows|freebsd-elf) 117 current=`expr $number_major + $number_minor` 118 age="$number_minor" 119 revision="$number_revision" 120 ;; 121- freebsd-aout|freebsd-elf|sunos) 122+ freebsd-aout|sunos) 123 current="$number_major" 124 revision="$number_minor" 125 age="0" 126@@ -3267,8 +3267,8 @@ 127 ;; 128 129 freebsd-elf) 130- major=".$current" 131- versuffix=".$current"; 132+ major=.`expr $current - $age` 133+ versuffix="$major" 134 ;; 135 136 irix | nonstopux) 137--- misc/CoinMP-1.6.0/CoinUtils/ltmain.sh 2010-06-14 02:53:51.000000000 +0900 138+++ misc/build/CoinMP-1.6.0/CoinUtils/ltmain.sh 2012-02-14 12:48:08.000000000 +0900 139@@ -3186,12 +3186,12 @@ 140 # which has an extra 1 added just for fun 141 # 142 case $version_type in 143- darwin|linux|osf|windows) 144+ darwin|linux|osf|windows|freebsd-elf) 145 current=`expr $number_major + $number_minor` 146 age="$number_minor" 147 revision="$number_revision" 148 ;; 149- freebsd-aout|freebsd-elf|sunos) 150+ freebsd-aout|sunos) 151 current="$number_major" 152 revision="$number_minor" 153 age="0" 154@@ -3267,8 +3267,8 @@ 155 ;; 156 157 freebsd-elf) 158- major=".$current" 159- versuffix=".$current"; 160+ major=.`expr $current - $age` 161+ versuffix="$major" 162 ;; 163 164 irix | nonstopux) 165--- misc/CoinMP-1.6.0/Osi/ltmain.sh 2010-06-14 02:59:18.000000000 +0900 166+++ misc/build/CoinMP-1.6.0/Osi/ltmain.sh 2012-02-14 12:48:24.000000000 +0900 167@@ -3186,12 +3186,12 @@ 168 # which has an extra 1 added just for fun 169 # 170 case $version_type in 171- darwin|linux|osf|windows) 172+ darwin|linux|osf|windows|freebsd-elf) 173 current=`expr $number_major + $number_minor` 174 age="$number_minor" 175 revision="$number_revision" 176 ;; 177- freebsd-aout|freebsd-elf|sunos) 178+ freebsd-aout|sunos) 179 current="$number_major" 180 revision="$number_minor" 181 age="0" 182@@ -3267,8 +3267,8 @@ 183 ;; 184 185 freebsd-elf) 186- major=".$current" 187- versuffix=".$current"; 188+ major=.`expr $current - $age` 189+ versuffix="$major" 190 ;; 191 192 irix | nonstopux) 193--- misc/build/CoinMP-1.6.0/Cbc/configure.orig 2011-11-03 20:55:10.000000000 -0700 194+++ misc/build/CoinMP-1.6.0/Cbc/configure 2012-05-21 23:29:18.000000000 -0700 195@@ -9224,7 +9224,7 @@ 196 hardcode_shlibpath_var=no 197 ;; 198 199- freebsd1*) 200+ freebsd1.*) 201 ld_shlibs=no 202 ;; 203 204@@ -9240,7 +9240,7 @@ 205 ;; 206 207 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 208- freebsd2*) 209+ freebsd2.*) 210 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 211 hardcode_direct=yes 212 hardcode_minus_L=yes 213@@ -9836,7 +9836,7 @@ 214 shlibpath_var=LD_LIBRARY_PATH 215 ;; 216 217-freebsd1*) 218+freebsd1.*) 219 dynamic_linker=no 220 ;; 221 222@@ -9859,7 +9859,7 @@ 223 objformat=`/usr/bin/objformat` 224 else 225 case $host_os in 226- freebsd[123]*) objformat=aout ;; 227+ freebsd[123].*) objformat=aout ;; 228 *) objformat=elf ;; 229 esac 230 fi 231@@ -9877,7 +9877,7 @@ 232 esac 233 shlibpath_var=LD_LIBRARY_PATH 234 case $host_os in 235- freebsd2*) 236+ freebsd2.*) 237 shlibpath_overrides_runpath=yes 238 ;; 239 freebsd3.[01]* | freebsdelf3.[01]*) 240@@ -12311,7 +12311,7 @@ 241 ;; 242 esac 243 ;; 244- freebsd[12]*) 245+ freebsd[12].*) 246 # C++ shared libraries reported to be fairly broken before switch to ELF 247 ld_shlibs_CXX=no 248 ;; 249@@ -13796,7 +13796,7 @@ 250 shlibpath_var=LD_LIBRARY_PATH 251 ;; 252 253-freebsd1*) 254+freebsd1.*) 255 dynamic_linker=no 256 ;; 257 258@@ -13819,7 +13819,7 @@ 259 objformat=`/usr/bin/objformat` 260 else 261 case $host_os in 262- freebsd[123]*) objformat=aout ;; 263+ freebsd[123].*) objformat=aout ;; 264 *) objformat=elf ;; 265 esac 266 fi 267@@ -13837,7 +13837,7 @@ 268 esac 269 shlibpath_var=LD_LIBRARY_PATH 270 case $host_os in 271- freebsd2*) 272+ freebsd2.*) 273 shlibpath_overrides_runpath=yes 274 ;; 275 freebsd3.[01]* | freebsdelf3.[01]*) 276@@ -15771,7 +15771,7 @@ 277 hardcode_shlibpath_var_F77=no 278 ;; 279 280- freebsd1*) 281+ freebsd1.*) 282 ld_shlibs_F77=no 283 ;; 284 285@@ -15787,7 +15787,7 @@ 286 ;; 287 288 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 289- freebsd2*) 290+ freebsd2.*) 291 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 292 hardcode_direct_F77=yes 293 hardcode_minus_L_F77=yes 294@@ -16383,7 +16383,7 @@ 295 shlibpath_var=LD_LIBRARY_PATH 296 ;; 297 298-freebsd1*) 299+freebsd1.*) 300 dynamic_linker=no 301 ;; 302 303@@ -16406,7 +16406,7 @@ 304 objformat=`/usr/bin/objformat` 305 else 306 case $host_os in 307- freebsd[123]*) objformat=aout ;; 308+ freebsd[123].*) objformat=aout ;; 309 *) objformat=elf ;; 310 esac 311 fi 312@@ -16424,7 +16424,7 @@ 313 esac 314 shlibpath_var=LD_LIBRARY_PATH 315 case $host_os in 316- freebsd2*) 317+ freebsd2.*) 318 shlibpath_overrides_runpath=yes 319 ;; 320 freebsd3.[01]* | freebsdelf3.[01]*) 321@@ -18370,7 +18370,7 @@ 322 hardcode_shlibpath_var_GCJ=no 323 ;; 324 325- freebsd1*) 326+ freebsd1.*) 327 ld_shlibs_GCJ=no 328 ;; 329 330@@ -18386,7 +18386,7 @@ 331 ;; 332 333 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 334- freebsd2*) 335+ freebsd2.*) 336 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 337 hardcode_direct_GCJ=yes 338 hardcode_minus_L_GCJ=yes 339@@ -18982,7 +18982,7 @@ 340 shlibpath_var=LD_LIBRARY_PATH 341 ;; 342 343-freebsd1*) 344+freebsd1.*) 345 dynamic_linker=no 346 ;; 347 348@@ -19005,7 +19005,7 @@ 349 objformat=`/usr/bin/objformat` 350 else 351 case $host_os in 352- freebsd[123]*) objformat=aout ;; 353+ freebsd[123].*) objformat=aout ;; 354 *) objformat=elf ;; 355 esac 356 fi 357@@ -19023,7 +19023,7 @@ 358 esac 359 shlibpath_var=LD_LIBRARY_PATH 360 case $host_os in 361- freebsd2*) 362+ freebsd2.*) 363 shlibpath_overrides_runpath=yes 364 ;; 365 freebsd3.[01]* | freebsdelf3.[01]*) 366--- misc/build/CoinMP-1.6.0/Cgl/configure.orig 2011-10-15 07:48:24.000000000 -0700 367+++ misc/build/CoinMP-1.6.0/Cgl/configure 2012-05-21 23:30:19.000000000 -0700 368@@ -9202,7 +9202,7 @@ 369 hardcode_shlibpath_var=no 370 ;; 371 372- freebsd1*) 373+ freebsd1.*) 374 ld_shlibs=no 375 ;; 376 377@@ -9218,7 +9218,7 @@ 378 ;; 379 380 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 381- freebsd2*) 382+ freebsd2.*) 383 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 384 hardcode_direct=yes 385 hardcode_minus_L=yes 386@@ -9814,7 +9814,7 @@ 387 shlibpath_var=LD_LIBRARY_PATH 388 ;; 389 390-freebsd1*) 391+freebsd1.*) 392 dynamic_linker=no 393 ;; 394 395@@ -9837,7 +9837,7 @@ 396 objformat=`/usr/bin/objformat` 397 else 398 case $host_os in 399- freebsd[123]*) objformat=aout ;; 400+ freebsd[123].*) objformat=aout ;; 401 *) objformat=elf ;; 402 esac 403 fi 404@@ -9855,7 +9855,7 @@ 405 esac 406 shlibpath_var=LD_LIBRARY_PATH 407 case $host_os in 408- freebsd2*) 409+ freebsd2.*) 410 shlibpath_overrides_runpath=yes 411 ;; 412 freebsd3.[01]* | freebsdelf3.[01]*) 413@@ -12289,7 +12289,7 @@ 414 ;; 415 esac 416 ;; 417- freebsd[12]*) 418+ freebsd[12].*) 419 # C++ shared libraries reported to be fairly broken before switch to ELF 420 ld_shlibs_CXX=no 421 ;; 422@@ -13774,7 +13774,7 @@ 423 shlibpath_var=LD_LIBRARY_PATH 424 ;; 425 426-freebsd1*) 427+freebsd1.*) 428 dynamic_linker=no 429 ;; 430 431@@ -13797,7 +13797,7 @@ 432 objformat=`/usr/bin/objformat` 433 else 434 case $host_os in 435- freebsd[123]*) objformat=aout ;; 436+ freebsd[123].*) objformat=aout ;; 437 *) objformat=elf ;; 438 esac 439 fi 440@@ -13815,7 +13815,7 @@ 441 esac 442 shlibpath_var=LD_LIBRARY_PATH 443 case $host_os in 444- freebsd2*) 445+ freebsd2.*) 446 shlibpath_overrides_runpath=yes 447 ;; 448 freebsd3.[01]* | freebsdelf3.[01]*) 449@@ -15749,7 +15749,7 @@ 450 hardcode_shlibpath_var_F77=no 451 ;; 452 453- freebsd1*) 454+ freebsd1.*) 455 ld_shlibs_F77=no 456 ;; 457 458@@ -15765,7 +15765,7 @@ 459 ;; 460 461 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 462- freebsd2*) 463+ freebsd2.*) 464 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 465 hardcode_direct_F77=yes 466 hardcode_minus_L_F77=yes 467@@ -16361,7 +16361,7 @@ 468 shlibpath_var=LD_LIBRARY_PATH 469 ;; 470 471-freebsd1*) 472+freebsd1.*) 473 dynamic_linker=no 474 ;; 475 476@@ -16384,7 +16384,7 @@ 477 objformat=`/usr/bin/objformat` 478 else 479 case $host_os in 480- freebsd[123]*) objformat=aout ;; 481+ freebsd[123].*) objformat=aout ;; 482 *) objformat=elf ;; 483 esac 484 fi 485@@ -16402,7 +16402,7 @@ 486 esac 487 shlibpath_var=LD_LIBRARY_PATH 488 case $host_os in 489- freebsd2*) 490+ freebsd2.*) 491 shlibpath_overrides_runpath=yes 492 ;; 493 freebsd3.[01]* | freebsdelf3.[01]*) 494@@ -18348,7 +18348,7 @@ 495 hardcode_shlibpath_var_GCJ=no 496 ;; 497 498- freebsd1*) 499+ freebsd1.*) 500 ld_shlibs_GCJ=no 501 ;; 502 503@@ -18364,7 +18364,7 @@ 504 ;; 505 506 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 507- freebsd2*) 508+ freebsd2.*) 509 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 510 hardcode_direct_GCJ=yes 511 hardcode_minus_L_GCJ=yes 512@@ -18960,7 +18960,7 @@ 513 shlibpath_var=LD_LIBRARY_PATH 514 ;; 515 516-freebsd1*) 517+freebsd1.*) 518 dynamic_linker=no 519 ;; 520 521@@ -18983,7 +18983,7 @@ 522 objformat=`/usr/bin/objformat` 523 else 524 case $host_os in 525- freebsd[123]*) objformat=aout ;; 526+ freebsd[123].*) objformat=aout ;; 527 *) objformat=elf ;; 528 esac 529 fi 530@@ -19001,7 +19001,7 @@ 531 esac 532 shlibpath_var=LD_LIBRARY_PATH 533 case $host_os in 534- freebsd2*) 535+ freebsd2.*) 536 shlibpath_overrides_runpath=yes 537 ;; 538 freebsd3.[01]* | freebsdelf3.[01]*) 539--- misc/build/CoinMP-1.6.0/Clp/configure.orig 2011-11-05 12:32:33.000000000 -0700 540+++ misc/build/CoinMP-1.6.0/Clp/configure 2012-05-21 23:35:23.000000000 -0700 541@@ -9225,7 +9225,7 @@ 542 hardcode_shlibpath_var=no 543 ;; 544 545- freebsd1*) 546+ freebsd1.*) 547 ld_shlibs=no 548 ;; 549 550@@ -9241,7 +9241,7 @@ 551 ;; 552 553 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 554- freebsd2*) 555+ freebsd2.*) 556 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 557 hardcode_direct=yes 558 hardcode_minus_L=yes 559@@ -9837,7 +9837,7 @@ 560 shlibpath_var=LD_LIBRARY_PATH 561 ;; 562 563-freebsd1*) 564+freebsd1.*) 565 dynamic_linker=no 566 ;; 567 568@@ -9860,7 +9860,7 @@ 569 objformat=`/usr/bin/objformat` 570 else 571 case $host_os in 572- freebsd[123]*) objformat=aout ;; 573+ freebsd[123].*) objformat=aout ;; 574 *) objformat=elf ;; 575 esac 576 fi 577@@ -9878,7 +9878,7 @@ 578 esac 579 shlibpath_var=LD_LIBRARY_PATH 580 case $host_os in 581- freebsd2*) 582+ freebsd2.*) 583 shlibpath_overrides_runpath=yes 584 ;; 585 freebsd3.[01]* | freebsdelf3.[01]*) 586@@ -12312,7 +12312,7 @@ 587 ;; 588 esac 589 ;; 590- freebsd[12]*) 591+ freebsd[12].*) 592 # C++ shared libraries reported to be fairly broken before switch to ELF 593 ld_shlibs_CXX=no 594 ;; 595@@ -13797,7 +13797,7 @@ 596 shlibpath_var=LD_LIBRARY_PATH 597 ;; 598 599-freebsd1*) 600+freebsd1.*) 601 dynamic_linker=no 602 ;; 603 604@@ -13820,7 +13820,7 @@ 605 objformat=`/usr/bin/objformat` 606 else 607 case $host_os in 608- freebsd[123]*) objformat=aout ;; 609+ freebsd[123].*) objformat=aout ;; 610 *) objformat=elf ;; 611 esac 612 fi 613@@ -13838,7 +13838,7 @@ 614 esac 615 shlibpath_var=LD_LIBRARY_PATH 616 case $host_os in 617- freebsd2*) 618+ freebsd2.*) 619 shlibpath_overrides_runpath=yes 620 ;; 621 freebsd3.[01]* | freebsdelf3.[01]*) 622@@ -15772,7 +15772,7 @@ 623 hardcode_shlibpath_var_F77=no 624 ;; 625 626- freebsd1*) 627+ freebsd1.*) 628 ld_shlibs_F77=no 629 ;; 630 631@@ -15788,7 +15788,7 @@ 632 ;; 633 634 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 635- freebsd2*) 636+ freebsd2.*) 637 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 638 hardcode_direct_F77=yes 639 hardcode_minus_L_F77=yes 640@@ -16384,7 +16384,7 @@ 641 shlibpath_var=LD_LIBRARY_PATH 642 ;; 643 644-freebsd1*) 645+freebsd1.*) 646 dynamic_linker=no 647 ;; 648 649@@ -16407,7 +16407,7 @@ 650 objformat=`/usr/bin/objformat` 651 else 652 case $host_os in 653- freebsd[123]*) objformat=aout ;; 654+ freebsd[123].*) objformat=aout ;; 655 *) objformat=elf ;; 656 esac 657 fi 658@@ -16425,7 +16425,7 @@ 659 esac 660 shlibpath_var=LD_LIBRARY_PATH 661 case $host_os in 662- freebsd2*) 663+ freebsd2.*) 664 shlibpath_overrides_runpath=yes 665 ;; 666 freebsd3.[01]* | freebsdelf3.[01]*) 667@@ -18371,7 +18371,7 @@ 668 hardcode_shlibpath_var_GCJ=no 669 ;; 670 671- freebsd1*) 672+ freebsd1.*) 673 ld_shlibs_GCJ=no 674 ;; 675 676@@ -18387,7 +18387,7 @@ 677 ;; 678 679 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 680- freebsd2*) 681+ freebsd2.*) 682 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 683 hardcode_direct_GCJ=yes 684 hardcode_minus_L_GCJ=yes 685@@ -18983,7 +18983,7 @@ 686 shlibpath_var=LD_LIBRARY_PATH 687 ;; 688 689-freebsd1*) 690+freebsd1.*) 691 dynamic_linker=no 692 ;; 693 694@@ -19006,7 +19006,7 @@ 695 objformat=`/usr/bin/objformat` 696 else 697 case $host_os in 698- freebsd[123]*) objformat=aout ;; 699+ freebsd[123].*) objformat=aout ;; 700 *) objformat=elf ;; 701 esac 702 fi 703@@ -19024,7 +19024,7 @@ 704 esac 705 shlibpath_var=LD_LIBRARY_PATH 706 case $host_os in 707- freebsd2*) 708+ freebsd2.*) 709 shlibpath_overrides_runpath=yes 710 ;; 711 freebsd3.[01]* | freebsdelf3.[01]*) 712--- misc/build/CoinMP-1.6.0/CoinMP/configure.orig 2011-11-07 19:35:10.000000000 -0800 713+++ misc/build/CoinMP-1.6.0/CoinMP/configure 2012-05-21 23:32:22.000000000 -0700 714@@ -9168,7 +9168,7 @@ 715 hardcode_shlibpath_var=no 716 ;; 717 718- freebsd1*) 719+ freebsd1.*) 720 ld_shlibs=no 721 ;; 722 723@@ -9184,7 +9184,7 @@ 724 ;; 725 726 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 727- freebsd2*) 728+ freebsd2.*) 729 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 730 hardcode_direct=yes 731 hardcode_minus_L=yes 732@@ -9780,7 +9780,7 @@ 733 shlibpath_var=LD_LIBRARY_PATH 734 ;; 735 736-freebsd1*) 737+freebsd1.*) 738 dynamic_linker=no 739 ;; 740 741@@ -9803,7 +9803,7 @@ 742 objformat=`/usr/bin/objformat` 743 else 744 case $host_os in 745- freebsd[123]*) objformat=aout ;; 746+ freebsd[123].*) objformat=aout ;; 747 *) objformat=elf ;; 748 esac 749 fi 750@@ -9821,7 +9821,7 @@ 751 esac 752 shlibpath_var=LD_LIBRARY_PATH 753 case $host_os in 754- freebsd2*) 755+ freebsd2.*) 756 shlibpath_overrides_runpath=yes 757 ;; 758 freebsd3.[01]* | freebsdelf3.[01]*) 759@@ -12255,7 +12255,7 @@ 760 ;; 761 esac 762 ;; 763- freebsd[12]*) 764+ freebsd[12].*) 765 # C++ shared libraries reported to be fairly broken before switch to ELF 766 ld_shlibs_CXX=no 767 ;; 768@@ -13740,7 +13740,7 @@ 769 shlibpath_var=LD_LIBRARY_PATH 770 ;; 771 772-freebsd1*) 773+freebsd1.*) 774 dynamic_linker=no 775 ;; 776 777@@ -13763,7 +13763,7 @@ 778 objformat=`/usr/bin/objformat` 779 else 780 case $host_os in 781- freebsd[123]*) objformat=aout ;; 782+ freebsd[123].*) objformat=aout ;; 783 *) objformat=elf ;; 784 esac 785 fi 786@@ -13781,7 +13781,7 @@ 787 esac 788 shlibpath_var=LD_LIBRARY_PATH 789 case $host_os in 790- freebsd2*) 791+ freebsd2.*) 792 shlibpath_overrides_runpath=yes 793 ;; 794 freebsd3.[01]* | freebsdelf3.[01]*) 795@@ -15715,7 +15715,7 @@ 796 hardcode_shlibpath_var_F77=no 797 ;; 798 799- freebsd1*) 800+ freebsd1.*) 801 ld_shlibs_F77=no 802 ;; 803 804@@ -15731,7 +15731,7 @@ 805 ;; 806 807 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 808- freebsd2*) 809+ freebsd2.*) 810 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 811 hardcode_direct_F77=yes 812 hardcode_minus_L_F77=yes 813@@ -16327,7 +16327,7 @@ 814 shlibpath_var=LD_LIBRARY_PATH 815 ;; 816 817-freebsd1*) 818+freebsd1.*) 819 dynamic_linker=no 820 ;; 821 822@@ -16350,7 +16350,7 @@ 823 objformat=`/usr/bin/objformat` 824 else 825 case $host_os in 826- freebsd[123]*) objformat=aout ;; 827+ freebsd[123].*) objformat=aout ;; 828 *) objformat=elf ;; 829 esac 830 fi 831@@ -16368,7 +16368,7 @@ 832 esac 833 shlibpath_var=LD_LIBRARY_PATH 834 case $host_os in 835- freebsd2*) 836+ freebsd2.*) 837 shlibpath_overrides_runpath=yes 838 ;; 839 freebsd3.[01]* | freebsdelf3.[01]*) 840@@ -18314,7 +18314,7 @@ 841 hardcode_shlibpath_var_GCJ=no 842 ;; 843 844- freebsd1*) 845+ freebsd1.*) 846 ld_shlibs_GCJ=no 847 ;; 848 849@@ -18330,7 +18330,7 @@ 850 ;; 851 852 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 853- freebsd2*) 854+ freebsd2.*) 855 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 856 hardcode_direct_GCJ=yes 857 hardcode_minus_L_GCJ=yes 858@@ -18926,7 +18926,7 @@ 859 shlibpath_var=LD_LIBRARY_PATH 860 ;; 861 862-freebsd1*) 863+freebsd1.*) 864 dynamic_linker=no 865 ;; 866 867@@ -18949,7 +18949,7 @@ 868 objformat=`/usr/bin/objformat` 869 else 870 case $host_os in 871- freebsd[123]*) objformat=aout ;; 872+ freebsd[123].*) objformat=aout ;; 873 *) objformat=elf ;; 874 esac 875 fi 876@@ -18967,7 +18967,7 @@ 877 esac 878 shlibpath_var=LD_LIBRARY_PATH 879 case $host_os in 880- freebsd2*) 881+ freebsd2.*) 882 shlibpath_overrides_runpath=yes 883 ;; 884 freebsd3.[01]* | freebsdelf3.[01]*) 885--- misc/build/CoinMP-1.6.0/CoinUtils/configure.orig 2011-11-03 20:11:07.000000000 -0700 886+++ misc/build/CoinMP-1.6.0/CoinUtils/configure 2012-05-21 23:33:08.000000000 -0700 887@@ -10658,7 +10658,7 @@ 888 hardcode_shlibpath_var=no 889 ;; 890 891- freebsd1*) 892+ freebsd1.*) 893 ld_shlibs=no 894 ;; 895 896@@ -10674,7 +10674,7 @@ 897 ;; 898 899 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 900- freebsd2*) 901+ freebsd2.*) 902 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 903 hardcode_direct=yes 904 hardcode_minus_L=yes 905@@ -11270,7 +11270,7 @@ 906 shlibpath_var=LD_LIBRARY_PATH 907 ;; 908 909-freebsd1*) 910+freebsd1.*) 911 dynamic_linker=no 912 ;; 913 914@@ -11293,7 +11293,7 @@ 915 objformat=`/usr/bin/objformat` 916 else 917 case $host_os in 918- freebsd[123]*) objformat=aout ;; 919+ freebsd[123].*) objformat=aout ;; 920 *) objformat=elf ;; 921 esac 922 fi 923@@ -11311,7 +11311,7 @@ 924 esac 925 shlibpath_var=LD_LIBRARY_PATH 926 case $host_os in 927- freebsd2*) 928+ freebsd2.*) 929 shlibpath_overrides_runpath=yes 930 ;; 931 freebsd3.[01]* | freebsdelf3.[01]*) 932@@ -13817,7 +13817,7 @@ 933 ;; 934 esac 935 ;; 936- freebsd[12]*) 937+ freebsd[12].*) 938 # C++ shared libraries reported to be fairly broken before switch to ELF 939 ld_shlibs_CXX=no 940 ;; 941@@ -15302,7 +15302,7 @@ 942 shlibpath_var=LD_LIBRARY_PATH 943 ;; 944 945-freebsd1*) 946+freebsd1.*) 947 dynamic_linker=no 948 ;; 949 950@@ -15325,7 +15325,7 @@ 951 objformat=`/usr/bin/objformat` 952 else 953 case $host_os in 954- freebsd[123]*) objformat=aout ;; 955+ freebsd[123].*) objformat=aout ;; 956 *) objformat=elf ;; 957 esac 958 fi 959@@ -15343,7 +15343,7 @@ 960 esac 961 shlibpath_var=LD_LIBRARY_PATH 962 case $host_os in 963- freebsd2*) 964+ freebsd2.*) 965 shlibpath_overrides_runpath=yes 966 ;; 967 freebsd3.[01]* | freebsdelf3.[01]*) 968@@ -17277,7 +17277,7 @@ 969 hardcode_shlibpath_var_F77=no 970 ;; 971 972- freebsd1*) 973+ freebsd1.*) 974 ld_shlibs_F77=no 975 ;; 976 977@@ -17293,7 +17293,7 @@ 978 ;; 979 980 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 981- freebsd2*) 982+ freebsd2.*) 983 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 984 hardcode_direct_F77=yes 985 hardcode_minus_L_F77=yes 986@@ -17889,7 +17889,7 @@ 987 shlibpath_var=LD_LIBRARY_PATH 988 ;; 989 990-freebsd1*) 991+freebsd1.*) 992 dynamic_linker=no 993 ;; 994 995@@ -17912,7 +17912,7 @@ 996 objformat=`/usr/bin/objformat` 997 else 998 case $host_os in 999- freebsd[123]*) objformat=aout ;; 1000+ freebsd[123].*) objformat=aout ;; 1001 *) objformat=elf ;; 1002 esac 1003 fi 1004@@ -17930,7 +17930,7 @@ 1005 esac 1006 shlibpath_var=LD_LIBRARY_PATH 1007 case $host_os in 1008- freebsd2*) 1009+ freebsd2.*) 1010 shlibpath_overrides_runpath=yes 1011 ;; 1012 freebsd3.[01]* | freebsdelf3.[01]*) 1013@@ -19892,7 +19892,7 @@ 1014 hardcode_shlibpath_var_GCJ=no 1015 ;; 1016 1017- freebsd1*) 1018+ freebsd1.*) 1019 ld_shlibs_GCJ=no 1020 ;; 1021 1022@@ -19908,7 +19908,7 @@ 1023 ;; 1024 1025 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 1026- freebsd2*) 1027+ freebsd2.*) 1028 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 1029 hardcode_direct_GCJ=yes 1030 hardcode_minus_L_GCJ=yes 1031@@ -20504,7 +20504,7 @@ 1032 shlibpath_var=LD_LIBRARY_PATH 1033 ;; 1034 1035-freebsd1*) 1036+freebsd1.*) 1037 dynamic_linker=no 1038 ;; 1039 1040@@ -20527,7 +20527,7 @@ 1041 objformat=`/usr/bin/objformat` 1042 else 1043 case $host_os in 1044- freebsd[123]*) objformat=aout ;; 1045+ freebsd[123].*) objformat=aout ;; 1046 *) objformat=elf ;; 1047 esac 1048 fi 1049@@ -20545,7 +20545,7 @@ 1050 esac 1051 shlibpath_var=LD_LIBRARY_PATH 1052 case $host_os in 1053- freebsd2*) 1054+ freebsd2.*) 1055 shlibpath_overrides_runpath=yes 1056 ;; 1057 freebsd3.[01]* | freebsdelf3.[01]*) 1058--- misc/build/CoinMP-1.6.0/Osi/configure.orig 2011-10-15 07:26:34.000000000 -0700 1059+++ misc/build/CoinMP-1.6.0/Osi/configure 2012-05-21 23:34:02.000000000 -0700 1060@@ -9197,7 +9197,7 @@ 1061 hardcode_shlibpath_var=no 1062 ;; 1063 1064- freebsd1*) 1065+ freebsd1.*) 1066 ld_shlibs=no 1067 ;; 1068 1069@@ -9213,7 +9213,7 @@ 1070 ;; 1071 1072 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 1073- freebsd2*) 1074+ freebsd2.*) 1075 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 1076 hardcode_direct=yes 1077 hardcode_minus_L=yes 1078@@ -9809,7 +9809,7 @@ 1079 shlibpath_var=LD_LIBRARY_PATH 1080 ;; 1081 1082-freebsd1*) 1083+freebsd1.*) 1084 dynamic_linker=no 1085 ;; 1086 1087@@ -9832,7 +9832,7 @@ 1088 objformat=`/usr/bin/objformat` 1089 else 1090 case $host_os in 1091- freebsd[123]*) objformat=aout ;; 1092+ freebsd[123].*) objformat=aout ;; 1093 *) objformat=elf ;; 1094 esac 1095 fi 1096@@ -9850,7 +9850,7 @@ 1097 esac 1098 shlibpath_var=LD_LIBRARY_PATH 1099 case $host_os in 1100- freebsd2*) 1101+ freebsd2.*) 1102 shlibpath_overrides_runpath=yes 1103 ;; 1104 freebsd3.[01]* | freebsdelf3.[01]*) 1105@@ -12284,7 +12284,7 @@ 1106 ;; 1107 esac 1108 ;; 1109- freebsd[12]*) 1110+ freebsd[12].*) 1111 # C++ shared libraries reported to be fairly broken before switch to ELF 1112 ld_shlibs_CXX=no 1113 ;; 1114@@ -13769,7 +13769,7 @@ 1115 shlibpath_var=LD_LIBRARY_PATH 1116 ;; 1117 1118-freebsd1*) 1119+freebsd1.*) 1120 dynamic_linker=no 1121 ;; 1122 1123@@ -13792,7 +13792,7 @@ 1124 objformat=`/usr/bin/objformat` 1125 else 1126 case $host_os in 1127- freebsd[123]*) objformat=aout ;; 1128+ freebsd[123].*) objformat=aout ;; 1129 *) objformat=elf ;; 1130 esac 1131 fi 1132@@ -13810,7 +13810,7 @@ 1133 esac 1134 shlibpath_var=LD_LIBRARY_PATH 1135 case $host_os in 1136- freebsd2*) 1137+ freebsd2.*) 1138 shlibpath_overrides_runpath=yes 1139 ;; 1140 freebsd3.[01]* | freebsdelf3.[01]*) 1141@@ -15744,7 +15744,7 @@ 1142 hardcode_shlibpath_var_F77=no 1143 ;; 1144 1145- freebsd1*) 1146+ freebsd1.*) 1147 ld_shlibs_F77=no 1148 ;; 1149 1150@@ -15760,7 +15760,7 @@ 1151 ;; 1152 1153 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 1154- freebsd2*) 1155+ freebsd2.*) 1156 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 1157 hardcode_direct_F77=yes 1158 hardcode_minus_L_F77=yes 1159@@ -16356,7 +16356,7 @@ 1160 shlibpath_var=LD_LIBRARY_PATH 1161 ;; 1162 1163-freebsd1*) 1164+freebsd1.*) 1165 dynamic_linker=no 1166 ;; 1167 1168@@ -16379,7 +16379,7 @@ 1169 objformat=`/usr/bin/objformat` 1170 else 1171 case $host_os in 1172- freebsd[123]*) objformat=aout ;; 1173+ freebsd[123].*) objformat=aout ;; 1174 *) objformat=elf ;; 1175 esac 1176 fi 1177@@ -16397,7 +16397,7 @@ 1178 esac 1179 shlibpath_var=LD_LIBRARY_PATH 1180 case $host_os in 1181- freebsd2*) 1182+ freebsd2.*) 1183 shlibpath_overrides_runpath=yes 1184 ;; 1185 freebsd3.[01]* | freebsdelf3.[01]*) 1186@@ -18343,7 +18343,7 @@ 1187 hardcode_shlibpath_var_GCJ=no 1188 ;; 1189 1190- freebsd1*) 1191+ freebsd1.*) 1192 ld_shlibs_GCJ=no 1193 ;; 1194 1195@@ -18359,7 +18359,7 @@ 1196 ;; 1197 1198 # Unfortunately, older versions of FreeBSD 2 do not have this feature. 1199- freebsd2*) 1200+ freebsd2.*) 1201 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 1202 hardcode_direct_GCJ=yes 1203 hardcode_minus_L_GCJ=yes 1204@@ -18955,7 +18955,7 @@ 1205 shlibpath_var=LD_LIBRARY_PATH 1206 ;; 1207 1208-freebsd1*) 1209+freebsd1.*) 1210 dynamic_linker=no 1211 ;; 1212 1213@@ -18978,7 +18978,7 @@ 1214 objformat=`/usr/bin/objformat` 1215 else 1216 case $host_os in 1217- freebsd[123]*) objformat=aout ;; 1218+ freebsd[123].*) objformat=aout ;; 1219 *) objformat=elf ;; 1220 esac 1221 fi 1222@@ -18996,7 +18996,7 @@ 1223 esac 1224 shlibpath_var=LD_LIBRARY_PATH 1225 case $host_os in 1226- freebsd2*) 1227+ freebsd2.*) 1228 shlibpath_overrides_runpath=yes 1229 ;; 1230 freebsd3.[01]* | freebsdelf3.[01]*) 1231