- Update to 2.0.3

6 files changed, 8 insertions, 61 deletions

diff --git a/biology/clustalw/Makefile b/biology/clustalw/Makefile
index 91b64b4ca491..7527622841f6 100644
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@@ -6,22 +6,17 @@
 #
 
 PORTNAME=	clustalw
-PORTVERSION=	2.0
+PORTVERSION=	2.0.3
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.ebi.ac.uk/pub/software/clustalw2/
-DISTNAME=	${PORTNAME}-linux-src-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CLUSTAL W Multiple Sequence Alignment Program
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
+GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-ALL_TARGET=	# empty
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/clustalw2 ${PREFIX}/bin
-	${LN} -sf clustalw2 ${PREFIX}/bin/clustalw
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/clustalw_help ${DATADIR}
+PLIST_FILES=	bin/clustalw2
 
 .include <bsd.port.mk>
diff --git a/biology/clustalw/distinfo b/biology/clustalw/distinfo
index 01cadf368b09..451e9a4adab7 100644
--- a/biology/clustalw/distinfo
+++ b/biology/clustalw/distinfo
@@ -1,3 +1,3 @@
-MD5 (clustalw-linux-src-2.0.tar.gz) = 04bb7bad022dad39bafc1db8c6d64446
-SHA256 (clustalw-linux-src-2.0.tar.gz) = e10c456f45f892936903069638271df6fb4bf30a84d0362ce62031f058408ded
-SIZE (clustalw-linux-src-2.0.tar.gz) = 274726
+MD5 (clustalw-2.0.3-src.tar.gz) = 77e7cf7fcea6084da22d2b19c52356c2
+SHA256 (clustalw-2.0.3-src.tar.gz) = 01a0dc2a3dc8d342367f5f7117749195a1c0d217c105d0a43e02565979cc459a
+SIZE (clustalw-2.0.3-src.tar.gz) = 287805
diff --git a/biology/clustalw/files/patch-Makefile b/biology/clustalw/files/patch-Makefile
deleted file mode 100644
index 0c97d76d5b5c..000000000000
--- a/biology/clustalw/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Wed Aug  8 18:21:23 2007
-+++ Makefile	Wed Oct 31 17:35:20 2007
-@@ -51,8 +51,8 @@
-           compiledObjects/RootedClusterTree.o compiledObjects/Iteration.o \
-           compiledObjects/InFileStream.o compiledObjects/ClustalWResources.o
- 
--CXX	= g++
--CXXFLAGS  = -c -O2
-+CXX	?= g++
-+CXXFLAGS  += -c -DDATADIR=\"${PREFIX}/share/clustalw\"
- LFLAGS	= -g
- 
- clustalw2: $(OBJECTS)
diff --git a/biology/clustalw/files/patch-general_ClustalWResources.cpp b/biology/clustalw/files/patch-general_ClustalWResources.cpp
deleted file mode 100644
index 998edbc5b93e..000000000000
--- a/biology/clustalw/files/patch-general_ClustalWResources.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- general/ClustalWResources.cpp.orig	Thu Jul 19 18:44:22 2007
-+++ general/ClustalWResources.cpp	Wed Oct 31 17:39:01 2007
-@@ -33,7 +33,7 @@
-     executablePath = ".";
-     
-     //installPath
--    installPath = ".";
-+    installPath = DATADIR;
-     char *env;
-     if ((env = getenv(CLUW_INSTALL_DIR)) != 0) 
-     {
diff --git a/biology/clustalw/files/patch-general_Utility.cpp b/biology/clustalw/files/patch-general_Utility.cpp
deleted file mode 100644
index 1bbb53d99f9a..000000000000
--- a/biology/clustalw/files/patch-general_Utility.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- general/Utility.cpp.orig	Wed May 23 22:47:41 2007
-+++ general/Utility.cpp	Wed Oct 31 17:19:21 2007
-@@ -144,7 +144,7 @@
-     while (true)
-     {
-         fprintf(stdout, "%s (%.1f-%.1f)   [%.1f]: ", instr, minx, maxx, def);
--        gets(line);
-+        fgets(line, 1024, stdin);
-         status = sscanf(line, "%f", &ret);
-         if (status == EOF)
-         {
-@@ -181,7 +181,7 @@
-     while (true)
-     {
-         fprintf(stdout, "%s (%d..%d)    [%d]: ", instr, minx, maxx, def);
--        gets(line);
-+        fgets(line, 1024, stdin);
-         status = sscanf(line, "%d", &ret);
-         if (status == EOF)
-         {
diff --git a/biology/clustalw/pkg-plist b/biology/clustalw/pkg-plist
deleted file mode 100644
index 8d07bcec1a07..000000000000
--- a/biology/clustalw/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/clustalw
-bin/clustalw2
-share/clustalw/clustalw_help
-@dirrm share/clustalw