Date: Wed, 9 Jun 2010 17:52:41 +0400 (MSD) From: Gleb Smirnoff <glebius@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/147722: [patch] several fixes to astro/gpsd Message-ID: <201006091352.o59DqffF018308@cell.glebius.int.ru> Resent-Message-ID: <201006091400.o59E0FfU020570@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147722
>Category: ports
>Synopsis: [patch] several fixes to astro/gpsd
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 09 14:00:15 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Gleb Smirnoff
>Release: FreeBSD 8.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD cell.glebius.int.ru 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #2: Fri May 28 13:58:02 MSD 2010 glebius@cell.glebius.int.ru:/usr/obj/usr/src/sys/NUCLEUS i386
>Description:
Here are several fixes to the port.
1) Fix installation of gpsfake, gpscat, gpsprof and their manual pages.
Since we now patch the Makefile.in, create patch-file and remove
post-patch REINPLACE_CMD.
2) Remove MKT3301 - no such option anymore.
3) Add AIVDM option.
4) gpsdecode and its manual page are installed only and only if three
options are on: RTCM104V2 && RTCM104V3 && AIVDM.
>How-To-Repeat:
>Fix:
diff -Nur /tmp/astro/gpsd/Makefile gpsd/Makefile
--- /tmp/astro/gpsd/Makefile 2010-05-28 04:52:25.000000000 +0400
+++ gpsd/Makefile 2010-06-07 19:13:33.000000000 +0400
@@ -27,7 +27,7 @@
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
MAN1= cgps.1 gps.1 gpscat.1 gpsctl.1 gpsfake.1 \
- gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 gpsdecode.1 gpsmon.1 \
+ gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 gpsmon.1 \
lcdgps.1
MAN3= libgps.3 libgpsd.3 libgpsmm.3
MAN5= rtcm-104.5 srec.5
@@ -51,10 +51,10 @@
OCEANSERVER "Oceanserver support" off \
UBX "UBX protocol support" on \
EVERMORE "Evermore binary support" on \
- MKT3301 "MKT-3301 support" on \
GPSCLOCK "GPSclock support" on \
RTCM104V2 "rtcm104v2 support" on \
RTCM104V3 "rtcm104v3 support" on \
+ AIVDM "Aivdm support" on \
NTRIP "NTRIP support" on \
PROFILING "Profiling support" off \
NTPSHM "TP time hinting support" on \
@@ -144,10 +144,6 @@
CONFIGURE_ARGS+=--disable-evermore
.endif
-.if defined(WITHOUT_MKT3301)
-CONFIGURE_ARGS+=--disable-mkt3301
-.endif
-
.if defined(WITHOUT_GPSCLOCK)
CONFIGURE_ARGS+=--disable-gpscloclk
.endif
@@ -160,6 +156,17 @@
CONFIGURE_ARGS+=--disable-rtcm104v3
.endif
+.if defined(WITHOUT_AIVDM)
+CONFIGURE_ARGS+=--disable-aivdm
+.endif
+
+.if defined(WITH_RTCM104V2) && defined(WITH_RTCM104V3) && defined(WITH_AIVDM)
+PLIST_SUB+= DECODE=""
+MAN1+= gpsdecode.1
+.else
+PLIST_SUB+= DECODE="@comment "
+.endif
+
.if defined(WITHOUT_NTRIP)
CONFIGURE_ARGS+=--disable-ntrip
.endif
@@ -180,9 +187,6 @@
CONFIGURE_ARGS+=--enable-dbus
.endif
-post-patch:
- @${REINPLACE_CMD} -e '/XMLTO/d' ${WRKSRC}/Makefile.in
-
post-install:
@${CAT} ${PKGMESSAGE}
diff -Nur /tmp/astro/gpsd/files/patch-Makefile.in gpsd/files/patch-Makefile.in
--- /tmp/astro/gpsd/files/patch-Makefile.in 1970-01-01 03:00:00.000000000 +0300
+++ gpsd/files/patch-Makefile.in 2010-06-07 18:52:40.000000000 +0400
@@ -0,0 +1,27 @@
+--- Makefile.in.bak 2010-06-07 18:25:09.000000000 +0400
++++ Makefile.in 2010-06-07 18:52:16.000000000 +0400
+@@ -371,7 +371,6 @@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-WITH_XMLTO = @WITH_XMLTO@
+ WITH_XSLTPROC = @WITH_XSLTPROC@
+ X11_LIBS = @X11_LIBS@
+ XAW_LIBS = @XAW_LIBS@
+@@ -471,7 +470,6 @@
+
+
+ #SUBDIRS = contrib
+-XMLTO = xmlto
+
+ #
+ # Conditionally add programs depending on libraries that may or may not be present.
+@@ -1996,7 +1994,7 @@
+
+ # Install Python modules
+ @HAVE_PYTHON_TRUE@install-exec-local:
+-@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR)
++@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix}
+
+ @HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
+ @HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
diff -Nur /tmp/astro/gpsd/pkg-plist gpsd/pkg-plist
--- /tmp/astro/gpsd/pkg-plist 2010-05-20 10:20:08.000000000 +0400
+++ gpsd/pkg-plist 2010-06-07 19:05:30.000000000 +0400
@@ -2,10 +2,13 @@
%%X11%%bin/xgps
sbin/gpsd
bin/cgps
+bin/gpscat
bin/gpsctl
-bin/gpsdecode
+%%DECODE%%bin/gpsdecode
+bin/gpsfake
bin/gpsmon
bin/gpspipe
+bin/gpsprof
bin/gpxlogger
bin/lcdgps
include/gps.h
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006091352.o59DqffF018308>