diff options
author | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-03-23 13:37:34 +0000 |
---|---|---|
committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-03-23 13:37:34 +0000 |
commit | 28837497a91391b0c160aadd2b76e51ac0f0b6b9 (patch) | |
tree | fdd668fb10c6e8a393d3b9ff9b4b1b3e2f8131da /astro/roadmap | |
parent | Update modules (acl, custom, fetchmail, lpadmin, postfix, proc, (diff) |
* Update to 0.14
* Includes patches missing from previous commit
PR: 50015
Submitted by: Nicholas Esborn <nick@netdot.net>
Notes
Notes:
svn path=/head/; revision=77252
Diffstat (limited to 'astro/roadmap')
-rw-r--r-- | astro/roadmap/Makefile | 12 | ||||
-rw-r--r-- | astro/roadmap/distinfo | 2 | ||||
-rw-r--r-- | astro/roadmap/files/patch-gtk-Makefile | 28 | ||||
-rw-r--r-- | astro/roadmap/files/patch-src-Makefile | 25 |
4 files changed, 57 insertions, 10 deletions
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile index 82e3437bbe0d..ddd5536dbaeb 100644 --- a/astro/roadmap/Makefile +++ b/astro/roadmap/Makefile @@ -6,15 +6,14 @@ # PORTNAME= roadmap -PORTVERSION= 0.13 +PORTVERSION= 0.14 CATEGORIES= astro -MASTER_SITES= http://www.geocities.com/pascal_f_martin/roadmap/ +MASTER_SITES= http://roadmap.saignon.net/roadmap/ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/}_src -EXTRACT_SUFX= .tgz MAINTAINER= nick@netdot.net -COMMENT= RoadMap is a displays US maps provided by the US Census Bureau +COMMENT= Vector-based GPS moving map LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt @@ -24,7 +23,6 @@ INSTALL_WRKSRC= ${WRKSRC}/src USE_GNOMENG= yes USE_GNOME= gtk12 -USE_REINPLACE= yes BINS= buildmap buildus dumpmap GUI_BINS= gtkroadmap gtkroadgps @@ -32,10 +30,6 @@ SCRIPTS= rdmdownload rdmgetall rdmgenmaps rdmcompare DATA= sprites preferences schema DOCS= AUTHORS BUGS COPYING README TODO -post-patch: - @${REINPLACE_CMD} -e 's,-Wall,-Wall -I${PREFIX}/include,g' ${BUILD_WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's,-lpopt,-lpopt -L${PREFIX}/lib,g' ${INSTALL_WRKSRC}/Makefile - do-install: .for _GUI_BIN in ${GUI_BINS} ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk/${_GUI_BIN} ${X11BASE}/bin/${_GUI_BIN} diff --git a/astro/roadmap/distinfo b/astro/roadmap/distinfo index bbd672e30f26..57d5dffb2009 100644 --- a/astro/roadmap/distinfo +++ b/astro/roadmap/distinfo @@ -1 +1 @@ -MD5 (roadmap_0_13_src.tgz) = b0706023f7d9e2946e89cf8d8a0cacf9 +MD5 (roadmap_0_14_src.tar.gz) = d7f94ed678055607d29b55fce0dd7264 diff --git a/astro/roadmap/files/patch-gtk-Makefile b/astro/roadmap/files/patch-gtk-Makefile new file mode 100644 index 000000000000..60d21009f710 --- /dev/null +++ b/astro/roadmap/files/patch-gtk-Makefile @@ -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 --git a/astro/roadmap/files/patch-src-Makefile b/astro/roadmap/files/patch-src-Makefile new file mode 100644 index 000000000000..0209eb972982 --- /dev/null +++ b/astro/roadmap/files/patch-src-Makefile @@ -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 ---------------------------------------- |