Date: Wed, 19 May 2004 22:32:41 +0200 (CEST) From: Roman Neuhauser <neuhauser@chello.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nick@netdot.net Subject: ports/66903: [PATCH] astro/roadmap: update to 1.0.5 Message-ID: <20040519203241.B69C72FDA01@isis.wad.cz> Resent-Message-ID: <200405192040.i4JKeDtO079547@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66903 >Category: ports >Synopsis: [PATCH] astro/roadmap: update to 1.0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 19 13:40:13 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Roman Neuhauser >Release: FreeBSD 4.9-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD isis.wad.cz 4.9-RELEASE-p2 FreeBSD 4.9-RELEASE-p2 #3: Sun Mar 7 02:11:16 CET 2004 root@isis.wad.cz:/usr/obj/usr/src/sys/FREEPUPPY2_6 i386 >Description: This patch mixes three issues: * http://roadmap.saignon.net/roadmap/ is gone, and * the port is at 1.0rc6, current is 1.0.5, and * the port ignores ${PREFIX} I have lumped all three things together, the port seems to DTRT, and gtkroadmap definitely does something, although I don't have gpsd running, and don't really know this stuff, so please test. >How-To-Repeat: >Fix: --- astro::roadmap-1.0.5.patch begins here --- Index: astro/roadmap/Makefile =================================================================== RCS file: /home/ncvs/ports/astro/roadmap/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- astro/roadmap/Makefile 4 Feb 2004 05:18:22 -0000 1.8 +++ astro/roadmap/Makefile 19 May 2004 20:22:25 -0000 @@ -6,12 +6,11 @@ # PORTNAME= roadmap -PORTVERSION= 1.0.r6 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= astro -MASTER_SITES= http://roadmap.saignon.net/roadmap/ -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}_1_0rc6_src +MASTER_SITES= http://roadmap.noscience.net/roadmap/ \ + http://roadmap.digitalomaha.net/roadmap/ +DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src MAINTAINER= nick@netdot.net COMMENT= Vector-based GPS moving map @@ -37,10 +36,10 @@ ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk/${_GUI_BIN} ${X11BASE}/bin/${_GUI_BIN} .endfor .for _BIN in ${BINS} - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${LOCALBASE}/bin/${_BIN} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${PREFIX}/bin/${_BIN} .endfor .for _SCRIPT in ${SCRIPTS} - ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${LOCALBASE}/bin/${_BIN} + ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${PREFIX}/bin/${_BIN} .endfor ${MKDIR} ${DATADIR} .for _DATA in ${DATA} Index: astro/roadmap/distinfo =================================================================== RCS file: /home/ncvs/ports/astro/roadmap/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- astro/roadmap/distinfo 31 Mar 2004 03:06:00 -0000 1.5 +++ astro/roadmap/distinfo 19 May 2004 19:40:19 -0000 @@ -1,2 +1,2 @@ -MD5 (roadmap_1_0rc6_src.tar.gz) = f983f17a45feb573975cde0748629044 -SIZE (roadmap_1_0rc6_src.tar.gz) = 213971 +MD5 (roadmap_1_0_5_src.tar.gz) = d58c70bb83c0d931776b922c36649c55 +SIZE (roadmap_1_0_5_src.tar.gz) = 270695 Index: astro/roadmap/files/patch-gtk-Makefile =================================================================== RCS file: /home/ncvs/ports/astro/roadmap/files/patch-gtk-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-gtk-Makefile --- astro/roadmap/files/patch-gtk-Makefile 31 Aug 2003 03:38:02 -0000 1.2 +++ astro/roadmap/files/patch-gtk-Makefile 19 May 2004 20:07:26 -0000 @@ -1,5 +1,5 @@ ---- src/gtk/Makefile.orig Sun May 11 22:23:11 2003 -+++ src/gtk/Makefile Mon Jun 30 22:51:16 2003 +--- src/gtk/Makefile.orig Sun Nov 2 03:13:23 2003 ++++ src/gtk/Makefile Wed May 19 22:01:17 2004 @@ -1,12 +1,12 @@ -GUICFLAGS=`gtk-config --cflags` @@ -7,8 +7,8 @@ +GUICFLAGS=`${GTK_CONFIG} --cflags` +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 -g -Wall ++STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include # STDCFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP # STDCFLAGS=-g -Wall -pg -fprofile-arcs -g Index: astro/roadmap/files/patch-src-Makefile =================================================================== RCS file: /home/ncvs/ports/astro/roadmap/files/patch-src-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-src-Makefile --- astro/roadmap/files/patch-src-Makefile 31 Aug 2003 03:38:02 -0000 1.2 +++ astro/roadmap/files/patch-src-Makefile 19 May 2004 20:06:56 -0000 @@ -1,30 +1,30 @@ ---- 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 +--- src/Makefile.orig Sat Nov 29 19:04:23 2003 ++++ src/Makefile Wed May 19 22:05:59 2004 +@@ -9,12 +9,12 @@ + CFLAGS=-g -Wall -pg -fprofile-arcs -g + LDFLAGS=-pg $(LDFLAGS) + else +- CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall $(OPTIONS) ++ CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall $(OPTIONS) -I${LOCALBASE}/include + endif + endif RDMLIBS=libroadmap.a unix/libosroadmap.a -LIBS=$(RDMLIBS) -lpopt -lm +LIBS=$(RDMLIBS) -lpopt -lm -L${LOCALBASE}/lib - # LDFLAGS=-pg $(LDFLAGS) -@@ -98,7 +98,7 @@ + +@@ -115,7 +115,7 @@ SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare - RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a + RUNTIME=$(RDMLIBS) libguiroadgps.a libguiroadmap.a -INSTALLDIR=/usr/local -+INSTALLDIR=${LOCALBASE} ++INSTALLDIR=${PREFIX} # --- Conventional targets ---------------------------------------- -@@ -114,10 +114,10 @@ +@@ -131,10 +131,10 @@ strip -s $(BUILD) clean: cleanone @@ -39,10 +39,19 @@ cleanone: rm -f *.o *.a *.da $(BUILD) -@@ -138,14 +138,14 @@ +@@ -149,7 +149,7 @@ + cd $(INSTALLDIR)/bin ; chmod a+x $(BUILD) $(SCRIPTS) + if [ -d /usr/lib/menu ] ; then cp roadmap.menu /usr/lib/menu/roadmap; fi + mkdir -p $(INSTALLDIR)/share/pixmaps +- cd icons ; make ICONDIR="$(INSTALLDIR)/share/pixmaps" install ++ cd icons ; ${MAKE} ICONDIR="$(INSTALLDIR)/share/pixmaps" install + cp -f roadmap*.png $(INSTALLDIR)/share/pixmaps + cp -f roadmap.desktop $(INSTALLDIR)/applications + +@@ -159,14 +159,14 @@ rm -f /usr/lib/menu/roadmap - everything: build + everything: runtime build icons - cd gtk ; make STDCFLAGS="$(CFLAGS)" all - cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all - cd qt ; make STDCFLAGS="$(CFLAGS)" all @@ -51,16 +60,17 @@ +# cd qt ; make STDCFLAGS="$(CFLAGS)" all cleanall: - cd gtk ; make clean +- cd gtk ; make clean - cd gtk2 ; make clean - cd qt ; make clean ++ cd gtk ; ${MAKE} clean +# cd gtk2 ; make clean +# cd qt ; make clean rebuild: cleanall everything -@@ -161,7 +161,7 @@ - ar rf libguiroadgps.a $(RGGUIOBJS) +@@ -186,7 +186,7 @@ + $(AR) rf libguiroadgps.a $(RGGUIOBJS) unix/libosroadmap.a: - cd unix; make "CFLAGS=$(CFLAGS) -I.." --- astro::roadmap-1.0.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040519203241.B69C72FDA01>