diff -urN /usr/ports/math/fftw/Makefile math/fftw/Makefile
--- /usr/ports/math/fftw/Makefile	Sat Apr 12 22:57:05 2003
+++ math/fftw/Makefile	Fri Jul 25 11:11:12 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	fftw
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ 		\
 		ftp://ftp.fftw.org/pub/fftw/old/ 	\
@@ -16,23 +17,26 @@
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 COMMENT=	Fast C routines to compute the Discrete Fourier Transform
 
-.include <bsd.port.pre.mk>
-
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} == "i386"
-CONFIGURE_ARGS=	--enable-i386-hacks
+CONFIGURE_ARGS+=	--enable-i386-hacks
 .endif
-CONFIGURE_ARGS+=--enable-shared
+
+post-extract:
+	@${RM} ${WRKSRC}/doc/fftw.info*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/fftw
-	${CP} ${WRKSRC}/doc/fftw.ps ${PREFIX}/share/doc/fftw
-	install-info ${PREFIX}/info/fftw.info ${PREFIX}/info/dir
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/fftw.ps ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/math/fftw/files/patch-configure math/fftw/files/patch-configure
--- /usr/ports/math/fftw/files/patch-configure	Thu Jan  1 09:00:00 1970
+++ math/fftw/files/patch-configure	Fri Jul 25 10:52:16 2003
@@ -0,0 +1,10 @@
+--- configure.orig	Mon Mar 24 16:09:56 2003
++++ configure	Fri Jul 25 10:52:07 2003
+@@ -8217,6 +8217,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff -urN /usr/ports/math/fftw/files/patch-doc::fftw.texi math/fftw/files/patch-doc::fftw.texi
--- /usr/ports/math/fftw/files/patch-doc::fftw.texi	Thu Jan  1 09:00:00 1970
+++ math/fftw/files/patch-doc::fftw.texi	Fri Jul 25 11:27:09 2003
@@ -0,0 +1,13 @@
+--- doc/fftw.texi.orig	Mon Mar 17 08:43:18 2003
++++ doc/fftw.texi	Fri Jul 25 11:26:48 2003
+@@ -3,6 +3,10 @@
+ @c %**start of header
+ @setfilename fftw.info
+ @settitle FFTW
++@dircategory Libraries
++@direntry
++* FFTW: (fftw).		Fast fourier transform library
++@end direntry
+ @c %**end of header
+ 
+ @include version.texi
diff -urN /usr/ports/math/fftw/pkg-plist math/fftw/pkg-plist
--- /usr/ports/math/fftw/pkg-plist	Fri Jun 16 19:37:37 2000
+++ math/fftw/pkg-plist	Fri Jul 25 11:28:06 2003
@@ -2,19 +2,12 @@
 include/rfftw.h
 @unexec install-info --delete %D/info/fftw.info %D/info/dir
 info/fftw.info
-info/fftw.info-1
-info/fftw.info-2
-info/fftw.info-3
-info/fftw.info-4
-info/fftw.info-5
 @exec install-info %D/info/fftw.info %D/info/dir
 lib/libfftw.a
-lib/libfftw.la
 lib/libfftw.so
 lib/libfftw.so.2
 lib/librfftw.a
-lib/librfftw.la
 lib/librfftw.so
 lib/librfftw.so.2
-share/doc/fftw/fftw.ps
-@dirrm share/doc/fftw
+%%PORTDOCS%%%%DOCSDIR%%/fftw.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%