From owner-svn-ports-head@FreeBSD.ORG Fri Aug 30 01:15:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 10A701DE; Fri, 30 Aug 2013 01:15:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0316281A; Fri, 30 Aug 2013 01:15:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7U1FP5t036890; Fri, 30 Aug 2013 01:15:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7U1FL73036853; Fri, 30 Aug 2013 01:15:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201308300115.r7U1FL73036853@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 30 Aug 2013 01:15:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325648 - in head/astro: astrometry fowsr foxtrotgps glunarclock gpscorrelate gpsdrive libosmpbf libroadnav marble mymoon nightfall openuniverse planets rmap roadnav sextractor starplot... 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.14 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: Fri, 30 Aug 2013 01:15:26 -0000 Author: bapt Date: Fri Aug 30 01:15:20 2013 New Revision: 325648 URL: http://svnweb.freebsd.org/changeset/ports/325648 Log: Convert astro to USES=gmake While here: - Trim headers - Use shebangfix when needed - Convert to new perl5 world Modified: head/astro/astrometry/Makefile head/astro/fowsr/Makefile head/astro/foxtrotgps/Makefile head/astro/glunarclock/Makefile head/astro/gpscorrelate/Makefile head/astro/gpsdrive/Makefile head/astro/libosmpbf/Makefile head/astro/libroadnav/Makefile head/astro/marble/Makefile head/astro/mymoon/Makefile head/astro/nightfall/Makefile head/astro/openuniverse/Makefile head/astro/planets/Makefile head/astro/rmap/Makefile head/astro/roadnav/Makefile head/astro/sextractor/Makefile head/astro/starplot/Makefile head/astro/swe/Makefile head/astro/wcslib/Makefile head/astro/wmjupiter/Makefile head/astro/wmmoonclock/Makefile head/astro/wmsolar/Makefile head/astro/xglobe/Makefile head/astro/xtide/Makefile Modified: head/astro/astrometry/Makefile ============================================================================== --- head/astro/astrometry/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/astrometry/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,9 +1,5 @@ -# New ports collection makefile for: astrometry -# Date created: 7 July 2009 -# Whom: Dereckson -# +# Created by: Dereckson # $FreeBSD$ -# PORTNAME= astrometry PORTVERSION= 0.34 @@ -22,8 +18,8 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphic BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy +USES= gmake USE_PYTHON= 2.5+ -USE_GMAKE= yes ALL_TARGET= all extra MAKE_ENV= INSTALL_DIR=${PREFIX}/astrometry MAKE_JOBS_UNSAFE= yes Modified: head/astro/fowsr/Makefile ============================================================================== --- head/astro/fowsr/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/fowsr/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -16,7 +16,7 @@ FILEVER= 1.0 FILEDATE= 20100718 WRKSRC= ${WRKDIR}/${PORTNAME}-${FILEVER} -USE_GMAKE= yes +USES= gmake PLIST_FILES= bin/fowsr Modified: head/astro/foxtrotgps/Makefile ============================================================================== --- head/astro/foxtrotgps/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/foxtrotgps/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -8,7 +8,7 @@ CATEGORIES= astro geography MASTER_SITES= http://www.foxtrotgps.org/releases/ MAINTAINER= crwhipp@gmail.com -COMMENT= A lightweight opensource gps moving map application +COMMENT= Lightweight opensource gps moving map application LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ exif:${PORTSDIR}/graphics/libexif \ @@ -16,10 +16,12 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ gps:${PORTSDIR}/astro/gpsd GNU_CONFIGURE= yes -USE_GMAKE= yes -USES= gettext +USES= gettext gmake pkgconfig shebangfix +SHEBANG_FILES= contrib/convert2gpx \ + contrib/convert2osm \ + contrib/georss2foxtrotgps-poi -USE_GNOME= gtk20 gconf2 libxml2 intltool pkgconfig libglade2 +USE_GNOME= gtk20 gconf2 libxml2 intltool libglade2 USE_SQLITE= 3 INSTALLS_ICONS= yes @@ -27,8 +29,4 @@ GCONF_SCHEMAS= apps_foxtrotgps.schemas MAN1= foxtrotgps.1 convert2gpx.1 convert2osm.1 -post-patch: - @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/contrib/convert2gpx ${WRKSRC}/contrib/convert2osm - @${REINPLACE_CMD} -e 's|/usr/bin/python|${LOCALBASE}/bin/python|' ${WRKSRC}/contrib/georss2foxtrotgps-poi - .include Modified: head/astro/glunarclock/Makefile ============================================================================== --- head/astro/glunarclock/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/glunarclock/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,6 +1,7 @@ # Created by: Vincent Tantardini # $FreeBSD$ # $MCom: ports/astro/glunarclock/Makefile,v 1.12 2009/04/07 03:25:51 marcus Exp $ + PORTNAME= glunarclock PORTVERSION= 0.34.1 PORTREVISION= 1 @@ -12,9 +13,8 @@ COMMENT= GNOME applet that displays the LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier -USES= pathfix gettext +USES= pathfix gettext gmake USE_GNOME= gnomepanel gnomeprefix intlhack libgnomeui -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0` LDFLAGS+= -L${LOCALBASE}/lib Modified: head/astro/gpscorrelate/Makefile ============================================================================== --- head/astro/gpscorrelate/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/gpscorrelate/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -22,8 +22,8 @@ USE_GITHUB= yes GH_ACCOUNT= freefoote GH_COMMIT= a36646b +USES= gmake USE_GNOME= libxml2 -USE_GMAKE= yes MAN1= gpscorrelate.1 MLINKS= gpscorrelate.1 gpscorrelate-gui.1 Modified: head/astro/gpsdrive/Makefile ============================================================================== --- head/astro/gpsdrive/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/gpsdrive/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -15,9 +15,8 @@ LICENSE= GPLv2 LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre -USES= perl5 +USES= gmake perl5 USE_AUTOTOOLS= libtool -USE_GMAKE= yes USE_GNOME= gtk20 USE_LDCONFIG= yes Modified: head/astro/libosmpbf/Makefile ============================================================================== --- head/astro/libosmpbf/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/libosmpbf/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -18,7 +18,7 @@ GH_PROJECT= OSM-binary GH_TAGNAME= v${PORTVERSION} GH_COMMIT= d9be2d1 -USE_GMAKE= yes +USES= gmake BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src Modified: head/astro/libroadnav/Makefile ============================================================================== --- head/astro/libroadnav/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/libroadnav/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -12,7 +12,7 @@ COMMENT= Helper library for Roadnav (3D USE_WX= 2.6+ WX_COMPS= wx contrib -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG} Modified: head/astro/marble/Makefile ============================================================================== --- head/astro/marble/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/marble/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -13,12 +13,11 @@ COMMENT= Virtual globe and world atlas f CONFLICTS= kdeedu-4.4.[0-4] USE_KDE4= kdehier kdelibs kdeprefix automoc4 sharedmime -USES= cmake:outsource +USES= cmake:outsource gmake USE_QT4= corelib dbus declarative designer_build gui network phonon \ qtestlib script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_XZ= yes -USE_GMAKE= yes USE_LDCONFIG= yes MAKE_ENV= XDG_CONFIG_HOME=/dev/null CMAKE_ARGS= -DMOBILE:BOOL=FALSE Modified: head/astro/mymoon/Makefile ============================================================================== --- head/astro/mymoon/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/mymoon/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mymoon -# Date created: 24 May 2003 -# Whom: Kirill Ponomarew -# +# Created by: Kirill Ponomarew # $FreeBSD$ -# PORTNAME= mymoon DISTVERSION= 1.2a @@ -21,7 +17,7 @@ LIB_DEPENDS= nova:${PORTSDIR}/astro/libn WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/astro/nightfall/Makefile ============================================================================== --- head/astro/nightfall/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/nightfall/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -14,9 +14,8 @@ OPTIONS_DEFINE= GNOME PGPLOT OPENGL OPTIONS_DEFAULT= PGPLOT OPENGL PGPLOT_DESC= Enable PGPLOT support -USES= pathfix gettext perl5 +USES= gmake pathfix gettext perl5 USE_GNOME= gnomehier gtk20 -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/astro/openuniverse/Makefile ============================================================================== --- head/astro/openuniverse/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/openuniverse/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,9 +1,5 @@ -# New ports collection makefile for: openuniverse -# Date created: 4 August 1998 -# Whom: Andrey Zakhvatov -# +# Created by: Andrey Zakhvatov # $FreeBSD$ -# PORTNAME= openuniverse DISTVERSION= 1.0beta3 @@ -18,9 +14,9 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic USE_GL= glut +USES= gmake USE_XORG= sm ice xmu xi xext x11 GNU_CONFIGURE= yes -USE_GMAKE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" \ Modified: head/astro/planets/Makefile ============================================================================== --- head/astro/planets/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/planets/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -15,7 +15,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= ocaml:${PORTSDIR}/lang/ocaml -USE_GMAKE= yes +USES= gmake ALL_TARGET= ${PORTNAME} MAN1= planets.1 Modified: head/astro/rmap/Makefile ============================================================================== --- head/astro/rmap/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/rmap/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -14,7 +14,7 @@ LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd MAN1= rmap.1 GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" Modified: head/astro/roadnav/Makefile ============================================================================== --- head/astro/roadnav/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/roadnav/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libroadn USE_WX= 2.6+ WX_COMPS= wx contrib -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG} Modified: head/astro/sextractor/Makefile ============================================================================== --- head/astro/sextractor/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/sextractor/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -11,7 +11,7 @@ MAINTAINER= mathias@monnerville.com COMMENT= Catalogue of objects builder from astronomical images GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake MAN1= sex.1 MANX= sex.x Modified: head/astro/starplot/Makefile ============================================================================== --- head/astro/starplot/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/starplot/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -10,9 +10,8 @@ MASTER_SITES= http://starplot.org/downlo MAINTAINER= ports@FreeBSD.org COMMENT= 3-dimensional viewer for star charts -USES= pathfix gettext +USES= gmake pathfix gettext USE_GNOME= gtk20 -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/astro/swe/Makefile ============================================================================== --- head/astro/swe/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/swe/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -11,7 +11,7 @@ MAINTAINER= 5u623l20@gmail.com COMMENT= High Precision Ephemeris Developed By Astrodienst WRKSRC= ${WRKDIR}/src -USE_GMAKE= yes +USES= gmake ALL_TARGET= # USE_LDCONFIG= yes Modified: head/astro/wcslib/Makefile ============================================================================== --- head/astro/wcslib/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/wcslib/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,27 +1,27 @@ # Created by: Tony Maher # $FreeBSD$ -PORTNAME= wcslib +PORTNAME= wcslib PORTVERSION= 4.13.4 -CATEGORIES= astro +CATEGORIES= astro MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/software/wcslib/ -MAINTAINER= tonymaher@optusnet.com.au -COMMENT= Library for parsing/generating FITS headers +MAINTAINER= tonymaher@optusnet.com.au +COMMENT= Library for parsing/generating FITS headers -USE_BZIP2= yes +USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -MAKEFILE= GNUmakefile +USES= gmake +MAKEFILE= GNUmakefile USE_LDCONFIG= yes -PLIST_SUB= VERSION="${PORTVERSION}" -MAN1= fitshdr.1 +PLIST_SUB= VERSION="${PORTVERSION}" +MAN1= fitshdr.1 # See makedefs.in which describes why you want to set the extra support. # For most users it will not be required. -OPTIONS_DEFINE= CFITSIO PGPLOT +OPTIONS_DEFINE= CFITSIO PGPLOT CFITSIO_DESC= Add cfitsio support (for tests only) PGPLOT_DESC= Add pgplot support (for tests only) Modified: head/astro/wmjupiter/Makefile ============================================================================== --- head/astro/wmjupiter/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/wmjupiter/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,9 +1,5 @@ -# New ports collection makefile for: wmjupiter -# Date created: Tue Jan 15 17:28:49 EST 2002 -# Whom: pat -# +# Created by: pat # $FreeBSD$ -# PORTNAME= wmjupiter PORTVERSION= 1.2 @@ -17,7 +13,7 @@ COMMENT= Dockapp that displays informati PLIST_FILES= bin/wmJupiter WRKSRC= ${WRKDIR}/wmJupiter USE_XORG= x11 xext xpm -USE_GMAKE= yes +USES= gmake pre-patch: @${REINPLACE_CMD} -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \ Modified: head/astro/wmmoonclock/Makefile ============================================================================== --- head/astro/wmmoonclock/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/wmmoonclock/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -13,7 +13,7 @@ COMMENT= Displays the phase of the moon, WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_XORG= xpm -USE_GMAKE= yes +USES= gmake MAN1= wmmoonclock.1 PLIST_FILES= bin/wmmoonclock Modified: head/astro/wmsolar/Makefile ============================================================================== --- head/astro/wmsolar/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/wmsolar/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -13,7 +13,7 @@ COMMENT= Dockapp that displays the Solar PLIST_FILES= bin/wmSolar WRKSRC= ${WRKDIR}/wmSolar USE_XORG= x11 xext xpm -USE_GMAKE= yes +USES= gmake pre-patch: @${REINPLACE_CMD} -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \ Modified: head/astro/xglobe/Makefile ============================================================================== --- head/astro/xglobe/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/xglobe/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xglobe -# Date created: 20 January 1998 -# Whom: Kris Kennaway -# +# Created by: Kris Kennaway # $FreeBSD$ -# PORTNAME= xglobe PORTVERSION= 0.5 @@ -15,8 +11,8 @@ MASTER_SITE_SUBDIR=kris MAINTAINER= ports@FreeBSD.org COMMENT= Displays a view of the Earth (like xearth) with a rendered photo map +USES= gmake USE_QT4= corelib gui qt3support moc_build -USE_GMAKE= yes MAKE_ENV= QT_PREFIX=${QT_PREFIX} do-install: Modified: head/astro/xtide/Makefile ============================================================================== --- head/astro/xtide/Makefile Fri Aug 30 01:08:08 2013 (r325647) +++ head/astro/xtide/Makefile Fri Aug 30 01:15:20 2013 (r325648) @@ -18,7 +18,7 @@ LICENSE= GPLv3 LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake USE_GCC= yes GNU_CONFIGURE= yes