From owner-svn-ports-head@FreeBSD.ORG Wed Jul 23 05:17:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2932214; Wed, 23 Jul 2014 05:17:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F2C02F41; Wed, 23 Jul 2014 05:17:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6N5HGkr031202; Wed, 23 Jul 2014 05:17:16 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6N5HGmt031199; Wed, 23 Jul 2014 05:17:16 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201407230517.s6N5HGmt031199@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 23 Jul 2014 05:17:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362621 - in head/astro/gpstk: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2014 05:17:16 -0000 Author: danfe Date: Wed Jul 23 05:17:15 2014 New Revision: 362621 URL: http://svnweb.freebsd.org/changeset/ports/362621 QAT: https://qat.redports.org/buildarchive/r362621/ Log: - Stagify; unbreak the against Clang - Allow for parallel (-jX) builds - Cleanup Makefile while I'm at here - Augment port description, fix WWW N.b., there's version 2.4 available. Added: head/astro/gpstk/files/patch-apps-swrx-IQStream.hpp (contents, props changed) Modified: head/astro/gpstk/Makefile head/astro/gpstk/pkg-descr Modified: head/astro/gpstk/Makefile ============================================================================== --- head/astro/gpstk/Makefile Wed Jul 23 05:15:35 2014 (r362620) +++ head/astro/gpstk/Makefile Wed Jul 23 05:17:15 2014 (r362621) @@ -1,4 +1,4 @@ -# Created by: bms@FreeBSD.org +# Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= gpstk @@ -10,38 +10,51 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit for developing GPS applications -BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam +LICENSE= LGPL21 -WRKSRC= ${WRKDIR}/${PORTNAME} +BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam USES= dos2unix -NO_STAGE= yes USE_PYTHON_RUN= yes USE_LDCONFIG= yes DOS2UNIX_FILES= ${WRKSRC}/Jamrules +WRKSRC= ${WRKDIR}/${PORTNAME} + JAM= jam -JAM_ENV= PREFIX="${PREFIX}" \ - BINDIR="${PREFIX}/bin" \ - INCDIR="${PREFIX}/include/${PORTNAME}" \ - LIBDIR="${PREFIX}/lib" \ +JAM_ENV= PREFIX="${STAGEDIR}${PREFIX}" \ CC="${CC}" CCFLAGS="${CFLAGS}" \ C++="${CXX}" C++FLAGS="${CXXFLAGS}" +post-patch: +# Unbreak with modern C++ compilers (notably, Clang) + @${REINPLACE_CMD} -e 's,assignFrom(,this->&,' \ + ${WRKSRC}/src/Vector.hpp ${WRKSRC}/src/Matrix.hpp + @${REINPLACE_CMD} -e 's,matSliceCheck(,this->&,' \ + ${WRKSRC}/src/Matrix.hpp + @${REINPLACE_CMD} -e 's,addData(,this->&,' \ + ${WRKSRC}/src/FileFilterFrame.hpp + @${REINPLACE_CMD} -e 's,float,double,' \ + ${WRKSRC}/apps/swrx/gpsSim.cpp + @${REINPLACE_CMD} -e '/GPSEllipsoid gm/s,const ,,' \ + ${WRKSRC}/apps/reszilla/ddGen.cpp + do-build: - cd ${WRKSRC} && ${SETENV} ${JAM_ENV} ${JAM} + cd ${WRKSRC} && ${SETENV} ${JAM_ENV} ${JAM} ${_MAKE_JOBS} NOSTRIPFILES= ddPlot|ordPlot # don't strip scripts SHLIBS= geodyn geomatics gpstk procframe rxio vdraw vplot -SHLIBVER= ${PORTVERSION:C/\.//g} +SHLIBVER= ${PORTVERSION:S/.//g} + do-install: - @${MKDIR} ${PREFIX}/include/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} cd ${WRKSRC} && ${SETENV} ${JAM_ENV} ${JAM} install .for shlib in ${SHLIBS} - @${LN} -sf lib${shlib}.so.${SHLIBVER} ${PREFIX}/lib/lib${shlib}.so + ${LN} -sf lib${shlib}.so.${SHLIBVER} \ + ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so .endfor @${STRIP_CMD} `${GREP} '^bin/' ${PLIST} | \ ${GREP} -E -v '^bin/(${NOSTRIPFILES})$$' | \ - ${SED} 's:^:${PREFIX}/:g'` + ${SED} 's,^,${STAGEDIR}${PREFIX}/,'` .include Added: head/astro/gpstk/files/patch-apps-swrx-IQStream.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/gpstk/files/patch-apps-swrx-IQStream.hpp Wed Jul 23 05:17:15 2014 (r362621) @@ -0,0 +1,12 @@ +--- apps/swrx/IQStream.hpp.orig 2012-06-27 22:22:33 +0800 ++++ apps/swrx/IQStream.hpp +@@ -130,6 +130,9 @@ namespace gpstk + inline IQStream& operator<<(IQStream& s, const std::complex& v) + { s.writeComplex(v); return s; }; + ++ inline IQStream& operator<<(IQStream& s, const std::complex& v) ++ { s.writeComplex(v); return s; }; ++ + + class IQ1Stream : public IQStream + { Modified: head/astro/gpstk/pkg-descr ============================================================================== --- head/astro/gpstk/pkg-descr Wed Jul 23 05:15:35 2014 (r362620) +++ head/astro/gpstk/pkg-descr Wed Jul 23 05:17:15 2014 (r362621) @@ -1,3 +1,9 @@ -The GPSTk is a C++ library for developing GPS applications. +The GPSTk is an open source C++ library for developing GPS applications. -WWW: http://gpstk.sourceforge.net/ +The GPSTk suite consists of a core library, auxiliary libraries, and a set +of applications. The GPSTk provides a wide array of functions that solve +processing problems associated with GNSS such as processing or using +standard formats such as RINEX. The libraries are the basis for the more +advanced applications distributed as part of the GPSTk suite. + +WWW: http://www.gpstk.org/