? coinmp-pkgconf.diff ? work Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/math/coinmp/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 3 Nov 2015 23:33:31 -0000 1.5 +++ distinfo 11 Apr 2016 21:15:18 -0000 @@ -4,3 +4,9 @@ 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) = fec534adf2f66a9ee16d6129a91a943c6fb1c61c +SHA1 (patch-Cgl-configure) = d81b911676fe782e2bedc6df787f2d53e7064431 +SHA1 (patch-Clp-configure) = 246cadf12f76813fbba830c7bd0c0f77651e32c8 +SHA1 (patch-CoinMP-configure) = d2af69615002509f497052fe9cc267f7af35d429 +SHA1 (patch-CoinUtils-configure) = a06abb1e29f905c370911d9b96c049152e2df578 +SHA1 (patch-Osi-configure) = 45c6d6adfe1630647783ba46ecbd947519206df5 Index: patches/patch-Cbc-configure =================================================================== RCS file: patches/patch-Cbc-configure diff -N patches/patch-Cbc-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Cbc-configure 11 Apr 2016 21:15:18 -0000 @@ -0,0 +1,38 @@ +$NetBSD$ + +--- 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 Index: patches/patch-Cgl-configure =================================================================== RCS file: patches/patch-Cgl-configure diff -N patches/patch-Cgl-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Cgl-configure 11 Apr 2016 21:15:18 -0000 @@ -0,0 +1,38 @@ +$NetBSD$ + +--- 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 Index: patches/patch-Clp-configure =================================================================== RCS file: patches/patch-Clp-configure diff -N patches/patch-Clp-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Clp-configure 11 Apr 2016 21:15:18 -0000 @@ -0,0 +1,38 @@ +$NetBSD$ + +--- 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 Index: patches/patch-CoinMP-configure =================================================================== RCS file: patches/patch-CoinMP-configure diff -N patches/patch-CoinMP-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-CoinMP-configure 11 Apr 2016 21:15:18 -0000 @@ -0,0 +1,38 @@ +$NetBSD$ + +--- 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 Index: patches/patch-CoinUtils-configure =================================================================== RCS file: patches/patch-CoinUtils-configure diff -N patches/patch-CoinUtils-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-CoinUtils-configure 11 Apr 2016 21:15:18 -0000 @@ -0,0 +1,38 @@ +$NetBSD$ + +--- 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 Index: patches/patch-Osi-configure =================================================================== RCS file: patches/patch-Osi-configure diff -N patches/patch-Osi-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Osi-configure 11 Apr 2016 21:15:18 -0000 @@ -0,0 +1,38 @@ +$NetBSD$ + +--- 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