From 7d35964a38880b9d5644e8dfcee9c6312a190ee1 Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Sun, 20 Jan 2008 13:21:41 +0000
Subject: [PATCH] - Update to 2.36

PR:		ports/119687
Submitted by:	Anton Karpov <toxa at toxahost.ru> (maintainer)
---
 astro/gpsd/Makefile              | 12 +++++++++---
 astro/gpsd/distinfo              |  6 +++---
 astro/gpsd/files/patch-gpspipe.c | 10 ----------
 astro/gpsd/pkg-plist             | 13 ++++++++++++-
 4 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 astro/gpsd/files/patch-gpspipe.c

diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 3356a45ed2d5..1caf123b6b65 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpsd
-PORTVERSION=	2.32
-PORTREVISION=	2
+PORTVERSION=	2.36
 CATEGORIES=	astro geography
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,13 +14,18 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	toxa@toxahost.ru
 COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 
+BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
+		xsltproc:${PORTSDIR}/textproc/libxslt
+
 USE_RC_SUBR=	gpsd
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
-MAN1=	gps.1 gpsfake.1 gpsflash.1 gpspipe.1 gpsprof.1 rtcmdecode.1 sirfmon.1
+MAN1=	cgps.1 cgpxlogger.1 gps.1 gpscat.1 gpsctl.1 gpsfake.1 gpsflash.1 \
+	gpspipe.1 gpsprof.1 rtcmdecode.1 sirfmon.1 xgps.1 xgpsspeed.1
 MAN3=	libgps.3 libgpsd.3 libgpsmm.3
 MAN5=	rtcm-104.5 srec.5
 MAN8=	gpsd.8
@@ -43,6 +47,8 @@ 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>
 
 SUB_FILES=	pkg-message
diff --git a/astro/gpsd/distinfo b/astro/gpsd/distinfo
index 8d777bee684c..bca72c62cd64 100644
--- a/astro/gpsd/distinfo
+++ b/astro/gpsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpsd-2.32.tar.gz) = 4bb9b0c1642d36265c807a04da3d6f60
-SHA256 (gpsd-2.32.tar.gz) = 95bee94daaf0168387152223fac186ba40d7b02657bfc0336c90edc5ea15bf10
-SIZE (gpsd-2.32.tar.gz) = 617947
+MD5 (gpsd-2.36.tar.gz) = bb54e89ddb4fdc7af8bbc5534652f9ce
+SHA256 (gpsd-2.36.tar.gz) = 0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a
+SIZE (gpsd-2.36.tar.gz) = 736220
diff --git a/astro/gpsd/files/patch-gpspipe.c b/astro/gpsd/files/patch-gpspipe.c
deleted file mode 100644
index 8cce28b6b75b..000000000000
--- a/astro/gpsd/files/patch-gpspipe.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gpspipe.c.orig	Mon Jan 30 16:04:07 2006
-+++ gpspipe.c	Mon Jan 30 16:04:56 2006
-@@ -26,6 +26,7 @@
- 
- #include <errno.h>
- #include <stdio.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/astro/gpsd/pkg-plist b/astro/gpsd/pkg-plist
index 18baeb336d93..eca3c643518c 100644
--- a/astro/gpsd/pkg-plist
+++ b/astro/gpsd/pkg-plist
@@ -3,6 +3,8 @@
 sbin/gpsd
 bin/cgps
 bin/cgpxlogger
+bin/gpscat
+bin/gpsctl
 bin/gpsflash
 bin/gpsprof
 bin/sirfmon
@@ -15,4 +17,13 @@ include/libgpsmm.h
 lib/libgps.a
 lib/libgps.la
 lib/libgps.so
-lib/libgps.so.15
+lib/libgps.so.17
+libdata/pkgconfig/libgps.pc
+libdata/pkgconfig/libgpsd.pc
+%%PYTHON_SITELIBDIR%%/gps.py
+%%PYTHON_SITELIBDIR%%/gps.pyc
+%%PYTHON_SITELIBDIR%%/gps.pyo
+%%PYTHON_SITELIBDIR%%/gpsfake.py
+%%PYTHON_SITELIBDIR%%/gpsfake.pyc
+%%PYTHON_SITELIBDIR%%/gpsfake.pyo
+%%PYTHON_SITELIBDIR%%/gpspacket.so