4 files changed, 38 insertions, 10 deletions

diff --git a/biology/boinc-simap/Makefile b/biology/boinc-simap/Makefile
index a7bd479be2d2..b765a9f23046 100644
--- a/biology/boinc-simap/Makefile
+++ b/biology/boinc-simap/Makefile
@@ -5,10 +5,10 @@
 #
 
 PORTNAME=	boinc-simap
-PORTVERSION=	5.10
+PORTVERSION=	${SIMAP_VERSION}.${HMMER_VERSION}
 CATEGORIES=	biology
 MASTER_SITES=	http://boinc.bio.wzw.tum.de/boincsimap/download/
-DISTNAME=	simap_${PORTVERSION}_${MACH}-pc-freebsd
+DISTNAME=	${SIMAP_BINARY} ${HMMER_BINARY}
 EXTRACT_SUFX=	#
 
 MAINTAINER=	pav@FreeBSD.org
@@ -27,9 +27,12 @@ BOINC_HOME?=	/var/db/boinc
 
 SIMAP_SITE=	boinc.bio.wzw.tum.de_boincsimap
 SIMAP_URL=	boinc.bio.wzw.tum.de/boincsimap
-SIMAP_BINARY=	${DISTNAME}
+SIMAP_BINARY=	simap_${SIMAP_VERSION}_${MACH}-pc-freebsd
+SIMAP_VERSION=	5.10
+HMMER_BINARY=	hmmer_${HMMER_VERSION}_${MACH}-pc-freebsd
+HMMER_VERSION=	5.09
 
-PLIST_SUB=	SIMAP_BINARY=${SIMAP_BINARY} SIMAP_SITE=${SIMAP_SITE} \
+PLIST_SUB=	SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} SIMAP_SITE=${SIMAP_SITE} \
 		BOINC_HOME=${BOINC_HOME}
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -51,7 +54,7 @@ AMD64=		"@comment "
 .endif
 
 SUB_FILES=	app_info.xml pkg-message
-SUB_LIST=	DISTNAME=${DISTNAME} APPVERSION=${PORTVERSION:S/.//} AMD64=${AMD64}
+SUB_LIST=	SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} SIMAP_APPVERSION=${SIMAP_VERSION:S/.//} HMMER_APPVERSION=${HMMER_VERSION:S/.//} AMD64=${AMD64}
 
 .if ${OSVERSION} < 600000
 IGNORE=		only supports FreeBSD 6.X and newer
@@ -59,13 +62,16 @@ IGNORE=		only supports FreeBSD 6.X and newer
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
+	@${CP} ${DISTDIR}/${SIMAP_BINARY} ${WRKDIR}
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${HMMER_BINARY} ${EXTRACT_AFTER_ARGS})
 
 do-install:
 	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
 	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects/${SIMAP_SITE}
 	${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SIMAP_SITE}
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/${SIMAP_BINARY} ${BOINC_HOME}/projects/${SIMAP_SITE}
+.for APP in ${DISTNAME}
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/${APP} ${BOINC_HOME}/projects/${SIMAP_SITE}
+.endfor
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/biology/boinc-simap/distinfo b/biology/boinc-simap/distinfo
index 361c19b52249..02f76957e12b 100644
--- a/biology/boinc-simap/distinfo
+++ b/biology/boinc-simap/distinfo
@@ -4,3 +4,9 @@ SIZE (simap_5.10_i386-pc-freebsd) = 391012
 MD5 (simap_5.10_i686-pc-freebsd) = 64a58aa385a0b4f06522caad715c2938
 SHA256 (simap_5.10_i686-pc-freebsd) = 360e29dcc7705e16254f3b33a8e2183c57fa54fb539b0a117a6484852b726e30
 SIZE (simap_5.10_i686-pc-freebsd) = 349724
+MD5 (hmmer_5.09_i386-pc-freebsd) = 88e169f4465692a3a124086181c4562d
+SHA256 (hmmer_5.09_i386-pc-freebsd) = 2cb02e6eafcae3cd8bea74a71c794e715df30112eab5be7e6473a7507ed60288
+SIZE (hmmer_5.09_i386-pc-freebsd) = 581267
+MD5 (hmmer_5.09_i686-pc-freebsd) = bc8dee0dbedb11d347fbcdd730a29aa2
+SHA256 (hmmer_5.09_i686-pc-freebsd) = 90f048c17d0cd944ead4b57a5c6de4b397df76fd39b5976f933a9004b8bcf91e
+SIZE (hmmer_5.09_i686-pc-freebsd) = 617590
diff --git a/biology/boinc-simap/files/app_info.xml.in b/biology/boinc-simap/files/app_info.xml.in
index 9e9ce6ee58ce..52679280e47e 100644
--- a/biology/boinc-simap/files/app_info.xml.in
+++ b/biology/boinc-simap/files/app_info.xml.in
@@ -2,15 +2,30 @@
     <app>
         <name>simap</name>
     </app>
+    <app>
+        <name>hmmer</name>
+    </app>
+    <file_info>
+        <name>%%SIMAP_BINARY%%</name>
+        <executable/>
+    </file_info>
     <file_info>
-        <name>%%DISTNAME%%</name>
+        <name>%%HMMER_BINARY%%</name>
         <executable/>
     </file_info>
     <app_version>
         <app_name>simap</app_name>
-        <version_num>%%APPVERSION%%</version_num>
+        <version_num>%%SIMAP_APPVERSION%%</version_num>
+       <file_ref>
+            <file_name>%%SIMAP_BINARY%%</file_name>
+            <main_program/>
+        </file_ref>
+    </app_version>
+    <app_version>
+        <app_name>hmmer</app_name>
+        <version_num>%%HMMER_APPVERSION%%</version_num>
        <file_ref>
-            <file_name>%%DISTNAME%%</file_name>
+            <file_name>%%HMMER_BINARY%%</file_name>
             <main_program/>
         </file_ref>
     </app_version>
diff --git a/biology/boinc-simap/pkg-plist b/biology/boinc-simap/pkg-plist
index b2721fbe82f7..ae390ed92135 100644
--- a/biology/boinc-simap/pkg-plist
+++ b/biology/boinc-simap/pkg-plist
@@ -1,4 +1,5 @@
 @cwd %%BOINC_HOME%%
 projects/%%SIMAP_SITE%%/app_info.xml
 projects/%%SIMAP_SITE%%/%%SIMAP_BINARY%%
+projects/%%SIMAP_SITE%%/%%HMMER_BINARY%%
 @unexec rmdir %D/projects/%%SIMAP_SITE%% 2>/dev/null || true