Date: Wed, 26 Feb 2003 15:19:28 -0800 (PST) From: Nicholas Esborn <nick@netdot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48725: Update port: astro/roadmap 0.6 -> 0.13 + port improvements Message-ID: <20030226231928.4E81FF80B@carbon.berkeley.netdot.net>
next in thread | raw e-mail | index | archive | help
>Number: 48725 >Category: ports >Synopsis: Update port: astro/roadmap 0.6 -> 0.13 + port improvements >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 Feb 26 15:20:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: Nicholas Esborn <nick@netdot.net> >Release: FreeBSD 4.7-STABLE i386 >Organization: dot network >Environment: >Description: - Update to 0.13 - Port is now portlint-safe - Quality of port greatly improved - Update submitted as diff - Obsoletes ports/48550 >How-To-Repeat: >Fix: diff -urN /usr/ports/astro/roadmap/Makefile astro/roadmap/Makefile --- /usr/ports/astro/roadmap/Makefile Thu Jan 30 13:15:09 2003 +++ astro/roadmap/Makefile Fri Feb 21 14:19:33 2003 @@ -6,41 +6,54 @@ # PORTNAME= roadmap -PORTVERSION= 0.6 +PORTVERSION= 0.13 CATEGORIES= astro + +MAINTAINER= nick@netdot.net +COMMENT= Vector-based GPS moving map + MASTER_SITES= http://www.geocities.com/pascal_f_martin/roadmap/ MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}_0_6_src +DISTNAME= ${PORTNAME}_0_13_src EXTRACT_SUFX= .tgz -MAINTAINER= nick@netdot.net - LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt WRKSRC= ${WRKDIR}/${PORTNAME} -BUILD_WRKSRC= ${WRKSRC}/src +BUILD_WRKSRC= ${WRKSRC}/src/gtk +INSTALL_WRKSRC= ${WRKSRC}/src USE_GNOMENG= yes USE_GNOME= gtk12 -BINARIES= buildmap buildus dumpmap roadmap roadgps +BINS= buildmap buildus dumpmap +GUI_BINS= gtkroadmap gtkroadgps +SCRIPTS= rdmdownload rdmgetall rdmgenmaps rdmcompare +DATA= sprites preferences schema DOCS= AUTHORS BUGS COPYING README TODO -DOCDIR= ${PREFIX}/share/doc/${PORTNAME} do-install: -.for bin in ${BINARIES} - $(INSTALL_PROGRAM) ${BUILD_WRKSRC}/${bin} ${LOCALBASE}/bin +.for _GUI_BIN in ${GUI_BINS} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk/${_GUI_BIN} ${X11BASE}/bin/${_GUI_BIN} +.endfor +.for _BIN in ${BINS} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${LOCALBASE}/bin/${_BIN} +.endfor +.for _SCRIPT in ${SCRIPTS} + ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${LOCALBASE}/bin/${_BIN} +.endfor + ${MKDIR} ${DATADIR} +.for _DATA in ${DATA} + ${INSTALL_DATA} ${INSTALL_WRKSRC}/${_DATA} ${DATADIR}/${_DATA} .endfor - ${MKDIR} ${PREFIX}/share/roadmap - .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCDIR} -.for doc in ${DOCS} - ${INSTALL_MAN} ${WRKSRC}/${doc} ${DOCDIR} + ${MKDIR} ${DOCSDIR} +.for _DOC in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${_DOC} ${DOCSDIR}/${_DOC} .endfor .endif post-install: - @${CAT} ${PKGMESSAGE} + @${SED} -e "s|%%DOCSDIR%%|${DOCSDIR}|" ${PKGMESSAGE} .include <bsd.port.mk> diff -urN /usr/ports/astro/roadmap/distinfo astro/roadmap/distinfo --- /usr/ports/astro/roadmap/distinfo Thu Jan 30 13:15:09 2003 +++ astro/roadmap/distinfo Tue Feb 18 20:56:49 2003 @@ -1 +1 @@ -MD5 (roadmap_0_6_src.tgz) = 910054bdfecb309c82a782504e3bc4e6 +MD5 (roadmap_0_13_src.tgz) = b0706023f7d9e2946e89cf8d8a0cacf9 diff -urN /usr/ports/astro/roadmap/files/patch-Makefile astro/roadmap/files/patch-Makefile --- /usr/ports/astro/roadmap/files/patch-Makefile Thu Jan 30 13:15:10 2003 +++ astro/roadmap/files/patch-Makefile Wed Dec 31 16:00:00 1969 @@ -1,35 +0,0 @@ ---- src/Makefile.orig Thu Oct 31 22:53:28 2002 -+++ src/Makefile Mon Nov 4 14:40:36 2002 -@@ -1,12 +1,12 @@ - --GUICFLAGS=-DROADMAP_GUI_USES_GTK `gtk-config --cflags` --GUILDFLAGS=`gtk-config --libs` -+GUICFLAGS=-DROADMAP_GUI_USES_GTK `${GTK_CONFIG} --cflags` -+GUILDFLAGS=`${GTK_CONFIG} --libs` - --CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall $(GUICFLAGS) -+CFLAGS+=-O2 -ffast-math -fomit-frame-pointer -Wall $(GUICFLAGS) - # CFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP $(GUICFLAGS) - # CFLAGS=-g -Wall -pg -fprofile-arcs -g $(GUICFLAGS) - --LDFLAGS=-lm -+LDFLAGS=-lm -L$(LOCALBASE)/lib - # LDFLAGS=-pg $(LDFLAGS) - - -@@ -103,13 +103,13 @@ - install: uninstall all - mkdir -p $(INSTALLDIR)/share/roadmap - cp *.rdm $(INSTALLDIR)/share/roadmap -- cp roadmap.menu /usr/lib/menu/roadmap -+# cp roadmap.menu /usr/lib/menu/roadmap - cp $(EXECUTABLES) $(INSTALLDIR)/bin - - uninstall: - cd $(INSTALLDIR)/bin ; rm -f $(EXECUTABLES) - rm -rf $(INSTALLDIR)/share/roadmap -- rm -f /usr/lib/menu/roadmap -+# rm -f /usr/lib/menu/roadmap - - # --- The real targets -------------------------------------------- - diff -urN /usr/ports/astro/roadmap/files/patch-gtk-Makefile astro/roadmap/files/patch-gtk-Makefile --- /usr/ports/astro/roadmap/files/patch-gtk-Makefile Wed Dec 31 16:00:00 1969 +++ astro/roadmap/files/patch-gtk-Makefile Tue Feb 18 22:03:10 2003 @@ -0,0 +1,28 @@ +--- src/gtk/Makefile.orig Tue Feb 18 21:59:04 2003 ++++ src/gtk/Makefile Tue Feb 18 22:01:52 2003 +@@ -1,12 +1,12 @@ + +-GUICFLAGS=`gtk-config --cflags` +-GUILDFLAGS=`gtk-config --libs` ++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=-g -Wall -DROADMAP_DEBUG_HEAP + # STDCFLAGS=-g -Wall -pg -fprofile-arcs -g + +-CFLAGS=$(STDCFLAGS) $(GUICFLAGS) -I.. ++CFLAGS+=$(STDCFLAGS) $(GUICFLAGS) -I.. + + RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a + LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm +@@ -23,7 +23,7 @@ + + RUNTIME=gtkroadgps gtkroadmap + +-INSTALLDIR=/usr/local ++INSTALLDIR=${LOCALBASE} + + + # --- Conventional targets ---------------------------------------- diff -urN /usr/ports/astro/roadmap/files/patch-src-Makefile astro/roadmap/files/patch-src-Makefile --- /usr/ports/astro/roadmap/files/patch-src-Makefile Wed Dec 31 16:00:00 1969 +++ astro/roadmap/files/patch-src-Makefile Tue Feb 18 22:02:48 2003 @@ -0,0 +1,25 @@ +--- src/Makefile.orig Tue Feb 18 21:55:28 2003 ++++ src/Makefile Tue Feb 18 21:58:51 2003 +@@ -1,11 +1,11 @@ + + +-CFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall ++CFLAGS+=-O2 -ffast-math -fomit-frame-pointer -Wall -I${LOCALBASE}/include + # CFLAGS=-g -Wall -DROADMAP_DEBUG_HEAP + # CFLAGS=-g -Wall -pg -fprofile-arcs -g + + RDMLIBS=libroadmap.a unix/libosroadmap.a +-LIBS=$(RDMLIBS) -lpopt -lm ++LIBS=$(RDMLIBS) -lpopt -lm -L${LOCALBASE}/lib + + # LDFLAGS=-pg $(LDFLAGS) + +@@ -88,7 +88,7 @@ + SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare + RUNTIME=libroadmap.a libguiroadgps.a libguiroadmap.a + +-INSTALLDIR=/usr/local ++INSTALLDIR=${LOCLBASE} + + + # --- Conventional targets ---------------------------------------- diff -urN /usr/ports/astro/roadmap/pkg-comment astro/roadmap/pkg-comment --- /usr/ports/astro/roadmap/pkg-comment Thu Jan 30 13:15:09 2003 +++ astro/roadmap/pkg-comment Wed Dec 31 16:00:00 1969 @@ -1 +0,0 @@ -RoadMap is a displays US maps provided by the US Census Bureau diff -urN /usr/ports/astro/roadmap/pkg-message astro/roadmap/pkg-message --- /usr/ports/astro/roadmap/pkg-message Thu Jan 30 13:15:09 2003 +++ astro/roadmap/pkg-message Fri Feb 21 14:15:02 2003 @@ -1,5 +1,10 @@ +------------------------------------------------------------------ +RoadMap is at an early stage of development, and is not thoroughly +documented. It would be very unwise to rely on RoadMap for real +navigation. -RoadMap is at an early stage of development, and is not thoroughly documented. -See the README in /usr/local/share/doc/roadmap for instructions on obtaining -and using the necessary data from the US Census Bureau. +The instructions for downloading and installing the necessary +TIGER data are located in: + %%DOCSDIR%%/README +------------------------------------------------------------------ diff -urN /usr/ports/astro/roadmap/pkg-plist astro/roadmap/pkg-plist --- /usr/ports/astro/roadmap/pkg-plist Thu Jan 30 13:15:09 2003 +++ astro/roadmap/pkg-plist Fri Feb 21 15:48:24 2003 @@ -1,13 +1,24 @@ +@cwd %%X11BASE%% +bin/gtkroadmap +bin/gtkroadgps +@exec ln -sf %D/bin/gtkroadmap %D/bin/roadmap +@exec ln -sf %D/bin/gtkroadgps %D/bin/roadgps +@unexec rm -f %D/bin/roadmap %D/bin/roadgps +@cwd %%LOCALBASE%% bin/buildmap bin/buildus bin/dumpmap -bin/roadmap -bin/roadgps -%%PORTDOCS%%share/doc/roadmap/AUTHORS -%%PORTDOCS%%share/doc/roadmap/BUGS -%%PORTDOCS%%share/doc/roadmap/COPYING -%%PORTDOCS%%share/doc/roadmap/README -%%PORTDOCS%%share/doc/roadmap/TODO -%%PORTDOCS%%@dirrm share/doc/roadmap -@exec mkdir -p %D/share/roadmap 2>/dev/null || true -@unexec rmdir %D/share/roadmap 2>/dev/null || true +bin/rdmdownload +bin/rdmgetall +bin/rdmgenmaps +bin/rdmcompare +%%DATADIR%%/preferences +%%DATADIR%%/schema +%%DATADIR%%/sprites +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030226231928.4E81FF80B>