From jr@opal.com  Wed Feb 23 23:54:12 2005
Return-Path: <jr@opal.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4505E16A4F3
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Feb 2005 23:54:12 +0000 (GMT)
Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 360F743D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Feb 2005 23:54:11 +0000 (GMT)
	(envelope-from jr@opal.com)
Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112])
	by smtp.vzavenue.net (MOS 3.4.8-GR)
	with ESMTP id BVJ06881;
	Wed, 23 Feb 2005 18:54:09 -0500 (EST)
Received: from linwhf.opal.com (localhost [127.0.0.1])
	by linwhf.opal.com (8.13.3/8.13.1) with ESMTP id j1NNs8q9006081
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Feb 2005 18:54:08 -0500 (EST)
	(envelope-from jr@linwhf.opal.com)
Received: (from jr@localhost)
	by linwhf.opal.com (8.13.3/8.13.1/Submit) id j1NNs8Bx006080;
	Wed, 23 Feb 2005 18:54:08 -0500 (EST)
	(envelope-from jr)
Message-Id: <200502232354.j1NNs8Bx006080@linwhf.opal.com>
Date: Wed, 23 Feb 2005 18:54:08 -0500 (EST)
From: "J.R. Oldroyd" <fbsd@opal.com>
Reply-To: "J.R. Oldroyd" <fbsd@opal.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: update to boinc-setiathome-4.07.20050218 with GUI support
X-Send-Pr-Version: 3.113

>Number:         77998
>Category:       ports
>Synopsis:       update to boinc-setiathome-4.07.20050218 with GUI support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 24 00:00:46 GMT 2005
>Closed-Date:    Fri Feb 25 15:57:46 GMT 2005
>Last-Modified:  Fri Feb 25 15:57:46 GMT 2005
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD linwhf.opal.com 6.0-CURRENT FreeBSD 6.0-CURRENT #74: Tue Feb 22 18:07:40 EST 2005 jr@linwhf.opal.com:/usr/src-current/sys/i386/compile/LINWHF i386
>Description:
This update brings the port to the 4.07 version of 2005/02/18.

The most significant change is that GUI support now works.

Notes to committer:
	files/patch-client::Makefile.in		deleted
	files/patch-db::schema_to_class.in	deleted

>How-To-Repeat:

>Fix:
diff -ruN /usr/ports/astro/boinc-setiathome/Makefile astro/boinc-setiathome/Makefile
--- /usr/ports/astro/boinc-setiathome/Makefile	Sat Nov 13 11:45:42 2004
+++ astro/boinc-setiathome/Makefile	Fri Feb 18 11:41:18 2005
@@ -6,44 +6,53 @@
 #
 
 PORTNAME=	boinc-setiathome
-PORTVERSION=	4.07
+PORTVERSION=	4.07.20050218
 CATEGORIES=	astro
 MASTER_SITES=	http://boinc.berkeley.edu/seti_source/nightly/
-DISTNAME=	seti_boinc-client-cvs-2004-11-09
+DISTNAME=	seti_boinc-client-cvs-2005-02-18
 
 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
+BUILD_DEPENDS=	${LOCALBASE}/boinc/bin/boinc-client:${PORTSDIR}/net/boinc-client
+RUN_DEPENDS=	boinc:${PORTSDIR}/net/boinc-client
+LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		glut:${PORTSDIR}/graphics/libglut
+USE_XLIB=	yes
+
+USE_AUTOMAKE_VER=	19
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
+USE_LIBTOOL_VER=	15
 
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+CONFIGURE_ARGS=	--disable-server --disable-dynamic-graphics
 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
 
-WRKSRC=		${WRKDIR}/seti_boinc/client
-CONFIGURE_WRKSRC=${WRKDIR}/seti_boinc/
+WRKSRC=		${WRKDIR}/seti_boinc
 
-FIND_SETI_BINARY=(cd ${WRKSRC}; make -V PROG)
-SETI_SITE?=	setiathome.berkeley.edu
+FIND_SETI_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_PROG)
 PLIST_SUB=	SETI_SITE=${SETI_SITE} BOINC_HOME=${BOINC_HOME}
 
+SETI_SITE?=	setiathome.berkeley.edu
+SETI_BINARY=	setiathome
+
 # 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-patch:
+	cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/libtool${USE_LIBTOOL_VER}/libltdl -I m4
+	${TOUCH} ${WRKSRC}/missing
 
 post-build:
-	${SED} -e "s:%%SETI_BINARY%%:`${FIND_SETI_BINARY}`:g" \
+	${SED} -e "s:%%SETI_BINARY%%:${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
@@ -53,16 +62,16 @@
 	  < 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}
+	${INSTALL_PROGRAM} ${WRKSRC}/client/`${FIND_SETI_BINARY}` ${PREFIX}/boinc/bin/${SETI_BINARY}
+	#${INSTALL_PROGRAM} ${WRKSRC}/client/`${FIND_SETI_BINARY}`.so ${PREFIX}/boinc/lib/${SETI_BINARY}.so
+	${MKDIR} ${BOINC_HOME}/projects/${SETI_SITE}
+	${INSTALL_DATA} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SETI_SITE}
+	${LN} -s ${PREFIX}/boinc/bin/${SETI_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}
+	#${LN} -s ${PREFIX}/boinc/lib/${SETI_BINARY}.so ${BOINC_HOME}/projects/${SETI_SITE}
 
 post-install:
 	${REINPLACE_CMD} \
-	  -e "s:%%SETI_BINARY%%:`${FIND_SETI_BINARY}`:g" \
+	  -e "s:%%SETI_BINARY%%:${SETI_BINARY}:g" \
 	  -e "s:%%BOINC_HOME%%:${BOINC_HOME}:g" ${TMPPLIST}
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff -ruN /usr/ports/astro/boinc-setiathome/distinfo astro/boinc-setiathome/distinfo
--- /usr/ports/astro/boinc-setiathome/distinfo	Sat Nov 13 11:45:42 2004
+++ astro/boinc-setiathome/distinfo	Fri Feb 18 09:45:30 2005
@@ -1,2 +1,2 @@
-MD5 (seti_boinc-client-cvs-2004-11-09.tar.gz) = 4120f1701484b78e099c51adfe31653b
-SIZE (seti_boinc-client-cvs-2004-10-01.tar.gz) = 1214124
+MD5 (seti_boinc-client-cvs-2005-02-18.tar.gz) = 6f4aa7dc0a88f50bc6f7c160fb3150ef
+SIZE (seti_boinc-client-cvs-2005-02-18.tar.gz) = 1462337
diff -ruN /usr/ports/astro/boinc-setiathome/files/patch-client::Makefile.in astro/boinc-setiathome/files/patch-client::Makefile.in
--- /usr/ports/astro/boinc-setiathome/files/patch-client::Makefile.in	Mon Oct  4 00:10:48 2004
+++ astro/boinc-setiathome/files/patch-client::Makefile.in	Wed Dec 31 19:00:00 1969
@@ -1,25 +0,0 @@
---- 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))
diff -ruN /usr/ports/astro/boinc-setiathome/files/patch-db::schema_to_class.in astro/boinc-setiathome/files/patch-db::schema_to_class.in
--- /usr/ports/astro/boinc-setiathome/files/patch-db::schema_to_class.in	Sun Oct  3 17:28:50 2004
+++ astro/boinc-setiathome/files/patch-db::schema_to_class.in	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- ../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
diff -ruN /usr/ports/astro/boinc-setiathome/pkg-plist astro/boinc-setiathome/pkg-plist
--- /usr/ports/astro/boinc-setiathome/pkg-plist	Sun Oct 10 19:26:23 2004
+++ astro/boinc-setiathome/pkg-plist	Tue Feb 15 14:27:55 2005
@@ -1,7 +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%%
+boinc/bin/%%SETI_BINARY%%
+@comment boinc/lib/%%SETI_BINARY%%.so
 @cd %%BOINC_HOME%%
 projects/%%SETI_SITE%%/app_info.xml
 projects/%%SETI_SITE%%/%%SETI_BINARY%%
+@comment projects/%%SETI_SITE%%/%%SETI_BINARY%%.so

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Feb 25 15:57:30 GMT 2005 
State-Changed-Why:  
Submitter requested cancellation of this update 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77998 
>Unformatted:
