Modified: trunk/dports/net/gpsd/Portfile (75799 => 75800)

--- trunk/dports/net/gpsd/Portfile	2011-02-09 01:11:27 UTC (rev 75799)
+++ trunk/dports/net/gpsd/Portfile	2011-02-09 01:19:52 UTC (rev 75800)
@@ -2,6 +2,9 @@
 # $Id$
 
 PortSystem              1.0
+if {[variant_isset qt]} {
+PortGroup               qt4 1.0
+}
 
 name                    gpsd
 version                 2.95
@@ -24,8 +27,6 @@
 
 patchfiles              patch-Makefile.in.diff
 
-universal_variant       yes
-
 post-patch {
     # fix up configure for LIBUSB variant
     if {![variant_isset libusb]} {
@@ -34,22 +35,10 @@
     }
 }
 
-pre-configure {
-    # remove ${prefix}/lib from LDFLAGS, and include it in the
-    # LIBRARY_PATH instead
-    configure.ldflags-delete "-L${prefix}/lib"
-    compiler.library_path ${prefix}/lib
+# rely on CPATH and LIBRARY_PATH instead
+configure.ldflags-delete "-L${prefix}/lib"
+configure.cppflags-delete "-I${prefix}/include"
 
-    # remove ${prefix}/include from CPPFLAGS, and include it in the
-    # CPATH instead (the default)
-    configure.cppflags-delete "-I${prefix}/include"
-}
-
-pre-build {
-    # use the corrected LIBRARY_PATH for build
-    compiler.library_path ${prefix}/lib
-}
-
 post-destroot {
     # fix up Python install egg-info filename
     set eggdir [exec find ${destroot}${prefix}/lib \
@@ -58,9 +47,7 @@
     move ${eggfile} ${eggdir}/gps.egg-info
 }
 
-variant qt description {Build Qt bindings} {
-    PortGroup qt4 1.0
-}
+variant qt description {Build Qt bindings} {}
 
 if {![variant_isset qt]} {
     configure.args-append --disable-libQgpsmm
@@ -79,24 +66,23 @@
 
 variant python25 conflicts python26 python27 \
 description "Use Python 2.5" {
-    configure.env      PYTHON=${prefix}/bin/python2.5
+    configure.python      ${prefix}/bin/python2.5
     depends_lib-append port:python25
 }
 
 variant python26 conflicts python25 python27 \
 description "Use Python 2.6" {
-    configure.env      PYTHON=${prefix}/bin/python2.6
+    configure.python      ${prefix}/bin/python2.6
     depends_lib-append port:python26
 }
 
 variant python27 conflicts python25 python26 \
 description "Use Python 2.7" {
-    configure.env      PYTHON=${prefix}/bin/python2.7
+    configure.python      ${prefix}/bin/python2.7
     depends_lib-append port:python27
 }
 
 if { ![variant_isset python25] && \
-     ![variant_isset python26] && \
      ![variant_isset python27] } {
     default_variants +python26
 }