Index: head/astro/Makefile =================================================================== --- head/astro/Makefile (revision 119694) +++ head/astro/Makefile (revision 119695) @@ -1,81 +1,82 @@ # $FreeBSD$ # COMMENT = Astronomical ports SUBDIR += SETIsupport SUBDIR += accrete + SUBDIR += boinc-setiathome SUBDIR += celestia SUBDIR += cfitsio SUBDIR += dgpsip SUBDIR += ephem SUBDIR += fooseti SUBDIR += gdesklets-goodweather SUBDIR += gdesklets-goodweather-psi SUBDIR += gdesklets-seti SUBDIR += gdesklets-weather SUBDIR += gkrellmearth SUBDIR += gkrellmoon SUBDIR += gkrellmoon2 SUBDIR += gkrellmseti SUBDIR += gkrellsun SUBDIR += glunarclock SUBDIR += gpsdrive SUBDIR += gpsman SUBDIR += jday SUBDIR += ksetisaver SUBDIR += ksetispy SUBDIR += ksetiwatch SUBDIR += libnova SUBDIR += linux-setiathome SUBDIR += luna SUBDIR += match SUBDIR += mymoon SUBDIR += nightfall SUBDIR += nova SUBDIR += openuniverse SUBDIR += p5-Astro-ADS SUBDIR += p5-Astro-Catalog SUBDIR += p5-Astro-DSS SUBDIR += p5-Astro-FITS-Header SUBDIR += p5-Astro-MoonPhase SUBDIR += p5-Astro-SIMBAD SUBDIR += p5-Astro-SunTime SUBDIR += p5-Astro-Sunrise SUBDIR += p5-GPS SUBDIR += p5-Geo-METAR SUBDIR += p5-SETI-Stats SUBDIR += phoon SUBDIR += planets SUBDIR += pp3 SUBDIR += py-metar SUBDIR += pyweather SUBDIR += rmap SUBDIR += roadmap SUBDIR += saoimage SUBDIR += sattrack SUBDIR += setiathome SUBDIR += sky2000 SUBDIR += spacechart SUBDIR += squeuer SUBDIR += sscalc SUBDIR += starplot SUBDIR += stars SUBDIR += stellarium SUBDIR += sunclock SUBDIR += tkseti SUBDIR += wmglobe SUBDIR += wmjupiter SUBDIR += wmmoonclock SUBDIR += wmsolar SUBDIR += wmspaceweather SUBDIR += wmsun SUBDIR += xearth SUBDIR += xephem SUBDIR += xglobe SUBDIR += xphoon SUBDIR += xplanet SUBDIR += xtide SUBDIR += xworld .include Property changes on: head/astro/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.83 \ No newline at end of property +1.84 \ No newline at end of property Index: head/astro/boinc-setiathome/Makefile =================================================================== --- head/astro/boinc-setiathome/Makefile (nonexistent) +++ head/astro/boinc-setiathome/Makefile (revision 119695) @@ -0,0 +1,69 @@ +# New ports collection makefile for: boinc-setiathome +# Date created: 01 October 2004 +# Whom: J.R. Oldroyd +# +# $FreeBSD$ +# + +PORTNAME= boinc-setiathome +PORTVERSION= 4.03 +CATEGORIES= astro +MASTER_SITES= http://boinc.berkeley.edu/seti_source/nightly/ +DISTNAME= seti_boinc-client-cvs-2004-10-01 + +MAINTAINER= fbsd@opal.com +COMMENT= Setiathome for boinc + +BUILD_DEPENDS= ${LOCALBASE}/boinc/api/boinc_api.h:${PORTSDIR}/net/boinc-client +RUN_DEPENDS= boinc-client:${PORTSDIR}/net/boinc-client +LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw + +GNU_CONFIGURE= yes +USE_REINPLACE= yes +CONFIGURE_ENV= LANG=C BOINCDIR=${LOCALBASE}/boinc CPPFLAGS=-I/usr/X11R6/include CFLAGS=-I/usr/X11R6/include LDFLAGS=-L/usr/local/lib +MAKE_ENV= LANG=C +USE_GMAKE= yes +PKGINSTALL= ${WRKDIR}/pkg-install + +WRKSRC= ${WRKDIR}/seti_boinc/client +CONFIGURE_WRKSRC=${WRKDIR}/seti_boinc/ + +FIND_SETI_BINARY=(cd ${WRKSRC}; make -V PROG) +SETI_SITE?= setiathome.berkeley.edu +PLIST_SUB= SETI_SITE=${SETI_SITE} BOINC_HOME=${BOINC_HOME} + +# these must match settings in ../../net/boinc-client/Makefile +BOINC_USER= boinc +BOINC_HOME= /var/db/boinc +BOINC_DATADIR= ${PREFIX}/boinc + +# ${TOUCH} ${WRKDIR}/seti_boinc/db/schema_master.cpp +pre-patch: + ${TOUCH} ${WRKDIR}/seti_boinc/client/dependencies + ${TOUCH} ${WRKDIR}/seti_boinc/db/dependencies + +post-build: + ${SED} -e "s:%%SETI_BINARY%%:`${FIND_SETI_BINARY}`:g" \ + -e "s:%%SETI_SITE%%:${SETI_SITE}:g" \ + -e "s:%%BOINC_DATADIR%%:${BOINC_DATADIR}:g" \ + < ${FILESDIR}/app_info.xml > ${WRKDIR}/app_info.xml + ${SED} -e "s:%%SETI_SITE%%:${SETI_SITE}:g" \ + -e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" \ + -e "s:%%BOINC_USER%%:${BOINC_USER}:g" \ + < pkg-install > ${WRKDIR}/pkg-install + +do-install: + ${MKDIR} ${PREFIX}/boinc/projects/${SETI_SITE} + ${INSTALL_PROGRAM} ${WRKSRC}/`${FIND_SETI_BINARY}` ${PREFIX}/boinc/projects/${SETI_SITE} + ${INSTALL_DATA} ${WRKDIR}/app_info.xml ${PREFIX}/boinc/projects/${SETI_SITE} + ${MKDIR} ${BOINC_HOME}/projects/${SETI_SITE}/ + ${LN} -s ${PREFIX}/boinc/projects/${SETI_SITE}/`${FIND_SETI_BINARY}` ${BOINC_HOME}/projects/${SETI_SITE} + ${LN} -s ${PREFIX}/boinc/projects/${SETI_SITE}/app_info.xml ${BOINC_HOME}/projects/${SETI_SITE} + +post-install: + ${REINPLACE_CMD} \ + -e "s:%%SETI_BINARY%%:`${FIND_SETI_BINARY}`:g" \ + -e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" ${TMPPLIST} + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + +.include Property changes on: head/astro/boinc-setiathome/Makefile ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/astro/boinc-setiathome/distinfo =================================================================== --- head/astro/boinc-setiathome/distinfo (nonexistent) +++ head/astro/boinc-setiathome/distinfo (revision 119695) @@ -0,0 +1,2 @@ +MD5 (seti_boinc-client-cvs-2004-10-01.tar.gz) = 9e4f91cf0bb468da09350da54b98aa7b +SIZE (seti_boinc-client-cvs-2004-10-01.tar.gz) = 1202532 Property changes on: head/astro/boinc-setiathome/distinfo ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/app_info.xml =================================================================== --- head/astro/boinc-setiathome/files/app_info.xml (nonexistent) +++ head/astro/boinc-setiathome/files/app_info.xml (revision 119695) @@ -0,0 +1,16 @@ + + + setiathome + + + %%SETI_BINARY%% + + + setiathome + 403 + + %%SETI_BINARY%% + + + + Property changes on: head/astro/boinc-setiathome/files/app_info.xml ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/patch-client::Makefile.in =================================================================== --- head/astro/boinc-setiathome/files/patch-client::Makefile.in (nonexistent) +++ head/astro/boinc-setiathome/files/patch-client::Makefile.in (revision 119695) @@ -0,0 +1,25 @@ +--- Makefile.in.orig Mon Aug 30 17:31:09 2004 ++++ Makefile.in Thu Oct 4 00:10:02 2004 +@@ -98,11 +98,11 @@ + @RANLIB@ libooura.$(LIBEXT) + + $(PROG): main.$(OBJEXT) libooura.$(LIBEXT) $(OBJS) +- $(CXX) main.$(OBJEXT) $(OBJS) $(LIBS) $(CLIBS) -o $(PROG) $(BOINC_OBJS) ++ $(CXX) main.$(OBJEXT) $(OBJS) $(LIBS) $(LDFLAGS) $(CLIBS) -o $(PROG) $(BOINC_OBJS) + strip $(PROG) + + $(GUIPROG): $(GUIOBJS) libooura.$(LIBEXT) +- $(CXX) $(GUIOBJS) $(GUILIBS) $(CLIBS) -o $(GUIPROG).debug $(BOINC_OBJS) ++ $(CXX) $(GUIOBJS) $(GUILIBS) $(LDFLAGS) $(CLIBS) -o $(GUIPROG).debug $(BOINC_OBJS) + cp $(GUIPROG).debug $(GUIPROG) + strip $(GUIPROG) + +@@ -115,7 +115,7 @@ + $(CXX) $(CXXFLAGS) $(BOINC_INC) -I.. -I../db -DTEST_VERSION -c -o main_test.$(OBJEXT) main.cpp + + setiathome_test$(DOTEXEEXT): main_test.$(OBJEXT) $(OBJS) libooura.$(LIBEXT) +- $(CXX) main_test.$(OBJEXT) $(OBJS) $(LIBS) $(CLIBS) -o setiathome_test$(DOTEXEEXT) $(BOINC_OBJS) ++ $(CXX) main_test.$(OBJEXT) $(OBJS) $(LIBS) $(LDFLAGS) $(CLIBS) -o setiathome_test$(DOTEXEEXT) $(BOINC_OBJS) + + ../db/sqlrow_client.$(OBJEXT): ../db/sqlrow.cpp ../db/sqlrow.h + (cd ../db; $(MAKE) sqlrow_client.$(OBJEXT)) Property changes on: head/astro/boinc-setiathome/files/patch-client::Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/patch-db::db_table.h =================================================================== --- head/astro/boinc-setiathome/files/patch-db::db_table.h (nonexistent) +++ head/astro/boinc-setiathome/files/patch-db::db_table.h (revision 119695) @@ -0,0 +1,119 @@ +--- ../db/db_table.h.orig Mon Apr 5 16:03:33 2004 ++++ ../db/db_table.h Sun Oct 3 15:41:31 2004 +@@ -53,6 +53,52 @@ + }; + + template ++class db_table; ++ ++template ++std::ostream &operator <<(std::ostream &o, const db_type &a) { ++ o << a.print_xml(); ++ return o; ++} ++ ++template ++std::ostream &operator <<(std::ostream &o, const db_table &a) { ++ o << a.me->print_xml(); ++ return o; ++} ++ ++template ++std::istream &operator >>(std::istream &i, db_table &a) { ++ std::string s; ++ std::string s_tag("<"); ++ std::string e_tag("> s; ++ if (xml_match_tag(s,s_tag.c_str())) { ++ found=true; ++ } ++ if (found) buffer+=(s+' '); ++ if (xml_match_tag(s,e_tag.c_str())) { ++ found=false; ++ done=true; ++ } ++ } ++ a.me->parse_xml(buffer); ++ std::string::size_type p=buffer.find(e_tag); ++ if (p != std::string::npos) { ++ p=buffer.find('>',p+1); ++ if (p != std::string::npos) { ++ i.seekg(p-buffer.size(),std::ios::cur); ++ } ++ } ++ return i; ++} ++ ++template + class db_table { + public: + db_table(T &t, SQL_CURSOR c); +@@ -332,12 +378,6 @@ + + #endif + +-template +-std::ostream &operator <<(std::ostream &o, const db_type &a) { +- o << a.print_xml(); +- return o; +-} +- + template + std::ostream &operator <<(std::ostream &o, const db_reference &a) { + o << a.print_xml(); +@@ -345,12 +385,6 @@ + } + + template +-std::ostream &operator <<(std::ostream &o, const db_table &a) { +- o << a.me->print_xml(); +- return o; +-} +- +-template + const char *db_type::search_tag(const char *s) { + if (s) { + _search_tag=s; +@@ -368,37 +402,6 @@ + _search_tag=table_name; + } + return _search_tag; +-} +- +-template +-std::istream &operator >>(std::istream &i, db_table &a) { +- std::string s; +- std::string s_tag("<"); +- std::string e_tag("> s; +- if (xml_match_tag(s,s_tag.c_str())) { +- found=true; +- } +- if (found) buffer+=(s+' '); +- if (xml_match_tag(s,e_tag.c_str())) { +- found=false; +- done=true; +- } +- } +- a.me->parse_xml(buffer); +- std::string::size_type p=buffer.find(e_tag); +- if (p != std::string::npos) { +- p=buffer.find('>',p+1); +- if (p != std::string::npos) { +- i.seekg(p-buffer.size(),std::ios::cur); +- } +- } +- return i; + } + + template Property changes on: head/astro/boinc-setiathome/files/patch-db::db_table.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/patch-db::schema_to_class.awk =================================================================== --- head/astro/boinc-setiathome/files/patch-db::schema_to_class.awk (nonexistent) +++ head/astro/boinc-setiathome/files/patch-db::schema_to_class.awk (revision 119695) @@ -0,0 +1,35 @@ +--- ../db/schema_to_class.awk.orig Thu Sep 30 21:58:31 2004 ++++ ../db/schema_to_class.awk Sun Oct 3 21:45:08 2004 +@@ -344,15 +344,15 @@ + print "\tvoid parse_xml(const std::string &s,const char *tag=\""table"\");" >headerfile + print " private:\n};\n\n" >headerfile + if (is_typedef) { +- print "const char * const db_type<"table">::type_name=\""table"\";" >sourcefile +- print "const char * db_type<"table">::_search_tag=type_name;" >sourcefile +- print "const int db_type<"table">::_nfields="nfields-1";" >sourcefile +- printf("const char * const db_type<%s>::column_names[%d]={",table,nfields-1) >sourcefile ++ print "template <> const char * const db_type<"table">::type_name=\""table"\";" >sourcefile ++ print "template <> const char * db_type<"table">::_search_tag=type_name;" >sourcefile ++ print "template <> const int db_type<"table">::_nfields="nfields-1";" >sourcefile ++ printf("template <> const char * const db_type<%s>::column_names[%d]={",table,nfields-1) >sourcefile + } else { +- print "const char * const db_table<"table">::table_name=\""table"\";" >sourcefile +- print "const char * db_table<"table">::_search_tag=table_name;" >sourcefile +- print "const int db_table<"table">::_nfields="nfields-1";" >sourcefile +- printf("const char * const db_table<%s>::column_names[%d]={",table,nfields-1) >sourcefile ++ print "template <> const char * const db_table<"table">::table_name=\""table"\";" >sourcefile ++ print "template <> const char * db_table<"table">::_search_tag=table_name;" >sourcefile ++ print "template <> const int db_table<"table">::_nfields="nfields-1";" >sourcefile ++ printf("template <> const char * const db_table<%s>::column_names[%d]={",table,nfields-1) >sourcefile + } + for (i=1;isourcefile + print "};\n" >sourcefile +@@ -618,7 +618,7 @@ + if (sis_deftype) print "\trv << xml_indent(-2);" > sourcefile + print "\trv << \"\\n\"; " >sourcefile + } else if (type[i]=="s") { +- print "\t{\n\t std::string enc_field=xml_encode_string("fields[i]",std::min(strlen("fields[i]"),sizeof("fields[i]")));" > sourcefile ++ print "\t{\n\t std::string enc_field=xml_encode_string("fields[i]",std::min(strlen("fields[i]"),sizeof("fields[i]")));" > sourcefile + print "\t rv << xml_indent() << \"<"fields[i]">\";" > sourcefile + print "\t rv << enc_field << \"\\n\";" >sourcefile + print "\t}" >> sourcefile Property changes on: head/astro/boinc-setiathome/files/patch-db::schema_to_class.awk ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/patch-db::schema_to_class.in =================================================================== --- head/astro/boinc-setiathome/files/patch-db::schema_to_class.in (nonexistent) +++ head/astro/boinc-setiathome/files/patch-db::schema_to_class.in (revision 119695) @@ -0,0 +1,11 @@ +--- ../db/schema_to_class.in.orig Wed Sep 22 18:42:01 2004 ++++ ../db/schema_to_class.in Sun Oct 3 17:28:10 2004 +@@ -22,7 +22,7 @@ + @CAT@ $1 | @TR@ "[A-Z]" "[a-z]" | @SED@ 's/\`//g' >>$filename + + @AWK@ -f @SAH_TOP_DIR@/db/schema_to_class.awk $filename +-INDENT=@INDENT@ ++INDENT= + if test -n "$INDENT" + then + @INDENT@ @INDENT_FLAGS@ $filename.h Property changes on: head/astro/boinc-setiathome/files/patch-db::schema_to_class.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/patch-db::sqlblob.h =================================================================== --- head/astro/boinc-setiathome/files/patch-db::sqlblob.h (nonexistent) +++ head/astro/boinc-setiathome/files/patch-db::sqlblob.h (revision 119695) @@ -0,0 +1,28 @@ +--- ../db/sqlblob.h.orig Thu Jul 1 13:55:37 2004 ++++ ../db/sqlblob.h Sun Oct 3 17:01:17 2004 +@@ -73,6 +73,12 @@ + } + + ++template ++inline std::string xml_encode_string(const sqlblob &input, ++ xml_encoding encoding=_x_xml_entity) { ++ return xml_encode_string(static_cast(input),input.size(),encoding); ++} ++ + + template + class sqlblob { +@@ -123,12 +129,6 @@ + template + std::string sqlblob::print_raw() const { + return std::string(reinterpret_cast(&(*begin())),size()); +-} +- +-template +-inline std::string xml_encode_string(const sqlblob &input, +- xml_encoding encoding=_x_xml_entity) { +- return xml_encode_string(static_cast(input),input.size(),encoding); + } + + Property changes on: head/astro/boinc-setiathome/files/patch-db::sqlblob.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/files/patch-db::xml_util.h =================================================================== --- head/astro/boinc-setiathome/files/patch-db::xml_util.h (nonexistent) +++ head/astro/boinc-setiathome/files/patch-db::xml_util.h (revision 119695) @@ -0,0 +1,11 @@ +--- ../db/xml_util.h.orig Wed Jun 30 16:52:29 2004 ++++ ../db/xml_util.h Sun Oct 3 21:16:22 2004 +@@ -223,7 +223,7 @@ + template + inline std::string xml_encode_string(const std::vector &input, + xml_encoding encoding=_x_xml_entity) { +- return xml_encode_string(&(*(input.begin())),input.size(),encoding); ++ return xml_encode_string(&(*(input.begin())),input.size(),encoding); + } + + #include Property changes on: head/astro/boinc-setiathome/files/patch-db::xml_util.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/pkg-descr =================================================================== --- head/astro/boinc-setiathome/pkg-descr (nonexistent) +++ head/astro/boinc-setiathome/pkg-descr (revision 119695) @@ -0,0 +1,18 @@ +SETI - Search for Extra-Terrestrial Intelligence + +Use your unused CPU cycles to aid in computations analyzing radio +telescope information for possible signs of ET. + +This version of SETI@home is based on BOINC (Berkeley Open +Infrastructure for Network Computing). Several other projects +besides SETI@home are using BOINC. BOINC lets you participate in +more than one project, and it lets you specify what fraction of +your computer time should go to each project. + +This port requires net/boinc-client and together these supersede +the astro/setiathome port which is now known as SETI-Classic. + +Be sure to join the "FreeBSD" team on the SETI website once you're +up and running. + +WWW: http://setiweb.ssl.berkeley.edu/ Property changes on: head/astro/boinc-setiathome/pkg-descr ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/pkg-install =================================================================== --- head/astro/boinc-setiathome/pkg-install (nonexistent) +++ head/astro/boinc-setiathome/pkg-install (revision 119695) @@ -0,0 +1,7 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + chown %%BOINC_USER%% %%BOINC_HOME%%/projects/%%SETI_SITE%% + ;; +esac Property changes on: head/astro/boinc-setiathome/pkg-install ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/astro/boinc-setiathome/pkg-plist =================================================================== --- head/astro/boinc-setiathome/pkg-plist (nonexistent) +++ head/astro/boinc-setiathome/pkg-plist (revision 119695) @@ -0,0 +1,7 @@ +@comment @unexec %D/boinc/boinc_client -detach_project %%SETI_SITE%% +boinc/projects/%%SETI_SITE%%/app_info.xml +boinc/projects/%%SETI_SITE%%/%%SETI_BINARY%% +@dirrm boinc/projects/%%SETI_SITE%% +@cd %%BOINC_HOME%% +projects/%%SETI_SITE%%/app_info.xml +projects/%%SETI_SITE%%/%%SETI_BINARY%% Property changes on: head/astro/boinc-setiathome/pkg-plist ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property