ports/149077: astro/gpsd: fix build

[Max Brazhnikov]

>Number:         149077
>Category:       ports
>Synopsis:       astro/gpsd: fix build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 29 18:00:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
FreeBSD luna.dio.ru 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #7: Wed Jul 14 01:05:50 MSD 2010     root at luna.dio.ru:/usr/obj/usr/freebsd/8/src/sys/LUNA  amd64
>Description:
Fix and sort plist
Fix distinfo
Explicitly disable QT bindings

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/gpsd/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	28 Jul 2010 11:05:41 -0000	1.23
+++ Makefile	29 Jul 2010 17:41:57 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpsd
 PORTVERSION=	2.95
+PORTREVISION=	1
 CATEGORIES=	astro geography
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +25,10 @@
 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 +38,9 @@
 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 +67,10 @@
 		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 +183,4 @@
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/astro/gpsd/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	28 Jul 2010 09:57:14 -0000	1.9
+++ distinfo	29 Jul 2010 17:43:13 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/astro/gpsd/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist	29 Jul 2010 09:38:26 -0000	1.9
+++ pkg-plist	29 Jul 2010 17:22:36 -0000
@@ -1,6 +1,3 @@
-%%X11%%bin/xgpsspeed
-bin/xgps
-sbin/gpsd
 bin/cgps
 bin/gpscat
 bin/gpsctl
@@ -11,31 +8,35 @@
 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


>Release-Note:
>Audit-Trail:
>Unformatted: