Attachment #107027 for bug #147722

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




		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"

MAN1=	cgps.1 gps.1 gpscat.1 gpsctl.1 gpsfake.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

		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 \

CONFIGURE_ARGS+=--disable-evermore
.endif

.if defined(WITHOUT_MKT3301)
CONFIGURE_ARGS+=--disable-mkt3301
.endif

.if defined(WITHOUT_GPSCLOCK)
CONFIGURE_ARGS+=--disable-gpscloclk
.endif

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

CONFIGURE_ARGS+=--enable-dbus
.endif

post-patch:
	@${REINPLACE_CMD} -e '/XMLTO/d' ${WRKSRC}/Makefile.in

post-install:
	@${CAT} ${PKGMESSAGE}





--- 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) $<




%%X11%%bin/xgps
sbin/gpsd
bin/cgps
bin/gpscat
bin/gpsctl
%%DECODE%%bin/gpsdecode
bin/gpsfake
bin/gpsmon
bin/gpspipe
bin/gpsprof
bin/gpxlogger
bin/lcdgps
include/gps.h

Return to bug 147722

Lines 27-33 Link Here

(-)gpsd/Makefile (-9 / +13 lines)
27	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	27	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
28		28
29	MAN1= cgps.1 gps.1 gpscat.1 gpsctl.1 gpsfake.1 \	29	MAN1= cgps.1 gps.1 gpscat.1 gpsctl.1 gpsfake.1 \
30	gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 gpsdecode.1 gpsmon.1 \	30	gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 gpsmon.1 \
31	lcdgps.1	31	lcdgps.1
32	MAN3= libgps.3 libgpsd.3 libgpsmm.3	32	MAN3= libgps.3 libgpsd.3 libgpsmm.3
33	MAN5= rtcm-104.5 srec.5	33	MAN5= rtcm-104.5 srec.5
Lines 51-60 Link Here
51	OCEANSERVER "Oceanserver support" off \	51	OCEANSERVER "Oceanserver support" off \
52	UBX "UBX protocol support" on \	52	UBX "UBX protocol support" on \
53	EVERMORE "Evermore binary support" on \	53	EVERMORE "Evermore binary support" on \
54	MKT3301 "MKT-3301 support" on \
55	GPSCLOCK "GPSclock support" on \	54	GPSCLOCK "GPSclock support" on \
56	RTCM104V2 "rtcm104v2 support" on \	55	RTCM104V2 "rtcm104v2 support" on \
57	RTCM104V3 "rtcm104v3 support" on \	56	RTCM104V3 "rtcm104v3 support" on \
		57	AIVDM "Aivdm support" on \
58	NTRIP "NTRIP support" on \	58	NTRIP "NTRIP support" on \
59	PROFILING "Profiling support" off \	59	PROFILING "Profiling support" off \
60	NTPSHM "TP time hinting support" on \	60	NTPSHM "TP time hinting support" on \
Lines 144-153 Link Here
144	CONFIGURE_ARGS+=--disable-evermore	144	CONFIGURE_ARGS+=--disable-evermore
145	.endif	145	.endif
146		146
147	.if defined(WITHOUT_MKT3301)
148	CONFIGURE_ARGS+=--disable-mkt3301
149	.endif
150
151	.if defined(WITHOUT_GPSCLOCK)	147	.if defined(WITHOUT_GPSCLOCK)
152	CONFIGURE_ARGS+=--disable-gpscloclk	148	CONFIGURE_ARGS+=--disable-gpscloclk
153	.endif	149	.endif
Lines 160-165 Link Here
160	CONFIGURE_ARGS+=--disable-rtcm104v3	156	CONFIGURE_ARGS+=--disable-rtcm104v3
161	.endif	157	.endif
162		158
		159	.if defined(WITHOUT_AIVDM)
		160	CONFIGURE_ARGS+=--disable-aivdm
		161	.endif
		162
		163	.if defined(WITH_RTCM104V2) && defined(WITH_RTCM104V3) && defined(WITH_AIVDM)
		164	PLIST_SUB+= DECODE=""
		165	MAN1+= gpsdecode.1
		166	.else
		167	PLIST_SUB+= DECODE="@comment "
		168	.endif
		169
163	.if defined(WITHOUT_NTRIP)	170	.if defined(WITHOUT_NTRIP)
164	CONFIGURE_ARGS+=--disable-ntrip	171	CONFIGURE_ARGS+=--disable-ntrip
165	.endif	172	.endif
Lines 180-188 Link Here
180	CONFIGURE_ARGS+=--enable-dbus	187	CONFIGURE_ARGS+=--enable-dbus
181	.endif	188	.endif
182		189
183	post-patch:
184	@${REINPLACE_CMD} -e '/XMLTO/d' ${WRKSRC}/Makefile.in
185
186	post-install:	190	post-install:
187	@${CAT} ${PKGMESSAGE}	191	@${CAT} ${PKGMESSAGE}
188		192

Line 0 Link Here

(-)gpsd/files/patch-Makefile.in (+27 lines)
	1	--- Makefile.in.bak 2010-06-07 18:25:09.000000000 +0400
	2	+++ Makefile.in 2010-06-07 18:52:16.000000000 +0400
	3	@@ -371,7 +371,6 @@
	4	SHELL = @SHELL@
	5	STRIP = @STRIP@
	6	VERSION = @VERSION@
	7	-WITH_XMLTO = @WITH_XMLTO@
	8	WITH_XSLTPROC = @WITH_XSLTPROC@
	9	X11_LIBS = @X11_LIBS@
	10	XAW_LIBS = @XAW_LIBS@
	11	@@ -471,7 +470,6 @@
	12
	13
	14	#SUBDIRS = contrib
	15	-XMLTO = xmlto
	16
	17	#
	18	# Conditionally add programs depending on libraries that may or may not be present.
	19	@@ -1996,7 +1994,7 @@
	20
	21	# Install Python modules
	22	@HAVE_PYTHON_TRUE@install-exec-local:
	23	-@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR)
	24	+@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix}
	25
	26	@HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
	27	@HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<

Lines 2-11 Link Here

(-)gpsd/pkg-plist (-1 / +4 lines)
2	%%X11%%bin/xgps	2	%%X11%%bin/xgps
3	sbin/gpsd	3	sbin/gpsd
4	bin/cgps	4	bin/cgps
		5	bin/gpscat
5	bin/gpsctl	6	bin/gpsctl
6	bin/gpsdecode	7	%%DECODE%%bin/gpsdecode
		8	bin/gpsfake
7	bin/gpsmon	9	bin/gpsmon
8	bin/gpspipe	10	bin/gpspipe
		11	bin/gpsprof
9	bin/gpxlogger	12	bin/gpxlogger
10	bin/lcdgps	13	bin/lcdgps
11	include/gps.h	14	include/gps.h