From a38e0d98468d061c64ee06db9c5ad33b8de50b08 Mon Sep 17 00:00:00 2001 From: pvalchev Date: Fri, 7 May 2004 23:35:51 +0000 Subject: [PATCH] Update to mcl-04-105 from maintainer Andreas Kahari --- math/mcl/Makefile | 4 ++-- math/mcl/distinfo | 6 ++--- math/mcl/patches/patch-configure | 6 ++--- math/mcl/patches/patch-src_doc_Makefile_in | 22 ------------------- math/mcl/patches/patch-src_graphs_Makefile_in | 10 ++++----- math/mcl/pkg/DESCR | 10 ++++----- math/mcl/pkg/PLIST | 12 +++++++++- 7 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 math/mcl/patches/patch-src_doc_Makefile_in diff --git a/math/mcl/Makefile b/math/mcl/Makefile index f87d2e38182..2c3ea5cdb56 100644 --- a/math/mcl/Makefile +++ b/math/mcl/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2003/10/17 19:22:07 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2004/05/07 23:35:51 pvalchev Exp $ COMMENT= "clustering algorithm for graphs" -V= 03-276 +V= 04-105 DISTNAME= mcl-${V} PKGNAME= mcl-${V:S,-,_,} CATEGORIES= math diff --git a/math/mcl/distinfo b/math/mcl/distinfo index 6708613a7c0..2460fdf4f5c 100644 --- a/math/mcl/distinfo +++ b/math/mcl/distinfo @@ -1,3 +1,3 @@ -MD5 (mcl-03-276.tar.gz) = c51a0ee1952a09b568cfefea24adecd7 -RMD160 (mcl-03-276.tar.gz) = 045787e28bf832a919465ab8c51da0c765aa8f8c -SHA1 (mcl-03-276.tar.gz) = a16c89cff0fc3aa52c789fd9f023e5c9bafc7adf +MD5 (mcl-04-105.tar.gz) = fbb023dbec23912c14a9e754a13ecdf0 +RMD160 (mcl-04-105.tar.gz) = 4e95a91bcb82fcc12963d7ae3db3176a5b5c40a6 +SHA1 (mcl-04-105.tar.gz) = 2c6665b7e11cd5383758e2b56956a52e237463fe diff --git a/math/mcl/patches/patch-configure b/math/mcl/patches/patch-configure index bfd86001f33..f42878079d3 100644 --- a/math/mcl/patches/patch-configure +++ b/math/mcl/patches/patch-configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2003/07/08 10:55:20 sturm Exp $ ---- configure.orig Tue Jul 8 12:22:58 2003 -+++ configure Tue Jul 8 12:41:36 2003 +$OpenBSD: patch-configure,v 1.2 2004/05/07 23:35:51 pvalchev Exp $ +--- configure.orig 2004-05-07 23:24:32.000000000 +0100 ++++ configure 2004-05-07 23:26:05.000000000 +0100 @@ -2956,13 +2956,13 @@ fi # FIXME: Replace `main' with a function in `-lpthread': diff --git a/math/mcl/patches/patch-src_doc_Makefile_in b/math/mcl/patches/patch-src_doc_Makefile_in deleted file mode 100644 index 1d180f53932..00000000000 --- a/math/mcl/patches/patch-src_doc_Makefile_in +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_doc_Makefile_in,v 1.1 2003/10/17 19:22:07 naddy Exp $ ---- src/doc/Makefile.in.orig 2003-10-10 23:42:24.000000000 +0100 -+++ src/doc/Makefile.in 2003-10-10 23:42:59.000000000 +0100 -@@ -441,6 +441,18 @@ uninstall-man: uninstall-man1 uninstall- - .1.txt: - $(TROFF) -t -e -mandoc -Tascii $< | $(COL) -bx > $@ - -+.5.ps: -+ $(TROFF) -man $< > $@ -+ -+.5.txt: -+ $(TROFF) -t -e -mandoc -Tascii $< | $(COL) -bx > $@ -+ -+.7.ps: -+ $(TROFF) -man $< > $@ -+ -+.7.txt: -+ $(TROFF) -t -e -mandoc -Tascii $< | $(COL) -bx > $@ -+ - .azm.html: - $(ZOEM) -d html -i $< -o $@ - $(ZOEM) -d html -i $< -o $@ diff --git a/math/mcl/patches/patch-src_graphs_Makefile_in b/math/mcl/patches/patch-src_graphs_Makefile_in index aeed841bea7..5ac54bf0a5d 100644 --- a/math/mcl/patches/patch-src_graphs_Makefile_in +++ b/math/mcl/patches/patch-src_graphs_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_graphs_Makefile_in,v 1.1.1.1 2003/07/08 10:55:20 sturm Exp $ ---- src/graphs/Makefile.in.orig Mon Jul 7 10:49:41 2003 -+++ src/graphs/Makefile.in Mon Jul 7 10:51:02 2003 +$OpenBSD: patch-src_graphs_Makefile_in,v 1.2 2004/05/07 23:35:51 pvalchev Exp $ +--- src/graphs/Makefile.in.orig 2004-05-07 23:30:44.000000000 +0100 ++++ src/graphs/Makefile.in 2004-05-07 23:32:11.000000000 +0100 @@ -82,7 +82,9 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ @@ -10,5 +10,5 @@ $OpenBSD: patch-src_graphs_Makefile_in,v 1.1.1.1 2003/07/08 10:55:20 sturm Exp $ +# OpenBSD wants examples in a different location... +exampledir = $(datadir)/examples/$(PACKAGE) - example_DATA = falkner.mci proteins.mci small.mci small.png small.ps\ - data.raw data.hdr data.tab small.tab fznyy.tab + example_DATA = falkner.mci proteins.mci matula.mci \ + small.mci small.png small.ps\ diff --git a/math/mcl/pkg/DESCR b/math/mcl/pkg/DESCR index eb0c052e75d..cdd49072a45 100644 --- a/math/mcl/pkg/DESCR +++ b/math/mcl/pkg/DESCR @@ -1,8 +1,8 @@ -The MCL algorithm is short for the Markov Cluster Algorithm, -a fast and scalable cluster algorithm for graphs based on -simulation of (stochastic) flow in graphs. The algorithm was -developed by Stijn van Dongen at the Centre for Mathematics and -Computer Science (also known as CWI) in the Netherlands. +The Markov Cluster Algorithm (MCL) is a fast and scalable +cluster algorithm for graphs based on simulation of (stochastic) +flow in graphs. The algorithm was developed by Stijn van Dongen +at the Centre for Mathematics and Computer Science in the +Netherlands. The MCL algorithm is very fast, very scalable, and has a number of attractive properties causing it to deliver high-quality diff --git a/math/mcl/pkg/PLIST b/math/mcl/pkg/PLIST index 19456385908..62eaa381fe3 100644 --- a/math/mcl/pkg/PLIST +++ b/math/mcl/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2003/10/17 19:22:07 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.3 2004/05/07 23:35:51 pvalchev Exp $ bin/clmdist bin/clmformat bin/clmimac @@ -9,6 +9,7 @@ bin/clmresidue bin/mcl bin/mclpipeline bin/mcx +bin/mcxarray bin/mcxassemble bin/mcxconvert bin/mcxmap @@ -23,12 +24,15 @@ man/man1/clmresidue.1 man/man1/mcl.1 man/man1/mclpipeline.1 man/man1/mcx.1 +man/man1/mcxarray.1 man/man1/mcxassemble.1 man/man1/mcxconvert.1 man/man1/mcxmap.1 man/man1/mcxsubs.1 man/man5/mcxio.5 +man/man7/mclfamily.7 man/man7/mclfaq.7 +man/man7/mclindex.7 share/doc/mcl/clmdist.html share/doc/mcl/clmdist.ps share/doc/mcl/clmformat.html @@ -47,14 +51,19 @@ share/doc/mcl/index.html share/doc/mcl/mcl.html share/doc/mcl/mcl.ps share/doc/mcl/mcl.txt +share/doc/mcl/mclfamily.html +share/doc/mcl/mclfamily.ps share/doc/mcl/mclfaq.html share/doc/mcl/mclfaq.ps share/doc/mcl/mclfaq.txt +share/doc/mcl/mclindex.ps share/doc/mcl/mclmcl.txt share/doc/mcl/mclpipeline.html share/doc/mcl/mclpipeline.ps share/doc/mcl/mcx.html share/doc/mcl/mcx.ps +share/doc/mcl/mcxarray.html +share/doc/mcl/mcxarray.ps share/doc/mcl/mcxassemble.html share/doc/mcl/mcxassemble.ps share/doc/mcl/mcxconvert.html @@ -70,6 +79,7 @@ share/examples/mcl/data.raw share/examples/mcl/data.tab share/examples/mcl/falkner.mci share/examples/mcl/fznyy.tab +share/examples/mcl/matula.mci share/examples/mcl/proteins.mci share/examples/mcl/small.mci share/examples/mcl/small.png