From b3f95b0e35b44920caf8a234bf0a9b80104b4634 Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sun, 1 Jun 2014 09:00:15 +0000 Subject: cat astro / benchmarks - USE_(BZIP2|XZ) -> USES=tar:(bzip2|xz) - adjust BSDn License --- astro/boinc-astropulse/Makefile | 3 +-- astro/boinc-setiathome-v7/Makefile | 3 +-- astro/pp3/Makefile | 10 +++------- astro/wcslib/Makefile | 3 +-- astro/xearth/Makefile | 2 +- 5 files changed, 7 insertions(+), 14 deletions(-) (limited to 'astro') diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 5c8b60e63566..1200ee9974ca 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -21,8 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float -USES= gmake pkgconfig -USE_XZ= yes +USES= tar:xz gmake pkgconfig USE_AUTOTOOLS= autoconf:env automake:env libtool GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/client diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v7/Makefile index daf0f32f3d8d..d3655e0fdb63 100644 --- a/astro/boinc-setiathome-v7/Makefile +++ b/astro/boinc-setiathome-v7/Makefile @@ -20,8 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float -USES= gmake pkgconfig -USE_XZ= yes +USES= tar:xz gmake pkgconfig USE_AUTOTOOLS= autoconf:env automake:env GNU_CONFIGURE= yes diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile index e808555f6f84..7d53b844b43e 100644 --- a/astro/pp3/Makefile +++ b/astro/pp3/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/PP3/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Creates celestial charts -USE_BZIP2= yes +USES= tar:bzip2 USE_TEX= latex OPTIONS_DEFINE= DOCS EXAMPLES @@ -18,21 +18,17 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include do-build: - cd ${WRKSRC} \ - && ${CXX} ${CXXFLAGS} -DPP3DATA=\"${DATADIR}\" pp3.cc -o pp3 + (cd ${WRKSRC} \ + && ${CXX} ${CXXFLAGS} -DPP3DATA=\"${DATADIR}\" pp3.cc -o pp3) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pp3 ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.dat ${STAGEDIR}${DATADIR} -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} -.endif .include diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile index 473aae0040cb..300744513ed0 100644 --- a/astro/wcslib/Makefile +++ b/astro/wcslib/Makefile @@ -10,9 +10,8 @@ MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/software/wcslib/ MAINTAINER= tonymaher@optusnet.com.au COMMENT= Library for parsing/generating FITS headers -USE_BZIP2= yes GNU_CONFIGURE= yes -USES= gmake +USES= tar:bzip2 gmake MAKEFILE= GNUmakefile USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile index a69855722b92..95bb96b54dcd 100644 --- a/astro/xearth/Makefile +++ b/astro/xearth/Makefile @@ -11,7 +11,7 @@ MAINTAINER= mexas@bris.ac.uk COMMENT= Set the root window to the image of earth USE_XORG= x11 xext sm ice xt -USE_XZ= yes +USES= tar:xz PLIST_FILES= bin/xearth \ man/man1/xearth.1.gz \ lib/X11/xearth/freebsd.committers.markers \ -- cgit v1.2.3