Attachment 133758 Details for Bug 178279 – file.diff

[patch] file.diff

file.diff (text/plain), 6.35 KB, created by Gleb Smirnoff on 2013-05-01 14:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Smirnoff

Created: 2013-05-01 14:20:00 UTC

Size: 6.35 KB

patch

obsolete

>diff -Nur /tmp/astro/gpsd/Makefile /usr/ports/astro/gpsd/Makefile
>--- /tmp/astro/gpsd/Makefile	2013-04-23 10:26:31.000000000 +0400
>+++ /usr/ports/astro/gpsd/Makefile	2013-05-01 16:38:41.000000000 +0400
>@@ -2,8 +2,7 @@
> # $FreeBSD: astro/gpsd/Makefile 316309 2013-04-23 06:26:31Z bapt $
> 
> PORTNAME=	gpsd
>-PORTVERSION=	3.6
>-PORTREVISION=	1
>+PORTVERSION=	3.9
> CATEGORIES=	astro geography
> MASTER_SITES=	SAVANNAH
> 
>@@ -21,7 +20,7 @@
> PYDISTUTILS_EGGINFO=	gps-${PORTVERSION}.egg-info
> MAKE_JOBS_SAFE=	yes
> 
>-SCONS_BUILDENV=	${SCONS_ENV}
>+SCONS_BUILDENV=	CC=${CC}
> SCONS_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
> 		chrpath=no
> 
>@@ -30,12 +29,12 @@
> 	gpsmon.1 lcdgps.1
> MAN3=	libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3
> MAN5=	srec.5 gpsd_json.5
>-MAN8=	gpsd.8 gpsdctl.8
>+MAN8=	gpsd.8 gpsdctl.8 gpsinit.8
> MANCOMPRESSED=	no
> 
> OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \
>-		GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NCURSES NMEA NTPSHM NTRIP \
>-		OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PPSONCTS PROFILING RECONFIGURE \
>+		GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NMEA NTPSHM NTRIP \
>+		OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PROFILING RECONFIGURE \
> 		RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
> 		TSIP QTBIND UBX USB
> OPTIONS_DEFAULT=	AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FV18 GARMIN GARMINTXT GEOSTAR \
>@@ -57,7 +56,6 @@
> ITRAX_DESC=		iTrax support
> MTK_DESC=		MTK-3301 support
> NAVCOM_DESC=		Navcom support
>-NCURSES_DESC=		Build with ncurses(3)
> NETFEED_DESC=		Build support for handling TCP/IP data sources
> NMEA_DESC=		NMEA support
> NTPSHM_DESC=		NTP time hinting support
>@@ -67,7 +65,6 @@
> ONCORE_DESC=		Motorola OnCore chipset support
> PASSTHROUGH_DESC=	Build support for passing through JSON
> PPS_DESC=		PPS time syncing support
>-PPSONCTS_DESC=		PPS pulse on CTS rather than DCD
> PROFILING_DESC=		Profiling support
> RECONFIGURE_DESC=	Allow gpsd to change device settings
> RTCM104V2_DESC=		rtcm104v2 support
>@@ -197,10 +194,6 @@
> .	endif
> .endif
> 
>-.if ${PORT_OPTIONS:MPPSONCTS}
>-SCONS_ARGS+=	pps_on_cts=yes
>-.endif
>-
> # Export methods
> .if ! ${PORT_OPTIONS:MSOCKEXPORT}
> SCONS_ARGS+=	socket_export=no
>@@ -260,14 +253,6 @@
> SCONS_ARGS+=	libgpsmm=no
> .endif
> 
>-.if ! ${PORT_OPTIONS:MNCURSES}
>-SCONS_ARGS+=	ncurses=no
>-PLIST_SUB+=	CURSES="@comment "
>-.else
>-PLIST_SUB+=	CURSES=""
>-USE_NCURSES=	yes
>-.endif
>-
> # Build control
> .if ${PORT_OPTIONS:MPROFILING}
> SCONS_ARGS+=	profiling=yes
>diff -Nur /tmp/astro/gpsd/distinfo /usr/ports/astro/gpsd/distinfo
>--- /tmp/astro/gpsd/distinfo	2012-07-14 16:56:14.000000000 +0400
>+++ /usr/ports/astro/gpsd/distinfo	2013-05-01 12:48:18.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (gpsd-3.6.tar.gz) = 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc
>-SIZE (gpsd-3.6.tar.gz) = 1449822
>+SHA256 (gpsd-3.9.tar.gz) = d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a
>+SIZE (gpsd-3.9.tar.gz) = 1518775
>diff -Nur /tmp/astro/gpsd/files/patch-SConstruct /usr/ports/astro/gpsd/files/patch-SConstruct
>--- /tmp/astro/gpsd/files/patch-SConstruct	2012-07-14 16:56:14.000000000 +0400
>+++ /usr/ports/astro/gpsd/files/patch-SConstruct	2013-05-01 16:30:59.000000000 +0400
>@@ -1,27 +1,27 @@
>---- SConstruct.orig	2012-01-12 20:41:41.000000000 +0400
>-+++ SConstruct	2012-01-14 03:42:13.000000000 +0400
>-@@ -423,14 +423,7 @@
>- # are like FreeBSD.
>- ncurseslibs= []
>- if env['ncurses']:
>--    if config.CheckPKG('ncurses'):
>--        ncurseslibs = pkg_config('ncurses')
>--    elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):
>--        ncurseslibs = ['!ncurses5-config --libs --cflags']
>--    elif sys.platform.startswith('freebsd'):
>--        ncurseslibs= [ '-lncurses' ]
>--    elif sys.platform.startswith('openbsd'):
>--        ncurseslibs= [ '-lcurses' ]
>-+    ncurseslibs= [ '-lncurses' ]
>- 
>- if env['usb']:
>-     # In FreeBSD except version 7, USB libraries are in the base system
>-@@ -1150,7 +1143,7 @@
>+--- SConstruct.orig	2013-05-01 09:44:21.000000000 +0400
>++++ SConstruct	2013-05-01 16:30:55.000000000 +0400
>+@@ -590,7 +590,14 @@
>+ #ifdef __LITTLE_ENDIAN__
>+ #undef WORDS_BIGENDIAN
>+ #else
>+-#include <endian.h>
>++''')
>++
>++if config.CheckHeader("endian.h"):
>++	confdefs.append("#include <endian.h>")
>++elif config.CheckHeader("sys/endian.h"):
>++	confdefs.append("#include <sys/endian.h>")
>++
>++confdefs.append('''
>+ #if __BYTE_ORDER == __BIG_ENDIAN
>+ #define WORDS_BIGENDIAN 1
>+ #elif __BYTE_ORDER == __LITTLE_ENDIAN
>+@@ -1242,7 +1249,7 @@
>  if not env['python']:
>      python_install = []
>  else:
> -    python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
>-+    python_lib_dir = sysconfig.get_python_lib(plat_specific=1, prefix = env['prefix'])
>++    python_lib_dir = sysconfig.get_python_lib(plat_specific=1,prefix=env['prefix'])
>      python_module_dir = python_lib_dir + os.sep + 'gps'
>      python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
>                                                      python_built_extensions)
>diff -Nur /tmp/astro/gpsd/files/patch-libgps.h /usr/ports/astro/gpsd/files/patch-libgps.h
>--- /tmp/astro/gpsd/files/patch-libgps.h	2012-07-14 16:56:14.000000000 +0400
>+++ /usr/ports/astro/gpsd/files/patch-libgps.h	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- libgps.h.orig	2011-11-22 12:49:33.000000000 +0400
>-+++ libgps.h	2012-01-15 16:48:21.469612990 +0400
>-@@ -21,6 +21,7 @@
>- #ifdef DBUS_EXPORT_ENABLE
>-     dbus,
>- #endif /* DBUS_EXPORT_ENABLE */
>-+	dummy, /* so it compiles when all exports are disabled */
>- };
>- 
>- /* values to poke in the gps_fd member if we get it via something special */ 
>diff -Nur /tmp/astro/gpsd/pkg-plist /usr/ports/astro/gpsd/pkg-plist
>--- /tmp/astro/gpsd/pkg-plist	2012-07-14 16:56:14.000000000 +0400
>+++ /usr/ports/astro/gpsd/pkg-plist	2013-05-01 16:39:25.000000000 +0400
>@@ -1,16 +1,16 @@
>+bin/cgps
> bin/gegps
> bin/gpscat
> bin/gpsctl
> bin/gpsdecode
> bin/gpsfake
>+bin/gpsmon
> bin/gpspipe
> bin/gpsprof
> bin/gpxlogger
> bin/lcdgps
> bin/xgps
> bin/xgpsspeed
>-%%CURSES%%bin/cgps
>-%%CURSES%%bin/gpsmon
> include/gps.h
> include/libgpsmm.h
> %%QTBIND%%lib/libQgpsmm.prl
>@@ -23,9 +23,9 @@
> lib/libgps.so.20.0
> lib/libgps.so.20.0.0
> lib/libgpsd.so
>-lib/libgpsd.so.20
>-lib/libgpsd.so.20.0
>-lib/libgpsd.so.20.0.0
>+lib/libgpsd.so.21
>+lib/libgpsd.so.21.0
>+lib/libgpsd.so.21.0.0
> %%PYTHON_SITELIBDIR%%/gps/__init__.py
> %%PYTHON_SITELIBDIR%%/gps/__init__.pyc
> %%PYTHON_SITELIBDIR%%/gps/__init__.pyo

Actions: View | Diff

Attachments on bug 178279: 133758