View | Details | Raw Unified | Return to bug 243206 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-13 / +7 lines)
Lines 2-29 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	muscle
4
PORTNAME=	muscle
5
PORTVERSION=	3.8.31
5
PORTVERSION=	3.8.1551
6
CATEGORIES=	biology
6
CATEGORIES=	biology
7
MASTER_SITES=	http://www.drive5.com/muscle/downloads${PORTVERSION}/
7
MASTER_SITES=	http://www.drive5.com/muscle/
8
DISTNAME=	${PORTNAME}${PORTVERSION}_src
8
DISTNAME=	${PORTNAME}_src_${PORTVERSION}
9
9
10
MAINTAINER=	mzaki@m.u-tokyo.ac.jp
10
MAINTAINER=	mzaki@e-mail.ne.jp
11
COMMENT=	MUltiple Sequence Comparison by Log-Expectation
11
COMMENT=	MUltiple Sequence Comparison by Log-Expectation
12
12
13
FETCH_ARGS=	-A
13
LICENSE=	PD
14
14
15
WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/src
15
USES=		dos2unix gmake
16
16
NO_WRKSUBDIR=	yes
17
USES=		dos2unix
18
DOS2UNIX_GLOB=	*.cpp
17
DOS2UNIX_GLOB=	*.cpp
19
18
20
ALL_TARGET=	muscle
21
22
PLIST_FILES=	bin/muscle
19
PLIST_FILES=	bin/muscle
23
20
24
ONLY_FOR_ARCHS=		amd64 i386
25
ONLY_FOR_ARCHS_REASON=	Fails to install: tries to modify /dev/tty
26
27
do-install:
21
do-install:
28
	${INSTALL_PROGRAM} ${WRKSRC}/muscle ${STAGEDIR}${PREFIX}/bin
22
	${INSTALL_PROGRAM} ${WRKSRC}/muscle ${STAGEDIR}${PREFIX}/bin
29
23
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (muscle3.8.31_src.tar.gz) = 43c5966a82133bd7da5921e8142f2f592c2b5f53d802f0527a2801783af809ad
1
TIMESTAMP = 1578543217
2
SIZE (muscle3.8.31_src.tar.gz) = 515267
2
SHA256 (muscle_src_3.8.1551.tar.gz) = c70c552231cd3289f1bad51c9bd174804c18bb3adcf47f501afec7a68f9c482e
3
SIZE (muscle_src_3.8.1551.tar.gz) = 190019
(-)files/patch-Makefile (+28 lines)
Line 0 Link Here
1
--- Makefile.orig	2014-07-12 16:42:52 UTC
2
+++ Makefile
3
@@ -10,8 +10,8 @@
4
 # this is fixed by deleting "-static" from the LDLIBS line.
5
 
6
 CFLAGS = -O3 -funroll-loops -Winline -DNDEBUG=1
7
-LDLIBS = -lm -static
8
-# LDLIBS = -lm
9
+#LDLIBS = -lm -static
10
+LDLIBS = -lm
11
 
12
 OBJ = .o
13
 EXE =
14
@@ -19,7 +19,7 @@ EXE =
15
 RM = rm -f
16
 CP = cp
17
 
18
-GPP = g++
19
+GPP = $(CXX)
20
 LD = $(GPP) $(CFLAGS)
21
 CPP = $(GPP) -c $(CFLAGS) 
22
 
23
@@ -33,4 +33,4 @@ $(CPPOBJ): %.o: %.cpp
24
 
25
 muscle: $(CPPOBJ)
26
 	$(LD) -o muscle $(CPPOBJ) $(LDLIBS)
27
-	strip muscle
28
+#	strip muscle
(-)files/patch-globalslinux.cpp (-6 / +6 lines)
Lines 1-5 Link Here
1
--- globalslinux.cpp.orig	Tue Nov 30 05:09:50 2004
1
--- globalslinux.cpp.orig	2020-01-09 04:20:25 UTC
2
+++ globalslinux.cpp	Mon Jul  4 11:13:18 2005
2
+++ globalslinux.cpp
3
@@ -7,6 +7,12 @@
3
@@ -7,6 +7,12 @@
4
 #include <errno.h>
4
 #include <errno.h>
5
 #include <stdio.h>
5
 #include <stdio.h>
Lines 13-19 Link Here
13
 
13
 
14
 const int ONE_MB = 1000000;
14
 const int ONE_MB = 1000000;
15
 const int MEM_WARNING_THRESHOLD = 20*ONE_MB;
15
 const int MEM_WARNING_THRESHOLD = 20*ONE_MB;
16
@@ -39,6 +45,34 @@
16
@@ -39,6 +45,34 @@ const char *GetCmdLine()
17
 	return szCmdLine;
17
 	return szCmdLine;
18
 	}
18
 	}
19
 
19
 
Lines 48-54 Link Here
48
 double GetMemUseMB()
48
 double GetMemUseMB()
49
 	{
49
 	{
50
 	static char statm[64];
50
 	static char statm[64];
51
@@ -83,6 +117,7 @@
51
@@ -74,6 +108,7 @@ double GetMemUseMB()
52
 
52
 
53
 	return ((double) Pages * (double) PageSize)/1e6;
53
 	return ((double) Pages * (double) PageSize)/1e6;
54
 	}
54
 	}
Lines 56-62 Link Here
56
 
56
 
57
 void SaveCmdLine(int argc, char *argv[])
57
 void SaveCmdLine(int argc, char *argv[])
58
 	{
58
 	{
59
@@ -118,6 +153,28 @@
59
@@ -109,6 +144,28 @@ void CheckMemUse()
60
 		dPeakMemUseMB = dMB;
60
 		dPeakMemUseMB = dMB;
61
 	}
61
 	}
62
 
62
 
Lines 85-91 Link Here
85
 double GetRAMSizeMB()
85
 double GetRAMSizeMB()
86
 	{
86
 	{
87
 	const double DEFAULT_RAM = 500;
87
 	const double DEFAULT_RAM = 500;
88
@@ -168,5 +225,6 @@
88
@@ -159,5 +216,6 @@ double GetRAMSizeMB()
89
 	int Bytes = atoi(pMem+9)*1000;
89
 	int Bytes = atoi(pMem+9)*1000;
90
 	return ((double) Bytes)/1e6;
90
 	return ((double) Bytes)/1e6;
91
 	}
91
 	}
(-)files/patch-mk (-27 lines)
Lines 1-27 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 243206