From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 30 18:10:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4C0C106568D for ; Fri, 30 Oct 2009 18:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B36078FC18 for ; Fri, 30 Oct 2009 18:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9UIA37n036498 for ; Fri, 30 Oct 2009 18:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9UIA3Cd036497; Fri, 30 Oct 2009 18:10:03 GMT (envelope-from gnats) Resent-Date: Fri, 30 Oct 2009 18:10:03 GMT Resent-Message-Id: <200910301810.n9UIA3Cd036497@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DD86106568B for ; Fri, 30 Oct 2009 18:00:49 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166]) by mx1.freebsd.org (Postfix) with ESMTP id 317F58FC0A for ; Fri, 30 Oct 2009 18:00:49 +0000 (UTC) Received: from localhost.localdomain (ZT029225.ppp.dion.ne.jp [59.128.29.225]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 5BA1747C036 for ; Sat, 31 Oct 2009 03:00:40 +0900 (JST) Message-Id: <20091031030008.1d8c4c15.tkato432@yahoo.com> Date: Sat, 31 Oct 2009 03:00:08 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/140112: Update port: astro/roadmap to 1.2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Oct 2009 18:10:03 -0000 >Number: 140112 >Category: ports >Synopsis: Update port: astro/roadmap to 1.2.1 >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: Fri Oct 30 18:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.2-RELEASE-p4 i386 >Organization: >Environment: >Description: - Update to version 1.2.1 Remove file: files/patch-gtk-Makefile files/patch-src-Makefile files/patch-src_buildmap__range.c pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/astro/roadmap/Makefile astro/roadmap/Makefile --- /usr/ports/astro/roadmap/Makefile 2009-08-22 16:13:11.000000000 +0900 +++ astro/roadmap/Makefile 2009-10-18 22:38:58.000000000 +0900 @@ -6,47 +6,62 @@ # PORTNAME= roadmap -PORTVERSION= 1.0.6 -PORTREVISION= 5 +PORTVERSION= 1.2.1 CATEGORIES= astro geography -MASTER_SITES= http://roadmap.digitalomaha.net/roadmap/ \ - SF/${PORTNAME}/OldFiles - -DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src +MASTER_SITES= SF/${PORTNAME}/RoadMap/${PORTVERSION} +DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Vector-based GPS moving map -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - sqlite.2:${PORTSDIR}/databases/sqlite2 +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src -USE_GNOME= gtk12 +USE_GNOME= gtk20 USE_GMAKE= yes +MAKE_ARGS= INSTALLDIR="${PREFIX}" CC="${CC}" CXX="${CXX}" + +SUB_FILES= pkg-message -BINS= buildmap buildus dumpmap +MAN1= roadgps.1 roadmap.1 +PORTDOCS= ${DOCS} README +PLIST_FILES= ${BINS:S,^,bin/,} ${GUI_BINS:S,^,bin/,} \ + ${GUI_BINS:S,^gtk,bin/,} ${SCRIPTS:S,^,bin/,} \ + ${DATA:S,^,%%DATADIR%%/,} +PLIST_DIRS= %%DATADIR%% + +BINS= dumpmap buildmap buildmap_osm buildplace buildus GUI_BINS= gtkroadmap gtkroadgps -SCRIPTS= rdmdownload rdmgetall rdmgenmaps rdmcompare -DATA= sprites preferences schema -PORTDOCS= AUTHORS BUGS README TODO -SUB_FILES+= pkg-message +SCRIPTS= rdmcompare rdmdownload rdmgendcwmaps rdmgenmaps \ + rdmgenshpmaps rdmgenstatemaps +DATA= drivers preferences roadmap.popup roadmap.screenobjects \ + session sprites +DOCS= Bugs ChangeLog Coding Configuration Developer-Guide \ + Installation Map-Building Map-Designing Map-Format \ + OpenStreetMap Platforms Quickstart Status ToDo Usage post-patch: - @${REINPLACE_CMD} -e '150s,static ,, ; 423s,static ,,' \ - ${WRKSRC}/src/roadmap_download.c + @${REINPLACE_CMD} -e 's|-O ||g ; \ + s|/usr/include|${LOCALBASE}/include|g ; \ + s|/usr/local/include|${LOCALBASE}/include|g ; \ + s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/src/options.mk do-install: -.for _GUI_BIN in ${GUI_BINS} - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk/${_GUI_BIN} ${PREFIX}/bin/${_GUI_BIN} -.endfor .for _BIN in ${BINS} ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${_BIN} ${PREFIX}/bin/${_BIN} .endfor +.for _GUI_BIN in ${GUI_BINS} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/gtk2/${_GUI_BIN} ${PREFIX}/bin/${_GUI_BIN} + ${LN} -sf ${_GUI_BIN} ${PREFIX}/bin/${_GUI_BIN:S,^gtk,,} +.endfor .for _SCRIPT in ${SCRIPTS} - ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${PREFIX}/bin/${_BIN} + ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${_SCRIPT} ${PREFIX}/bin/${_SCRIPT} +.endfor +.for _MAN in ${MAN1} + ${INSTALL_MAN} ${INSTALL_WRKSRC}/${_MAN} ${MANPREFIX}/man/man1/${_MAN} .endfor @${MKDIR} ${DATADIR} .for _DATA in ${DATA} @@ -54,8 +69,9 @@ .endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for _DOC in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${_DOC} ${DOCSDIR}/${_DOC} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README +.for _DOC in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${_DOC} ${DOCSDIR}/${_DOC} .endfor .endif diff -urN /usr/ports/astro/roadmap/distinfo astro/roadmap/distinfo --- /usr/ports/astro/roadmap/distinfo 2006-01-22 17:18:35.000000000 +0900 +++ astro/roadmap/distinfo 2009-10-10 23:00:20.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (roadmap_1_0_6_src.tar.gz) = 1549975dd112127aff018dd430870037 -SHA256 (roadmap_1_0_6_src.tar.gz) = de9edf1bfcae3321e879db4f4cafb9a100cce7359142ff8bf07bb07ef374cbfc -SIZE (roadmap_1_0_6_src.tar.gz) = 276634 +MD5 (roadmap-1.2.1-src.tar.gz) = 85004cf39b7bd7e0cfd8fd0b256d1ab4 +SHA256 (roadmap-1.2.1-src.tar.gz) = b688efa61061fc35ce66c98b7ba7a5107087677d158a6cb329e43e4b70cd1625 +SIZE (roadmap-1.2.1-src.tar.gz) = 1303030 diff -urN /usr/ports/astro/roadmap/files/patch-gtk-Makefile astro/roadmap/files/patch-gtk-Makefile --- /usr/ports/astro/roadmap/files/patch-gtk-Makefile 2004-06-07 07:43:49.000000000 +0900 +++ astro/roadmap/files/patch-gtk-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,67 +0,0 @@ ---- src/gtk/Makefile.orig Tue May 25 07:28:15 2004 -+++ src/gtk/Makefile Mon Jun 7 00:25:58 2004 -@@ -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 -g -Wall -+STDCFLAGS=-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 ../libroadmap.a - LIBS=$(RDMLIBS) $(GUILDFLAGS) -lm -@@ -24,7 +24,7 @@ - - RUNTIME=gtkroadgps gtkroadmap - --INSTALLDIR=/usr/local -+INSTALLDIR=${LOCALBASE} - - - # --- 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 -urN /usr/ports/astro/roadmap/files/patch-src-Makefile astro/roadmap/files/patch-src-Makefile --- /usr/ports/astro/roadmap/files/patch-src-Makefile 2004-06-07 07:43:49.000000000 +0900 +++ astro/roadmap/files/patch-src-Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,86 +0,0 @@ ---- src/Makefile.orig Tue May 25 08:36:00 2004 -+++ src/Makefile Mon Jun 7 00:36:22 2004 -@@ -10,7 +10,7 @@ - MODECFLAGS=-g -Wall -pg -fprofile-arcs -g - MODELDFLAGS=-pg - else -- MODECFLAGS=-O2 -ffast-math -fomit-frame-pointer -Wall $(OPTIONS) -+ MODECFLAGS=-ffast-math -fomit-frame-pointer -Wall $(OPTIONS) -I${LOCALBASE}/include - MODELDFLAGS= - endif - endif -@@ -20,17 +20,17 @@ - SQLLDFLAGS= - SQLTOOLS= - else -- SQLCFLAGS=-DROADMAP_USES_SQLITE -- SQLLDFLAGS=-lsqlite -+ SQLCFLAGS=-DROADMAP_USES_SQLITE -I${LOCALBASE}/include -+ SQLLDFLAGS=-lsqlite -L${LOCALBASE}/lib - SQLTOOLS=sqliteload - endif - --CFLAGS=$(MODECFLAGS) $(SQLCFLAGS) -+CFLAGS+=$(MODECFLAGS) $(SQLCFLAGS) - LDFLAGS=$(MODELDFLAGS) $(SQLLDFLAGS) - TOOLS=sunrise $(SQLTOOLS) - - RDMLIBS=libroadmap.a unix/libosroadmap.a --LIBS=$(RDMLIBS) -lpopt -lm -+LIBS=$(RDMLIBS) -lpopt -lm -L${LOCALBASE}/lib - - - -@@ -133,7 +133,7 @@ - SCRIPTS=rdmdownload rdmgetall rdmgenmaps rdmcompare - RUNTIME=$(RDMLIBS) libguiroadgps.a libguiroadmap.a - --INSTALLDIR=/usr/local -+INSTALLDIR=${PREFIX} - - - # --- Conventional targets ---------------------------------------- -@@ -149,10 +149,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) -@@ -168,7 +168,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 - -@@ -178,9 +178,7 @@ - rm -f /usr/lib/menu/roadmap - - everything: runtime build icons $(TOOLS) -- cd gtk ; make STDCFLAGS="$(CFLAGS)" all -- cd gtk2 ; make STDCFLAGS="$(CFLAGS)" all -- cd qt ; make STDCFLAGS="$(CFLAGS)" all -+ cd gtk ; ${MAKE} STDCFLAGS="$(CFLAGS)" all - - cleanall: - cd gtk ; make clean -@@ -207,7 +205,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 -urN /usr/ports/astro/roadmap/files/patch-src_buildmap__range.c astro/roadmap/files/patch-src_buildmap__range.c --- /usr/ports/astro/roadmap/files/patch-src_buildmap__range.c 2004-08-23 00:04:07.000000000 +0900 +++ astro/roadmap/files/patch-src_buildmap__range.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,15 +0,0 @@ - -$FreeBSD: ports/astro/roadmap/files/patch-src_buildmap__range.c,v 1.1 2004/08/22 15:04:07 krion Exp $ - ---- src/buildmap_range.c.orig Sun Aug 22 16:58:03 2004 -+++ src/buildmap_range.c Sun Aug 22 16:58:18 2004 -@@ -889,7 +889,8 @@ - } - - next_square: -- } -+ break; -+ } - - - square_current = -1; diff -urN /usr/ports/astro/roadmap/pkg-descr astro/roadmap/pkg-descr --- /usr/ports/astro/roadmap/pkg-descr 2007-06-14 23:25:08.000000000 +0900 +++ astro/roadmap/pkg-descr 2009-10-10 22:52:54.000000000 +0900 @@ -13,4 +13,4 @@ RoadMap comes with a set of tools to convert the US Census bureau data into its own map format. -WWW: http://roadmap.digitalomaha.net/ +WWW: http://roadmap.sourceforge.net/ diff -urN /usr/ports/astro/roadmap/pkg-plist astro/roadmap/pkg-plist --- /usr/ports/astro/roadmap/pkg-plist 2008-04-19 15:29:50.000000000 +0900 +++ astro/roadmap/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,17 +0,0 @@ -bin/gtkroadmap -bin/gtkroadgps -@exec ln -sf %D/bin/gtkroadmap %D/bin/roadmap -@exec ln -sf %D/bin/gtkroadgps %D/bin/roadgps -@rmtry bin/roadmap -@rmtry bin/roadgps -bin/buildmap -bin/buildus -bin/dumpmap -bin/rdmdownload -bin/rdmgetall -bin/rdmgenmaps -bin/rdmcompare -%%DATADIR%%/preferences -%%DATADIR%%/schema -%%DATADIR%%/sprites -@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: