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