1 files changed, 34 insertions, 80 deletions

diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 2e771e811f49..dab41039c507 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -6,111 +6,65 @@
 #
 
 PORTNAME=	boinc-client
-PORTVERSION=	4.68.20050601
-PORTREVISION=	3
+PORTVERSION=	5.2.15
 CATEGORIES=	net
-MASTER_SITES=	http://boinc.berkeley.edu/source/nightly/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
-DISTNAME=	boinc-cvs-2005-06-01
 
-MAINTAINER=	fbsd@opal.com
+MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Berkeley Open Infrastructure for Network Computing client
 
-.include <bsd.port.pre.mk>
+LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-# Disable GUI on FreeBSD 4.x due to problems with wxgtk lib
-.if ${OSVERSION} < 500000
-WITHOUT_X11=	yes
-.endif
-
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv \
-		wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		glut:${PORTSDIR}/graphics/libglut
-USE_XLIBS=	yes
-.endif
-
-USE_AUTOTOOLS=	automake:19 autoheader:259 autoconf:259 libtool:15
-USE_REINPLACE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 
-MAN1=		boinc.1
-.if !defined(WITHOUT_X11)
-MLINKS=		boinc.1 boincmgr.1
-.endif
+BOINC_USER?=	boinc
+BOINC_GROUP?=	nobody
+BOINC_HOME?=	/var/db/boinc
 
-BOINC_USER=	boinc
-BOINC_GROUP=	nobody
-BOINC_HOME=	/var/db/boinc
-BOINC_BINARY=	boinc-client
-
-PLIST_SUB=	BOINC_BINARY="${BOINC_BINARY}" BOINC_HOME="${BOINC_HOME}" \
-		BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
-.if !defined(WITHOUT_X11)
-PLIST_SUB+=	BOINC_GUI=""
-.else
-PLIST_SUB+=	BOINC_GUI="@comment "
-.endif
+PLIST_SUB=	BOINC_HOME="${BOINC_HOME}" BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
 
-SUB_FILES=	bin-boinc.sh boinc.1 boinc.sh pkg-install
-SUB_LIST=	BOINC_BINARY="${BOINC_BINARY}" BOINC_HOME="${BOINC_HOME}" \
-		BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
+SUB_FILES=	pkg-install
+SUB_LIST=	BOINC_HOME="${BOINC_HOME}" BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
 
 USE_RC_SUBR=	boinc.sh
 
 CONFIGURE_ARGS=	--disable-server
+CONFIGURE_ENV=	CPPFLAGS=-I${X11BASE}/include CXXFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -O3" CFLAGS="${CFLAGS} -O3"
+
+OPTIONS=	X11 "Build Boinc Manager GUI" on
+
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
 .else
 CONFIGURE_ARGS+=	--with-wx-config=false
 .endif
-CONFIGURE_ENV=	CPPFLAGS=-I${X11BASE}/include CXXFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include"
 
-FIND_BOINC_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_BIN_FILENAME)
-FIND_BOINCMGR_BINARY=(cd ${WRKSRC}/client; make -V CLIENT_GUI_BIN_FILENAME)
+.if !defined(WITHOUT_X11)
+LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv \
+		wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		glut:${PORTSDIR}/graphics/libglut
+.endif
 
-WRKSRC=		${WRKDIR}/boinc
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGPLIST=	${WRKDIR}/pkg-plist
+.if !defined(WITHOUT_X11)
+PLIST_SUB+=	BOINC_GUI=""
+.else
+PLIST_SUB+=	BOINC_GUI="@comment "
+.endif
 
 .if ${OSVERSION} < 500000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-client-time_stats.C
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-MainDocument.cpp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-MainFrame.cpp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-ViewProjects.cpp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-ViewResources.cpp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-ViewTransfers.cpp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-ViewWork.cpp
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clientgui-stdwx.h
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-lib-acct_mgr_client.C
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-lib-diagnostics.h
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-lib-gui_rpc_client.C
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-lib-parse.C
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-zip-boinc_zip.cpp
+BROKEN=		Does not compile. Consider upgrading your FreeBSD to at least 5.X
 .endif
 
-pre-configure:
-	cd ${WRKSRC}; ${ACLOCAL} -I m4
-
-do-install:
-	${MKDIR} ${PREFIX}/lib/boinc
-	${INSTALL_PROGRAM} ${WRKSRC}/client/`${FIND_BOINC_BINARY}` ${PREFIX}/lib/boinc/${BOINC_BINARY}
-.if !defined(WITHOUT_X11)
-	${INSTALL_PROGRAM} ${WRKSRC}/clientgui/`${FIND_BOINCMGR_BINARY}` ${PREFIX}/bin
-.endif
-	${MKDIR} ${PREFIX}/include/BOINC
-	${INSTALL} ${WRKSRC}/api/*.h ${PREFIX}/include/BOINC
-	${INSTALL} ${WRKSRC}/lib/*.h ${PREFIX}/include/BOINC
-	${INSTALL} ${WRKSRC}/zip/*.h ${PREFIX}/include/BOINC
-	${INSTALL} ${WRKSRC}/api/*.a ${PREFIX}/lib
-	${INSTALL} ${WRKSRC}/lib/*.a ${PREFIX}/lib
-	${INSTALL} ${WRKSRC}/zip/*.a ${PREFIX}/lib
-	${INSTALL} ${WRKSRC}/RSAEuro/source/librsaeuro.a ${PREFIX}/lib
-	${INSTALL_SCRIPT} ${WRKDIR}/bin-boinc.sh ${PREFIX}/bin/boinc
-	${INSTALL_MAN} ${WRKDIR}/boinc.1 ${PREFIX}/man/man1
-	${CAT} ${PKGMESSAGE}
+post-patch:
+	@${REINPLACE_CMD} -e 's|gui_rpc_auth.cfg|${BOINC_HOME}/gui_rpc_auth.cfg|g' \
+		${WRKSRC}/client/file_names.h ${WRKSRC}/lib/boinc_cmd.C \
+		${WRKSRC}/clientgui/MainDocument.cpp
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL