ports/73869: Update port: astro/boinc-setiathome update to 4.07
J.R. Oldroyd
fbsd at opal.com
Fri Nov 12 14:20:16 UTC 2004
>Number: 73869
>Category: ports
>Synopsis: Update port: astro/boinc-setiathome update to 4.07
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 12 14:20:15 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: J.R. Oldroyd
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD linwhf.opal.com 6.0-CURRENT FreeBSD 6.0-CURRENT #67: Fri Oct 8 14:11:54 EDT 2004 jr at linwhf.opal.com:/usr/src-current/sys/i386/compile/LINWHF i386
>Description:
Update of port to version 4.07 from Berkeley.
Port files deleted:
files/patch-db::db_table.h
files/patch-db::schema_to_class.awk
files/patch-db::sqlblob.h
files/patch-db::xml_util.h
all deleted because those changes have now been incorporated
into the distributed source.
New version includes other changes also, as documented on the
Seti website.
>How-To-Repeat:
>Fix:
diff -ruN boinc-setiathome-4.03/Makefile boinc-setiathome/Makefile
--- boinc-setiathome-4.03/Makefile Sun Oct 17 18:47:46 2004
+++ boinc-setiathome/Makefile Tue Nov 9 14:12:05 2004
@@ -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 at opal.com
COMMENT= Setiathome for boinc
diff -ruN boinc-setiathome-4.03/distinfo boinc-setiathome/distinfo
--- boinc-setiathome-4.03/distinfo Fri Oct 1 11:53:51 2004
+++ boinc-setiathome/distinfo Tue Nov 9 14:11:44 2004
@@ -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 -ruN boinc-setiathome-4.03/files/app_info.xml boinc-setiathome/files/app_info.xml
--- boinc-setiathome-4.03/files/app_info.xml Sun Oct 10 19:18:25 2004
+++ boinc-setiathome/files/app_info.xml Tue Nov 9 14:18:59 2004
@@ -7,7 +7,7 @@
</file_info>
<app_version>
<app_name>setiathome</app_name>
- <version_num>403</version_num>
+ <version_num>407</version_num>
<file_ref>
<file_name>%%SETI_BINARY%%</file_name>
<main_program/>
diff -ruN boinc-setiathome-4.03/files/patch-db::db_table.h boinc-setiathome/files/patch-db::db_table.h
--- boinc-setiathome-4.03/files/patch-db::db_table.h Sat Oct 2 15:41:54 2004
+++ boinc-setiathome/files/patch-db::db_table.h Wed Dec 31 19:00:00 1969
@@ -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 <typename T>
-+class db_table;
-+
-+template <typename T>
-+std::ostream &operator <<(std::ostream &o, const db_type<T> &a) {
-+ o << a.print_xml();
-+ return o;
-+}
-+
-+template <typename T>
-+std::ostream &operator <<(std::ostream &o, const db_table<T> &a) {
-+ o << a.me->print_xml();
-+ return o;
-+}
-+
-+template <typename T>
-+std::istream &operator >>(std::istream &i, db_table<T> &a) {
-+ std::string s;
-+ std::string s_tag("<");
-+ std::string e_tag("</");
-+ s_tag+=a._search_tag;
-+ e_tag+=a._search_tag;
-+ std::string buffer("");
-+ bool found=false, done=false;
-+ while (!i.eof() && !done) {
-+ i >> 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 <typename T>
- class db_table {
- public:
- db_table(T &t, SQL_CURSOR c);
-@@ -332,12 +378,6 @@
-
- #endif
-
--template <typename T>
--std::ostream &operator <<(std::ostream &o, const db_type<T> &a) {
-- o << a.print_xml();
-- return o;
--}
--
- template <typename T, typename ID_TYPE>
- std::ostream &operator <<(std::ostream &o, const db_reference<T,ID_TYPE> &a) {
- o << a.print_xml();
-@@ -345,12 +385,6 @@
- }
-
- template <typename T>
--std::ostream &operator <<(std::ostream &o, const db_table<T> &a) {
-- o << a.me->print_xml();
-- return o;
--}
--
--template <typename T>
- const char *db_type<T>::search_tag(const char *s) {
- if (s) {
- _search_tag=s;
-@@ -368,37 +402,6 @@
- _search_tag=table_name;
- }
- return _search_tag;
--}
--
--template <typename T>
--std::istream &operator >>(std::istream &i, db_table<T> &a) {
-- std::string s;
-- std::string s_tag("<");
-- std::string e_tag("</");
-- s_tag+=a._search_tag;
-- e_tag+=a._search_tag;
-- std::string buffer("");
-- bool found=false, done=false;
-- while (!i.eof() && !done) {
-- i >> 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 <typename T>
diff -ruN boinc-setiathome-4.03/files/patch-db::schema_to_class.awk boinc-setiathome/files/patch-db::schema_to_class.awk
--- boinc-setiathome-4.03/files/patch-db::schema_to_class.awk Sun Oct 3 23:00:48 2004
+++ boinc-setiathome/files/patch-db::schema_to_class.awk Wed Dec 31 19:00:00 1969
@@ -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;i<nfields;i++) printf("\"%s\"%s",fields[i],comma[i]) >sourcefile
- print "};\n" >sourcefile
-@@ -618,7 +618,7 @@
- if (sis_deftype) print "\trv << xml_indent(-2);" > sourcefile
- print "\trv << \"</"fields[i]">\\n\"; " >sourcefile
- } else if (type[i]=="s") {
-- print "\t{\n\t std::string enc_field=xml_encode_string<char>("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 << \"</"fields[i]">\\n\";" >sourcefile
- print "\t}" >> sourcefile
diff -ruN boinc-setiathome-4.03/files/patch-db::sqlblob.h boinc-setiathome/files/patch-db::sqlblob.h
--- boinc-setiathome-4.03/files/patch-db::sqlblob.h Sun Oct 3 17:17:58 2004
+++ boinc-setiathome/files/patch-db::sqlblob.h Wed Dec 31 19:00:00 1969
@@ -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 <typename T>
-+inline std::string xml_encode_string(const sqlblob<T> &input,
-+ xml_encoding encoding=_x_xml_entity) {
-+ return xml_encode_string(static_cast<const T *>(input),input.size(),encoding);
-+}
-+
-
- template <typename T=unsigned char>
- class sqlblob {
-@@ -123,12 +129,6 @@
- template <typename T>
- std::string sqlblob<T>::print_raw() const {
- return std::string(reinterpret_cast<const char *>(&(*begin())),size());
--}
--
--template <typename T>
--inline std::string xml_encode_string(const sqlblob<T> &input,
-- xml_encoding encoding=_x_xml_entity) {
-- return xml_encode_string(static_cast<const T *>(input),input.size(),encoding);
- }
-
-
diff -ruN boinc-setiathome-4.03/files/patch-db::xml_util.h boinc-setiathome/files/patch-db::xml_util.h
--- boinc-setiathome-4.03/files/patch-db::xml_util.h Sun Oct 3 21:16:41 2004
+++ boinc-setiathome/files/patch-db::xml_util.h Wed Dec 31 19:00:00 1969
@@ -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 <typename T>
- inline std::string xml_encode_string(const std::vector<T> &input,
- xml_encoding encoding=_x_xml_entity) {
-- return xml_encode_string<T>(&(*(input.begin())),input.size(),encoding);
-+ return xml_encode_string(&(*(input.begin())),input.size(),encoding);
- }
-
- #include <cctype>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list