3 files changed, 27 insertions, 33 deletions

diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 11d9b56bd033..d859c19165a1 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -24,6 +24,10 @@ USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--disable-libQgpsmm
+USE_PYTHON=	yes
+INSTALLS_EGGINFO=	yes
+PYDISTUTILS_PKGNAME=	gps
 
 MAN1=	cgps.1 gps.1 gpscat.1 gpsctl.1 gpsfake.1 \
 	gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 gpsmon.1 \
@@ -33,7 +37,9 @@ MAN5=	rtcm-104.5 srec.5
 MAN8=	gpsd.8
 MANCOMPRESSED=	no
 
-OPTIONS=	XGPS "Build xgps and xgpsspeed (require X)" off \
+SUB_FILES=	pkg-message
+
+OPTIONS=	GTK2 "Install py-gtk2 (required for xgps & xgpsspeed)" off \
 		NMEA "NMEA support" on \
 		SIRF "SiRF chipset support" on \
 		SUPERSTARII "SuperStarII support" off \
@@ -60,23 +66,10 @@ OPTIONS=	XGPS "Build xgps and xgpsspeed (require X)" off \
 		PPS "PPS time syncing support" off \
 		DBUS "DBUS support" off
 
-USE_PYTHON=	yes
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-SUB_FILES=	pkg-message
-CONFIGURE_ARGS+=--disable-garmin
-
-.if defined(WITH_XGPS)
-CONFIGURE_ENV+=	CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm"
-CONFIGURE_ARGS+=--with-x
-USE_MOTIF=	yes
-USE_XORG=	x11 xpm xaw7
-PLIST_SUB+=	X11=""
-.else
-CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	X11="@comment "
+.if defined(WITH_GTK2)
+USE_GNOME+=	pygtk2
 .endif
 
 .if defined(WITHOUT_NMEA)
@@ -189,4 +182,4 @@ CONFIGURE_ARGS+=--enable-dbus
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/gpsd/distinfo b/astro/gpsd/distinfo
index 879ca488cc0b..156c6352f391 100644
--- a/astro/gpsd/distinfo
+++ b/astro/gpsd/distinfo
@@ -1,3 +1,3 @@
 MD5 (gpsd-2.95.tar.gz) = 12535a9ed9fecf9ea2c5bdc9840da5ae
 SHA256 (gpsd-2.95.tar.gz) = 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae
-SIZE (gpsd-2.94.tar.gz) = 1385681
+SIZE (gpsd-2.95.tar.gz) = 1385681
diff --git a/astro/gpsd/pkg-plist b/astro/gpsd/pkg-plist
index 6b641b7daec7..6ead67f9d2b5 100644
--- a/astro/gpsd/pkg-plist
+++ b/astro/gpsd/pkg-plist
@@ -1,6 +1,3 @@
-%%X11%%bin/xgpsspeed
-bin/xgps
-sbin/gpsd
 bin/cgps
 bin/gpscat
 bin/gpsctl
@@ -11,31 +8,35 @@ bin/gpspipe
 bin/gpsprof
 bin/gpxlogger
 bin/lcdgps
+bin/xgps
+bin/xgpsspeed
 include/gps.h
 include/gpsd.h
 include/libgpsmm.h
-lib/libgpsd.a
-lib/libgpsd.la
-lib/libgpsd.so
-lib/libgpsd.so.0
 lib/libgps.a
 lib/libgps.la
 lib/libgps.so
 lib/libgps.so.19
-libdata/pkgconfig/libgps.pc
-libdata/pkgconfig/libgpsd.pc
-%%PYTHON_SITELIBDIR%%/gpscap.py
-%%PYTHON_SITELIBDIR%%/gpscap.pyc
-%%PYTHON_SITELIBDIR%%/gpscap.pyo
+lib/libgpsd.a
+lib/libgpsd.la
+lib/libgpsd.so
+lib/libgpsd.so.0
 %%PYTHON_SITELIBDIR%%/gps/__init__.py
 %%PYTHON_SITELIBDIR%%/gps/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gps/client.py
+%%PYTHON_SITELIBDIR%%/gps/client.pyc
 %%PYTHON_SITELIBDIR%%/gps/clienthelpers.so
 %%PYTHON_SITELIBDIR%%/gps/fake.py
 %%PYTHON_SITELIBDIR%%/gps/fake.pyc
 %%PYTHON_SITELIBDIR%%/gps/gps.py
 %%PYTHON_SITELIBDIR%%/gps/gps.pyc
-%%PYTHON_SITELIBDIR%%/gps/packet.so
 %%PYTHON_SITELIBDIR%%/gps/misc.py
 %%PYTHON_SITELIBDIR%%/gps/misc.pyc
-%%PYTHON_SITELIBDIR%%/gps-2.95-py2.6.egg-info
+%%PYTHON_SITELIBDIR%%/gps/packet.so
+%%PYTHON_SITELIBDIR%%/gpscap.py
+%%PYTHON_SITELIBDIR%%/gpscap.pyc
+%%PYTHON_SITELIBDIR%%/gpscap.pyo
+libdata/pkgconfig/libgps.pc
+libdata/pkgconfig/libgpsd.pc
+sbin/gpsd
 @dirrm %%PYTHON_SITELIBDIR%%/gps