From owner-svn-ports-head@FreeBSD.ORG Tue May 20 16:41:07 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 75ED7D0A; Tue, 20 May 2014 16:41:07 +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 56843285D; Tue, 20 May 2014 16:41:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KGf7fI060605; Tue, 20 May 2014 16:41:07 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KGf6dK060424; Tue, 20 May 2014 16:41:06 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405201641.s4KGf6dK060424@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 20 May 2014 16:41:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354654 - in head/astro/gpsd: . 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: Tue, 20 May 2014 16:41:07 -0000 Author: amdmi3 Date: Tue May 20 16:41:06 2014 New Revision: 354654 URL: http://svnweb.freebsd.org/changeset/ports/354654 QAT: https://qat.redports.org/buildarchive/r354654/ Log: - Stagify - Switch to USES=scons Approved by: glebius (maintainer) Modified: head/astro/gpsd/Makefile head/astro/gpsd/files/patch-SConstruct head/astro/gpsd/pkg-plist Modified: head/astro/gpsd/Makefile ============================================================================== --- head/astro/gpsd/Makefile Tue May 20 16:34:16 2014 (r354653) +++ head/astro/gpsd/Makefile Tue May 20 16:41:06 2014 (r354654) @@ -12,25 +12,13 @@ COMMENT= Daemon that monitors one or mor BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt -NO_STAGE= yes -USES= pathfix pkgconfig -USE_SCONS= yes +USES= pathfix pkgconfig scons USE_RC_SUBR= gpsd USE_PYTHON= yes -INSTALLS_EGGINFO= yes -PYDISTUTILS_EGGINFO= gps-${PORTVERSION}.egg-info -SCONS_BUILDENV= CC=${CC} -SCONS_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \ +MAKE_ARGS= prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \ chrpath=no - -MAN1= cgps.1 gegps.1 gps.1 gpscat.1 gpsctl.1 gpsdecode.1 \ - gpsfake.1 gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 \ - gpsmon.1 lcdgps.1 -MAN3= libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3 -MAN5= srec.5 gpsd_json.5 -MAN8= gpsd.8 gpsdctl.8 gpsinit.8 -MANCOMPRESSED= no +MAKE_ENV= DESTDIR="${STAGEDIR}" OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \ GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NMEA NTPSHM NTRIP \ @@ -262,12 +250,10 @@ SCONS_ARGS+= profiling=yes # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted # with these files when module is imported from root user post-install: - @${FIND} ${PYTHON_SITELIBDIR:C/^${LOCALBASE}/${PREFIX}/}/gps \ - -name "*.py" -exec \ - ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py {} \; - @${SETENV} PYTHONOPTIMIZE=yes \ - ${FIND} ${PYTHON_SITELIBDIR:C/^${LOCALBASE}/${PREFIX}/}/gps \ - -name "*.py" -exec \ - ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py {} \; + (cd ${STAGEDIR}${PREFIX} && \ + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \ + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) .include Modified: head/astro/gpsd/files/patch-SConstruct ============================================================================== --- head/astro/gpsd/files/patch-SConstruct Tue May 20 16:34:16 2014 (r354653) +++ head/astro/gpsd/files/patch-SConstruct Tue May 20 16:41:06 2014 (r354654) @@ -1,6 +1,21 @@ --- SConstruct.orig 2013-05-01 09:44:21.000000000 +0400 -+++ SConstruct 2013-05-01 16:30:55.000000000 +0400 -@@ -590,7 +590,14 @@ ++++ SConstruct 2014-05-20 00:47:57.769697286 +0400 +@@ -268,14 +268,6 @@ + wrapped.replace("/usr/etc", "/etc") + return wrapped + +-# Honor the specified installation prefix in link paths. +-if not env["sysroot"]: +- env.Prepend(LIBPATH=[installdir('libdir')]) +-else: +- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')]) +-if env["shared"]: +- env.Prepend(RPATH=[installdir('libdir')]) +- + # Give deheader a way to set compiler flags + if 'MORECFLAGS' in os.environ: + env.Append(CFLAGS=Split(os.environ['MORECFLAGS'])) +@@ -590,7 +582,14 @@ #ifdef __LITTLE_ENDIAN__ #undef WORDS_BIGENDIAN #else @@ -16,7 +31,7 @@ #if __BYTE_ORDER == __BIG_ENDIAN #define WORDS_BIGENDIAN 1 #elif __BYTE_ORDER == __LITTLE_ENDIAN -@@ -1242,7 +1249,7 @@ +@@ -1242,7 +1241,7 @@ if not env['python']: python_install = [] else: Modified: head/astro/gpsd/pkg-plist ============================================================================== --- head/astro/gpsd/pkg-plist Tue May 20 16:34:16 2014 (r354653) +++ head/astro/gpsd/pkg-plist Tue May 20 16:41:06 2014 (r354654) @@ -26,6 +26,29 @@ lib/libgpsd.so lib/libgpsd.so.21 lib/libgpsd.so.21.0 lib/libgpsd.so.21.0.0 +man/man1/cgps.1.gz +man/man1/gegps.1.gz +man/man1/gps.1.gz +man/man1/gpscat.1.gz +man/man1/gpsctl.1.gz +man/man1/gpsdecode.1.gz +man/man1/gpsfake.1.gz +man/man1/gpsmon.1.gz +man/man1/gpspipe.1.gz +man/man1/gpsprof.1.gz +man/man1/lcdgps.1.gz +man/man1/xgps.1.gz +man/man1/xgpsspeed.1.gz +man/man3/libQgpsmm.3.gz +man/man3/libgps.3.gz +man/man3/libgpsd.3.gz +man/man3/libgpsmm.3.gz +man/man5/gpsd_json.5.gz +man/man5/srec.5.gz +man/man8/gpsd.8.gz +man/man8/gpsdctl.8.gz +man/man8/gpsinit.8.gz +%%PYTHON_SITELIBDIR%%/gps-3.9.egg-info %%PYTHON_SITELIBDIR%%/gps/__init__.py %%PYTHON_SITELIBDIR%%/gps/__init__.pyc %%PYTHON_SITELIBDIR%%/gps/__init__.pyo @@ -44,6 +67,8 @@ lib/libgpsd.so.21.0.0 %%PYTHON_SITELIBDIR%%/gps/misc.pyo %%PYTHON_SITELIBDIR%%/gps/packet.so @dirrm %%PYTHON_SITELIBDIR%%/gps +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% %%QTBIND%%libdata/pkgconfig/Qgpsmm.pc libdata/pkgconfig/libgps.pc libdata/pkgconfig/libgpsd.pc