Hi,

attached is a shell archive for version 5.06 of the Astropulse client of
the s...@home project, as well as an infrastructure-only update of the
s...@home client.  The latter is required because both subprojects share
the same app_info.xml file.

Work units for Astropulse seem quite scarce, which means I didn't get
one myself yet.  So I'm not sure if the calculations will be correct,
but on the other hand the source code is original, except for some
changes to make it compile against the current release version of
s...@home instead of the current development version.

I would be interested in the actual results of the boinc-astropulse port.

Thanks,
Rene
-- 
http://www.rene-ladan.nl/

GPG fingerprint = ADBC ECCD EB5F A6B4 549F  600D 8C9E 647A E564 2BFC
(subkeys.pgp.net)
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       boinc-astropulse
#       boinc-astropulse/pkg-descr
#       boinc-astropulse/distinfo
#       boinc-astropulse/pkg-plist
#       boinc-astropulse/Makefile
#       boinc-astropulse/files
#       boinc-astropulse/files/pkg-install.in
#       boinc-astropulse/files/pkg-message.in
#       boinc-astropulse/files/patch-client_configure.ac
#       boinc-astropulse/files/patch-client_m4_sah_check_boinc.m4
#       boinc-astropulse/files/pkg-deinstall.in
#       boinc-astropulse/files/patch-client_Makefile.am
#       boinc-astropulse/files/patch-legacy-server_db_ap_schema.cpp
#
echo c - boinc-astropulse
mkdir -p boinc-astropulse > /dev/null 2>&1
echo x - boinc-astropulse/pkg-descr
sed 's/^X//' >boinc-astropulse/pkg-descr << 'ba111c0dfde6e0fc817fec10baf5b404'
XSETI - Search for Extra-Terrestrial Intelligence -- AstroPulse
X
XThe project listens for broad-band, short-time pulses that might represent
Xextraterrestial intelligence, or other phenomena such as rapidly rotating
Xpulsars or exploding primordial black holes.
X
XThe port automatically optimizes for the host CPU using the CPUTYPE
Xvariable in /etc/make.conf
X
XWWW: http://setiathome.berkeley.edu/
ba111c0dfde6e0fc817fec10baf5b404
echo x - boinc-astropulse/distinfo
sed 's/^X//' >boinc-astropulse/distinfo << '14865789e7d628051272f32f7a3f17c4'
XMD5 (astropulse-svn-562.tar.bz2) = 0ef9a54db0c603f9302017c751e57e57
XSHA256 (astropulse-svn-562.tar.bz2) = 
30abe5e64428b07106763903bcfc8149cdf5fde6dc84b3ddce7247d491441e5f
XSIZE (astropulse-svn-562.tar.bz2) = 1377080
14865789e7d628051272f32f7a3f17c4
echo x - boinc-astropulse/pkg-plist
sed 's/^X//' >boinc-astropulse/pkg-plist << '87de1f91fc33c52eef7bd1fffdbdfc45'
x...@cwd %%BOINC_HOME%%/projects
X%%SETI_SITE%%/%%AP_BINARY%%
X%%X11%%%%SETI_SITE%%/ap_graphics
x...@dirrmtry %%SETI_SITE%%
87de1f91fc33c52eef7bd1fffdbdfc45
echo x - boinc-astropulse/Makefile
sed 's/^X//' >boinc-astropulse/Makefile << 'd060143090403850dfd87df95de76456'
X# New ports collection makefile for:   boinc-astropulse
X# Date created:                                8 July 2009
X# Whom:                                        Rene Ladan <r...@freebsd.org>
X# $FreeBSD$
X#
X
XPORTNAME=      boinc-astropulse
XPORTVERSION=   5.06
XCATEGORIES=    astro
XMASTER_SITES=  ftp://rene-ladan.nl/pub/distfiles/
XDISTNAME=      astropulse-svn-562
X
XMAINTAINER=    r...@freebsd.org
XCOMMENT=       Astropulse for BOINC
X
XEXTRACT_DEPENDS=${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-enhanced:patch
XBUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \
X               
${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client \
X               ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
XRUN_DEPENDS=   boinc_client:${PORTSDIR}/net/boinc-client
XLIB_DEPENDS=   fftw3f:${PORTSDIR}/math/fftw3-float
X
XUSE_AUTOTOOLS= autoconf:262:env automake:110:env
XUSE_BZIP2=     yes
XGNU_CONFIGURE= yes
XUSE_GMAKE=     yes
XUSE_GNOME=     pkgconfig
XWRKSRC=                ${WRKDIR}/${DISTNAME}/client
X
XCFLAGS+=       -O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include 
-L${LOCALBASE}/lib
X.if defined(CPUTYPE)
XCFLAGS+=       -march=${CPUTYPE}
X.endif
X
X# these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
XBOINC_USER?=   boinc
XBOINC_GROUP?=  nobody
XBOINC_HOME?=   /var/db/boinc
X
XOPTIONS=       X11             "Build screensaver" on
X
X.include <bsd.port.pre.mk>
X
X# TODO fix upstream
X.if defined(WITHOUT_X11)
XBROKEN=Currently Astropulse requires X11 to build
X.endif
X
X.if !defined(WITHOUT_X11)
X.if !exists(${LOCALBASE}/lib/libboinc_graphics2.a)
XBROKEN=Reinstall net/boinc-client with X11 enabled for screensavers
X.endif
XLIB_DEPENDS+=  jpeg.11:${PORTSDIR}/graphics/jpeg \
X               xcb.2:${PORTSDIR}/x11/libxcb
XUSE_GL=                gl glu glut
XUSE_XORG=      ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm
XPLIST_SUB+=    X11=""
X.else
XCONFIGURE_ARGS+=       --disable-graphics
XPLIST_SUB+=    X11="@comment "
X.endif
X
X.if ${OSVERSION} >= 700042 && (${ARCH} == "amd64" || ${ARCH} == "i386")
XCFLAGS+=       -mtune=native
X.endif
X
XCXXFLAGS+=     ${CFLAGS}
X
XCONFIGURE_ENV+=        BOINCDIR="${LOCALBASE}" \
X               BOINC_DIR="${LOCALBASE}" \
X               
SETI_BOINC_DIR="${PORTSDIR}/astro/boinc-setiathome-enhanced/work/setiathome-svn-412"
XCONFIGURE_ARGS+=       --disable-static-client 
--with-boinc-platform=${ARCH}-portbld-freebsd
X
XSETI_SITE=     setiathome.berkeley.edu
XAP_BINARY=     astropulse-${PORTVERSION:S/.0/./}.${ARCH}-portbld-freebsd
X
XSUB_FILES=     pkg-deinstall pkg-install pkg-message
XSUB_LIST=      AP_BINARY=${AP_BINARY} \
X               AP_VERSION=${PORTVERSION:S/.//} \
X               SETI_SITE=${SETI_SITE} \
X               BOINC_HOME=${BOINC_HOME}
XPLIST_SUB+=    AP_BINARY=${AP_BINARY} \
X               SETI_SITE=${SETI_SITE} \
X               BOINC_HOME=${BOINC_HOME}
X
Xpre-configure:
X       (cd ${WRKSRC} ; ./_autosetup ; ${REINPLACE_CMD} -E -e 
"s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure)
X
Xdo-install:
X       ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
X       ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} 
${BOINC_HOME}/projects/${SETI_SITE}
X       ${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} 
${WRKSRC}/${AP_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
X.if !defined(WITHOUT_X11)
X       ${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} 
${WRKSRC}/ap_graphics ${BOINC_HOME}/projects/${SETI_SITE}/
X.endif
X
Xpost-install:
X       @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
X       @${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.post.mk>
d060143090403850dfd87df95de76456
echo c - boinc-astropulse/files
mkdir -p boinc-astropulse/files > /dev/null 2>&1
echo x - boinc-astropulse/files/pkg-install.in
sed 's/^X//' >boinc-astropulse/files/pkg-install.in << 
'03feba2f7ca8a25fd0cedb794a0a61c5'
X#!/bin/sh
X
X# $FreeBSD$
X
Xif [ "$2" != "POST-INSTALL" ]; then
X    exit 0
Xfi
X
XF=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
X
Xif [ ! -f $F ]; then
X    echo Creating new $F
X    echo "<app_info>" > $F
X    echo "</app_info>" >> $F
Xfi
X
Xecho Adding astropulse_v505 lines to $F
Xed - $F <<EOF
X1a
X<app>
X<name>astropulse_v505</name>
X</app>
X<file_info>
X<name>%%AP_BINARY%%</name>
X<executable/>
X</file_info>
X<app_version>
X<app_name>astropulse_v505</app_name>
X<version_num>%%AP_VERSION%%</version_num>
X<file_ref>
X<file_name>%%AP_BINARY%%</file_name>
X<main_program/>
X</file_ref>
X</app_version>
X.
Xw
Xq
XEOF
03feba2f7ca8a25fd0cedb794a0a61c5
echo x - boinc-astropulse/files/pkg-message.in
sed 's/^X//' >boinc-astropulse/files/pkg-message.in << 
'437b14a4eaf04d999be8e6a8443afde4'
X*****************************************************************************
XATTACHING PROJECT
X
XJust run boinc_gui (if installed), choose Attach, and follow instructions.
XProject URL is %%SETI_SITE%%
X
XMANUAL INSTALLATION
X *) If this is your first time in any BOINC project, create a new account at
X    http://%%SETI_SITE%%/create_account_form.php
X
X *) Or get your account key at http://%%SETI_SITE%%/get_passwd.php
X
X *) Attach to the project:
X    cd /var/db/boinc
X    boinc_cmd --project_attach %%SETI_SITE%% <account key>
X*****************************************************************************
437b14a4eaf04d999be8e6a8443afde4
echo x - boinc-astropulse/files/patch-client_configure.ac
sed 's/^X//' >boinc-astropulse/files/patch-client_configure.ac << 
'aee6d76baab32fcdbec51c70915ee552'
X--- configure.ac.orig  2009-06-11 19:35:16.000000000 +0200
X+++ configure.ac       2009-09-23 21:56:49.000000000 +0200
X@@ -7,17 +7,17 @@
X dnl Process this file with autoconf to produce a configure script.
X AC_INIT(astropulse, 5.06)
X 
X-svnrev="`svn info | grep Revision:`"
X+#svnrev="`svn info | grep Revision:`"
X 
X-if test -n "${svnrev}" ; then
X-  AC_REVISION("${svnrev}") 
X-  AC_DEFINE_UNQUOTED(SVN_REV,"${svnrev}",
X-    [Define to be the subversion revision number])
X-else
X-  AC_REVISION([$Revision: 163 $])
X-  AC_DEFINE(SVN_REV,"$Revision: 163 $",
X+#if test -n "${svnrev}" ; then
X+#  AC_REVISION("${svnrev}") 
X+#  AC_DEFINE_UNQUOTED(SVN_REV,"${svnrev}",
X+#    [Define to be the subversion revision number])
X+#else
X+  AC_REVISION([$Revision: 562 $])
X+  AC_DEFINE(SVN_REV,"$Revision: 562 $",
X     [Define to be the subversion revision number])
X-fi
X+#fi
X 
X 
X echo "--- Configuring Astropulse $AC_PACKAGE_VERSION ---"
X@@ -262,9 +262,7 @@
X dnl AC_CHECK_LIB([stdc++], [main])
X SAH_GRX_LIBS
X AC_LANG(C++)
X-SAH_CHECK_BOINC
X SAH_CHECK_SAH
X-SAH_FIND_SETILIB
X AC_CACHE_SAVE
X
X if test "${ac_cv_cxx_compiler_gnu}" = "yes" ; then
X@@ -378,7 +376,7 @@
X AM_CONDITIONAL(ENABLE_GUI, [test "${enable_graphics}" = yes])
X AM_CONDITIONAL(LINUX, [test -n "`echo ${target} | grep linux`"])
X AM_CONDITIONAL(I386, [test -n "`echo ${target} | grep i.86`"])
X-AM_CONDITIONAL(X86_64, [test -n "`echo ${target} | grep 'x86_64'`"])
X+AM_CONDITIONAL(X86_64, [test -n "`echo ${target} | ${EGREP} 'x86_64|amd64'`"])
X AM_CONDITIONAL(PPC, [test -n "`echo ${target} | grep 'powerpc'`" -o -n "`echo 
${target} | grep 'ppc'`" ])
X 
X 
aee6d76baab32fcdbec51c70915ee552
echo x - boinc-astropulse/files/patch-client_m4_sah_check_boinc.m4
sed 's/^X//' >boinc-astropulse/files/patch-client_m4_sah_check_boinc.m4 << 
'e82c28af0153942350d42f57b818fb38'
X--- m4/sah_check_boinc.m4      (revision 633)
X+++ m4/sah_check_boinc.m4      (working copy)
X@@ -23,16 +23,16 @@
X   do
X     if test -d $boinc_dir 
X     then
X-      if test -f $boinc_dir/Makefile.am 
X+      if test -f $boinc_dir/include/std_fixes.h -o -f 
$boinc_dir/lib/std_fixes.h
X       then
X         cd $boinc_dir
X         BOINCDIR=`pwd`
X       cd $thisdir
X       break
X       else
X-        if $FIND $boinc_dir -name "Makefile.am" >& /dev/null
X+        if $FIND $boinc_dir -name "std_fixes.h" >& /dev/null
X       then
X-        BOINCDIR=`$FIND $boinc_dir -name "Makefile.am" -print | $HEAD -1 | 
sed 's/\/Makefile.am//'`         
X+        BOINCDIR=`$FIND $boinc_dir -name "std_fixes.h" -print | $HEAD -1 | 
sed 's/\/std_fixes.h//'`         
X           cd $BOINCDIR
X           BOINCDIR=`pwd`
X         cd $thisdir
e82c28af0153942350d42f57b818fb38
echo x - boinc-astropulse/files/pkg-deinstall.in
sed 's/^X//' >boinc-astropulse/files/pkg-deinstall.in << 
'6254bac2ea3fdf87ae80ef7effb4530b'
X#!/bin/sh
X
X# $FreeBSD$
X
Xif [ "$2" != "POST-DEINSTALL" ]; then
X    exit 0
Xfi
X
XF=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
Xecho Removing astropulse_v505 lines from $F
X
Xl=`grep -n "<name>astropulse_v505</name>" $F | cut -f 1 -d :`
Xif [ $? -ne 0 ]; then
X    echo $F is corrupt
X    exit 1
Xfi
Xl1=$((l-1))
Xl2=$((l+13))
Xsed -i.bak "${l1},${l2}d" $F # sed wants the braces
Xrm $F.bak
X
Xl=`wc -l $F | cut -f 1 -d / | sed 's/ //g'`
Xif [ $l -eq 2 ]; then
X    echo Removing empty $F
X    rm $F
Xfi
6254bac2ea3fdf87ae80ef7effb4530b
echo x - boinc-astropulse/files/patch-client_Makefile.am
sed 's/^X//' >boinc-astropulse/files/patch-client_Makefile.am << 
'a7da22ce617ebdf3b0d23d0a42260a7e'
X--- Makefile.am        (revision 633)
X+++ Makefile.am        (working copy)
X@@ -31,7 +31,7 @@
X      GUI_C_FLAGS = $(CLIENT_C_FLAGS) $(GRAPHICS_CFLAGS)
X      GUI_LD_FLAGS = $(CLIENT_LD_FLAGS)
X      GUI_LD_ADD = -L$(BOINCDIR)/api -L$(BOINCDIR)/lib $(BOINC_LIBS) 
$(GRAPHICS_LIBS_RAW) $(APP_LIBS)
X-     CLIENT_LD_FLAGS += $(LDSTATIC) -nodefaultlibs
X+     CLIENT_LD_FLAGS += $(LDSTATIC)
X      CLIENT_LD_ADD += -L$(BOINCDIR)/api -L$(BOINCDIR)/lib $(BOINC_LIBS) 
$(AM_LIBS) $(APP_LIBS)
X      AP_GRX_SOURCES = ap_gfx_main.cpp 
X else
a7da22ce617ebdf3b0d23d0a42260a7e
echo x - boinc-astropulse/files/patch-legacy-server_db_ap_schema.cpp
sed 's/^X//' >boinc-astropulse/files/patch-legacy-server_db_ap_schema.cpp << 
'660032f7bc3193bca18b215cd61c0346'
X--- ../server/db/ap_schema.cpp.orig    2009-06-16 19:06:20.000000000 +0200
X+++ ../server/db/ap_schema.cpp 2009-09-25 22:26:58.000000000 +0200
X@@ -174,7 +174,7 @@
X             }
X 
X       void coordinate_t::parse(const std::string &s) {
X-            SQL_ROW row(&s,3);
X+            SQL_ROW row(s.c_str(),3);
X             parse(row);
X             }
X 
X@@ -313,7 +313,7 @@
X             }
X 
X       void threshold_t::parse(const std::string &s) {
X-            SQL_ROW row(&s,2);
X+            SQL_ROW row(s.c_str(),2);
X             parse(row);
X             }
X 
X@@ -460,10 +460,10 @@
X 
X       void data_description_t::parse(const SQL_ROW &s) {
X         {  
X-        start.parse(SQL_ROW(s[0],0));
X+        start.parse(SQL_ROW(s[0]->c_str(),0));
X           }
X         {  
X-        end.parse(SQL_ROW(s[1],0));
X+        end.parse(SQL_ROW(s[1]->c_str(),0));
X           }
X         {  
X               std::istringstream row(*(s[2]));
X@@ -476,7 +476,7 @@
X             }
X 
X       void data_description_t::parse(const std::string &s) {
X-            SQL_ROW row(&s,4);
X+            SQL_ROW row(s.c_str(),4);
X             parse(row);
X             }
X 
X@@ -714,7 +714,7 @@
X             }
X 
X       void tape::parse(const std::string &s) {
X-            SQL_ROW row(&s,8);
X+            SQL_ROW row(s.c_str(),8);
X             parse(row);
X             }
X 
X@@ -1034,15 +1034,15 @@
X         std::string::size_type p,q;
X         int i;
X           thresholds.clear();
X-            SQL_ROW tmp(s[11]); 
X+            SQL_ROW tmp((*s[11]).c_str()); 
X             for (i=0;i<tmp.argc();i++) {
X-       thresholds.push_back(threshold_t(SQL_ROW(tmp[i])));
X+       thresholds.push_back(threshold_t(SQL_ROW((*tmp[i]).c_str())));
X             }
X           }
X             }
X 
X       void analysis_config::parse(const std::string &s) {
X-            SQL_ROW row(&s,12);
X+            SQL_ROW row(s.c_str(),12);
X             parse(row);
X             }
X 
X@@ -1248,7 +1248,7 @@
X             }
X 
X       void recorder_config::parse(const std::string &s) {
X-            SQL_ROW row(&s,6);
X+            SQL_ROW row(s.c_str(),6);
X             parse(row);
X             }
X 
X@@ -1643,7 +1643,7 @@
X         std::string::size_type p,q;
X         int i;
X           az_corr_coeff.clear();
X-            SQL_ROW tmp(s[10]); 
X+            SQL_ROW tmp((*s[10]).c_str()); 
X               for (i=0;i<tmp.argc();i++) {
X                 std::istringstream in(*(tmp[i]));
X                 float tmp0;
X@@ -1655,7 +1655,7 @@
X         std::string::size_type p,q;
X         int i;
X           zen_corr_coeff.clear();
X-            SQL_ROW tmp(s[11]); 
X+            SQL_ROW tmp((*s[11]).c_str()); 
X               for (i=0;i<tmp.argc();i++) {
X                 std::istringstream in(*(tmp[i]));
X                 float tmp0;
X@@ -1678,7 +1678,7 @@
X             }
X 
X       void receiver_config::parse(const std::string &s) {
X-            SQL_ROW row(&s,15);
X+            SQL_ROW row(s.c_str(),15);
X             parse(row);
X             }
X 
X@@ -1828,7 +1828,7 @@
X             }
X 
X       void splitter_config::parse(const std::string &s) {
X-            SQL_ROW row(&s,3);
X+            SQL_ROW row(s.c_str(),3);
X             parse(row);
X             }
X 
X@@ -2044,21 +2044,21 @@
X               row >> active;
X           }
X         {  
X-        receiver_cfg.parse(SQL_ROW(s[2],0));
X+        receiver_cfg.parse(SQL_ROW(s[2]->c_str(),0));
X           }
X         {  
X-        recorder_cfg.parse(SQL_ROW(s[3],0));
X+        recorder_cfg.parse(SQL_ROW(s[3]->c_str(),0));
X           }
X         {  
X-        splitter_cfg.parse(SQL_ROW(s[4],0));
X+        splitter_cfg.parse(SQL_ROW(s[4]->c_str(),0));
X           }
X         {  
X-        analysis_cfg.parse(SQL_ROW(s[5],0));
X+        analysis_cfg.parse(SQL_ROW(s[5]->c_str(),0));
X           }
X             }
X 
X       void settings::parse(const std::string &s) {
X-            SQL_ROW row(&s,6);
X+            SQL_ROW row(s.c_str(),6);
X             parse(row);
X             }
X 
X@@ -2312,27 +2312,27 @@
X               name[127]=0;
X           }
X         {  
X-        tape_info.parse(SQL_ROW(s[2],0));
X+        tape_info.parse(SQL_ROW(s[2]->c_str(),0));
X           }
X         {  
X-        receiver_cfg.parse(SQL_ROW(s[3],0));
X+        receiver_cfg.parse(SQL_ROW(s[3]->c_str(),0));
X           }
X         {  
X-        recorder_cfg.parse(SQL_ROW(s[4],0));
X+        recorder_cfg.parse(SQL_ROW(s[4]->c_str(),0));
X           }
X         {  
X-        splitter_cfg.parse(SQL_ROW(s[5],0));
X+        splitter_cfg.parse(SQL_ROW(s[5]->c_str(),0));
X           }
X         {  
X-        analysis_cfg.parse(SQL_ROW(s[6],0));
X+        analysis_cfg.parse(SQL_ROW(s[6]->c_str(),0));
X           }
X         {  
X-        data_desc.parse(SQL_ROW(s[7],0));
X+        data_desc.parse(SQL_ROW(s[7]->c_str(),0));
X           }
X             }
X 
X       void workunit_header::parse(const std::string &s) {
X-            SQL_ROW row(&s,8);
X+            SQL_ROW row(s.c_str(),8);
X             parse(row);
X             }
X 
X@@ -2569,7 +2569,7 @@
X               row >> boinc_result;
X           }
X         {  
X-        wuid.parse(SQL_ROW(s[2],0));
X+        wuid.parse(SQL_ROW(s[2]->c_str(),0));
X           }
X         {  
X               std::istringstream row(*(s[3]));
X@@ -2602,7 +2602,7 @@
X             }
X 
X       void result::parse(const std::string &s) {
X-            SQL_ROW row(&s,10);
X+            SQL_ROW row(s.c_str(),10);
X             parse(row);
X             }
X 
X@@ -2959,7 +2959,7 @@
X               row >> id;
X           }
X         {  
X-        resultid.parse(SQL_ROW(s[1],0));
X+        resultid.parse(SQL_ROW(s[1]->c_str(),0));
X           }
X         {  
X               std::istringstream row(*(s[2]));
X@@ -3034,7 +3034,7 @@
X             }
X 
X       void ap_signal::parse(const std::string &s) {
X-            SQL_ROW row(&s,20);
X+            SQL_ROW row(s.c_str(),20);
X             parse(row);
X             }
X 
X@@ -3315,7 +3315,7 @@
X               row >> id;
X           }
X         {  
X-        ap_signalid.parse(SQL_ROW(s[1],0));
X+        ap_signalid.parse(SQL_ROW(s[1]->c_str(),0));
X           }
X         {  
X               std::istringstream row(*(s[2]));
X@@ -3368,7 +3368,7 @@
X             }
X 
X       void rfi::parse(const std::string &s) {
X-            SQL_ROW row(&s,14);
X+            SQL_ROW row(s.c_str(),14);
X             parse(row);
X             }
X 
660032f7bc3193bca18b215cd61c0346
exit

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/boinc-setiathome-enhanced/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile    5 Feb 2010 11:33:50 -0000       1.26
+++ Makefile    8 Feb 2010 20:32:33 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=      boinc-setiathome-enhanced
 PORTVERSION=   6.08
-PORTREVISION=  1
+PORTREVISION=  2
 CATEGORIES=    astro
 MASTER_SITES=  ftp://rene-ladan.nl/pub/distfiles/
 DISTNAME=      setiathome-svn-412
@@ -67,16 +67,17 @@
 SETI_SITE=     setiathome.berkeley.edu
 SETI_BINARY=   setiathome-${PORTVERSION:S/.0/./}.${ARCH}-portbld-freebsd
 
-SUB_FILES=     app_info.xml pkg-message
+SUB_FILES=     pkg-deinstall pkg-install pkg-message
 SUB_LIST=      SETI_BINARY=${SETI_BINARY} \
                SETI_SITE=${SETI_SITE} \
-               SETI_VERSION=${PORTVERSION:S/.//}
+               SETI_VERSION=${PORTVERSION:S/.//} \
+               BOINC_HOME=${BOINC_HOME}
 PLIST_SUB+=    SETI_BINARY=${SETI_BINARY} \
                SETI_SITE=${SETI_SITE} \
                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|" ./configure)
 
 do-install:
        ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
@@ -85,9 +86,9 @@
 .if !defined(WITHOUT_X11)
        ${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} 
${WRKSRC}/client/seti_graphics ${BOINC_HOME}/projects/${SETI_SITE}/
 .endif
-       ${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} 
${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SETI_SITE}/
 
 post-install:
+       @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
        @${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/astro/boinc-setiathome-enhanced/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist   15 Sep 2009 21:37:57 -0000      1.6
+++ pkg-plist   8 Feb 2010 20:32:33 -0000
@@ -1,5 +1,4 @@
 @cwd %%BOINC_HOME%%/projects
-%%SETI_SITE%%/app_info.xml
 %%SETI_SITE%%/%%SETI_BINARY%%
 %%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
--- files/app_info.xml.in       15 Sep 2009 21:37:57 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<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/pkg-deinstall.in
===================================================================
RCS file: files/pkg-deinstall.in
diff -N files/pkg-deinstall.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ files/pkg-deinstall.in      8 Feb 2010 20:32:33 -0000
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
+
+F=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
+echo Removing setiathome_enhanced lines from $F
+
+l=`grep -n "<name>setiathome_enhanced</name>" $F | cut -f 1 -d :`
+if [ $? -ne 0 ]; then
+    echo $F is corrupt
+    exit 1
+fi
+l1=$((l-1))
+l2=$((l+13))
+sed -i.bak "${l1},${l2}d" $F # sed wants the braces
+rm $F.bak
+
+l=`wc -l $F | cut -f 1 -d / | sed 's/ //g'`
+if [ $l -eq 2 ]; then
+    echo Removing empty $F
+    rm $F
+fi
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ files/pkg-install.in        8 Feb 2010 20:32:33 -0000
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+if [ "$2" != "POST-INSTALL" ]; then
+    exit 0
+fi
+
+F=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
+
+if [ ! -f $F ]; then
+    echo Creating new $F
+    echo "<app_info>" > $F
+    echo "</app_info>" >> $F
+fi
+
+echo Adding setiathome_enhanced lines to $F
+ed - $F <<EOF
+1a
+<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>
+.
+w
+q
+EOF

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to