From 93b51cd7f755f13cdb21bf6b1ae7e28570470c74 Mon Sep 17 00:00:00 2001 From: pav Date: Fri, 12 Nov 2004 22:20:16 +0000 Subject: - Update to 4.07 PR: ports/73869 Submitted by: J.R. Oldroyd (maintainer) --- astro/boinc-setiathome/Makefile | 6 +- astro/boinc-setiathome/distinfo | 4 +- astro/boinc-setiathome/files/app_info.xml | 2 +- astro/boinc-setiathome/files/patch-db::db_table.h | 119 --------------------- .../files/patch-db::schema_to_class.awk | 35 ------ astro/boinc-setiathome/files/patch-db::sqlblob.h | 28 ----- astro/boinc-setiathome/files/patch-db::xml_util.h | 11 -- 7 files changed, 6 insertions(+), 199 deletions(-) delete mode 100644 astro/boinc-setiathome/files/patch-db::db_table.h delete mode 100644 astro/boinc-setiathome/files/patch-db::schema_to_class.awk delete mode 100644 astro/boinc-setiathome/files/patch-db::sqlblob.h delete mode 100644 astro/boinc-setiathome/files/patch-db::xml_util.h (limited to 'astro') diff --git a/astro/boinc-setiathome/Makefile b/astro/boinc-setiathome/Makefile index c57047859ba4..916933d5e434 100644 --- a/astro/boinc-setiathome/Makefile +++ b/astro/boinc-setiathome/Makefile @@ -6,10 +6,10 @@ # PORTNAME= boinc-setiathome -PORTVERSION= 4.03 +PORTVERSION= 4.07 CATEGORIES= astro MASTER_SITES= http://boinc.berkeley.edu/seti_source/nightly/ -DISTNAME= seti_boinc-client-cvs-2004-10-01 +DISTNAME= seti_boinc-client-cvs-2004-11-09 MAINTAINER= fbsd@opal.com COMMENT= Setiathome for boinc @@ -20,7 +20,7 @@ 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 +CONFIGURE_ENV= LANG=C BOINCDIR=${LOCALBASE}/boinc CPPFLAGS=-I${X11BASE}/include CFLAGS=-I${X11BASE}/include LDFLAGS=-L${LOCALBASE}/lib MAKE_ENV= LANG=C USE_GMAKE= yes PKGINSTALL= ${WRKDIR}/pkg-install diff --git a/astro/boinc-setiathome/distinfo b/astro/boinc-setiathome/distinfo index d5b835d5b187..d337068e7166 100644 --- a/astro/boinc-setiathome/distinfo +++ b/astro/boinc-setiathome/distinfo @@ -1,2 +1,2 @@ -MD5 (seti_boinc-client-cvs-2004-10-01.tar.gz) = 9e4f91cf0bb468da09350da54b98aa7b -SIZE (seti_boinc-client-cvs-2004-10-01.tar.gz) = 1202532 +MD5 (seti_boinc-client-cvs-2004-11-09.tar.gz) = 4120f1701484b78e099c51adfe31653b +SIZE (seti_boinc-client-cvs-2004-10-01.tar.gz) = 1214124 diff --git a/astro/boinc-setiathome/files/app_info.xml b/astro/boinc-setiathome/files/app_info.xml index d4a3d3c8d855..a9a583a2be45 100644 --- a/astro/boinc-setiathome/files/app_info.xml +++ b/astro/boinc-setiathome/files/app_info.xml @@ -7,7 +7,7 @@ setiathome - 403 + 407 %%SETI_BINARY%% diff --git a/astro/boinc-setiathome/files/patch-db::db_table.h b/astro/boinc-setiathome/files/patch-db::db_table.h deleted file mode 100644 index a56ce6c7d534..000000000000 --- a/astro/boinc-setiathome/files/patch-db::db_table.h +++ /dev/null @@ -1,119 +0,0 @@ ---- ../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 diff --git a/astro/boinc-setiathome/files/patch-db::schema_to_class.awk b/astro/boinc-setiathome/files/patch-db::schema_to_class.awk deleted file mode 100644 index d54587988295..000000000000 --- a/astro/boinc-setiathome/files/patch-db::schema_to_class.awk +++ /dev/null @@ -1,35 +0,0 @@ ---- ../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 diff --git a/astro/boinc-setiathome/files/patch-db::sqlblob.h b/astro/boinc-setiathome/files/patch-db::sqlblob.h deleted file mode 100644 index 5df9c99f3602..000000000000 --- a/astro/boinc-setiathome/files/patch-db::sqlblob.h +++ /dev/null @@ -1,28 +0,0 @@ ---- ../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); - } - - diff --git a/astro/boinc-setiathome/files/patch-db::xml_util.h b/astro/boinc-setiathome/files/patch-db::xml_util.h deleted file mode 100644 index c7f6a32f360a..000000000000 --- a/astro/boinc-setiathome/files/patch-db::xml_util.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../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 -- cgit