Mon Sep 7 18:57:47 2015 UTC ()
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.)


(gdt)
diff -r1.8 -r1.9 pkgsrc/geography/gpsbabel/distinfo
diff -r0 -r1.1 pkgsrc/geography/gpsbabel/patches/patch-configure
diff -r0 -r1.1 pkgsrc/geography/gpsbabel/patches/patch-configure.in

cvs diff -r1.8 -r1.9 pkgsrc/geography/gpsbabel/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/gpsbabel/distinfo 2015/06/06 12:57:58 1.8
+++ pkgsrc/geography/gpsbabel/distinfo 2015/09/07 18:57:47 1.9
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.8 2015/06/06 12:57:58 gdt Exp $ 1$NetBSD: distinfo,v 1.9 2015/09/07 18:57:47 gdt Exp $
2 2
3SHA1 (gpsbabel-1.5.2.tar.gz) = 4962a7e98bbfcbfd59baa970e9b33d1300053004 3SHA1 (gpsbabel-1.5.2.tar.gz) = 4962a7e98bbfcbfd59baa970e9b33d1300053004
4RMD160 (gpsbabel-1.5.2.tar.gz) = 86a54f6e6647ed8eaa340641e9240565acf5ca99 4RMD160 (gpsbabel-1.5.2.tar.gz) = 86a54f6e6647ed8eaa340641e9240565acf5ca99
5Size (gpsbabel-1.5.2.tar.gz) = 8392465 bytes 5Size (gpsbabel-1.5.2.tar.gz) = 8392465 bytes
6SHA1 (patch-ad) = 9f7d481ddc1d2935fb05df687db25127fe3b37f0 6SHA1 (patch-ad) = 9f7d481ddc1d2935fb05df687db25127fe3b37f0
7SHA1 (patch-af) = 5f066824b49f959ea8b06cdeccf21a4ce789fd1d 7SHA1 (patch-af) = 5f066824b49f959ea8b06cdeccf21a4ce789fd1d
 8SHA1 (patch-configure) = 1050c5c0117c41ea4aa276d774c34b47a89b56e2
 9SHA1 (patch-configure.in) = f046a83e7ddf0a0f26d5623709ad799284875b49
8SHA1 (patch-testo) = 9c71a74aae088eb110c837114a7b691c3a8d9ff6 10SHA1 (patch-testo) = 9c71a74aae088eb110c837114a7b691c3a8d9ff6

File Added: pkgsrc/geography/gpsbabel/patches/Attic/patch-configure
$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

File Added: pkgsrc/geography/gpsbabel/patches/Attic/patch-configure.in
$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