5 files changed, 105 insertions, 14 deletions

diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 9beb2703e45c..5196c89f11f9 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	roadmap
-PORTVERSION=	0.14
+PORTVERSION=	1.0.r6
 CATEGORIES=	astro
 MASTER_SITES=	http://roadmap.saignon.net/roadmap/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}_src
+DISTNAME=	${PORTNAME}_1_0rc6_src
 
 MAINTAINER=	nick@netdot.net
 COMMENT=	Vector-based GPS moving map
@@ -18,11 +18,13 @@ COMMENT=	Vector-based GPS moving map
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-BUILD_WRKSRC=	${WRKSRC}/src/gtk
+BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
 
 USE_GNOME=	gtk12
 
+USE_GMAKE=yes
+
 BINS=		buildmap buildus dumpmap
 GUI_BINS=	gtkroadmap gtkroadgps
 SCRIPTS=	rdmdownload rdmgetall rdmgenmaps rdmcompare
diff --git a/astro/roadmap/distinfo b/astro/roadmap/distinfo
index 57d5dffb2009..f1b1d3cad55f 100644
--- a/astro/roadmap/distinfo
+++ b/astro/roadmap/distinfo
@@ -1 +1 @@
-MD5 (roadmap_0_14_src.tar.gz) = d7f94ed678055607d29b55fce0dd7264
+MD5 (roadmap_1_0rc6_src.tar.gz) = f983f17a45feb573975cde0748629044
diff --git a/astro/roadmap/files/patch-gtk-Makefile b/astro/roadmap/files/patch-gtk-Makefile
index 60d21009f710..7ef85f42a0b5 100644
--- a/astro/roadmap/files/patch-gtk-Makefile
+++ b/astro/roadmap/files/patch-gtk-Makefile
@@ -1,5 +1,5 @@
---- src/gtk/Makefile.orig	Tue Feb 18 21:59:04 2003
-+++ src/gtk/Makefile	Tue Feb 18 22:01:52 2003
+--- src/gtk/Makefile.orig	Sun May 11 22:23:11 2003
++++ src/gtk/Makefile	Mon Jun 30 22:51:16 2003
 @@ -1,12 +1,12 @@
  
 -GUICFLAGS=`gtk-config --cflags`
@@ -8,7 +8,7 @@
 +GUILDFLAGS=`${GTK_CONFIG} --libs`
  
 -STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall
-+STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include
++STDCFLAGS=-O2 -ffast-math  -fomit-frame-pointer -Wall -I${LOCALBASE}/include
  # STDCFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP
  # STDCFLAGS=-g -Wall -pg -fprofile-arcs -g
  
@@ -17,7 +17,7 @@
  
  RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a
  LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
  
  RUNTIME=gtkroadgps gtkroadmap
  
@@ -26,3 +26,42 @@
  
  
  # --- Conventional targets ----------------------------------------
+@@ -32,23 +32,23 @@
+ all: runtime
+ 
+ others:
+-	make -C .. CFLAGS="$(STDCFLAGS)" runtime
+-	make -C .. -C unix CFLAGS="$(STDCFLAGS) -I.." runtime
++	${MAKE} -C .. CFLAGS="$(STDCFLAGS)" runtime
++	${MAKE} -C .. -C unix CFLAGS="$(STDCFLAGS) -I.." runtime
+ 
+ build:
+-	make -C .. CFLAGS="$(STDCFLAGS)" build
++	${MAKE} -C .. CFLAGS="$(STDCFLAGS)" build
+ 
+ runtime: others $(RUNTIME)
+ 
+ clean: cleanone
+-	make -C .. cleanone
+-	make -C .. -C unix cleanone
++	${MAKE} -C .. cleanone
++	${MAKE} -C .. -C unix cleanone
+ 
+ cleanone:
+ 	rm -f *.o *.a *.da $(RUNTIME)
+ 
+ install: all
+-	make -C .. install
++	${MAKE} -C .. install
+ 	cd $(INSTALLDIR)/bin; rm -f $(RUNTIME) roadmap roadgps
+ 	cp $(RUNTIME) $(INSTALLDIR)/bin
+ 	ln -s $(INSTALLDIR)/bin/gtkroadmap $(INSTALLDIR)/bin/roadmap
+@@ -57,7 +57,7 @@
+ 
+ uninstall:
+ 	cd $(INSTALLDIR)/bin ; rm -f $(RUNTIME) roadmap roadgps
+-	make -C .. uninstall
++	${MAKE} -C .. uninstall
+ 
+ # --- The real targets --------------------------------------------
+ 
diff --git a/astro/roadmap/files/patch-src-Makefile b/astro/roadmap/files/patch-src-Makefile
index 0209eb972982..5b61df153e33 100644
--- a/astro/roadmap/files/patch-src-Makefile
+++ b/astro/roadmap/files/patch-src-Makefile
@@ -1,10 +1,11 @@
---- src/Makefile.orig	Tue Feb 18 21:55:28 2003
-+++ src/Makefile	Tue Feb 18 21:58:51 2003
-@@ -1,11 +1,11 @@
+--- 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=-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
  
@@ -14,12 +15,56 @@
  
  # LDFLAGS=-pg $(LDFLAGS)
  
-@@ -88,7 +88,7 @@
+@@ -98,7 +98,7 @@
  SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare
  RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a
  
 -INSTALLDIR=/usr/local
-+INSTALLDIR=${LOCLBASE}
++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)
diff --git a/astro/roadmap/pkg-message b/astro/roadmap/pkg-message
index d6c8c8be3c7e..6babd84eb27b 100644
--- a/astro/roadmap/pkg-message
+++ b/astro/roadmap/pkg-message
@@ -7,4 +7,9 @@ The instructions for downloading and installing the necessary
 TIGER data are located in:
 
      %%DOCSDIR%%/README
+
+Make sure that you either have a program called flite (a voice synthesizer)
+or disable (mute) audio throught the menu. Other voice synthesizer can 
+be used, like festival
+
 ------------------------------------------------------------------