From nobody Wed Aug 10 17:03:35 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M2x9360vjz4YQlF; Wed, 10 Aug 2022 17:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M2x934TZZz4NGY; Wed, 10 Aug 2022 17:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660151015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXPU7F0eL6K3ZqAEVM6iGIAa03Z6E5M++Qmr7l97JDE=; b=Yw5J/hM6RGebC7FYyWenY4rPNQSq82HQtDF8r1/Z9YkaarAWCSYzioN6q+OijHDYec257V VFV5y5LKgRzo4r9B4I+n5x5GTFdyQCxc9ZYhejJptdN3CkxBFrxtCIg76z7zwRdaE6mrIm jgfw814aQEFbIBrZ2pwz31SXmEkOTG5SIv7jbxtb2GwT69BZXoRVRIi47L6MVPzaTE2tb2 /IfdUnN/lVelC/iB0N8ZkR1k2fxvsP/Xo2blR5sr+9qTVhSNymMuLJTMo4SLGSeAZnHsP3 ULNobIuOush28zOM/tmDH40FdoFn9gw7iV4Y+DVt8OVdkotCCJLiIiaf4PB4QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M2x9338ZqzJfc; Wed, 10 Aug 2022 17:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27AH3Zd8053992; Wed, 10 Aug 2022 17:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AH3ZS8053991; Wed, 10 Aug 2022 17:03:35 GMT (envelope-from git) Date: Wed, 10 Aug 2022 17:03:35 GMT Message-Id: <202208101703.27AH3ZS8053991@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: 609457fe58e4 - main - net/boinc-client: add keyword.h include for boinc_curses List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 609457fe58e48f3acfb99a7b72eec69195473439 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660151015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXPU7F0eL6K3ZqAEVM6iGIAa03Z6E5M++Qmr7l97JDE=; b=iOVv4ZD8W30sRIOkq06nKaN9UpTbrDOn/z6jFqWAEzsJ+sKzN3Cvz9ex2cfCdQ01nWHwsA WVrnPPF71JDLf8hW3og8CEgPkN2S7PEcM2T30zyi8AshXaJwjiTdLNowvAVvva4do5C83K SA6EY90NN/kVliTfmob2MEvbozmmCznP8pDDOa/5w6HkUbrd1a3hBUFNOq0X+B8UWXdEDu FZaQV+1AF5U0fzhEhNQ+SNmEdDJIQjt2S8p9PQt21r1CxwtaHoFOCbFc+PGgMsIr3Q3eYP 9GRUSnow7vSasHAIrLnvnoC59Z5Hr44pt740KCKhMzreBTN3j3foRITO4MV1Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660151015; a=rsa-sha256; cv=none; b=j+wnorGbMdAHhQ+qBjYQHahV97VjO/V8hQ/oMN3HyIlO7Y1rgGzxSY8eBXwEoUDwILsFkG YTcW63vjhKbDmuEQjBYa4t/mDhy4nuv73wiPUucDNlMN7+OC0kApIPylhPLsf6Z3AqHcYC dsqax4u+2EH0fY81OYyq84S5tKn/Ynw0Y8wv5Q+dhL7D5UfgrQ4QVVW/n4fHNIIXzuyHO7 9/6M76M1EXaMJilArhQRKyabv/Q8EOTRlQtLEQ5KXOvf504WSEoi3WVkncyYroRKGtf2BZ 4qW3V9KcX6BZHWOJrO5R0YkhF8mAqTg6doDyn/NFxq6LQ+56izEWBepstu9LnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=609457fe58e48f3acfb99a7b72eec69195473439 commit 609457fe58e48f3acfb99a7b72eec69195473439 Author: Larry Rosenman AuthorDate: 2022-08-10 17:02:43 +0000 Commit: Larry Rosenman CommitDate: 2022-08-10 17:02:43 +0000 net/boinc-client: add keyword.h include for boinc_curses portfmt run as well. --- net/boinc-client/Makefile | 144 +++++++++++++++++++++++++-------------------- net/boinc-client/pkg-plist | 1 + 2 files changed, 82 insertions(+), 63 deletions(-) diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 0ef41735e773..0218a713b6f7 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -1,6 +1,6 @@ PORTNAME= boinc-client PORTVERSION= 7.20.2 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= client_release/7.20/ CATEGORIES= net @@ -9,8 +9,8 @@ COMMENT= Berkeley Open Infrastructure for Network Computing client LICENSE= LGPL3 -USES= autoreconf compiler:c++11-lang dos2unix gettext gmake \ - libtool pkgconfig ssl tar:xz +USES= autoreconf compiler:c++11-lang dos2unix gettext gmake libtool \ + pkgconfig ssl tar:xz INSTALL_TARGET= install-strip GNU_CONFIGURE= yes USE_GITHUB= yes @@ -26,64 +26,69 @@ BOINC_CLIENT_USER?= boinc BOINC_CLIENT_GROUP?= boinc BOINC_CLIENT_HOME?= /var/db/boinc -SUB_FILES= pkg-install pkg-deinstall -SUB_LIST= BOINC_CLIENT_HOME="${BOINC_CLIENT_HOME}" \ +SUB_FILES= pkg-deinstall pkg-install +SUB_LIST= BOINC_CLIENT_GROUP="${BOINC_CLIENT_GROUP}" \ + BOINC_CLIENT_HOME="${BOINC_CLIENT_HOME}" \ BOINC_CLIENT_USER="${BOINC_CLIENT_USER}" \ - BOINC_CLIENT_GROUP="${BOINC_CLIENT_GROUP}" \ - PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" + LOCALBASE="${LOCALBASE}" \ + PREFIX="${PREFIX}" CONFIGURE_ARGS= --disable-server CONFIGURE_ENV= OBJCXX="${CXX}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -OPTIONS_DEFINE= CLIENT MANAGER NLS X11 LINUX USER SKINS -OPTIONS_DEFAULT= CLIENT MANAGER X11 USER +OPTIONS_DEFINE= CLIENT LINUX MANAGER NLS SKINS USER X11 +OPTIONS_DEFAULT= CLIENT MANAGER USER X11 OPTIONS_GROUP= SCRIPT OPTIONS_GROUP_SCRIPT= NO_GUI_RPC NO_NET_INFO -CLIENT_DESC= Build BOINC client -MANAGER_DESC= Build BOINC manager GUI -X11_DESC= Build graphics API -LINUX_DESC= Accept Linux science applications -USER_DESC= Create/check BOINC client user and directory -SKINS_DESC= Install more skins for BOINC manager -SCRIPT_DESC= Command line options in script -NO_GUI_RPC_DESC= Disable GUI RPC and socket (breaks boinc_curses) -NO_NET_INFO_DESC= Do not send host address and name to servers - -OPTIONS_SUB= yes - -MANAGER_LIB_DEPENDS= libnotify.so:devel/libnotify \ - libfontconfig.so:x11-fonts/fontconfig \ - libsqlite3.so:databases/sqlite3 \ - libxcb-util.so:x11/xcb-util -MANAGER_CONFIGURE_ON= --with-sqlite3-prefix=${LOCALBASE} -MANAGER_CONFIGURE_OFF= --with-wx-config=false --without-x -MANAGER_CONFIGURE_ENABLE=manager -MANAGER_USES= gnome iconv -MANAGER_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20,pango \ - XORG=xcb,x11,xext,xscrnsaver WX=3.0 - -CLIENT_CONFIGURE_ENABLE=client -CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl \ - libfreetype.so:print/freetype2 -CLIENT_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -CLIENT_USE= RC_SUBR=boinc-client +CLIENT_DESC= BOINC Build client +MANAGER_DESC= BOINC Build GUI manager +X11_DESC= API Build graphics +LINUX_DESC= Accept applications Linux science +USER_DESC= and BOINC client Create/check directory user +SKINS_DESC= BOINC for Install manager more skins +SCRIPT_DESC= Command in line options script +NO_GUI_RPC_DESC= (breaks and boinc_curses) Disable GUI RPC socket +NO_NET_INFO_DESC= address and Do host name not send servers to + +OPTIONS_SUB= yes + +MANAGER_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libnotify.so:devel/libnotify \ + libsqlite3.so:databases/sqlite3 \ + libxcb-util.so:x11/xcb-util +MANAGER_CONFIGURE_ON= --with-sqlite3-prefix=${LOCALBASE} +MANAGER_CONFIGURE_OFF= --with-wx-config=false \ + --without-x +MANAGER_CONFIGURE_ENABLE= manager +MANAGER_USES= gnome iconv +MANAGER_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20,pango \ + WX=3.0 \ + XORG=x11,xcb,xext,xscrnsaver + +CLIENT_CONFIGURE_ENABLE= client +CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl \ + libfreetype.so:print/freetype2 +CLIENT_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss +CLIENT_USE= RC_SUBR=boinc-client LINUX_CONFIGURE_ON= --with-boinc-alt-platform=i686-pc-linux-gnu LINUX_USES= linux -X11_USES= jpeg gl xorg -X11_USE= GL=glut XORG=x11,xscrnsaver,xmu,xi -X11_CONFIGURE_OFF= --without-x ax_cv_check_glut_libglut=no +X11_USES= gl jpeg xorg +X11_USE= GL=glut \ + XORG=x11,xi,xmu,xscrnsaver +X11_CONFIGURE_OFF= --without-x \ + ax_cv_check_glut_libglut=no .include .if ${PORT_OPTIONS:MMANAGER} -WX_CONF_ARGS= absolute -SUB_LIST+= OPTION_MANAGER="true" +WX_CONF_ARGS= absolute +SUB_LIST+= OPTION_MANAGER="true" .else -SUB_LIST+= OPTION_MANAGER="" +SUB_LIST+= OPTION_MANAGER="" CONFIGURE_ARGS+= --disable-manager .endif @@ -101,51 +106,64 @@ SUB_LIST+= OPTION_USER="" post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|' \ ${WRKSRC}/client/hostinfo_unix.cpp - @${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e 's|client/scripts||' \ + ${WRKSRC}/Makefile.am # avoid build conflict with archivers/libzip - @${MV} ${WRKSRC}/zip/unzip/zip.h ${WRKSRC}/zip/unzip/boinczip.h - @${MV} ${WRKSRC}/zip/zip/zip.h ${WRKSRC}/zip/zip/boinczip.h + @${MV} ${WRKSRC}/zip/unzip/zip.h \ + ${WRKSRC}/zip/unzip/boinczip.h + @${MV} ${WRKSRC}/zip/zip/zip.h \ + ${WRKSRC}/zip/zip/boinczip.h @${REINPLACE_CMD} -e 's|zip/zip.h|zip/boinczip.h|' \ - ${WRKSRC}/zip/boinc_zip.cpp + ${WRKSRC}/zip/boinc_zip.cpp @${REINPLACE_CMD} -e 's|"zip.h"|"boinczip.h"|' \ - ${WRKSRC}/zip/unzip/crc32.c ${WRKSRC}/zip/unzip/ttyio.c \ - ${WRKSRC}/zip/zip/deflate.c ${WRKSRC}/zip/zip/trees.c \ - ${WRKSRC}/zip/zip/unix/z_unix.c ${WRKSRC}/zip/zip/util.c \ - ${WRKSRC}/zip/zip/z_fileio.c ${WRKSRC}/zip/zip/z_globals.c \ - ${WRKSRC}/zip/zip/zip.c ${WRKSRC}/zip/zip/zipfile.c \ - ${WRKSRC}/zip/zip/zipup.c + ${WRKSRC}/zip/unzip/crc32.c \ + ${WRKSRC}/zip/unzip/ttyio.c \ + ${WRKSRC}/zip/zip/deflate.c \ + ${WRKSRC}/zip/zip/trees.c \ + ${WRKSRC}/zip/zip/unix/z_unix.c \ + ${WRKSRC}/zip/zip/util.c \ + ${WRKSRC}/zip/zip/z_fileio.c \ + ${WRKSRC}/zip/zip/z_globals.c \ + ${WRKSRC}/zip/zip/zip.c \ + ${WRKSRC}/zip/zip/zipfile.c \ + ${WRKSRC}/zip/zip/zipup.c post-patch-X11-off: - @${REINPLACE_CMD} -e 's|enable_xss="yes"|enable_xss="no"|' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|enable_xss="yes"|enable_xss="no"|' \ + ${WRKSRC}/configure.ac post-install: -.for name in config.h project_specific_defines.h api/reduce.h \ +.for name in config.h project_specific_defines.h api/reduce.h lib/keyword.h \ lib/opencl_boinc.h lib/shmem.h lib/std_fixes.h lib/str_replace.h - ${INSTALL_DATA} ${WRKSRC}/${name} ${STAGEDIR}${PREFIX}/include/boinc + ${INSTALL_DATA} ${WRKSRC}/${name} \ + ${STAGEDIR}${PREFIX}/include/boinc .endfor post-install-MANAGER-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc .for name in 16 32 48 ${INSTALL_DATA} ${WRKSRC}/packages/generic/sea/boincmgr.${name}x${name}.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps + ${STAGEDIR}${PREFIX}/share/pixmaps .endfor .if ${PORT_OPTIONS:MSKINS} (cd ${WRKSRC}/clientgui && \ - ${COPYTREE_SHARE} skins ${STAGEDIR}${PREFIX}/share/boinc/ ) + ${COPYTREE_SHARE} skins ${STAGEDIR}${PREFIX}/share/boinc/ \ + ) .else ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc/skins (cd ${WRKSRC}/clientgui/skins && \ - ${COPYTREE_SHARE} Default ${STAGEDIR}${PREFIX}/share/boinc/skins/ ) + ${COPYTREE_SHARE} Default ${STAGEDIR}${PREFIX}/share/boinc/skins/ \ + ) .endif post-install-X11-on: -.for name in api/boinc_gl.h api/graphics_api.h api/graphics_data.h \ - api/ttfont.h - ${INSTALL_DATA} ${WRKSRC}/${name} ${STAGEDIR}${PREFIX}/include/boinc +.for name in api/boinc_gl.h api/graphics_api.h api/graphics_data.h api/ttfont.h + ${INSTALL_DATA} ${WRKSRC}/${name} \ + ${STAGEDIR}${PREFIX}/include/boinc .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc/ttf (cd ${WRKSRC}/api/ttf/liberation-fonts-ttf-2.00.0 && \ - ${COPYTREE_SHARE} \*.ttf ${STAGEDIR}${PREFIX}/share/boinc/ttf/ ) + ${COPYTREE_SHARE} \*.ttf ${STAGEDIR}${PREFIX}/share/boinc/ttf/ \ + ) .include diff --git a/net/boinc-client/pkg-plist b/net/boinc-client/pkg-plist index 6f1a4ef26c51..fdcdb12da7bc 100644 --- a/net/boinc-client/pkg-plist +++ b/net/boinc-client/pkg-plist @@ -25,6 +25,7 @@ include/boinc/graphics2.h include/boinc/gui_rpc_client.h include/boinc/gutil.h include/boinc/hostinfo.h +include/boinc/keyword.h include/boinc/md5.h include/boinc/md5_file.h include/boinc/mem_usage.h