Date: Wed, 5 Mar 2014 17:27:27 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347124 - in head/math: fftw fftw-float fftw/files Message-ID: <201403051727.s25HRRNA011146@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Mar 5 17:27:27 2014 New Revision: 347124 URL: http://svnweb.freebsd.org/changeset/ports/347124 QAT: https://qat.redports.org/buildarchive/r347124/ Log: - Add USES=libtool to fix linker problem on FreeBSD/i386 8.x and FreeBSD/ia64. - Remove patch-configure.in (not needed) and remove USE_AUTOTOOLS. - Add OPTIONS_EXCLUDE=DOCS to math/fftw-float slave port. - Simplify Makefile a little. PR: ports/187274 Deleted: head/math/fftw/files/patch-configure.in Modified: head/math/fftw-float/Makefile head/math/fftw/Makefile head/math/fftw/pkg-plist Modified: head/math/fftw-float/Makefile ============================================================================== --- head/math/fftw-float/Makefile Wed Mar 5 17:16:06 2014 (r347123) +++ head/math/fftw-float/Makefile Wed Mar 5 17:27:27 2014 (r347124) @@ -1,11 +1,10 @@ # Created by: Michael Johnson <ahze@ahze.net> # $FreeBSD$ -PORTREVISION= 3 - COMMENT= Fast C routines (Single Percision) FFTW_FLAVOR= float MASTERDIR= ${.CURDIR}/../../math/fftw +OPTIONS_EXCLUDE=DOCS .include "${MASTERDIR}/Makefile" Modified: head/math/fftw/Makefile ============================================================================== --- head/math/fftw/Makefile Wed Mar 5 17:16:06 2014 (r347123) +++ head/math/fftw/Makefile Wed Mar 5 17:27:27 2014 (r347124) @@ -3,13 +3,12 @@ PORTNAME= fftw PORTVERSION= 2.1.5 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES= math MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.fftw.org/pub/fftw/old/ \ ftp://theory.lcs.mit.edu/pub/fftw/ \ ftp://pm.cse.rmit.edu.au/pub/dsp/fftw/ -PKGNAMESUFFIX= ${FFTW_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT?= Fast C routines to compute the Discrete Fourier Transform @@ -20,16 +19,14 @@ OPTIONS_DEFINE= DOCS # current flavors: default, float FFTW_FLAVOR?= default -FFTW_SUFIX= -USES= fortran gmake -USE_AUTOTOOLS= aclocal automake autoconf libtool -ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal -AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared +USES= fortran gmake libtool USE_LDCONFIG= yes +BROKEN_sparc64= does not build + PLIST_SUB= FFTW_SUFX="${FFTW_SUFX}" PORTSCOUT= limit:^2\. @@ -37,11 +34,10 @@ PORTSCOUT= limit:^2\. .if ${FFTW_FLAVOR}=="float" CONFIGURE_ARGS+= --enable-float --enable-type-prefix FFTW_SUFX= s -FFTW_PKGNAMESUFFIX= -float -PLIST_SUB+= DEF="@comment " +PKGNAMESUFFIX= -float .else +FFTW_SUFIX= INFO= fftw -PLIST_SUB+= DEF="" .endif .include <bsd.port.options.mk> @@ -50,12 +46,8 @@ PLIST_SUB+= DEF="" CONFIGURE_ARGS+= --enable-i386-hacks .endif -.if ${ARCH} == "sparc64" -BROKEN= does not build -.endif - post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS/s|doc | |' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e '/^SUBDIRS/s|doc | |' ${WRKSRC}/Makefile.in post-build: .if ${FFTW_FLAVOR}=="default" Modified: head/math/fftw/pkg-plist ============================================================================== --- head/math/fftw/pkg-plist Wed Mar 5 17:16:06 2014 (r347123) +++ head/math/fftw/pkg-plist Wed Mar 5 17:27:27 2014 (r347124) @@ -4,9 +4,11 @@ lib/lib%%FFTW_SUFX%%fftw.a lib/lib%%FFTW_SUFX%%fftw.la lib/lib%%FFTW_SUFX%%fftw.so lib/lib%%FFTW_SUFX%%fftw.so.2 +lib/lib%%FFTW_SUFX%%fftw.so.2.0.7 lib/lib%%FFTW_SUFX%%rfftw.a lib/lib%%FFTW_SUFX%%rfftw.la lib/lib%%FFTW_SUFX%%rfftw.so lib/lib%%FFTW_SUFX%%rfftw.so.2 -%%DEF%%%%PORTDOCS%%%%DOCSDIR%%/fftw.ps -%%DEF%%%%PORTDOCS%%@dirrm %%DOCSDIR%% +lib/lib%%FFTW_SUFX%%rfftw.so.2.0.7 +%%PORTDOCS%%%%DOCSDIR%%/fftw.ps +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403051727.s25HRRNA011146>