6 files changed, 123 insertions, 98 deletions

diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index 153b648bb592..32a719ae8421 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -5,91 +5,146 @@
 #
 
 PORTNAME=	boinc-setiathome-enhanced
-PORTVERSION=	5.27
-PORTREVISION=	3
+PORTVERSION=	${SETI_PORTVERSION_FULL}.${AP_PORTVERSION_FULL}
 CATEGORIES=	astro
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
+DISTFILES=	astropulse-${AP_PORTVERSION_FULL}.tar.bz2 setiathome-${SETI_PORTVERSION_FULL}.tar.bz2
 
-MAINTAINER=	r.c.ladan@gmail.com
-COMMENT=	Setiathome Enhanced for BOINC
+MAINTAINER=	rene@freebsd.org
+COMMENT=	Setiathome Enhanced/Astropulse for BOINC
 
+# don't use USE_AUTOTOOLS because we want to invoke it in a non-default way
 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
+		${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client \
+		${LOCALBASE}/bin/autoconf-2.62:${PORTSDIR}/devel/autoconf262 \
+		${LOCALBASE}/bin/automake-1.8:${PORTSDIR}/devel/automake18 \
+		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf-wrapper \
+		${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake-wrapper \
+		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
+LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		xcb.1:${PORTSDIR}/x11/libxcb
 
+USE_GL=		gl glu glut
+USE_XORG=	ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm
+
+USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig
+NO_WRKSUBDIR=	yes
 
-# 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
-.elif ${MACHINE_CPU:Msse2}
-CFLAGS+=	-msse2
-.elif ${MACHINE_CPU:Msse}
-CFLAGS+=	-msse
-.endif
-.if ${MACHINE_CPU:Mmmx}
-CFLAGS+=	-mmmx
-.endif
-.ifdef ${MACHINE_CPU:M3dnow}
-CFLAGS+=	-m3dnow
-.endif
-.if ${MACHINE_CPU:Msse3} || ${MACHINE_CPU:Msse2} || ${MACHINE_CPU:Msse}
-CFLAGS+=	-mfpmath=sse
-.else
-CFLAGS+=	-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
+SETI_PORTVERSION=6.3
+SETI_PORTVERSION_FULL=6.03
+AP_PORTVERSION=5.0
+AP_PORTVERSION_FULL=5.00
 
-CFLAGS+=	-I${LOCALBASE}/include -funroll-loops -ffast-math -O3
-CXXFLAGS+=	${CFLAGS}
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		BOINCDIR="${LOCALBASE}"
+CFLAGS+=	-I${LOCALBASE}/include/boinc -O2 -I${LOCALBASE}/include -L${LOCALBASE}/lib
+.if defined(CPUTYPE)
+CFLAGS+=	-march=${CPUTYPE}
+.endif
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
 BOINC_USER?=	boinc
 BOINC_GROUP?=	nobody
 BOINC_HOME?=	/var/db/boinc
 
-SETI_SITE=	setiathome.berkeley.edu
-SETI_BINARY=	setiathome-${PORTVERSION}.${ARCH}-portbld-freebsd
+OPTIONS=	SETI_APP	"Install SETI@home binary" on \
+		AP_APP		"Install Astropulse binary" on
+
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} >= 700000)
+CFLAGS+=	-mtune=native
+.endif
+CXXFLAGS+=	${CFLAGS}
+
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		BOINCDIR="${LOCALBASE}" \
+		BOINC_DIR="${LOCALBASE}"
+CONFIGURE_FLAGS+=	--disable-static-client --with-boinc-platform=${ARCH}-portbld-freebsd --build=${ARCH}-portbld-freebsd
+
+.if defined(WITHOUT_SETI_APP) && defined(WITHOUT_AP_APP)
+IGNORE=	neither SETI@home nor Astropulse selected
+.endif
 
-SUB_FILES=	app_info.xml
-SUB_LIST=	STRIPPED_PORTVERSION=${PORTVERSION:S/.//} \
-		SETI_BINARY="${SETI_BINARY}"
+SETI_SITE=	setiathome.berkeley.edu
+SETI_BINARY=	setiathome-${SETI_PORTVERSION}.${ARCH}-portbld-freebsd
+AP_BINARY=	astropulse-${AP_PORTVERSION}.${ARCH}-portbld-freebsd
 
-PLIST_SUB=	SETI_BINARY="${SETI_BINARY}" SETI_SITE=${SETI_SITE} \
+PLIST_SUB=	SETI_BINARY=${SETI_BINARY} \
+		AP_BINARY=${AP_BINARY} \
+		SETI_SITE=${SETI_SITE} \
 		BOINC_HOME=${BOINC_HOME}
 
-PORTDOCS=	AUTHORS COPYING COPYRIGHT README checkin_notes
+do-configure:
+.if !defined(WITHOUT_AP_APP)
+	(cd ${WRKDIR}/astropulse/client ; ${REINPLACE_CMD} -E -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure ; ${CONFIGURE_ENV} ./configure ${CONFIGURE_FLAGS})
+.endif
+	# always configure seti@home, the astropulse source code relies on it
+	(cd ${WRKDIR}/seti_boinc ; ./_autosetup ; ${REINPLACE_CMD} -E -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure ; ${CONFIGURE_ENV} ./configure ${CONFIGURE_FLAGS} --disable-server)
+
+do-build:
+	@${ECHO_CMD} "<app_info>" >> ${WRKDIR}/app_info.xml
+.if !defined(WITHOUT_AP_APP)
+	(cd ${WRKDIR}/astropulse/client ; ${GMAKE})
+	#add app_info tags for astropulse
+	@${ECHO_CMD} "<app>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<name>astropulse</name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</app>" >> ${WRKDIR}/app_info.xml
+
+	@${ECHO_CMD} "<file_info>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<name>${AP_BINARY}</name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<executable/>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</file_info>" >> ${WRKDIR}/app_info.xml
+
+	@${ECHO_CMD} "<app_version>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<app_name>astropulse</app_name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<version_num>${AP_PORTVERSION_FULL:S/.//}</version_num>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<file_ref>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<file_name>${AP_BINARY}</file_name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<main_program/>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</file_ref>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</app_version>" >> ${WRKDIR}/app_info.xml
+.endif
+.if !defined(WITHOUT_SETI_APP)
+	(cd ${WRKDIR}/seti_boinc ; ${GMAKE})
+	#add app_info tags for setiathome
+	@${ECHO_CMD} "<app>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<name>setiathome_enhanced</name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</app>" >> ${WRKDIR}/app_info.xml
+
+	@${ECHO_CMD} "<file_info>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<name>${SETI_BINARY}</name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<executable/>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</file_info>" >> ${WRKDIR}/app_info.xml
+
+	@${ECHO_CMD} "<app_version>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<app_name>setiathome_enhanced</app_name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<version_num>${SETI_PORTVERSION_FULL:S/.//}</version_num>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<file_ref>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<file_name>${SETI_BINARY}</file_name>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "<main_program/>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</file_ref>" >> ${WRKDIR}/app_info.xml
+	@${ECHO_CMD} "</app_version>" >> ${WRKDIR}/app_info.xml
+.endif
+	@${ECHO_CMD} "</app_info>" >> ${WRKDIR}/app_info.xml
+
 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} ${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}/
-.ifndef NOPORTDOCS
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file}
-.endfor
+.if !defined(WITHOUT_SETI_APP)
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/seti_boinc/client/${SETI_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/seti_boinc/client/seti_graphics ${BOINC_HOME}/projects/${SETI_SITE}/
 .endif
+.if !defined(WITHOUT_AP_APP)
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/astropulse/client/${AP_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/astropulse/client/ap_graphics ${BOINC_HOME}/projects/${SETI_SITE}/
+.endif
+	${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SETI_SITE}/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not install
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/astro/boinc-setiathome-enhanced/distinfo b/astro/boinc-setiathome-enhanced/distinfo
index 21670b1ce595..8a6a7d005370 100644
--- a/astro/boinc-setiathome-enhanced/distinfo
+++ b/astro/boinc-setiathome-enhanced/distinfo
@@ -1,3 +1,6 @@
-MD5 (boinc-setiathome-enhanced-5.27.tar.gz) = 272bc31ba5aeabcc2f2038764f5b0e97
-SHA256 (boinc-setiathome-enhanced-5.27.tar.gz) = a1f47075acf47a3ff503d4b82443448cafcbb3fda98447a3487829ca73191c4e
-SIZE (boinc-setiathome-enhanced-5.27.tar.gz) = 646840
+MD5 (astropulse-5.00.tar.bz2) = d3096d95a9f719c03e3d685c0969010b
+SHA256 (astropulse-5.00.tar.bz2) = 077a76c863374d439a201bb15949f16dbbd27f6075649a88cba9f8ba091c439d
+SIZE (astropulse-5.00.tar.bz2) = 474505
+MD5 (setiathome-6.03.tar.bz2) = df5f0c6f3e5a3a115839d1c9e8328a7f
+SHA256 (setiathome-6.03.tar.bz2) = cd746cb6e2e0ce27769d189dbd6e4f5123dbd9f116385cf9c1306d31a60ec041
+SIZE (setiathome-6.03.tar.bz2) = 620033
diff --git a/astro/boinc-setiathome-enhanced/files/app_info.xml.in b/astro/boinc-setiathome-enhanced/files/app_info.xml.in
deleted file mode 100644
index cdcbc0a953ee..000000000000
--- a/astro/boinc-setiathome-enhanced/files/app_info.xml.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<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/files/patch-amd64 b/astro/boinc-setiathome-enhanced/files/patch-amd64
deleted file mode 100644
index 82643534f984..000000000000
--- a/astro/boinc-setiathome-enhanced/files/patch-amd64
+++ /dev/null
@@ -1,9 +0,0 @@
---- configure	2007-09-01 04:00:21.000000000 -0400
-+++ configure	2008-01-06 11:24:56.000000000 -0500
-@@ -41958,5 +41958,5 @@
- fi
- 
-- if test -n "`echo ${target} | grep 'x86_64'`"; then
-+ if test -n "`echo ${target} | egrep 'x86_64|amd64'`"; then
-   X86_64_TRUE=
-   X86_64_FALSE='#'
diff --git a/astro/boinc-setiathome-enhanced/pkg-descr b/astro/boinc-setiathome-enhanced/pkg-descr
index 1feac4e34a4d..88764ba512af 100644
--- a/astro/boinc-setiathome-enhanced/pkg-descr
+++ b/astro/boinc-setiathome-enhanced/pkg-descr
@@ -2,18 +2,8 @@ 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 extra-terrestrial intelligence.
-The project exclusively uses the enhanced version since 2006-05-17.
 
 The port automatically optimizes for the host CPU using the CPUTYPE
 variable in /etc/make.conf
 
-Note that there is currently no screensaver support in this version.
-
-The source archive is a repackaged version of
-setiathome_enhanced-client-cvs-2007-08-08.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://setiathome.berkeley.edu/
diff --git a/astro/boinc-setiathome-enhanced/pkg-plist b/astro/boinc-setiathome-enhanced/pkg-plist
index c1e26054226b..54711def78f2 100644
--- a/astro/boinc-setiathome-enhanced/pkg-plist
+++ b/astro/boinc-setiathome-enhanced/pkg-plist
@@ -1,4 +1,7 @@
 @cwd %%BOINC_HOME%%/projects
 %%SETI_SITE%%/app_info.xml
 %%SETI_SITE%%/%%SETI_BINARY%%
+%%SETI_SITE%%/%%AP_BINARY%%
+%%SETI_SITE%%/seti_graphics
+%%SETI_SITE%%/ap_graphics
 @dirrmtry %%SETI_SITE%%