From nobody Wed Aug 16 05:34:45 2023 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 4RQcK14sv4z4qFTf; Wed, 16 Aug 2023 05:34:45 +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 4RQcK14Lgnz3FTT; Wed, 16 Aug 2023 05:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164085; 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=UVZDbWPrpJILQ5bQIQ8OimVixfDjeJTaOQAn08ID4e0=; b=RvfnYAQdXkOMqDKsxkXi3rQYNIepOpJD08fu9ySPRs2W24oW8Kf0WK8iOHG/WPyleG2S0J GHdJM6cB6qcDEcrP2RYKNUYy87VgtZJz0WLnaTcKAA6/qHZv9QD3KgbAC/nSWbIBXU2lZW zxzlnHx8i364KAOr/JUg7waD+MisPyGMNPgP6wztnaFSv8Me6WY8TDjw30m2A3N263VKXp SdL7v7fgBe26zpV+MmhRsPUIya+oOHyyKRW1r5EfdIg97h3mJpz5tsg3c1t1Ui1Ukn5Gk1 3H7OiPJVZIhKG9+8QyJOwflPR+PMRE3zhEKgQUYMkhyvpHVT9HkD+E3fKzeP4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164085; 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=UVZDbWPrpJILQ5bQIQ8OimVixfDjeJTaOQAn08ID4e0=; b=bBc9m7nt/5oF6tLVNOAdqiL1RLK4cgiAfSz5DFaYcuqinZJoRzv0RBR/BNgGcgW0f8msDq HHPZERGgWjkIXpzFofXt97YTXBkPA2nCqzgo3Z8jZ+aOIIXFqvOEraDmLfaor3CkY/979d 3uh9lwBqOcosY2HjLsqoE/H7tSFHRNDrTzHR6hZG2dP+eeWKyEnK/KHbtJP5hhdxy7yRau KSc52sLTgBQg1LSLdfpgdm8AnX2rCCajEvveVM/y+IUlj4+ySyE1ytnnRF+sILjaxRTLZV pwh8Q+nUN5ujqWdrvTCdoflxAVjdUYdjy7CGKVUTNNK41HLks3gPlomZ0EEH3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692164085; a=rsa-sha256; cv=none; b=gVRXV98tOXgvPWS1VDbooQPLo4274QDztiS/OjsjFiQo7hfPeHSuLFva7kn7dMghCOFEdi lKv+2qXoRIg0GbOHVqkZ4f9pwKmyUUsPSBYSFy8qT7eCLFmN+dF1vFsjMNFJRrYCahhi5Z nktd8P2WGPXVML94PBheuTQBJXrs3v/SYJwNfALcAFfeAXfpVJqLMEEG8pcn1eehm4adyK JEqzQuCUnPPjGHEDFMvp+jJDMzhb0YM7kKHhK4CgUl2hDiIo/ddfLYW0nb6vZUpvihSZ8D oZriJBWDu6/aJjX7rxPwCZIwkOIc2Fl//uG94AI4TrfP7PQK7x2NUkX2oKuWmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQcK13PHvzg3R; Wed, 16 Aug 2023 05:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G5YjOq023871; Wed, 16 Aug 2023 05:34:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G5YjOn023868; Wed, 16 Aug 2023 05:34:45 GMT (envelope-from git) Date: Wed, 16 Aug 2023 05:34:45 GMT Message-Id: <202308160534.37G5YjOn023868@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 399a4274d24f - main - */bareos19-*: Fix build on 14 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 399a4274d24f900d61073c1a1e5da3f285f6a58c Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=399a4274d24f900d61073c1a1e5da3f285f6a58c commit 399a4274d24f900d61073c1a1e5da3f285f6a58c Author: Muhammad Moinur Rahman AuthorDate: 2023-08-16 04:05:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-16 05:34:36 +0000 */bareos19-*: Fix build on 14 - Utilize USES=localbase - Utilize OPTIONSNG where possible - Mark www/bareos19-webui DEPRECATED which was missed during the previous commit on marking bareos19 DEPRECATED - Set EXPIRATION_DATE 2023-09-30 for www/bareos19-webui Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- sysutils/bareos19-server/Makefile | 35 ++++++++++++++++++----------------- www/bareos19-webui/Makefile | 3 +++ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/sysutils/bareos19-server/Makefile b/sysutils/bareos19-server/Makefile index 1234aaf46938..a69bbd47af53 100644 --- a/sysutils/bareos19-server/Makefile +++ b/sysutils/bareos19-server/Makefile @@ -13,7 +13,6 @@ WWW= https://www.bareos.org/ LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -BROKEN_FreeBSD_14= fails to configure error: environment variable 'SOURCE_DATE_EPOCH' ('') must be a non-negative decimal integer <= 253402300799 DEPRECATED= Upstream EOL reached EXPIRATION_DATE= 2023-09-30 @@ -22,7 +21,7 @@ CONFLICTS?= bareos18-server bareos17-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake compiler:c++11-lang cpe localbase perl5 pkgconfig readline \ +USES+= cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \ shebangfix USE_GITHUB= yes USE_PERL5= run @@ -36,8 +35,7 @@ USE_LDCONFIG= yes SHEBANG_LANG= perl SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in -CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/readline OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO @@ -172,26 +170,19 @@ CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild_client_only=OFF # Server default database +MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx MYSQL_CMAKE_ON= -Dmysql=ON MYSQL_USES= mysql +MYSQL_VARS= DBTYPE=mysql +MYSQL_SUB_LIST= REQ_MYSQL=mysql REQ_PGSQL="" SQLITE3_CMAKE_ON= -Dsqlite3=ON SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +SQLITE3_VARS= DBTYPE=sqlite3 PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql +PGSQL_VARS= DBTYPE=postgresql +PGSQL_SUB_LIST= REQ_MYSQL="" REQ_PGSQL=postgresql -MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx - -.include - -.if ${PORT_OPTIONS:MMYSQL} -DBTYPE= mysql -SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" -.elif ${PORT_OPTIONS:MSQLITE3} -DBTYPE= sqlite3 -.else -DBTYPE= postgresql -SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql -.endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif @@ -241,4 +232,14 @@ post-install: .else .include "${MASTERDIR}/Makefile.common" .endif # 19-client and 19-server are defined + +.include + +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) +USES+= llvm:max=15 +CC= clang${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +.endif + .include diff --git a/www/bareos19-webui/Makefile b/www/bareos19-webui/Makefile index f19709641a62..62d28162039b 100644 --- a/www/bareos19-webui/Makefile +++ b/www/bareos19-webui/Makefile @@ -11,6 +11,9 @@ WWW= https://www.bareos.org/ LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/webui/LICENSE +DEPRECATED= Upstream EOL reached +EXPIRATION_DATE= 2023-09-30 + USE_GITHUB= yes USES= cmake cpe gettext php:build