Problem: homebrew package names sometimes are different from linux ones

Solution: add optional brew_name variable for projects, and use it if defined

Author: bluca

README.md

@@ -659,7 +659,7 @@ Model is described in `zproject_known_projects.xml` file:
         </use>
     -->
 
-    <use project = "libzmq" prefix = "zmq" debian_name = "libzmq3-dev" redhat_name = "zeromq-devel"
+    <use project = "libzmq" prefix = "zmq" debian_name = "libzmq3-dev" redhat_name = "zeromq-devel" brew_name = "zeromq"
         repository = "https://github.com/zeromq/libzmq.git"
         test = "zmq_init" />
 
@@ -740,10 +740,12 @@ Model is described in `zproject_known_projects.xml` file:
         prefix = "curl"
         repository = "https://github.com/curl/curl.git"
         debian_name = "libcurl4-nss-dev"
+        brew_name = "curl"
         test = "curl_easy_init"
         header = "curl/curl.h" />
 
     <use project = "libmicrohttpd"
+         brew_name = "libmicrohttpd"
          prefix = "microhttpd"
          repository = "https://gnunet.org/git/libmicrohttpd.git"
          test = "MHD_start_daemon" />
@@ -772,6 +774,7 @@ Model is described in `zproject_known_projects.xml` file:
     <use project = "uuid"
         test = "uuid_generate"
         header = "uuid/uuid.h"
+        brew_name = "ossp-uuid"
         redhat_name = "libuuid-devel"
         debian_name = "uuid-dev" />
 

zproject_known_projects.xml

@@ -33,7 +33,7 @@
         </use>
     -->
 
-    <use project = "libzmq" prefix = "zmq" debian_name = "libzmq3-dev" redhat_name = "zeromq-devel"
+    <use project = "libzmq" prefix = "zmq" debian_name = "libzmq3-dev" redhat_name = "zeromq-devel" brew_name = "zeromq"
         repository = "https://github.com/zeromq/libzmq.git"
         test = "zmq_init" />
 
@@ -114,10 +114,12 @@
         prefix = "curl"
         repository = "https://github.com/curl/curl.git"
         debian_name = "libcurl4-nss-dev"
+        brew_name = "curl"
         test = "curl_easy_init"
         header = "curl/curl.h" />
 
     <use project = "libmicrohttpd"
+         brew_name = "libmicrohttpd"
          prefix = "microhttpd"
          repository = "https://gnunet.org/git/libmicrohttpd.git"
          test = "MHD_start_daemon" />
@@ -146,6 +148,7 @@
     <use project = "uuid"
         test = "uuid_generate"
         header = "uuid/uuid.h"
+        brew_name = "ossp-uuid"
         redhat_name = "libuuid-devel"
         debian_name = "uuid-dev" />
 

zproject_projects.gsl

@@ -25,6 +25,7 @@ function resolve_project_dependency (use)
         my.use.release     ?= known.release?
         my.use.draft       ?= known.draft?
         my.use.debian_name ?= known.debian_name?
+        my.use.brew_name   ?= known.brew_name?
         # The spec_name is only transitional - I assume it wasn't widely used
         # maybe trigger a warning if used?
         my.use.redhat_name ?= known.spec_name?

zproject_travis.gsl

@@ -641,7 +641,11 @@ if \
 .   else
 \! ((command -v dpkg >/dev/null 2>&1 && dpkg -s $(use.project)-dev >/dev/null 2>&1) || \\
 .   endif
+.   if defined (use.brew_name)
+    (command -v brew >/dev/null 2>&1 && brew ls --versions $(use.brew_name) >/dev/null 2>&1)) || \\
+.   else
     (command -v brew >/dev/null 2>&1 && brew ls --versions $(use.project) >/dev/null 2>&1)) || \\
+.   endif
        ([ -e "$(use.project)" ]) \\
 ; then
 .if ! defined (use.repository) & ! defined (use.tarball)
@@ -1070,7 +1074,11 @@ default|default-Werror|default-with-docs|valgrind|clang-format-check)
 .      else
 \! ((command -v dpkg >/dev/null 2>&1 && dpkg -s $(use.project)-dev >/dev/null 2>&1) || \\
 .      endif
+.      if defined (use.brew_name)
+          (command -v brew >/dev/null 2>&1 && brew ls --versions $(use.brew_name) >/dev/null 2>&1)) \\
+.      else
           (command -v brew >/dev/null 2>&1 && brew ls --versions $(use.project) >/dev/null 2>&1)) \\
+.      endif
     ; then
         echo ""
 .       if ! defined (use.repository) & ! defined (use.tarball)