Attachment #32761 for bug #53991

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

Lines 6-12 Link Here

(-)roadmap/Makefile (-2 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= roadmap	8	PORTNAME= roadmap
9	PORTVERSION= 0.14	9	PORTVERSION= 1.0rc6
10	CATEGORIES= astro	10	CATEGORIES= astro
11	MASTER_SITES= http://roadmap.saignon.net/roadmap/	11	MASTER_SITES= http://roadmap.saignon.net/roadmap/
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 18-27 Link Here
18	LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt	18	LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
19		19
20	WRKSRC= ${WRKDIR}/${PORTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}
21	BUILD_WRKSRC= ${WRKSRC}/src/gtk	21	BUILD_WRKSRC= ${WRKSRC}/src
22	INSTALL_WRKSRC= ${WRKSRC}/src	22	INSTALL_WRKSRC= ${WRKSRC}/src
23		23
24	USE_GNOME= gtk12	24	USE_GNOME= gtk12
		25
		26	USE_GMAKE=yes
25		27
26	BINS= buildmap buildus dumpmap	28	BINS= buildmap buildus dumpmap
27	GUI_BINS= gtkroadmap gtkroadgps	29	GUI_BINS= gtkroadmap gtkroadgps

Line 1 Link Here

(-)roadmap/distinfo (-1 / +1 lines)
1	MD5 (roadmap_0_14_src.tar.gz) = d7f94ed678055607d29b55fce0dd7264	1	MD5 (roadmap_1_0rc6_src.tar.gz) = f983f17a45feb573975cde0748629044

Lines 1-5 Link Here

(-)roadmap/files/patch-gtk-Makefile (-4 / +43 lines)
1	--- src/gtk/Makefile.orig Tue Feb 18 21:59:04 2003	1	--- src/gtk/Makefile.orig Sun May 11 22:23:11 2003
2	+++ src/gtk/Makefile Tue Feb 18 22:01:52 2003	2	+++ src/gtk/Makefile Mon Jun 30 22:51:16 2003
3	@@ -1,12 +1,12 @@	3	@@ -1,12 +1,12 @@
4		4
5	-GUICFLAGS=`gtk-config --cflags`	5	-GUICFLAGS=`gtk-config --cflags`
Lines 8-14 Link Here
8	+GUILDFLAGS=`${GTK_CONFIG} --libs`	8	+GUILDFLAGS=`${GTK_CONFIG} --libs`
9		9
10	-STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall	10	-STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
11	+STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include	11	+STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
12	# STDCFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP	12	# STDCFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
13	# STDCFLAGS=-g -Wall -pg -fprofile-arcs -g	13	# STDCFLAGS=-g -Wall -pg -fprofile-arcs -g
14		14
Lines 17-23 Link Here
17		17
18	RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a	18	RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a
19	LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm	19	LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm
20	@@ -23,7 +23,7 @@	20	@@ -24,7 +24,7 @@
21		21
22	RUNTIME=gtkroadgps gtkroadmap	22	RUNTIME=gtkroadgps gtkroadmap
23		23
Lines 26-28 Link Here
26		26
27		27
28	# --- Conventional targets ----------------------------------------	28	# --- Conventional targets ----------------------------------------
		29	@@ -32,23 +32,23 @@
		30	all: runtime
		31
		32	others:
		33	- make -C .. CFLAGS="$(STDCFLAGS)" runtime
		34	- make -C .. -C unix CFLAGS="$(STDCFLAGS) -I.." runtime
		35	+ ${MAKE} -C .. CFLAGS="$(STDCFLAGS)" runtime
		36	+ ${MAKE} -C .. -C unix CFLAGS="$(STDCFLAGS) -I.." runtime
		37
		38	build:
		39	- make -C .. CFLAGS="$(STDCFLAGS)" build
		40	+ ${MAKE} -C .. CFLAGS="$(STDCFLAGS)" build
		41
		42	runtime: others $(RUNTIME)
		43
		44	clean: cleanone
		45	- make -C .. cleanone
		46	- make -C .. -C unix cleanone
		47	+ ${MAKE} -C .. cleanone
		48	+ ${MAKE} -C .. -C unix cleanone
		49
		50	cleanone:
		51	rm -f .o .a *.da $(RUNTIME)
		52
		53	install: all
		54	- make -C .. install
		55	+ ${MAKE} -C .. install
		56	cd $(INSTALLDIR)/bin; rm -f $(RUNTIME) roadmap roadgps
		57	cp $(RUNTIME) $(INSTALLDIR)/bin
		58	ln -s $(INSTALLDIR)/bin/gtkroadmap $(INSTALLDIR)/bin/roadmap
		59	@@ -57,7 +57,7 @@
		60
		61	uninstall:
		62	cd $(INSTALLDIR)/bin ; rm -f $(RUNTIME) roadmap roadgps
		63	- make -C .. uninstall
		64	+ ${MAKE} -C .. uninstall
		65
		66	# --- The real targets --------------------------------------------
		67




--- src/Makefile.orig	Mon Jun  2 23:09:02 2003
+++ src/Makefile	Mon Jun 30 22:53:43 2003
@@ -1,12 +1,12 @@
 
 
-CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
+CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
 # CFLAGS=-g -Wall
 # CFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
 # CFLAGS=-g -Wall -pg -fprofile-arcs -g
 

 
 # LDFLAGS=-pg $(LDFLAGS)
 
@@ -98,7 +98,7 @@
 SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare
 RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a
 
-INSTALLDIR=/usr/local
+INSTALLDIR=${LOCALBASE}
 
 
 # --- Conventional targets ----------------------------------------
@@ -114,10 +114,10 @@
 	strip -s $(BUILD)
 
 clean: cleanone
-	make -C qt cleanone
-	make -C gtk cleanone
-	make -C gtk2 cleanone
-	make -C unix cleanone
+#	${MAKE} -C qt cleanone
+	${MAKE} -C gtk cleanone
+#	${MAKE} -C gtk2 cleanone
+	${MAKE} -C unix cleanone
 
 cleanone:
 	rm -f *.o *.a *.da $(BUILD)
@@ -138,14 +138,14 @@
 	rm -f /usr/lib/menu/roadmap
 
 everything: build
-	cd gtk ; make STDCFLAGS="$(CFLAGS)" all
-	cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all
-	cd qt ; make STDCFLAGS="$(CFLAGS)" all
+	cd gtk ; ${MAKE} STDCFLAGS="$(CFLAGS)" all
+#	cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all
+#	cd qt ; make STDCFLAGS="$(CFLAGS)" all
 
 cleanall:
 	cd gtk ; make clean
-	cd gtk2 ; make clean
-	cd qt ; make clean
+#	cd gtk2 ; make clean
+#	cd qt ; make clean
 
 rebuild: cleanall everything
 
@@ -161,7 +161,7 @@
 	ar rf libguiroadgps.a $(RGGUIOBJS)
 
 unix/libosroadmap.a:
-	cd unix; make "CFLAGS=$(CFLAGS) -I.."
+	cd unix; ${MAKE} "CFLAGS=$(CFLAGS) -I.."
 
 dumpmap: $(DMOBJS) $(RDMLIBS)
 	$(CC) $(LDFLAGS) $(DMOBJS) -o dumpmap $(LIBS)

Lines 7-10 Link Here

(-)roadmap/pkg-message (+5 lines)
7	TIGER data are located in:	7	TIGER data are located in:
8		8
9	%%DOCSDIR%%/README	9	%%DOCSDIR%%/README
		10
		11	Make sure that you either have a program called flite (a voice synthesizer)
		12	or disable (mute) audio throught the menu. Other voice synthesizer can
		13	be used, like festival
		14
10	------------------------------------------------------------------	15	------------------------------------------------------------------

Return to bug 53991

Lines 1-10 Link Here

(-)roadmap/files/patch-src-Makefile (-6 / +51 lines)
1	--- src/Makefile.orig Tue Feb 18 21:55:28 2003	1	--- src/Makefile.orig Mon Jun 2 23:09:02 2003
2	+++ src/Makefile Tue Feb 18 21:58:51 2003	2	+++ src/Makefile Mon Jun 30 22:53:43 2003
3	@@ -1,11 +1,11 @@	3	@@ -1,12 +1,12 @@
4		4
5		5
6	-CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall	6	-CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
7	+CFLAGS+=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include	7	+CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
		8	# CFLAGS=-g -Wall
8	# CFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP	9	# CFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
9	# CFLAGS=-g -Wall -pg -fprofile-arcs -g	10	# CFLAGS=-g -Wall -pg -fprofile-arcs -g
10		11
Lines 14-25 Link Here
14		15
15	# LDFLAGS=-pg $(LDFLAGS)	16	# LDFLAGS=-pg $(LDFLAGS)
16		17
17	@@ -88,7 +88,7 @@	18	@@ -98,7 +98,7 @@
18	SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare	19	SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare
19	RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a	20	RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a
20		21
21	-INSTALLDIR=/usr/local	22	-INSTALLDIR=/usr/local
22	+INSTALLDIR=${LOCLBASE}	23	+INSTALLDIR=${LOCALBASE}
23		24
24		25
25	# --- Conventional targets ----------------------------------------	26	# --- Conventional targets ----------------------------------------
		27	@@ -114,10 +114,10 @@
		28	strip -s $(BUILD)
		29
		30	clean: cleanone
		31	- make -C qt cleanone
		32	- make -C gtk cleanone
		33	- make -C gtk2 cleanone
		34	- make -C unix cleanone
		35	+# ${MAKE} -C qt cleanone
		36	+ ${MAKE} -C gtk cleanone
		37	+# ${MAKE} -C gtk2 cleanone
		38	+ ${MAKE} -C unix cleanone
		39
		40	cleanone:
		41	rm -f .o .a *.da $(BUILD)
		42	@@ -138,14 +138,14 @@
		43	rm -f /usr/lib/menu/roadmap
		44
		45	everything: build
		46	- cd gtk ; make STDCFLAGS="$(CFLAGS)" all
		47	- cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all
		48	- cd qt ; make STDCFLAGS="$(CFLAGS)" all
		49	+ cd gtk ; ${MAKE} STDCFLAGS="$(CFLAGS)" all
		50	+# cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all
		51	+# cd qt ; make STDCFLAGS="$(CFLAGS)" all
		52
		53	cleanall:
		54	cd gtk ; make clean
		55	- cd gtk2 ; make clean
		56	- cd qt ; make clean
		57	+# cd gtk2 ; make clean
		58	+# cd qt ; make clean
		59
		60	rebuild: cleanall everything
		61
		62	@@ -161,7 +161,7 @@
		63	ar rf libguiroadgps.a $(RGGUIOBJS)
		64
		65	unix/libosroadmap.a:
		66	- cd unix; make "CFLAGS=$(CFLAGS) -I.."
		67	+ cd unix; ${MAKE} "CFLAGS=$(CFLAGS) -I.."
		68
		69	dumpmap: $(DMOBJS) $(RDMLIBS)
		70	$(CC) $(LDFLAGS) $(DMOBJS) -o dumpmap $(LIBS)