6 files changed, 81 insertions, 51 deletions

diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index ef7350de3aef..c56cd8c4bdc7 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -5,29 +5,49 @@
 #
 
 PORTNAME=	boinc-setiathome-enhanced
-PORTVERSION=	5.12
+PORTVERSION=	5.13
 CATEGORIES=	astro
-MASTER_SITES=	http://www.lb.shuttle.de/apastron/boinc/
-DISTNAME=	seti${PORTVERSION}freebsd-i386
+MASTER_SITES=	http://home.tiscali.nl/rladan/distfiles/
 
 MAINTAINER=	r.c.ladan@gmail.com
 COMMENT=	Setiathome Enhanced for BOINC
 
-USE_BZIP2=	yes
-
-.include <bsd.port.pre.mk>
-
-ONLY_FOR_ARCHS=	i386 amd64
-
-.if ${OSVERSION} >= 600000
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
-#also depends on libm.so.3, libstdc++.so.4, libpthread.so.1
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \
+		${LOCALBASE}/include/BOINC/std_fixes.h:${PORTSDIR}/net/boinc-client
+# fftw3f is statically linked :
+LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float
+RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
+
+# The compiler flags below are copied from m4/optimizations.m4,
+# leaving out the -march flag which is set by /usr/share/mk/bsd.cpu.mk
+.if ${MACHINE_CPU:Msse3}
+CFLAGS+=	-msse3 -mfpmath=sse
+.elif ${MACHINE_CPU:Msse2}
+CFLAGS+=	-msse2 -mfpmath=sse
+.elif ${MACHINE_CPU:Msse}
+CFLAGS+=	-msse -mfpmath=sse
 .endif
+.if ${MACHINE_CPU:Mmmx}
+CFLAGS+=	-mmmx -mfpmath=387
+.endif
+.ifdef ${MACHINE_CPU:M3dnow}
+CFLAGS+=	-m3dnow -mfpmath=387
+.endif
+# From http://www,lb.shuttle.de/apastron/boincDown.shtml :
+# what about other 64 bit archs (especially S/390, see gcc.info.gz) ?
+.ifdef ${MACHINE_CPU:Mamd64}
+CFLAGS+=	-m64
+.endif
+# no SPARC options (-mvis) available for autodection
 
-RUN_DEPENDS+=	boinc_client:${PORTSDIR}/net/boinc-client
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+CFLAGS+=	-I${LOCALBASE}/include -funroll-loops -ffast-math -O3
+CXXFLAGS+=	${CFLAGS}
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		BOINCDIR="${LOCALBASE}"
+CONFIGURE_ARGS=	--disable-server \
+		--disable-graphics
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
 BOINC_USER?=	boinc
@@ -35,33 +55,29 @@ BOINC_GROUP?=	nobody
 BOINC_HOME?=	/var/db/boinc
 
 SETI_SITE=	setiathome.berkeley.edu
-SETI_BINARY=	setiathome-${PORTVERSION}.i386-unknown-freebsd
-
-.if ${ARCH} == amd64 && ${OSVERSION} >= 600000
-AMD64=		""
-.else
-AMD64=		"@comment "
-.endif
+SETI_BINARY=	setiathome-${PORTVERSION}.${ARCH}-portbld-freebsd
 
-SUB_FILES=	pkg-message
-SUB_LIST=	AMD64=${AMD64}
+SUB_FILES=	app_info.xml
+SUB_LIST=	STRIPPED_PORTVERSION=${PORTVERSION:S/.//} \
+		SETI_BINARY="${SETI_BINARY}"
 
 PLIST_SUB=	SETI_BINARY="${SETI_BINARY}" SETI_SITE=${SETI_SITE} \
 		BOINC_HOME=${BOINC_HOME}
 
+PORTDOCS=	AUTHORS COPYING COPYRIGHT README checkin_notes
 do-install:
 	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects/${SETI_SITE}$
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/${SETI_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects/${SETI_SITE}
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKSRC}/client/${SETI_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
 	${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SETI_SITE}/
-.if !defined(NOPORTDOCS)
+.ifndef NOPORTDOCS
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS CHANGES COPYING COPYRIGHT README
-	${INSTALL_DATA} ${WRKDIR}/${file} ${DOCSDIR}/${file}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file}
 .endfor
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/boinc-setiathome-enhanced/distinfo b/astro/boinc-setiathome-enhanced/distinfo
index 3a5d0f0035cf..e82dd4df3c21 100644
--- a/astro/boinc-setiathome-enhanced/distinfo
+++ b/astro/boinc-setiathome-enhanced/distinfo
@@ -1,3 +1,3 @@
-MD5 (seti5.12freebsd-i386.tar.bz2) = f15959f52b11305e330c28484281da51
-SHA256 (seti5.12freebsd-i386.tar.bz2) = d4813a3796da6b5dd5ac3c22bde3a75f438e68430e7ef81537c22e2cba4458a8
-SIZE (seti5.12freebsd-i386.tar.bz2) = 456053
+MD5 (boinc-setiathome-enhanced-5.13.tar.gz) = 15cbcce330cddf418573adf0f7cfc649
+SHA256 (boinc-setiathome-enhanced-5.13.tar.gz) = 86877601e21e0567a4266a6c8014606b9853a7336d9efc1255c8f25f5b7fe951
+SIZE (boinc-setiathome-enhanced-5.13.tar.gz) = 777562
diff --git a/astro/boinc-setiathome-enhanced/files/app_info.xml.in b/astro/boinc-setiathome-enhanced/files/app_info.xml.in
new file mode 100644
index 000000000000..cdcbc0a953ee
--- /dev/null
+++ b/astro/boinc-setiathome-enhanced/files/app_info.xml.in
@@ -0,0 +1,17 @@
+<app_info>
+    <app>
+        <name>setiathome_enhanced</name>
+    </app>
+    <file_info>
+        <name>%%SETI_BINARY%%</name>
+        <executable/>
+    </file_info>
+    <app_version>
+        <app_name>setiathome_enhanced</app_name>
+        <version_num>%%STRIPPED_PORTVERSION%%</version_num>
+        <file_ref>
+            <file_name>%%SETI_BINARY%%</file_name>
+            <main_program/>
+        </file_ref>
+    </app_version>
+</app_info>
diff --git a/astro/boinc-setiathome-enhanced/pkg-descr b/astro/boinc-setiathome-enhanced/pkg-descr
index 4224d98b2102..474be66260c7 100644
--- a/astro/boinc-setiathome-enhanced/pkg-descr
+++ b/astro/boinc-setiathome-enhanced/pkg-descr
@@ -1,10 +1,19 @@
 SETI - Search for Extra-Terrestrial Intelligence -- Enhanced version
 
 Use your unused CPU cycles to aid in computations analyzing radio
-telescope information for possible signs of ET.  The project exclusively
-uses the enhanced version as of 2006-05-17.
+telescope information for possible signs of extra-terrestrial intelligence.
+The project exclusively uses the enhanced version since 2006-05-17.
 
-This version is a FreeBSD binary built by Stefan Urbat for Pentium II
-or AMD K6 CPUs and higher (requires MMX instructions). 
+The port automatically optimizes for the host CPU using the CPUTYPE
+variable in /etc/make.conf
 
-WWW: http://www.lb.shuttle.de/apastron/boincDown.shtml#freebsd
+Note that there is currently no screensaver support in this version.
+
+The source archive is a repackaged version of
+setiathome_enhanced-client-cvs-2006-05-12.tar.gz at
+http://setiathome.berkeley.edu/seti_source/nightly/old/ :
+* The screensaver and server code is removed
+* The configure and Makefile scripts are regenerated to match the
+  net/boinc-client port
+
+WWW: http://home.tiscali.nl/rladan/distfiles/
diff --git a/astro/boinc-setiathome-enhanced/files/pkg-message.in b/astro/boinc-setiathome-enhanced/pkg-message
index ec1fba67304e..ec27395eea77 100644
--- a/astro/boinc-setiathome-enhanced/files/pkg-message.in
+++ b/astro/boinc-setiathome-enhanced/pkg-message
@@ -14,9 +14,3 @@ MANUAL INSTALLATION
     cd /var/db/boinc
     boinc_cmd --project_attach setiathome.berkeley.edu <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%%*****************************************************************************
diff --git a/astro/boinc-setiathome-enhanced/pkg-plist b/astro/boinc-setiathome-enhanced/pkg-plist
index da986802e005..c1e26054226b 100644
--- a/astro/boinc-setiathome-enhanced/pkg-plist
+++ b/astro/boinc-setiathome-enhanced/pkg-plist
@@ -1,9 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @cwd %%BOINC_HOME%%/projects
 %%SETI_SITE%%/app_info.xml
 %%SETI_SITE%%/%%SETI_BINARY%%