Add patches to work around an upstream semi-bug configuring on OSX.

The upstream distribution tries to use qt as a framework, but pkgsrc
provides it as a normal package.  This commit comments out the special
case logic in configure that uses "-framework QtCore" on OS X.

(configure.in is patched too, because that's the source file, even
though it's not rebuilt.)

3 files changed, 60 insertions, 1 deletions

diff --git a/geography/gpsbabel/distinfo b/geography/gpsbabel/distinfo
index 468b6949a49..5cc7b82984f 100644
--- a/geography/gpsbabel/distinfo
+++ b/geography/gpsbabel/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2015/06/06 12:57:58 gdt Exp $
+$NetBSD: distinfo,v 1.9 2015/09/07 18:57:47 gdt Exp $
 
 SHA1 (gpsbabel-1.5.2.tar.gz) = 4962a7e98bbfcbfd59baa970e9b33d1300053004
 RMD160 (gpsbabel-1.5.2.tar.gz) = 86a54f6e6647ed8eaa340641e9240565acf5ca99
 Size (gpsbabel-1.5.2.tar.gz) = 8392465 bytes
 SHA1 (patch-ad) = 9f7d481ddc1d2935fb05df687db25127fe3b37f0
 SHA1 (patch-af) = 5f066824b49f959ea8b06cdeccf21a4ce789fd1d
+SHA1 (patch-configure) = 1050c5c0117c41ea4aa276d774c34b47a89b56e2
+SHA1 (patch-configure.in) = f046a83e7ddf0a0f26d5623709ad799284875b49
 SHA1 (patch-testo) = 9c71a74aae088eb110c837114a7b691c3a8d9ff6
diff --git a/geography/gpsbabel/patches/patch-configure b/geography/gpsbabel/patches/patch-configure
new file mode 100644
index 00000000000..9ab5d14704e
--- /dev/null
+++ b/geography/gpsbabel/patches/patch-configure
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2015/09/07 18:57:47 gdt Exp $
+
+--- configure.orig	2015-09-01 16:32:13.000000000 +0000
++++ configure
+@@ -4816,19 +4816,7 @@ rm -f core conftest.err conftest.$ac_obj
+       $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+ 
+ 
+-      # On Mac, use frameworks for includes and library files.
+-      # Macports uses a non-standard build of Qt with an added
+-      # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
+-      # version first.  That will fail on 'normal' Qt so fall
+-      # back to QT_INSTALL_LIBS.
+-      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+-      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
+-         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+-      fi
+-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+-      QT_INC="$QT_FW_OR_LIBS"
+-      QT_INC_OPT="-F"
+-      QT_SYSINC_OPT="-iframework"
++      # In pkgsrc, we use the installed qt, not the framework.
+       ;;
+     *-*-freebsd*)
+ 	GBSER=gbser_posix.o
diff --git a/geography/gpsbabel/patches/patch-configure.in b/geography/gpsbabel/patches/patch-configure.in
new file mode 100644
index 00000000000..751b3acb0b1
--- /dev/null
+++ b/geography/gpsbabel/patches/patch-configure.in
@@ -0,0 +1,32 @@
+$NetBSD: patch-configure.in,v 1.1 2015/09/07 18:57:47 gdt Exp $
+
+In pkgsrc, we don't provide Qt as a framework.
+
+It's not clear how/if this should be addressed upstream.
+
+--- configure.in.orig	2015-01-02 23:02:55.000000000 +0000
++++ configure.in
+@@ -214,20 +214,9 @@ case "$target" in
+       mac/libusb/usb.o "
+       USB_LIBS="-framework  IOKit -framework CoreFoundation"
+       AC_DEFINE(HAVE_LIBUSB, 1)
+- 
+-      # On Mac, use frameworks for includes and library files.
+-      # Macports uses a non-standard build of Qt with an added 
+-      # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
+-      # version first.  That will fail on 'normal' Qt so fall 
+-      # back to QT_INSTALL_LIBS.
+-      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+-      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
+-         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+-      fi
+-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+-      QT_INC="$QT_FW_OR_LIBS"
+-      QT_INC_OPT="-F"
+-      QT_SYSINC_OPT="-iframework"
++
++
++      # In pkgsrc, we use the installed qt, not the framework.
+       ;;
+     *-*-freebsd*)
+ 	GBSER=gbser_posix.o