Attachment #133758 for bug #178279

View | Details | Raw Unified | Return to bug 178279
Collapse All | Expand All




# $FreeBSD: astro/gpsd/Makefile 316309 2013-04-23 06:26:31Z bapt $

PORTNAME=	gpsd
PORTVERSION=	3.9
PORTREVISION=	1
CATEGORIES=	astro geography
MASTER_SITES=	SAVANNAH


PYDISTUTILS_EGGINFO=	gps-${PORTVERSION}.egg-info
MAKE_JOBS_SAFE=	yes

SCONS_BUILDENV=	CC=${CC}
SCONS_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
		chrpath=no


	gpsmon.1 lcdgps.1
MAN3=	libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3
MAN5=	srec.5 gpsd_json.5
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 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 \

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

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

.	endif
.endif

.if ${PORT_OPTIONS:MPPSONCTS}
SCONS_ARGS+=	pps_on_cts=yes
.endif

# Export methods
.if ! ${PORT_OPTIONS:MSOCKEXPORT}
SCONS_ARGS+=	socket_export=no

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

Lines 1-2 Link Here

(-)/usr/ports/astro/gpsd/distinfo (-2 / +2 lines)
1	SHA256 (gpsd-3.6.tar.gz) = 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc	1	SHA256 (gpsd-3.9.tar.gz) = d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a
2	SIZE (gpsd-3.6.tar.gz) = 1449822	2	SIZE (gpsd-3.9.tar.gz) = 1518775




--- 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_module_dir = python_lib_dir + os.sep + 'gps'
     python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
                                                     python_built_extensions)

Lines 1-10 Link Here

(-)/usr/ports/astro/gpsd/files/patch-libgps.h (-10 lines)
1	--- libgps.h.orig 2011-11-22 12:49:33.000000000 +0400
2	+++ libgps.h 2012-01-15 16:48:21.469612990 +0400
3	@@ -21,6 +21,7 @@
4	#ifdef DBUS_EXPORT_ENABLE
5	dbus,
6	#endif /* DBUS_EXPORT_ENABLE */
7	+ dummy, /* so it compiles when all exports are disabled */
8	};
9
10	/* values to poke in the gps_fd member if we get it via something special */




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

lib/libgps.so.20.0
lib/libgps.so.20.0.0
lib/libgpsd.so
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

Return to bug 178279

Lines 2-9 Link Here

(-)/usr/ports/astro/gpsd/Makefile (-20 / +5 lines)
2	# $FreeBSD: astro/gpsd/Makefile 316309 2013-04-23 06:26:31Z bapt $	2	# $FreeBSD: astro/gpsd/Makefile 316309 2013-04-23 06:26:31Z bapt $
3		3
4	PORTNAME= gpsd	4	PORTNAME= gpsd
5	PORTVERSION= 3.6	5	PORTVERSION= 3.9
6	PORTREVISION= 1
7	CATEGORIES= astro geography	6	CATEGORIES= astro geography
8	MASTER_SITES= SAVANNAH	7	MASTER_SITES= SAVANNAH
9		8
Lines 21-27 Link Here
21	PYDISTUTILS_EGGINFO= gps-${PORTVERSION}.egg-info	20	PYDISTUTILS_EGGINFO= gps-${PORTVERSION}.egg-info
22	MAKE_JOBS_SAFE= yes	21	MAKE_JOBS_SAFE= yes
23		22
24	SCONS_BUILDENV= ${SCONS_ENV}	23	SCONS_BUILDENV= CC=${CC}
25	SCONS_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \	24	SCONS_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
26	chrpath=no	25	chrpath=no
27		26
Lines 30-41 Link Here
30	gpsmon.1 lcdgps.1	29	gpsmon.1 lcdgps.1
31	MAN3= libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3	30	MAN3= libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3
32	MAN5= srec.5 gpsd_json.5	31	MAN5= srec.5 gpsd_json.5
33	MAN8= gpsd.8 gpsdctl.8	32	MAN8= gpsd.8 gpsdctl.8 gpsinit.8
34	MANCOMPRESSED= no	33	MANCOMPRESSED= no
35		34
36	OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \	35	OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \
37	GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NCURSES NMEA NTPSHM NTRIP \	36	GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NMEA NTPSHM NTRIP \
38	OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PPSONCTS PROFILING RECONFIGURE \	37	OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PROFILING RECONFIGURE \
39	RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \	38	RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
40	TSIP QTBIND UBX USB	39	TSIP QTBIND UBX USB
41	OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FV18 GARMIN GARMINTXT GEOSTAR \	40	OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FV18 GARMIN GARMINTXT GEOSTAR \
Lines 57-63 Link Here
57	ITRAX_DESC= iTrax support	56	ITRAX_DESC= iTrax support
58	MTK_DESC= MTK-3301 support	57	MTK_DESC= MTK-3301 support
59	NAVCOM_DESC= Navcom support	58	NAVCOM_DESC= Navcom support
60	NCURSES_DESC= Build with ncurses(3)
61	NETFEED_DESC= Build support for handling TCP/IP data sources	59	NETFEED_DESC= Build support for handling TCP/IP data sources
62	NMEA_DESC= NMEA support	60	NMEA_DESC= NMEA support
63	NTPSHM_DESC= NTP time hinting support	61	NTPSHM_DESC= NTP time hinting support
Lines 67-73 Link Here
67	ONCORE_DESC= Motorola OnCore chipset support	65	ONCORE_DESC= Motorola OnCore chipset support
68	PASSTHROUGH_DESC= Build support for passing through JSON	66	PASSTHROUGH_DESC= Build support for passing through JSON
69	PPS_DESC= PPS time syncing support	67	PPS_DESC= PPS time syncing support
70	PPSONCTS_DESC= PPS pulse on CTS rather than DCD
71	PROFILING_DESC= Profiling support	68	PROFILING_DESC= Profiling support
72	RECONFIGURE_DESC= Allow gpsd to change device settings	69	RECONFIGURE_DESC= Allow gpsd to change device settings
73	RTCM104V2_DESC= rtcm104v2 support	70	RTCM104V2_DESC= rtcm104v2 support
Lines 197-206 Link Here
197	. endif	194	. endif
198	.endif	195	.endif
199		196
200	.if ${PORT_OPTIONS:MPPSONCTS}
201	SCONS_ARGS+= pps_on_cts=yes
202	.endif
203
204	# Export methods	197	# Export methods
205	.if ! ${PORT_OPTIONS:MSOCKEXPORT}	198	.if ! ${PORT_OPTIONS:MSOCKEXPORT}
206	SCONS_ARGS+= socket_export=no	199	SCONS_ARGS+= socket_export=no
Lines 260-273 Link Here
260	SCONS_ARGS+= libgpsmm=no	253	SCONS_ARGS+= libgpsmm=no
261	.endif	254	.endif
262		255
263	.if ! ${PORT_OPTIONS:MNCURSES}
264	SCONS_ARGS+= ncurses=no
265	PLIST_SUB+= CURSES="@comment "
266	.else
267	PLIST_SUB+= CURSES=""
268	USE_NCURSES= yes
269	.endif
270
271	# Build control	256	# Build control
272	.if ${PORT_OPTIONS:MPROFILING}	257	.if ${PORT_OPTIONS:MPROFILING}
273	SCONS_ARGS+= profiling=yes	258	SCONS_ARGS+= profiling=yes

Lines 1-27 Link Here

(-)/usr/ports/astro/gpsd/files/patch-SConstruct (-20 / +20 lines)
1	--- SConstruct.orig 2012-01-12 20:41:41.000000000 +0400	1	--- SConstruct.orig 2013-05-01 09:44:21.000000000 +0400
2	+++ SConstruct 2012-01-14 03:42:13.000000000 +0400	2	+++ SConstruct 2013-05-01 16:30:55.000000000 +0400
3	@@ -423,14 +423,7 @@	3	@@ -590,7 +590,14 @@
4	# are like FreeBSD.	4	#ifdef __LITTLE_ENDIAN__
5	ncurseslibs= []	5	#undef WORDS_BIGENDIAN
6	if env['ncurses']:	6	#else
7	- if config.CheckPKG('ncurses'):	7	-#include <endian.h>
8	- ncurseslibs = pkg_config('ncurses')	8	+''')
9	- elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):	9	+
10	- ncurseslibs = ['!ncurses5-config --libs --cflags']	10	+if config.CheckHeader("endian.h"):
11	- elif sys.platform.startswith('freebsd'):	11	+ confdefs.append("#include <endian.h>")
12	- ncurseslibs= [ '-lncurses' ]	12	+elif config.CheckHeader("sys/endian.h"):
13	- elif sys.platform.startswith('openbsd'):	13	+ confdefs.append("#include <sys/endian.h>")
14	- ncurseslibs= [ '-lcurses' ]	14	+
15	+ ncurseslibs= [ '-lncurses' ]	15	+confdefs.append('''
16		16	#if __BYTE_ORDER == __BIG_ENDIAN
17	if env['usb']:	17	#define WORDS_BIGENDIAN 1
18	# In FreeBSD except version 7, USB libraries are in the base system	18	#elif __BYTE_ORDER == __LITTLE_ENDIAN
19	@@ -1150,7 +1143,7 @@	19	@@ -1242,7 +1249,7 @@
20	if not env['python']:	20	if not env['python']:
21	python_install = []	21	python_install = []
22	else:	22	else:
23	- python_lib_dir = sysconfig.get_python_lib(plat_specific=1)	23	- python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
24	+ python_lib_dir = sysconfig.get_python_lib(plat_specific=1, prefix = env['prefix'])	24	+ python_lib_dir = sysconfig.get_python_lib(plat_specific=1,prefix=env['prefix'])
25	python_module_dir = python_lib_dir + os.sep + 'gps'	25	python_module_dir = python_lib_dir + os.sep + 'gps'
26	python_extensions_install = python_env.Install( DESTDIR + python_module_dir,	26	python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
27	python_built_extensions)	27	python_built_extensions)

Lines 1-16 Link Here

(-)/usr/ports/astro/gpsd/pkg-plist (-5 / +5 lines)
		1	bin/cgps
1	bin/gegps	2	bin/gegps
2	bin/gpscat	3	bin/gpscat
3	bin/gpsctl	4	bin/gpsctl
4	bin/gpsdecode	5	bin/gpsdecode
5	bin/gpsfake	6	bin/gpsfake
		7	bin/gpsmon
6	bin/gpspipe	8	bin/gpspipe
7	bin/gpsprof	9	bin/gpsprof
8	bin/gpxlogger	10	bin/gpxlogger
9	bin/lcdgps	11	bin/lcdgps
10	bin/xgps	12	bin/xgps
11	bin/xgpsspeed	13	bin/xgpsspeed
12	%%CURSES%%bin/cgps
13	%%CURSES%%bin/gpsmon
14	include/gps.h	14	include/gps.h
15	include/libgpsmm.h	15	include/libgpsmm.h
16	%%QTBIND%%lib/libQgpsmm.prl	16	%%QTBIND%%lib/libQgpsmm.prl
Lines 23-31 Link Here
23	lib/libgps.so.20.0	23	lib/libgps.so.20.0
24	lib/libgps.so.20.0.0	24	lib/libgps.so.20.0.0
25	lib/libgpsd.so	25	lib/libgpsd.so
26	lib/libgpsd.so.20	26	lib/libgpsd.so.21
27	lib/libgpsd.so.20.0	27	lib/libgpsd.so.21.0
28	lib/libgpsd.so.20.0.0	28	lib/libgpsd.so.21.0.0
29	%%PYTHON_SITELIBDIR%%/gps/__init__.py	29	%%PYTHON_SITELIBDIR%%/gps/__init__.py
30	%%PYTHON_SITELIBDIR%%/gps/__init__.pyc	30	%%PYTHON_SITELIBDIR%%/gps/__init__.pyc
31	%%PYTHON_SITELIBDIR%%/gps/__init__.pyo	31	%%PYTHON_SITELIBDIR%%/gps/__init__.pyo