- Update to milkyway-0.7, which 1) have work available 2) runs 10 times hotter

  than the old app

4 files changed, 27 insertions, 39 deletions

diff --git a/astro/boinc-milkyway/Makefile b/astro/boinc-milkyway/Makefile
index db2deab83447..a17b48edf5cc 100644
--- a/astro/boinc-milkyway/Makefile
+++ b/astro/boinc-milkyway/Makefile
@@ -6,29 +6,26 @@
 #
 
 PORTNAME=	boinc-milkyway
-PORTVERSION=	1.21
+PORTVERSION=	0.7
+PORTEPOCH=	1
 CATEGORIES=	astro
-MASTER_SITES=	http://milkyway.cs.rpi.edu/milkyway/download/
-DISTNAME=	astronomy_${PORTVERSION}_${ARCH}-unknown-freebsd
+MASTER_SITES=	http://milkyway.cs.rpi.edu/milkyway/download/code_release/
+DISTNAME=	milkyway_release_${PORTVERSION}.tar
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Modelling the evolution of the Milkyway Galaxy
 
 EXTRACT_SUFX=	#
 
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/version.h:${PORTSDIR}/net/boinc-client
+RUN_DEPENDS+=	boinc_client:${PORTSDIR}/net/boinc-client
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${OSVERSION} >= 700000
-LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
-.endif
-
-RUN_DEPENDS+=	boinc_client:${PORTSDIR}/net/boinc-client
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-STRIP=		#
+WRKSRC=		${WRKDIR}/milkyway/bin
+MAKEFILE=	make.linux
+USE_GMAKE=	yes
+ALL_TARGET=	app_x86_64
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
 BOINC_USER?=	boinc
@@ -37,29 +34,29 @@ BOINC_HOME?=	/var/db/boinc
 
 MILKYWAY_SITE=	milkyway.cs.rpi.edu_milkyway
 MILKYWAY_URL=	milkyway.cs.rpi.edu/milkyway
-MILKYWAY_BINARY=${DISTNAME}
-
-.if ${ARCH} == amd64 && ${OSVERSION} >= 600000
-AMD64=		""
-.else
-AMD64=		"@comment "
-.endif
+MILKYWAY_BINARY=milkyway_${PORTVERSION}_${ARCH}-portbuild-freebsd
 
 SUB_FILES=	pkg-message app_info.xml
-SUB_LIST=	AMD64=${AMD64} MILKYWAY_VERSION=${PORTVERSION:S/.//} MILKYWAY_BINARY="${MILKYWAY_BINARY}"
+SUB_LIST=	MILKYWAY_VERSION=0${PORTVERSION:S/.//} MILKYWAY_BINARY="${MILKYWAY_BINARY}"
 
 PLIST_SUB=	MILKYWAY_BINARY="${MILKYWAY_BINARY}" MILKYWAY_SITE=${MILKYWAY_SITE} \
 		BOINC_HOME=${BOINC_HOME}
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/software/boinc-6.3.14-0/pkg/include/boinc|${LOCALBASE}/include/boinc|' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|/projects/wcl/software/boinc|${LOCALBASE}/lib|' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|/api$$|| ; /^BOINC_LIB_/s|/lib$$||' ${WRKSRC}/${MAKEFILE}
+.if ${OSVERSION} < 700042
+	@${REINPLACE_CMD} -e 's|-ftree-vectorize ||' ${WRKSRC}/${MAKEFILE}
+.endif
 
 do-install:
 	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
 	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects/${MILKYWAY_SITE}
 	${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${MILKYWAY_SITE}
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/${MILKYWAY_BINARY} ${BOINC_HOME}/projects/${MILKYWAY_SITE}
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKSRC}/milkyway_${PORTVERSION}_x86_64-pc-linux-gnu ${BOINC_HOME}/projects/${MILKYWAY_SITE}/${MILKYWAY_BINARY}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/astro/boinc-milkyway/distinfo b/astro/boinc-milkyway/distinfo
index 03ba6e78bc95..5b3a6c5adf89 100644
--- a/astro/boinc-milkyway/distinfo
+++ b/astro/boinc-milkyway/distinfo
@@ -1,6 +1,3 @@
-MD5 (astronomy_1.21_amd64-unknown-freebsd) = b0e2def4033f1d6931b9aea552c6abe6
-SHA256 (astronomy_1.21_amd64-unknown-freebsd) = fe17316df1de0916af60e23b8953be4329514ba1dd0fb691df1b46801a7a464d
-SIZE (astronomy_1.21_amd64-unknown-freebsd) = 315101
-MD5 (astronomy_1.21_i386-unknown-freebsd) = 0c7db6aec0895c2ff2bb071b2b202797
-SHA256 (astronomy_1.21_i386-unknown-freebsd) = 5e1a1af979c18c1056df905a81174374add773c1d746127a0304b76f2fd58bd5
-SIZE (astronomy_1.21_i386-unknown-freebsd) = 288688
+MD5 (milkyway_release_0.7.tar) = 0067797f44443b78b5b9e5b8d4ef9bde
+SHA256 (milkyway_release_0.7.tar) = 54b8347087a82c6339713e7dbb1981eabae6378fe760add141d3e4b9b4113bf9
+SIZE (milkyway_release_0.7.tar) = 1570748
diff --git a/astro/boinc-milkyway/files/app_info.xml.in b/astro/boinc-milkyway/files/app_info.xml.in
index 2f98574f77b1..06de67dd5d59 100644
--- a/astro/boinc-milkyway/files/app_info.xml.in
+++ b/astro/boinc-milkyway/files/app_info.xml.in
@@ -1,13 +1,13 @@
 <app_info>
 <app>
-<name>astronomy</name>
+<name>milkyway</name>
 </app>
 <file_info>
 <name>%%MILKYWAY_BINARY%%</name>
 <executable/>
 </file_info>
 <app_version>
-<app_name>astronomy</app_name>
+<app_name>milkyway</app_name>
 <version_num>%%MILKYWAY_VERSION%%</version_num>
 <file_ref>
 <file_name>%%MILKYWAY_BINARY%%</file_name>
diff --git a/astro/boinc-milkyway/files/pkg-message.in b/astro/boinc-milkyway/files/pkg-message.in
index 4929ccf9b2f5..672dabeb53f1 100644
--- a/astro/boinc-milkyway/files/pkg-message.in
+++ b/astro/boinc-milkyway/files/pkg-message.in
@@ -14,9 +14,3 @@ MANUAL INSTALLATION
     cd /var/db/boinc
     boinc_cmd --project_attach milkyway.cs.rpi.edu/milkyway <account key>
 *****************************************************************************
-%%AMD64%%  IMPORTANT NOTICE FOR AMD64 USERS RUNNING 6.X:
-%%AMD64%%
-%%AMD64%% You have to have this line in /etc/libmap32.conf:
-%%AMD64%%   libpthread.so.1	libc_r.so.5
-%%AMD64%% before you attach the project.  Otherwise it will not work.
-%%AMD64%%*****************************************************************************