diff options
13 files changed, 50 insertions, 345 deletions
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index f500f4d6c96e..71b039220b94 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -6,9 +6,10 @@ PORTNAME= boinc-astropulse PORTVERSION= 5.06 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ -DISTNAME= astropulse-svn-562 +DISTNAME= astropulse-svn-868 MAINTAINER= rene@FreeBSD.org COMMENT= Astropulse for BOINC @@ -22,8 +23,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float -USE_AUTOTOOLS= autoconf:env automake:env -USE_BZIP2= yes +USE_XZ= yes +USE_AUTOTOOLS= autoconf:env automake:env libtool GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig @@ -89,8 +90,9 @@ PLIST_SUB+= AP_BINARY=${AP_BINARY} \ BOINC_HOME=${BOINC_HOME} pre-configure: - (cd ${WRKSRC} ; ./_autosetup ; ${REINPLACE_CMD} -E -e \ - "s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure) + (cd ${WRKSRC} ; ./_autosetup) + ${REINPLACE_CMD} -E -e "s|/bin/sh|${LOCALBASE}/bin/bash|" \ + ${WRKSRC}/configure do-install: ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects diff --git a/astro/boinc-astropulse/distinfo b/astro/boinc-astropulse/distinfo index 463edea7d285..1cc3b00731f0 100644 --- a/astro/boinc-astropulse/distinfo +++ b/astro/boinc-astropulse/distinfo @@ -1,2 +1,2 @@ -SHA256 (astropulse-svn-562.tar.bz2) = 30abe5e64428b07106763903bcfc8149cdf5fde6dc84b3ddce7247d491441e5f -SIZE (astropulse-svn-562.tar.bz2) = 1377080 +SHA256 (astropulse-svn-868.tar.xz) = ad484398a7e694773ffc108382706e2fc274f3c9ac9982fbdabb20f82d46bb5b +SIZE (astropulse-svn-868.tar.xz) = 1093224 diff --git a/astro/boinc-astropulse/files/patch-client__configure.ac b/astro/boinc-astropulse/files/patch-client__configure.ac index 7a12ffe0be2c..ae754ea56cfa 100644 --- a/astro/boinc-astropulse/files/patch-client__configure.ac +++ b/astro/boinc-astropulse/files/patch-client__configure.ac @@ -13,8 +13,8 @@ -else - AC_REVISION([$Revision: 163 $]) - AC_DEFINE(SVN_REV,"$Revision: 163 $", -+ AC_REVISION([$Revision: 562 $]) -+ AC_DEFINE(SVN_REV,"$Revision: 562 $", ++ AC_REVISION([$Revision: 868 $]) ++ AC_DEFINE(SVN_REV,"$Revision: 868 $", [Define to be the subversion revision number]) -fi diff --git a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 b/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 deleted file mode 100644 index 6e7946dd0f9c..000000000000 --- a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- m4/sah_check_boinc.m4 (revision 633) -+++ m4/sah_check_boinc.m4 (working copy) -@@ -23,16 +23,16 @@ - do - if test -d $boinc_dir - then -- if test -f $boinc_dir/Makefile.am -+ if test -f $boinc_dir/include/std_fixes.h -o -f $boinc_dir/lib/std_fixes.h - then - cd $boinc_dir - BOINCDIR=`pwd` - cd $thisdir - break - else -- if $FIND $boinc_dir -name "Makefile.am" >& /dev/null -+ if $FIND $boinc_dir -name "std_fixes.h" >& /dev/null - then -- BOINCDIR=`$FIND $boinc_dir -name "Makefile.am" -print | $HEAD -1 | sed 's/\/Makefile.am//'` -+ BOINCDIR=`$FIND $boinc_dir -name "std_fixes.h" -print | $HEAD -1 | sed 's/\/std_fixes.h//'` - cd $BOINCDIR - BOINCDIR=`pwd` - cd $thisdir diff --git a/astro/boinc-astropulse/files/patch-legacy-server__db__ap_schema.cpp b/astro/boinc-astropulse/files/patch-legacy-server__db__ap_schema.cpp deleted file mode 100644 index a87ad804a848..000000000000 --- a/astro/boinc-astropulse/files/patch-legacy-server__db__ap_schema.cpp +++ /dev/null @@ -1,231 +0,0 @@ ---- ../server/db/ap_schema.cpp.orig 2009-06-16 19:06:20.000000000 +0200 -+++ ../server/db/ap_schema.cpp 2009-09-25 22:26:58.000000000 +0200 -@@ -174,7 +174,7 @@ - } - - void coordinate_t::parse(const std::string &s) { -- SQL_ROW row(&s,3); -+ SQL_ROW row(s.c_str(),3); - parse(row); - } - -@@ -313,7 +313,7 @@ - } - - void threshold_t::parse(const std::string &s) { -- SQL_ROW row(&s,2); -+ SQL_ROW row(s.c_str(),2); - parse(row); - } - -@@ -460,10 +460,10 @@ - - void data_description_t::parse(const SQL_ROW &s) { - { -- start.parse(SQL_ROW(s[0],0)); -+ start.parse(SQL_ROW(s[0]->c_str(),0)); - } - { -- end.parse(SQL_ROW(s[1],0)); -+ end.parse(SQL_ROW(s[1]->c_str(),0)); - } - { - std::istringstream row(*(s[2])); -@@ -476,7 +476,7 @@ - } - - void data_description_t::parse(const std::string &s) { -- SQL_ROW row(&s,4); -+ SQL_ROW row(s.c_str(),4); - parse(row); - } - -@@ -714,7 +714,7 @@ - } - - void tape::parse(const std::string &s) { -- SQL_ROW row(&s,8); -+ SQL_ROW row(s.c_str(),8); - parse(row); - } - -@@ -1034,15 +1034,15 @@ - std::string::size_type p,q; - int i; - thresholds.clear(); -- SQL_ROW tmp(s[11]); -+ SQL_ROW tmp((*s[11]).c_str()); - for (i=0;i<tmp.argc();i++) { -- thresholds.push_back(threshold_t(SQL_ROW(tmp[i]))); -+ thresholds.push_back(threshold_t(SQL_ROW((*tmp[i]).c_str()))); - } - } - } - - void analysis_config::parse(const std::string &s) { -- SQL_ROW row(&s,12); -+ SQL_ROW row(s.c_str(),12); - parse(row); - } - -@@ -1248,7 +1248,7 @@ - } - - void recorder_config::parse(const std::string &s) { -- SQL_ROW row(&s,6); -+ SQL_ROW row(s.c_str(),6); - parse(row); - } - -@@ -1643,7 +1643,7 @@ - std::string::size_type p,q; - int i; - az_corr_coeff.clear(); -- SQL_ROW tmp(s[10]); -+ SQL_ROW tmp((*s[10]).c_str()); - for (i=0;i<tmp.argc();i++) { - std::istringstream in(*(tmp[i])); - float tmp0; -@@ -1655,7 +1655,7 @@ - std::string::size_type p,q; - int i; - zen_corr_coeff.clear(); -- SQL_ROW tmp(s[11]); -+ SQL_ROW tmp((*s[11]).c_str()); - for (i=0;i<tmp.argc();i++) { - std::istringstream in(*(tmp[i])); - float tmp0; -@@ -1678,7 +1678,7 @@ - } - - void receiver_config::parse(const std::string &s) { -- SQL_ROW row(&s,15); -+ SQL_ROW row(s.c_str(),15); - parse(row); - } - -@@ -1828,7 +1828,7 @@ - } - - void splitter_config::parse(const std::string &s) { -- SQL_ROW row(&s,3); -+ SQL_ROW row(s.c_str(),3); - parse(row); - } - -@@ -2044,21 +2044,21 @@ - row >> active; - } - { -- receiver_cfg.parse(SQL_ROW(s[2],0)); -+ receiver_cfg.parse(SQL_ROW(s[2]->c_str(),0)); - } - { -- recorder_cfg.parse(SQL_ROW(s[3],0)); -+ recorder_cfg.parse(SQL_ROW(s[3]->c_str(),0)); - } - { -- splitter_cfg.parse(SQL_ROW(s[4],0)); -+ splitter_cfg.parse(SQL_ROW(s[4]->c_str(),0)); - } - { -- analysis_cfg.parse(SQL_ROW(s[5],0)); -+ analysis_cfg.parse(SQL_ROW(s[5]->c_str(),0)); - } - } - - void settings::parse(const std::string &s) { -- SQL_ROW row(&s,6); -+ SQL_ROW row(s.c_str(),6); - parse(row); - } - -@@ -2312,27 +2312,27 @@ - name[127]=0; - } - { -- tape_info.parse(SQL_ROW(s[2],0)); -+ tape_info.parse(SQL_ROW(s[2]->c_str(),0)); - } - { -- receiver_cfg.parse(SQL_ROW(s[3],0)); -+ receiver_cfg.parse(SQL_ROW(s[3]->c_str(),0)); - } - { -- recorder_cfg.parse(SQL_ROW(s[4],0)); -+ recorder_cfg.parse(SQL_ROW(s[4]->c_str(),0)); - } - { -- splitter_cfg.parse(SQL_ROW(s[5],0)); -+ splitter_cfg.parse(SQL_ROW(s[5]->c_str(),0)); - } - { -- analysis_cfg.parse(SQL_ROW(s[6],0)); -+ analysis_cfg.parse(SQL_ROW(s[6]->c_str(),0)); - } - { -- data_desc.parse(SQL_ROW(s[7],0)); -+ data_desc.parse(SQL_ROW(s[7]->c_str(),0)); - } - } - - void workunit_header::parse(const std::string &s) { -- SQL_ROW row(&s,8); -+ SQL_ROW row(s.c_str(),8); - parse(row); - } - -@@ -2569,7 +2569,7 @@ - row >> boinc_result; - } - { -- wuid.parse(SQL_ROW(s[2],0)); -+ wuid.parse(SQL_ROW(s[2]->c_str(),0)); - } - { - std::istringstream row(*(s[3])); -@@ -2602,7 +2602,7 @@ - } - - void result::parse(const std::string &s) { -- SQL_ROW row(&s,10); -+ SQL_ROW row(s.c_str(),10); - parse(row); - } - -@@ -2959,7 +2959,7 @@ - row >> id; - } - { -- resultid.parse(SQL_ROW(s[1],0)); -+ resultid.parse(SQL_ROW(s[1]->c_str(),0)); - } - { - std::istringstream row(*(s[2])); -@@ -3034,7 +3034,7 @@ - } - - void ap_signal::parse(const std::string &s) { -- SQL_ROW row(&s,20); -+ SQL_ROW row(s.c_str(),20); - parse(row); - } - -@@ -3315,7 +3315,7 @@ - row >> id; - } - { -- ap_signalid.parse(SQL_ROW(s[1],0)); -+ ap_signalid.parse(SQL_ROW(s[1]->c_str(),0)); - } - { - std::istringstream row(*(s[2])); -@@ -3368,7 +3368,7 @@ - } - - void rfi::parse(const std::string &s) { -- SQL_ROW row(&s,14); -+ SQL_ROW row(s.c_str(),14); - parse(row); - } - diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index 54d55219f518..caba1ac47379 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -5,11 +5,10 @@ # PORTNAME= boinc-setiathome-enhanced -PORTVERSION= 6.08 -PORTREVISION= 4 +PORTVERSION= 6.12 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ -DISTNAME= setiathome-svn-412 +DISTNAME= setiathome-svn-1008 MAINTAINER= rene@FreeBSD.org COMMENT= Setiathome Enhanced for BOINC @@ -22,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float -USE_BZIP2= yes +USE_XZ= yes USE_AUTOTOOLS= autoconf:env automake:env GNU_CONFIGURE= yes USE_GMAKE= yes @@ -64,7 +63,7 @@ CFLAGS+= -mtune=native CONFIGURE_ENV+= BOINCDIR="${NONEXISTENT}" CONFIGURE_ARGS+= --disable-static-client --disable-server \ - --disable-altivec \ + --disable-altivec --disable-tests \ --with-boinc-platform=${ARCH}-portbld-freebsd SETI_SITE= setiathome.berkeley.edu @@ -80,6 +79,16 @@ PLIST_SUB+= SETI_BINARY=${SETI_BINARY} \ BOINC_HOME=${BOINC_HOME} \ PREFIX=${PREFIX} +# str_replace.h is included in newer versions of net/boinc-client, +# but it is not needed on FreeBSD +post-patch: + ${REINPLACE_CMD} -E -e "s|#include \"str_replace.h\"||" \ + ${WRKSRC}/client/main.cpp \ + ${WRKSRC}/client/sah_gfx.cpp \ + ${WRKSRC}/client/seti.cpp \ + ${WRKSRC}/client/timecvt.cpp \ + ${WRKSRC}/db/xml_util.cpp + pre-configure: (cd ${WRKSRC} ; ./_autosetup ; ${REINPLACE_CMD} -E -e \ "s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure) diff --git a/astro/boinc-setiathome-enhanced/distinfo b/astro/boinc-setiathome-enhanced/distinfo index 7d9543877514..6ebb49763b87 100644 --- a/astro/boinc-setiathome-enhanced/distinfo +++ b/astro/boinc-setiathome-enhanced/distinfo @@ -1,2 +1,2 @@ -SHA256 (setiathome-svn-412.tar.bz2) = f2e1b5d896c6a2e96e9323c85f2ef74b56b23fae1bbd5afc2133f84bd58319cb -SIZE (setiathome-svn-412.tar.bz2) = 2411273 +SHA256 (setiathome-svn-1008.tar.xz) = bde909b6922e94abe9b454e81b5c84dffb0fef64bf60ed3dbe4121f87fe31d6e +SIZE (setiathome-svn-1008.tar.xz) = 1771116 diff --git a/astro/boinc-setiathome-enhanced/files/patch-Makefile.am b/astro/boinc-setiathome-enhanced/files/patch-Makefile.am deleted file mode 100644 index 237812ef9c51..000000000000 --- a/astro/boinc-setiathome-enhanced/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/astro/boinc-setiathome-enhanced/files/patch-_autosetup b/astro/boinc-setiathome-enhanced/files/patch-_autosetup deleted file mode 100644 index 768a1cd810ce..000000000000 --- a/astro/boinc-setiathome-enhanced/files/patch-_autosetup +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/astro/boinc-setiathome-enhanced/files/patch-client_Makefile.am b/astro/boinc-setiathome-enhanced/files/patch-client_Makefile.am deleted file mode 100644 index e52e30043e5b..000000000000 --- a/astro/boinc-setiathome-enhanced/files/patch-client_Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ ---- client/Makefile.am.orig 2008-09-10 00:43:08.000000000 +0200 -+++ client/Makefile.am 2010-10-22 22:54:44.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 \ diff --git a/astro/boinc-setiathome-enhanced/files/patch-client__vector__analyzeFuncs_vector.cpp b/astro/boinc-setiathome-enhanced/files/patch-client__vector__analyzeFuncs_vector.cpp new file mode 100644 index 000000000000..947c43c291a9 --- /dev/null +++ b/astro/boinc-setiathome-enhanced/files/patch-client__vector__analyzeFuncs_vector.cpp @@ -0,0 +1,17 @@ +--- client/vector/analyzeFuncs_vector.cpp.orig 2009-07-14 21:02:10.000000000 +0200 ++++ client/vector/analyzeFuncs_vector.cpp 2011-02-27 15:56:58.000000000 +0100 +@@ -87,12 +87,10 @@ + #endif + + +-#ifdef HAVE___ISNAN +-#define isnotnan(x) (!__isnan(x)) +-#elif defined(HAVE__ISNAN) ++#if defined(HAVE__ISNAN) + #define isnotnan(x) (!_isnan(x)) + #elif defined(HAVE_ISNAN) +-#define isnotnam(x) (!isnan(x)) ++#define isnotnan(x) (!isnan(x)) + #else + #define isnotnan(x) ((x) == (x)) + #endif diff --git a/astro/boinc-setiathome-enhanced/files/patch-client_vector_hires-timer.cpp b/astro/boinc-setiathome-enhanced/files/patch-client_vector_hires-timer.cpp deleted file mode 100644 index c0fc40f88658..000000000000 --- a/astro/boinc-setiathome-enhanced/files/patch-client_vector_hires-timer.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- client/vector/hires_timer.cpp.orig 2008-09-09 18:55:19.000000000 +0200 -+++ client/vector/hires_timer.cpp 2010-10-23 00:05:28.000000000 +0200 -@@ -56,6 +56,7 @@ - #include <sys/param.h> - #endif - #ifdef HAVE_SYS_SYSTM_H -+#include <sys/types.h> - #include <sys/systm.h> - #endif - #ifdef HAVE_MACHINE_CPU_H diff --git a/astro/boinc-setiathome-enhanced/files/patch-configure.ac b/astro/boinc-setiathome-enhanced/files/patch-configure.ac index fce298cfbc64..a8699ab4bd19 100644 --- a/astro/boinc-setiathome-enhanced/files/patch-configure.ac +++ b/astro/boinc-setiathome-enhanced/files/patch-configure.ac @@ -1,18 +1,16 @@ ---- 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 @@ - +--- configure.ac.orig 2010-09-29 22:47:20.000000000 +0200 ++++ configure.ac 2011-02-28 08:36:17.000000000 +0100 +@@ -5,17 +5,10 @@ AC_PREREQ(2.57) --AC_INIT(setiathome_enhanced, 6.03, ports@setiathome.ssl.berkeley.edu) + AC_INIT(setiathome_enhanced, 6.12, 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 $", ++AC_REVISION([$Revision: 1008 $]) ++AC_DEFINE(SVN_REV,"$Revision: 1008 $", [Define to be the subversion revision number]) -else - AC_REVISION([$Revision: 316 $]) @@ -22,21 +20,3 @@ 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 |