View | Details | Raw Unified | Return to bug 191130
Collapse All | Expand All

(-)Makefile (-18 / +8 lines)
Lines 2-37 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	muscle
4
PORTNAME=	muscle
5
PORTVERSION=	3.6
5
PORTVERSION=	3.8.31
6
CATEGORIES=	biology
6
CATEGORIES=	biology
7
MASTER_SITES=	http://www.drive5.com/muscle/downloads${PORTVERSION}/
7
MASTER_SITES=	http://www.drive5.com/muscle/downloads${PORTVERSION}/
8
DISTNAME=	${PORTNAME}${PORTVERSION}_src
8
DISTNAME=	${PORTNAME}${PORTVERSION}_src
9
9
10
.if !defined(NOPORTDOCS)
11
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
12
DISTFILES=	${EXTRACT_ONLY}
13
PORTDOCS=	${PORTNAME}.pdf ${PORTNAME}.html
14
MASTER_SITES+=	http://www.drive5.com/muscle/:docs
15
.for file in ${PORTDOCS}
16
DISTFILES+=	${file}:docs
17
.endfor
18
.endif
19
20
MAINTAINER=	mzaki@m.u-tokyo.ac.jp
10
MAINTAINER=	mzaki@m.u-tokyo.ac.jp
21
COMMENT=	Multiple Sequence Comparison by Log-Expectation
11
COMMENT=	MUltiple Sequence Comparison by Log-Expectation
22
12
23
FETCH_ARGS=	-A
13
FETCH_ARGS=	-A
24
14
25
USES=		dos2unix gmake
15
WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/src
26
DOS2UNIX_FILES=	*.cpp
27
16
17
USES=		dos2unix
18
DOS2UNIX_GLOB=	*.cpp
19
20
ALL_TARGET=	muscle
21
28
PLIST_FILES=	bin/muscle
22
PLIST_FILES=	bin/muscle
29
23
30
do-install:
24
do-install:
31
	${INSTALL_PROGRAM} ${WRKSRC}/muscle ${STAGEDIR}${PREFIX}/bin
25
	${INSTALL_PROGRAM} ${WRKSRC}/muscle ${STAGEDIR}${PREFIX}/bin
32
.if !defined(NOPORTDOCS)
33
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
34
	${INSTALL_DATA} ${PORTDOCS:S|^|${DISTDIR}/|} ${STAGEDIR}${DOCSDIR}
35
.endif
36
26
37
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)distinfo (-6 / +2 lines)
Lines 1-6 Link Here
1
SHA256 (muscle3.6_src.tar.gz) = 32b818a51f421e1d687f513dc31374a330470950151a5e7df961e64781699431
1
SHA256 (muscle3.8.31_src.tar.gz) = 43c5966a82133bd7da5921e8142f2f592c2b5f53d802f0527a2801783af809ad
2
SIZE (muscle3.6_src.tar.gz) = 185267
2
SIZE (muscle3.8.31_src.tar.gz) = 515267
3
SHA256 (muscle.pdf) = a28fd0afc0919c176a9a1cedb3b46cadb24a53c575089305cc4b2967ec4a5fc9
4
SIZE (muscle.pdf) = 239031
5
SHA256 (muscle.html) = 4df43445f08d99e18da71a06438cc8fc3ba42b6709e19c8cfea0c31788dc17b6
6
SIZE (muscle.html) = 94645
(-)files/patch-Makefile (-35 lines)
Lines 1-35 Link Here
1
--- Makefile.orig	Fri Sep  9 07:26:04 2005
2
+++ Makefile	Tue Dec 20 18:50:33 2005
3
@@ -9,28 +9,14 @@
4
 # On OSX, using -static gives the error "ld: can't locate file for: -lcrt0.o",
5
 # this is fixed by deleting "-static" from the LDLIBS line.
6
 
7
-CFLAGS = -O3 -funroll-loops -Winline -DNDEBUG=1
8
-LDLIBS = -lm -static
9
-# LDLIBS = -lm
10
-
11
-OBJ = .o
12
-EXE =
13
-
14
-RM = rm -f
15
-CP = cp
16
-
17
-GPP = g++
18
-LD = $(GPP) $(CFLAGS)
19
-CPP = $(GPP) -c $(CFLAGS) 
20
+CC = g++
21
+CXXFLAGS += -O3 -funroll-loops -Winline -DNDEBUG=1
22
+LDLIBS = -lm -lkvm
23
 
24
 all: muscle
25
 
26
 CPPSRC = $(sort $(wildcard *.cpp))
27
 CPPOBJ	= $(subst .cpp,.o,$(CPPSRC))
28
 
29
-$(CPPOBJ): %.o: %.cpp
30
-	$(CPP) $< -o $@
31
-
32
 muscle: $(CPPOBJ)
33
-	$(LD) -o muscle $(CPPOBJ) $(LDLIBS)
34
-	strip muscle
35
+	$(LINK.o) -o $@ $^ $(LDLIBS)
(-)files/patch-intmath.cpp (-30 lines)
Lines 1-30 Link Here
1
--- intmath.cpp.orig	Tue Nov 30 05:09:50 2004
2
+++ intmath.cpp	Mon Jul  4 07:49:45 2005
3
@@ -8,13 +8,6 @@
4
 	return (PROB) pow(2.0, (double) Score/INTSCALE);
5
 	}
6
 
7
-static const double log2e = log2(exp(1.0));
8
-
9
-double lnTolog2(double ln)
10
-	{
11
-	return ln*log2e;
12
-	}
13
-
14
 double log2(double x)
15
 	{
16
 	if (0 == x)
17
@@ -24,6 +17,13 @@
18
 // Multiply by inverse of log(2) just in case multiplication
19
 // is faster than division.
20
 	return log(x)*dInvLn2;
21
+	}
22
+
23
+static const double log2e = log2(exp(1.0));
24
+
25
+double lnTolog2(double ln)
26
+	{
27
+	return ln*log2e;
28
 	}
29
 
30
 SCORE ProbToScore(PROB Prob)
(-)files/patch-mk (+27 lines)
Line 0 Link Here
1
--- mk.orig	2010-05-02 08:15:42.000000000 +0900
2
+++ mk	2014-06-17 23:45:55.000000000 +0900
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/bin/sh
6
 CPPNames='aligngivenpath aligngivenpathsw aligntwomsas aligntwoprofs aln alpha anchors bittraceback blosum62 blosumla clust cluster clwwt color cons diaglist diffobjscore diffpaths difftrees difftreese distcalc distfunc distpwkimura domuscle dosp dpreglist drawtree edgelist enumopts enumtostr estring fasta fasta2 fastclust fastdist fastdistjones fastdistkbit fastdistkmer fastdistmafft fastdistnuc fastscorepath2 finddiags finddiagsn glbalign glbalign352 glbaligndiag glbalignle glbalignsimple glbalignsp glbalignspn glbalignss glbalndimer globals globalslinux globalsosx globalsother globalswin32 gonnet henikoffweight henikoffweightpb html hydro intmath local main makerootmsa makerootmsab maketree mhack mpam200 msa msa2 msadistkimura msf muscle muscleout nucmx nwdasimple nwdasimple2 nwdasmall nwrec nwsmall objscore objscore2 objscoreda onexception options outweights pam200mafft params phy phy2 phy3 phy4 phyfromclust phyfromfile physeq phytofile posgap ppscore profdb profile profilefrommsa progalign progress progressivealign pwpath readmx realigndiffs realigndiffse refine refinehoriz refinesubfams refinetree refinetreee refinevert refinew savebest scoredist scoregaps scorehistory scorepp seq seqvect setblosumweights setgscweights setnewhandler spfast sptest stabilize subfam subfams sw termgaps textfile threewaywt tomhydro traceback tracebackopt tracebacksw treefrommsa typetostr upgma2 usage validateids vtml2 writescorefile'
7
 ObjNames='aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln.o alpha.o anchors.o bittraceback.o blosum62.o blosumla.o clust.o cluster.o clwwt.o color.o cons.o diaglist.o diffobjscore.o diffpaths.o difftrees.o difftreese.o distcalc.o distfunc.o distpwkimura.o domuscle.o dosp.o dpreglist.o drawtree.o edgelist.o enumopts.o enumtostr.o estring.o fasta.o fasta2.o fastclust.o fastdist.o fastdistjones.o fastdistkbit.o fastdistkmer.o fastdistmafft.o fastdistnuc.o fastscorepath2.o finddiags.o finddiagsn.o glbalign.o glbalign352.o glbaligndiag.o glbalignle.o glbalignsimple.o glbalignsp.o glbalignspn.o glbalignss.o glbalndimer.o globals.o globalslinux.o globalsosx.o globalsother.o globalswin32.o gonnet.o henikoffweight.o henikoffweightpb.o html.o hydro.o intmath.o local.o main.o makerootmsa.o makerootmsab.o maketree.o mhack.o mpam200.o msa.o msa2.o msadistkimura.o msf.o muscle.o muscleout.o nucmx.o nwdasimple.o nwdasimple2.o nwdasmall.o nwrec.o nwsmall.o objscore.o objscore2.o objscoreda.o onexception.o options.o outweights.o pam200mafft.o params.o phy.o phy2.o phy3.o phy4.o phyfromclust.o phyfromfile.o physeq.o phytofile.o posgap.o ppscore.o profdb.o profile.o profilefrommsa.o progalign.o progress.o progressivealign.o pwpath.o readmx.o realigndiffs.o realigndiffse.o refine.o refinehoriz.o refinesubfams.o refinetree.o refinetreee.o refinevert.o refinew.o savebest.o scoredist.o scoregaps.o scorehistory.o scorepp.o seq.o seqvect.o setblosumweights.o setgscweights.o setnewhandler.o spfast.o sptest.o stabilize.o subfam.o subfams.o sw.o termgaps.o textfile.o threewaywt.o tomhydro.o traceback.o tracebackopt.o tracebacksw.o treefrommsa.o typetostr.o upgma2.o usage.o validateids.o vtml2.o writescorefile.o'
8
 
9
@@ -6,16 +6,15 @@
10
 for CPPName in $CPPNames
11
 do
12
   echo $CPPName >> /dev/tty
13
-  g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o  >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
14
+  ${CXX} $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o  >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
15
 done
16
 
17
 LINK_OPTS=
18
 if [ `uname -s` == Linux ] ; then
19
     LINK_OPTS=-static
20
 fi
21
-g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames  >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
22
+${CXX} $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames  >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
23
 tail muscle.make.stderr.txt
24
 
25
-strip muscle
26
 ls -lh muscle
27
 sum muscle

Return to bug 191130