Ticket #4947: gpsbabel.Portfile.diff

Portfile

@@ -2 +2 @@
 PortSystem              1.0
 
 name            gpsbabel
-version         1.2.4
+version         1.2.7
 categories      textproc comms
 maintainers     thomas+darwinports@stromberg.org
 description     GPSBabel converts/uploads GPS waypoints, tracks, and routes
@@ -14 +14 @@
 homepage                http://gpsbabel.sourceforge.net
 platforms               darwin
 master_sites    sourceforge
-checksums               md5 90adf3f0aabbe2c63ed1054465629525
+checksums               md5 535da9798714e53a9584e22ac7d651d3
 
 depends_lib             lib:libexpat.0:expat
 
 # Note: Not yet supported on MacOSX, but may work on others
 variant usb {
         depends_lib-append      lib:libusb-0.1.4:libusb
-        build.args-delete       LIBEXPAT="-L${prefix}/lib -lexpat"
-        build.args-append       LIBEXPAT="-L${prefix}/lib -lexpat -lusb" \
-                                                INHIBIT_USB=""
+        build.args-delete       LIBUSB="" \
+                            INHIBIT_USB="-DNO_USB"
+        build.args-append       LIBUSB="-lusb /System/Library/Frameworks/CoreFoundation.framework/Versions/Current/CoreFoundation /System/Library/Frameworks/IOKit.framework/Versions/Current/IOKit" \
+                            INHIBIT_USB="" \
+                                                
 }
 
 variant tk {
@@ -36 +38 @@
 
 use_configure   no
 build.args              EXTRA_CFLAGS="-I${prefix}/include" \
-                                LIBEXPAT="-L${prefix}/lib -lexpat"
+                                LIBEXPAT="-L${prefix}/lib -lexpat" \
+                                LIBUSB="" \
+                                INHIBIT_USB="-DNO_USB"
 
 destroot {
         cd ${worksrcpath}
@@ -52 +56 @@
 }
 
 platform darwin {
-        patchfiles-append       patch-project.pbxproj
         post-patch {
                 # Patch with version from pre-compiled application for now.
                 # Authors have been notified of these changes for future
@@ -86 +89 @@
         }
         post-destroot {
                 if {[file exist ${worksrcpath}/macgpsbabel/conftest]} {
-                        cd ${worksrcpath}/macgpsbabel/build
+                        if {$xcodeversion == "2.1"} {
+                            cd ${worksrcpath}/macgpsbabel/build/Deployment
+                        } else {
+                            cd ${worksrcpath}/macgpsbabel/build
+                        }
                         xinstall -d -m 0755 ${destroot}/Applications/DarwinPorts
                         system "cp -R MacGPSBabel.app ${destroot}/Applications/DarwinPorts"
                 }