From owner-svn-ports-all@FreeBSD.ORG Wed Mar 5 17:27:28 2014 Return-Path: Delivered-To: svn-ports-all@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 655E0DA2; Wed, 5 Mar 2014 17:27:28 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 514203B9; Wed, 5 Mar 2014 17:27:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25HRShe011149; Wed, 5 Mar 2014 17:27:28 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25HRRNA011146; Wed, 5 Mar 2014 17:27:27 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201403051727.s25HRRNA011146@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 5 Mar 2014 17:27:27 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 17:27:28 -0000 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 # $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 @@ -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%%