Date: Mon, 14 Sep 2009 21:53:43 GMT From: Rene Ladan <rene@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/138825: [maintainer-update] update astro/boinc-setiathome-enhanced to 6.08 Message-ID: <200909142153.n8ELrhSc014711@www.freebsd.org> Resent-Message-ID: <200909142200.n8EM01vF027422@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138825 >Category: ports >Synopsis: [maintainer-update] update astro/boinc-setiathome-enhanced to 6.08 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Sep 14 22:00:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Rene Ladan >Release: 8.0-BETA4 amd64 >Organization: >Environment: FreeBSD self.rene-ladan.nl 8.0-BETA4 FreeBSD 8.0-BETA4 #0: Sun Sep 6 04:44:31 UTC 2009 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: update astro/boinc-setiathome-enhanced to 6.08: * fix build (teach the configure script how to use our m4) * reroll distfile to be an svn-exported tarball (revision 412) * drop outdated astropulse (should be its own port) * cleanup Makefile * fix pkg-plist (X11 wasn't optional) The client is tested against the reference workunit and succesfully used for various production units (see http://setiathome.berkeley.edu/show_host_detail.php?hostid=4500916) Passes `port test' and most of `portlint -A' Somehow the graphics don't work (in boinc_gui the "Show graphics" button is always grayed out). >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/astro/boinc-setiathome-enhanced/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- Makefile 18 Jul 2009 11:10:10 -0000 1.22 +++ Makefile 14 Sep 2009 21:48:22 -0000 @@ -5,42 +5,27 @@ # PORTNAME= boinc-setiathome-enhanced -PORTVERSION= ${SETI_PORTVERSION_FULL}.${AP_PORTVERSION_FULL} -PORTREVISION= 3 +PORTVERSION= 6.08 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ -DISTFILES= astropulse-${AP_PORTVERSION_FULL}.tar.bz2 setiathome-${SETI_PORTVERSION_FULL}.tar.bz2 +DISTNAME= setiathome-svn-412 -MAINTAINER= rene@freebsd.org -COMMENT= Setiathome Enhanced/Astropulse for BOINC +MAINTAINER= rene@FreeBSD.org +COMMENT= Setiathome Enhanced 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 \ - ${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.10:${PORTSDIR}/graphics/jpeg \ - xcb.2:${PORTSDIR}/x11/libxcb - -USE_GL= gl glu glut -USE_XORG= ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm +LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float USE_BZIP2= yes +USE_AUTOTOOLS= autoconf:262:env automake:18:env +GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig -NO_WRKSUBDIR= yes - -SETI_PORTVERSION=6.3 -SETI_PORTVERSION_FULL=6.03 -AP_PORTVERSION=5.0 -AP_PORTVERSION_FULL=5.00 -CFLAGS+= -I${LOCALBASE}/include/boinc -O2 -I${LOCALBASE}/include -L${LOCALBASE}/lib +CFLAGS+= -O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include -L${LOCALBASE}/lib .if defined(CPUTYPE) CFLAGS+= -march=${CPUTYPE} .endif @@ -50,106 +35,59 @@ BOINC_GROUP?= nobody BOINC_HOME?= /var/db/boinc -OPTIONS= SETI_APP "Install SETI@home binary" on \ - AP_APP "Install Astropulse binary" on +OPTIONS= X11 "Build screensaver" off .include <bsd.port.pre.mk> -.if (${OSVERSION} >= 700000) -CFLAGS+= -mtune=native +.if !defined(WITHOUT_X11) +.if !exists(${LOCALBASE}/lib/libboinc_graphics2.a) +BROKEN=Reinstall net/boinc-client with X11 enabled for screensavers +.endif +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ + xcb.2:${PORTSDIR}/x11/libxcb +USE_GL= gl glu glut +USE_XORG= ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm +PLIST_SUB+= X11="" +.else +CONFIGURE_ARGS+= --disable-graphics +PLIST_SUB+= X11="@comment " .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 ${OSVERSION} >= 700042 .if ${ARCH} == "sparc64" BROKEN= Does not compile with GCC 4.2 .endif +CFLAGS+= -mtune=native .endif -.if defined(WITHOUT_SETI_APP) && defined(WITHOUT_AP_APP) -IGNORE= neither SETI@home nor Astropulse selected -.endif +CXXFLAGS+= ${CFLAGS} + +CONFIGURE_ENV+= BOINCDIR="${LOCALBASE}" + +CONFIGURE_ARGS+= --disable-static-client --with-boinc-platform=${ARCH}-portbld-freebsd --disable-server SETI_SITE= setiathome.berkeley.edu -SETI_BINARY= setiathome-${SETI_PORTVERSION}.${ARCH}-portbld-freebsd -AP_BINARY= astropulse-${AP_PORTVERSION}.${ARCH}-portbld-freebsd +SETI_BINARY= setiathome-${PORTVERSION:S/.0/./}.${ARCH}-portbld-freebsd -PLIST_SUB= SETI_BINARY=${SETI_BINARY} \ - AP_BINARY=${AP_BINARY} \ +SUB_FILES= app_info.xml pkg-message +SUB_LIST= SETI_BINARY=${SETI_BINARY} \ + SETI_SITE=${SETI_SITE} \ + SETI_VERSION=${PORTVERSION:S/.//} +PLIST_SUB+= SETI_BINARY=${SETI_BINARY} \ SETI_SITE=${SETI_SITE} \ BOINC_HOME=${BOINC_HOME} -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 +pre-configure: + (cd ${WRKSRC}; ./_autosetup ; ${REINPLACE_CMD} -E -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure) 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} -.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_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKSRC}/client/${SETI_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/ +.if !defined(WITHOUT_X11) + ${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKSRC}/client/seti_graphics ${BOINC_HOME}/projects/${SETI_SITE}/ ${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SETI_SITE}/ +.endif post-install: @${CAT} ${PKGMESSAGE} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/astro/boinc-setiathome-enhanced/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 28 Dec 2008 18:20:18 -0000 1.7 +++ distinfo 14 Sep 2009 21:48:22 -0000 @@ -1,6 +1,3 @@ -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 +MD5 (setiathome-svn-412.tar.bz2) = 2fc5afd466257c68b048129ea8c24955 +SHA256 (setiathome-svn-412.tar.bz2) = f2e1b5d896c6a2e96e9323c85f2ef74b56b23fae1bbd5afc2133f84bd58319cb +SIZE (setiathome-svn-412.tar.bz2) = 2411273 Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 30 Jul 2006 19:20:52 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -***************************************************************************** -ATTACHING PROJECT - -Just run boinc_gui, choose Attach, and follow instructions. -Project URL is setiathome.berkeley.edu - -MANUAL INSTALLATION - *) If this is your first time in any BOINC project, create a new account at - http://setiathome.berkeley.edu/create_account_form.php - - *) Or get your account key at http://setiathome.berkeley.edu/get_passwd.php - - *) Attach to the project: - cd /var/db/boinc - boinc_cmd --project_attach setiathome.berkeley.edu <account key> -***************************************************************************** Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/astro/boinc-setiathome-enhanced/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 28 Dec 2008 18:20:18 -0000 1.5 +++ pkg-plist 14 Sep 2009 21:48:22 -0000 @@ -1,7 +1,5 @@ @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 +%%X11%%%%SETI_SITE%%/seti_graphics @dirrmtry %%SETI_SITE%% Index: files/app_info.xml.in =================================================================== RCS file: files/app_info.xml.in diff -N files/app_info.xml.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/app_info.xml.in 14 Sep 2009 21:48:23 -0000 @@ -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>%%SETI_VERSION%%</version_num> +<file_ref> +<file_name>%%SETI_BINARY%%</file_name> +<main_program/> +</file_ref> +</app_version> +</app_info> Index: files/patch-Makefile.am =================================================================== RCS file: files/patch-Makefile.am diff -N files/patch-Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile.am 14 Sep 2009 21:48:23 -0000 @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2008-02-19 19:50:56.000000000 +0100 ++++ Makefile.am 2009-09-09 22:49:11.000000000 +0200 +@@ -8,7 +8,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + if ENABLE_CLIENT +- CLIENT_SUBDIRS = client tools ++ CLIENT_SUBDIRS = client + endif + + if ENABLE_SERVER Index: files/patch-_autosetup =================================================================== RCS file: files/patch-_autosetup diff -N files/patch-_autosetup --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-_autosetup 14 Sep 2009 21:48:23 -0000 @@ -0,0 +1,13 @@ +Index: _autosetup +=================================================================== +--- _autosetup (revision 429) ++++ _autosetup (working copy) +@@ -42,7 +42,7 @@ + version="0"; + fi + if [ -n "${version}" ]; then +- version=`echo $version | awk '{ for (i=1;i<=NF;i++) { split($i,j,"."); m=j[1]"."j[2] ; if ((m*1)>0) { print m ; break; } } }'` ++ version=`echo $version | awk '{ for (i=1;i<=NF;i++) { split($i,j,"."); m=j[1]"."j[2] ; if (m ~ /[0-9]+\.[0-9]+/) { print m ; break; } } }'` + if [ -z "$version" ]; then version=0; fi + success=`echo "$version" "$desired" | awk '{ if ($1 >= $2) { print "yes";} else {print "no";}} '` + else Index: files/patch-client_Makefile.am =================================================================== RCS file: files/patch-client_Makefile.am diff -N files/patch-client_Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-client_Makefile.am 14 Sep 2009 21:48:23 -0000 @@ -0,0 +1,16 @@ +--- client/Makefile.am.orig 2008-09-10 00:43:08.000000000 +0200 ++++ client/Makefile.am 2009-09-09 22:50:54.000000000 +0200 +@@ -50,12 +50,7 @@ + + + +-noinst_PROGRAMS = seti_boinc hires_timer_test +- +-hires_timer_test_SOURCES= vector/hires_timer.cpp +-hires_timer_test_CXXFLAGS=-DTEST_TIMER $(CXXFLAGS) $(CLIENT_C_FLAGS) +-hires_timer_test_LDFLAGS=$(CLIENT_LD_FLAGS) +-hires_timer_test_LDADD=$(CLIENT_LD_ADD) ++noinst_PROGRAMS = seti_boinc + + seti_boinc_SOURCES = \ + main.cpp \ Index: files/patch-configure.ac =================================================================== RCS file: files/patch-configure.ac diff -N files/patch-configure.ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-configure.ac 14 Sep 2009 21:48:23 -0000 @@ -0,0 +1,42 @@ +--- configure.ac.orig 2008-12-03 00:00:50.000000000 +0100 ++++ configure.ac 2009-09-11 01:48:48.000000000 +0200 +@@ -4,18 +4,11 @@ + + + AC_PREREQ(2.57) +-AC_INIT(setiathome_enhanced, 6.03, ports@setiathome.ssl.berkeley.edu) +-svnrev="`svn info | grep Revision:`" ++AC_INIT(setiathome_enhanced, 6.08, ports@setiathome.ssl.berkeley.edu) + +-if test -n "${svnrev}" ; then +- AC_REVISION("${svnrev}") +- AC_DEFINE_UNQUOTED(SVN_REV,"${svnrev}", ++AC_REVISION([$Revision: 412 $]) ++AC_DEFINE(SVN_REV,"$Revision: 412 $", + [Define to be the subversion revision number]) +-else +- AC_REVISION([$Revision: 316 $]) +- AC_DEFINE(SVN_REV,"$Revision: 316 $", +- [Define to be the subversion revision number]) +-fi + + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE(dist-zip) +@@ -320,7 +313,7 @@ + dnl AC_CHECK_LIB([dl], [dlopen], + dnl AC_DEFINE([HAVE_LIBDL],[1],[Define to 1 if you have the dl library])) + AC_LANG(C++) +-SAH_CHECK_HEALPIX ++dnl SAH_CHECK_HEALPIX + + + if test "${ac_cv_cxx_compiler_gnu}" = "yes" ; then +@@ -408,7 +401,7 @@ + AM_CONDITIONAL(ENABLE_GUI, [test "${enable_graphics}" = yes]) + AM_CONDITIONAL(LINUX, [test -n "`echo ${target} | grep linux`"]) + AM_CONDITIONAL(I386, [test -n "`echo ${target} | grep i.86`"]) +-AM_CONDITIONAL(X86_64, [test -n "`echo ${target} | grep 'x86_64'`"]) ++AM_CONDITIONAL(X86_64, [test -n "`echo ${target} | egrep 'x86_64|amd64'`"]) + AM_CONDITIONAL(PPC, [test -n "`echo ${target} | grep 'powerpc'`" -o -n "`echo ${target} | grep 'ppc'`" ]) + + AC_CACHE_SAVE Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 14 Sep 2009 21:48:23 -0000 @@ -0,0 +1,16 @@ +***************************************************************************** +ATTACHING PROJECT + +Just run boinc_gui (if installed), choose Attach, and follow instructions. +Project URL is %%SETI_SITE%% + +MANUAL INSTALLATION + *) If this is your first time in any BOINC project, create a new account at + http://%%SETI_SITE%%/create_account_form.php + + *) Or get your account key at http://%%SETI_SITE%%/get_passwd.php + + *) Attach to the project: + cd /var/db/boinc + boinc_cmd --project_attach %%SETI_SITE%% <account key> +***************************************************************************** >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909142153.n8ELrhSc014711>