Date: Sun, 22 Dec 2013 16:22:29 +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: r337197 - in head/math/algae: . files Message-ID: <201312221622.rBMGMTi3027240@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Dec 22 16:22:28 2013 New Revision: 337197 URL: http://svnweb.freebsd.org/changeset/ports/337197 Log: - USES=fortran (eliminate FORTRANLIBS, LDFLAGS and pre-configure). - Remove some patches and post-patch. - Remove USE_AUTOTOOLS=autoconf and patch configure script directly. - Replace BROKEN with BROKEN_${ARCH}. - Staging (add DESTDIR support to the makefiles). - Make sure the port uses its own arpack, blas, lapack and superlu. Added: head/math/algae/files/patch-configure (contents, props changed) head/math/algae/files/patch-doc-Makefile.in (contents, props changed) head/math/algae/files/patch-src-Makefile.in (contents, props changed) head/math/algae/files/patch-tools-Makefile.in (contents, props changed) Deleted: head/math/algae/files/patch-config.h.in head/math/algae/files/patch-configure.in Modified: head/math/algae/Makefile (contents, props changed) head/math/algae/files/patch-Makefile.in (contents, props changed) head/math/algae/pkg-plist (contents, props changed) Modified: head/math/algae/Makefile ============================================================================== --- head/math/algae/Makefile Sun Dec 22 16:11:41 2013 (r337196) +++ head/math/algae/Makefile Sun Dec 22 16:22:28 2013 (r337197) @@ -3,7 +3,7 @@ PORTNAME= algae PORTVERSION= 4.3.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -12,35 +12,17 @@ COMMENT= Programming language for numeri LICENSE= GPLv2 -USE_FORTRAN= yes -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf +BROKEN_ia64= does not compile +BROKEN_powerpc= does not compile +BROKEN_sparc64= does not compile -ALGAE_VERSION= ${PORTVERSION} -PLIST_SUB= ALGAE_VERSION=${ALGAE_VERSION} +GNU_CONFIGURE= yes +USES= fortran -LDFLAGS+= -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -L`${CAT} ${WRKSRC}/LIBDIR` -L${LOCALBASE}/lib -FORTRANLIBS= gfortranbegin gfortran +CONFIGURE_ARGS= --disable-dlmalloc --without-fftw --without-blas \ + --without-lapack --without-bcslib --without-npsol +PLIST_SUB= ALGAE_VERSION=${PORTVERSION} -MAN1= ${PORTNAME}.1 INFO= ${PORTNAME} -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e 's,<malloc\.h>,<stdlib.h>,' \ - ${WRKSRC}/src/mem.h \ - ${WRKSRC}/superlu/sp_coletree.c \ - ${WRKSRC}/superlu/util.h - @${REINPLACE_CMD} -e 's,%%FORTRANLIBS%%,${FORTRANLIBS},' \ - ${WRKSRC}/configure.in - -pre-configure: - @${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= does not compile on ${ARCH} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/algae/files/patch-Makefile.in ============================================================================== --- head/math/algae/files/patch-Makefile.in Sun Dec 22 16:11:41 2013 (r337196) +++ head/math/algae/files/patch-Makefile.in Sun Dec 22 16:22:28 2013 (r337197) @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sun May 18 17:22:07 2003 -+++ Makefile.in Sun May 18 17:23:00 2003 +--- Makefile.in.orig ++++ Makefile.in @@ -78,12 +78,12 @@ libdir = $(prefix)/lib @@ -112,23 +112,39 @@ clean mostlyclean distclean maintainer-clean:: rm -f a.out core conft* algae-*.tar algae-*.tar.gz -@@ -297,12 +293,9 @@ - $(INSTALL_DATA) algae.A $(RC0) - $(INSTALL_DATA) COPYING $(htmldir) - $(INSTALL_DATA) LICENSE $(htmldir) +@@ -294,15 +290,12 @@ + # >>>> End of deleted section. + + install: algae.A installdirs +- $(INSTALL_DATA) algae.A $(RC0) +- $(INSTALL_DATA) COPYING $(htmldir) +- $(INSTALL_DATA) LICENSE $(htmldir) - cd src; \ - $(MAKE) bindir=$(bindir) install - cd tools; \ - $(MAKE) tooldir=$(tooldir) install - cd doc; \ - $(MAKE) mandir=$(mandir) datadir=$(datadir) \ ++ $(INSTALL_DATA) algae.A $(DESTDIR)$(RC0) ++ $(INSTALL_DATA) COPYING $(DESTDIR)$(htmldir) ++ $(INSTALL_DATA) LICENSE $(DESTDIR)$(htmldir) + $(MAKE) -C src bindir=$(bindir) install + $(MAKE) -C tools tooldir=$(tooldir) install + $(MAKE) -C doc mandir=$(mandir) datadir=$(datadir) \ manext=$(manext) infodir=$(infodir) htmldir=$(htmldir) install .PHONY: install -@@ -318,9 +311,9 @@ +@@ -310,17 +303,17 @@ + # if necessary. + + installdirs: mkinstalldirs +- $(srcdir)/mkinstalldirs $(bindir) $(datadir) $(libdir) $(infodir) \ +- $(mandir) $(tooldir) $(rcdir) $(htmldir) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(libdir) $(DESTDIR)$(infodir) \ ++ $(DESTDIR)$(mandir) $(DESTDIR)$(tooldir) $(DESTDIR)$(rcdir) $(DESTDIR)$(htmldir) + .PHONY: installdirs + + # Why would anyone want to uninstall? uninstall: rm -f $(RC0) Added: head/math/algae/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/algae/files/patch-configure Sun Dec 22 16:22:28 2013 (r337197) @@ -0,0 +1,43 @@ +--- configure.orig ++++ configure +@@ -2561,9 +2561,9 @@ + cat > conftest.$ac_ext <<EOF + #line 2562 "configure" + #include "confdefs.h" +-int main(int argc, char *argv); ++int main(int argc, char **argv); + int t(void); +-int main(int argc, char *argv) { return t(); } ++int main(int argc, char **argv) { return t(); } + int t(void) { return 0; } + EOF + if eval $ac_compile; then +@@ -4479,7 +4479,7 @@ + *-unicos* ) f77_lib_names="F77 I77 sci f" ;; + * ) f77_lib_names="F77 I77" ;; + esac +-f77_lib_names="$f77_lib_names g2c f2c" ++f77_lib_names=gfortran + for f in $f77_lib_names; do reversed_names="$f $reversed_names"; done + + #--------------------------------------------------------------------- +@@ -5494,8 +5494,7 @@ + # checks (except for LAPACK) don't need it and won't find it. + + if test "$BLAS" = xblas; then +- LDFLAGS="$LDFLAGS -L../blas" +- LOCAL_LIBS="-lblas $LOCAL_LIBS" ++ LOCAL_LIBS="../blas/libblas.a $LOCAL_LIBS" + fi + + +@@ -5590,8 +5589,7 @@ + # checks don't need it and won't find it. + + if test "$LAPACK" = xlapack; then +- LDFLAGS="$LDFLAGS -L../lapack" +- LOCAL_LIBS="-llapack $LOCAL_LIBS" ++ LOCAL_LIBS="../lapack/liblapack.a $LOCAL_LIBS" + fi + + Added: head/math/algae/files/patch-doc-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/algae/files/patch-doc-Makefile.in Sun Dec 22 16:22:28 2013 (r337197) @@ -0,0 +1,23 @@ +--- doc/Makefile.in.orig ++++ doc/Makefile.in +@@ -173,15 +173,13 @@ + install: algae.info algae.1 algae_toc.html index.html info.db + -if test -f algae.info; then d=.; else d=$(srcdir); fi; \ + for f in $$d/algae.info $$d/algae.info-*; do \ +- $(INSTALL_DATA) $$f $(infodir); \ +- done; \ +- if $(SHELL) -c 'install-info --version' > /dev/null 2>&1; then \ +- install-info --info-dir=$(infodir) $$d/algae.info; else true; fi ++ $(INSTALL_DATA) $$f $(DESTDIR)$(infodir); \ ++ done + -if test -f algae_toc.html; then d=.; else d=$(srcdir); fi; \ + for f in $$d/index.html $$d/algae*.html $$d/icon.gif $$d/info.db; do \ +- $(INSTALL_DATA) $$f $(htmldir); done +- -rm -f $(datadir)/algae/html; ln -s $(htmldir) $(datadir)/algae/html +- -$(INSTALL_DATA) algae.1 $(mandir)/algae.$(manext) ++ $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir); done ++ -rm -f $(DESTDIR)$(datadir)/algae/html; ln -s $(htmldir) $(DESTDIR)$(datadir)/algae/html ++ -$(INSTALL_DATA) algae.1 $(DESTDIR)$(mandir)/algae.$(manext) + + uninstall: + rm -f $(infodir)/algae.info* $(mandir)/algae.$(manext) \ Added: head/math/algae/files/patch-src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/algae/files/patch-src-Makefile.in Sun Dec 22 16:22:28 2013 (r337197) @@ -0,0 +1,24 @@ +--- src/Makefile.in.orig ++++ src/Makefile.in +@@ -48,7 +48,7 @@ + + # Libraries. + +-LIBS = -L../arpack -larpack -L../superlu -lsuperlu @LOCAL_LIBS@ @LIBS@ ++LIBS = ../arpack/libarpack.a ../superlu/libsuperlu.a @LOCAL_LIBS@ @LIBS@ + + # Source files. + +@@ -218,9 +218,9 @@ + # ========================== Installation ========================== + + install: all +- $(INSTALL_PROGRAM) algae $(bindir)/algae-$(VERSION_NUMBER) +- rm -f $(bindir)/algae +- ln -s $(bindir)/algae-$(VERSION_NUMBER) $(bindir)/algae ++ $(INSTALL_PROGRAM) algae $(DESTDIR)$(bindir)/algae-$(VERSION_NUMBER) ++ rm -f $(DESTDIR)$(bindir)/algae ++ ln -s algae-$(VERSION_NUMBER) $(DESTDIR)$(bindir)/algae + .PHONY: install + + uninstall: Added: head/math/algae/files/patch-tools-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/algae/files/patch-tools-Makefile.in Sun Dec 22 16:22:28 2013 (r337197) @@ -0,0 +1,13 @@ +--- tools/Makefile.in.orig ++++ tools/Makefile.in +@@ -47,8 +47,8 @@ + # ========================== Installation ========================= + + install: tools.algae +- for f in *.A; do $(INSTALL_DATA) $$f $(tooldir); done +- $(INSTALL_DATA) tools.algae $(tooldir) ++ for f in *.A; do $(INSTALL_DATA) $$f $(DESTDIR)$(tooldir); done ++ $(INSTALL_DATA) tools.algae $(DESTDIR)$(tooldir) + .PHONY: install + + uninstall: Modified: head/math/algae/pkg-plist ============================================================================== --- head/math/algae/pkg-plist Sun Dec 22 16:11:41 2013 (r337196) +++ head/math/algae/pkg-plist Sun Dec 22 16:22:28 2013 (r337197) @@ -1,6 +1,7 @@ bin/algae bin/algae-%%ALGAE_VERSION%% lib/algae/%%ALGAE_VERSION%%/algae.A +man/man1/algae.1.gz %%DATADIR%%/%%ALGAE_VERSION%%/html/COPYING %%DATADIR%%/%%ALGAE_VERSION%%/html/LICENSE %%DATADIR%%/%%ALGAE_VERSION%%/html/algae.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312221622.rBMGMTi3027240>