Fix build when coinmp is already installed and using pkgconf.

Reported by tnn@
Fix by bapt@FreeBSD.org, thanks!

7 files changed, 247 insertions, 1 deletions

diff --git a/math/coinmp/distinfo b/math/coinmp/distinfo
index 213e1f39839..f00500110f4 100644
--- a/math/coinmp/distinfo
+++ b/math/coinmp/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 23:33:31 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/04/12 22:04:30 wiz Exp $
 
 SHA1 (CoinMP-1.8.3.tgz) = e7831d46414f1c0067664dcfd6cea600043e489d
 RMD160 (CoinMP-1.8.3.tgz) = fea560407773a4d4eaa3b13afa5827f924de6f33
 SHA512 (CoinMP-1.8.3.tgz) = 4cfec5ed973d6cf2325500fbc8d5640530004e4c99cf9a6446bae2906970fdc9aff3c72533d68b5bb2aed75fea6cbc916523e3f1676a2b046990c458186ef5c9
 Size (CoinMP-1.8.3.tgz) = 10535972 bytes
+SHA1 (patch-Cbc-configure) = 952f46ebdfe030cbea90ba89293185f3ffd95cd0
+SHA1 (patch-Cgl-configure) = 1515dd0c0e806e87586f115acb3c827bf5531a6d
+SHA1 (patch-Clp-configure) = 2b25360a39089abd9570db1255e785a721e85af0
+SHA1 (patch-CoinMP-configure) = 13fdf4d38d328029dbe8e3525b8b7c5cb1974e9b
+SHA1 (patch-CoinUtils-configure) = 2fad81415b80a5b3b302e43a679f897ba98a370c
+SHA1 (patch-Osi-configure) = 1d31ad1af50976ee6f865aa6e7d146ad6e690961
diff --git a/math/coinmp/patches/patch-Cbc-configure b/math/coinmp/patches/patch-Cbc-configure
new file mode 100644
index 00000000000..06e8823e274
--- /dev/null
+++ b/math/coinmp/patches/patch-Cbc-configure
@@ -0,0 +1,40 @@
+$NetBSD: patch-Cbc-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
+
+Fix build with pkgconf.
+
+--- Cbc/configure.orig	2015-09-22 16:20:00.000000000 +0000
++++ Cbc/configure
+@@ -20686,33 +20686,6 @@ fi
+ 
+ 
+ 
+-# assemble pkg-config search path for installed projects
+-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+-
+-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+-if test "x${prefix}" = xNONE ; then
+-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-else
+-  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-fi
+-
+-
+-# Check whether --with-coin-instdir or --without-coin-instdir was given.
+-if test "${with_coin_instdir+set}" = set; then
+-  withval="$with_coin_instdir"
+-  if test -d "$withval"; then : ; else
+-     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-
+-fi;
+-
+-
+-
+ # assemble additional pkg-config search paths for uninstalled projects
+ if test x$coin_projectdir = xyes ; then
+   # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
diff --git a/math/coinmp/patches/patch-Cgl-configure b/math/coinmp/patches/patch-Cgl-configure
new file mode 100644
index 00000000000..e6a97f474bc
--- /dev/null
+++ b/math/coinmp/patches/patch-Cgl-configure
@@ -0,0 +1,40 @@
+$NetBSD: patch-Cgl-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
+
+Fix build with pkgconf.
+
+--- Cgl/configure.orig	2015-09-22 15:01:33.000000000 +0000
++++ Cgl/configure
+@@ -20652,33 +20652,6 @@ fi
+ 
+ 
+ 
+-# assemble pkg-config search path for installed projects
+-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+-
+-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+-if test "x${prefix}" = xNONE ; then
+-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-else
+-  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-fi
+-
+-
+-# Check whether --with-coin-instdir or --without-coin-instdir was given.
+-if test "${with_coin_instdir+set}" = set; then
+-  withval="$with_coin_instdir"
+-  if test -d "$withval"; then : ; else
+-     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-
+-fi;
+-
+-
+-
+ # assemble additional pkg-config search paths for uninstalled projects
+ if test x$coin_projectdir = xyes ; then
+   # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
diff --git a/math/coinmp/patches/patch-Clp-configure b/math/coinmp/patches/patch-Clp-configure
new file mode 100644
index 00000000000..c7d3bd78ebb
--- /dev/null
+++ b/math/coinmp/patches/patch-Clp-configure
@@ -0,0 +1,40 @@
+$NetBSD: patch-Clp-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
+
+Fix build with pkgconf.
+
+--- Clp/configure.orig	2015-09-21 18:52:13.000000000 +0000
++++ Clp/configure
+@@ -20682,33 +20682,6 @@ fi
+ 
+ 
+ 
+-# assemble pkg-config search path for installed projects
+-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+-
+-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+-if test "x${prefix}" = xNONE ; then
+-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-else
+-  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-fi
+-
+-
+-# Check whether --with-coin-instdir or --without-coin-instdir was given.
+-if test "${with_coin_instdir+set}" = set; then
+-  withval="$with_coin_instdir"
+-  if test -d "$withval"; then : ; else
+-     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-
+-fi;
+-
+-
+-
+ # assemble additional pkg-config search paths for uninstalled projects
+ if test x$coin_projectdir = xyes ; then
+   # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
diff --git a/math/coinmp/patches/patch-CoinMP-configure b/math/coinmp/patches/patch-CoinMP-configure
new file mode 100644
index 00000000000..e7bc9b77f0c
--- /dev/null
+++ b/math/coinmp/patches/patch-CoinMP-configure
@@ -0,0 +1,40 @@
+$NetBSD: patch-CoinMP-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
+
+Fix build with pkgconf.
+
+--- CoinMP/configure.orig	2015-09-22 19:52:20.000000000 +0000
++++ CoinMP/configure
+@@ -20624,33 +20624,6 @@ fi
+ 
+ 
+ 
+-# assemble pkg-config search path for installed projects
+-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+-
+-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+-if test "x${prefix}" = xNONE ; then
+-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-else
+-  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-fi
+-
+-
+-# Check whether --with-coin-instdir or --without-coin-instdir was given.
+-if test "${with_coin_instdir+set}" = set; then
+-  withval="$with_coin_instdir"
+-  if test -d "$withval"; then : ; else
+-     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-
+-fi;
+-
+-
+-
+ # assemble additional pkg-config search paths for uninstalled projects
+ if test x$coin_projectdir = xyes ; then
+   # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
diff --git a/math/coinmp/patches/patch-CoinUtils-configure b/math/coinmp/patches/patch-CoinUtils-configure
new file mode 100644
index 00000000000..36149a30af8
--- /dev/null
+++ b/math/coinmp/patches/patch-CoinUtils-configure
@@ -0,0 +1,40 @@
+$NetBSD: patch-CoinUtils-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
+
+Fix build with pkgconf.
+
+--- CoinUtils/configure.orig	2015-09-11 17:04:38.000000000 +0000
++++ CoinUtils/configure
+@@ -29625,33 +29625,6 @@ fi
+ 
+ 
+ 
+-# assemble pkg-config search path for installed projects
+-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+-
+-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+-if test "x${prefix}" = xNONE ; then
+-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-else
+-  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-fi
+-
+-
+-# Check whether --with-coin-instdir or --without-coin-instdir was given.
+-if test "${with_coin_instdir+set}" = set; then
+-  withval="$with_coin_instdir"
+-  if test -d "$withval"; then : ; else
+-     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-
+-fi;
+-
+-
+-
+ # assemble additional pkg-config search paths for uninstalled projects
+ if test x$coin_projectdir = xyes ; then
+   # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
diff --git a/math/coinmp/patches/patch-Osi-configure b/math/coinmp/patches/patch-Osi-configure
new file mode 100644
index 00000000000..24bb4d52181
--- /dev/null
+++ b/math/coinmp/patches/patch-Osi-configure
@@ -0,0 +1,40 @@
+$NetBSD: patch-Osi-configure,v 1.1 2016/04/12 22:04:30 wiz Exp $
+
+Fix build with pkgconf.
+
+--- Osi/configure.orig	2015-09-21 22:51:25.000000000 +0000
++++ Osi/configure
+@@ -20650,33 +20650,6 @@ fi
+ 
+ 
+ 
+-# assemble pkg-config search path for installed projects
+-COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+-
+-# let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
+-# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
+-# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
+-if test "x${prefix}" = xNONE ; then
+-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-else
+-  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-fi
+-
+-
+-# Check whether --with-coin-instdir or --without-coin-instdir was given.
+-if test "${with_coin_instdir+set}" = set; then
+-  withval="$with_coin_instdir"
+-  if test -d "$withval"; then : ; else
+-     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+-echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+-
+-fi;
+-
+-
+-
+ # assemble additional pkg-config search paths for uninstalled projects
+ if test x$coin_projectdir = xyes ; then
+   # if we are in a project setup, then in a classic setup, we want to find uninstalled projects