From 4f830a88aac18a4b66b5546c6d76fb3d596e1983 Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Sun, 27 Jul 2003 15:30:23 +0000 Subject: [PATCH] - Do not install useless .la files - Fix handling info files PR: 54902 Submitted by: KATO Tsuguru Approved by: fjoe (mentor) (implicit) --- math/fftw/Makefile | 22 +++++++++++++--------- math/fftw/files/patch-configure | 10 ++++++++++ math/fftw/files/patch-doc::fftw.texi | 13 +++++++++++++ math/fftw/pkg-plist | 11 ++--------- math/fftw3/Makefile | 22 +++++++++++++--------- math/fftw3/files/patch-configure | 10 ++++++++++ math/fftw3/files/patch-doc::fftw.texi | 13 +++++++++++++ math/fftw3/pkg-plist | 11 ++--------- 8 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 math/fftw/files/patch-configure create mode 100644 math/fftw/files/patch-doc::fftw.texi create mode 100644 math/fftw3/files/patch-configure create mode 100644 math/fftw3/files/patch-doc::fftw.texi diff --git a/math/fftw/Makefile b/math/fftw/Makefile index 82c07059ada6..8c270d55b451 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -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 @@ MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE COMMENT= Fast C routines to compute the Discrete Fourier Transform -.include - -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 + .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 diff --git a/math/fftw/files/patch-configure b/math/fftw/files/patch-configure new file mode 100644 index 000000000000..18bde56854e2 --- /dev/null +++ b/math/fftw/files/patch-configure @@ -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 --git a/math/fftw/files/patch-doc::fftw.texi b/math/fftw/files/patch-doc::fftw.texi new file mode 100644 index 000000000000..dcf37f7ea431 --- /dev/null +++ b/math/fftw/files/patch-doc::fftw.texi @@ -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 --git a/math/fftw/pkg-plist b/math/fftw/pkg-plist index 0ea1930b799c..d019bd7f4cc0 100644 --- a/math/fftw/pkg-plist +++ b/math/fftw/pkg-plist @@ -2,19 +2,12 @@ include/fftw.h 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%% diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 82c07059ada6..8c270d55b451 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -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 @@ MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE COMMENT= Fast C routines to compute the Discrete Fourier Transform -.include - -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 + .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 diff --git a/math/fftw3/files/patch-configure b/math/fftw3/files/patch-configure new file mode 100644 index 000000000000..18bde56854e2 --- /dev/null +++ b/math/fftw3/files/patch-configure @@ -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 --git a/math/fftw3/files/patch-doc::fftw.texi b/math/fftw3/files/patch-doc::fftw.texi new file mode 100644 index 000000000000..dcf37f7ea431 --- /dev/null +++ b/math/fftw3/files/patch-doc::fftw.texi @@ -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 --git a/math/fftw3/pkg-plist b/math/fftw3/pkg-plist index 0ea1930b799c..d019bd7f4cc0 100644 --- a/math/fftw3/pkg-plist +++ b/math/fftw3/pkg-plist @@ -2,19 +2,12 @@ include/fftw.h 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%%