From owner-svn-ports-all@FreeBSD.ORG Sat Sep 29 05:07:45 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8B7F7106566B; Sat, 29 Sep 2012 05:07:45 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6BF098FC15; Sat, 29 Sep 2012 05:07:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8T57jDX066936; Sat, 29 Sep 2012 05:07:45 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8T57jXt066931; Sat, 29 Sep 2012 05:07:45 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201209290507.q8T57jXt066931@svn.freebsd.org> From: Alexey Dokuchaev Date: Sat, 29 Sep 2012 05:07:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305023 - in head/astro: libroadnav roadnav X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Sep 2012 05:07:45 -0000 Author: danfe Date: Sat Sep 29 05:07:44 2012 New Revision: 305023 URL: http://svn.freebsd.org/changeset/ports/305023 Log: - Use `pre-su-install' target to unbreak non-root installation - Switch from checking NOPORTDOCS to PORT_OPTIONS:MDOCS - Cleanup Makefile header, fix COMMENT text, wrap overly long lines - Synchronize descriptions and add a note about one port being a helper library for another Modified: head/astro/libroadnav/Makefile head/astro/libroadnav/pkg-descr head/astro/roadnav/Makefile head/astro/roadnav/pkg-descr Modified: head/astro/libroadnav/Makefile ============================================================================== --- head/astro/libroadnav/Makefile Sat Sep 29 04:33:27 2012 (r305022) +++ head/astro/libroadnav/Makefile Sat Sep 29 05:07:44 2012 (r305023) @@ -1,4 +1,4 @@ -# Created by: stevef +# Created by: Steve Franks # $FreeBSD$ PORTNAME= libroadnav @@ -8,7 +8,7 @@ CATEGORIES= astro geography MASTER_SITES= SF/roadnav/LibRoadnav/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Helper library for Roadnav: A 3D GPS Mapping program +COMMENT= Helper library for Roadnav (3D GPS mapping program) USE_WX= 2.6+ WX_COMPS= wx contrib @@ -21,10 +21,13 @@ LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= * -.if defined(NOPORTDOCS) +.include + post-patch: - @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-libroadnavdocDATA||' \ - ${WRKSRC}/Makefile.in +.if ! ${PORT_OPTIONS:MDOCS} + @${REINPLACE_CMD} -e \ + '/^install-data-am:/s|install-libroadnavdocDATA||' \ + ${WRKSRC}/Makefile.in .endif -.include +.include Modified: head/astro/libroadnav/pkg-descr ============================================================================== --- head/astro/libroadnav/pkg-descr Sat Sep 29 04:33:27 2012 (r305022) +++ head/astro/libroadnav/pkg-descr Sat Sep 29 05:07:44 2012 (r305023) @@ -10,4 +10,6 @@ with the GNIS state and topical gazettee locations. It has experimental support for scripting, LCDproc, importing OpenStreetMap data, and importing GPX waypoints and tracks. +This port provides helper library for Roadnav. + WWW: http://roadnav.sourceforge.net/ Modified: head/astro/roadnav/Makefile ============================================================================== --- head/astro/roadnav/Makefile Sat Sep 29 04:33:27 2012 (r305022) +++ head/astro/roadnav/Makefile Sat Sep 29 05:07:44 2012 (r305023) @@ -1,4 +1,4 @@ -# Created by: stevef +# Created by: Steve Franks # $FreeBSD$ PORTNAME= roadnav @@ -8,7 +8,7 @@ CATEGORIES= astro geography MASTER_SITES= SF/${PORTNAME}/Roadnav/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A 3D GPS Mapping program +COMMENT= 3D GPS mapping program BUILD_DEPENDS= ${LOCALBASE}/lib/libroadnav.a:${PORTSDIR}/astro/libroadnav @@ -23,15 +23,17 @@ LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= * -pre-install: - ${MKDIR} ${PREFIX}/share/applications +.include + +pre-su-install: + @${MKDIR} ${PREFIX}/share/applications post-patch: @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \ ${WRKSRC}/Makefile.in ${WRKSRC}/src/Makefile.in -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-roadnavdocDATA||' \ +.if ! ${PORT_OPTIONS:MDOCS} + @${REINPLACE_CMD} -e '/^install-data-am:/s|install-roadnavdocDATA||' \ ${WRKSRC}/Makefile.in .endif -.include +.include Modified: head/astro/roadnav/pkg-descr ============================================================================== --- head/astro/roadnav/pkg-descr Sat Sep 29 04:33:27 2012 (r305022) +++ head/astro/roadnav/pkg-descr Sat Sep 29 05:07:44 2012 (r305023) @@ -1,13 +1,13 @@ -Roadnav is an open source street navigation solution capable of running on a -variety of operating systems. It can obtain your position from a GPS unit, -plot a map of your area, and provide directions to locations in the USA. It -can also verbalize directions using Microsoft SAPI 5.1, Festival, flite, and +Roadnav is an open source street navigation solution capable of running on a +variety of operating systems. It can obtain your position from a GPS unit, +plot a map of your area, and provide directions to locations in the USA. It +can also verbalize directions using Microsoft SAPI 5.1, Festival, flite, and OS X's built in text to speech engine. -Roadnav uses the free TIGER/Line (Topologically Integrated Geographic -Encoding and Referencing) files from the US Census Bureau to build the maps, -along with the GNIS state and topical gazetteer data from the USGS to identify -locations. It has experimental support for scripting, LCDproc, importing -OpenStreetMap data, and importing GPX waypoints and tracks. +Roadnav uses free TIGER/Line (Topologically Integrated Geographic Encoding +and Referencing) files from the US Census Bureau to build the maps, along +with the GNIS state and topical gazetteer data from the USGS to identify +locations. It has experimental support for scripting, LCDproc, importing +OpenStreetMap data, and importing GPX waypoints and tracks. WWW: http://roadnav.sourceforge.net/