From nobody Wed Aug 16 05:34:52 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 4RQcK84Qhlz4qFpM; Wed, 16 Aug 2023 05:34:52 +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 4RQcK83xK0z3Fkh; Wed, 16 Aug 2023 05:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164092; 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=U8guLcvQ0clzHarsbsAJE2WzpW8hNPHHcCVJi7iAdS0=; b=hawTaj7TcLFTqNZXPoqzeF0y6EZfa5T1nCfcdatK99oMptB19As6iKzT1XEabMsDh/A868 hXIxrq6rJw4+OfItjDlJKSTi4iDUGgaP0or6or8sjj0TLYvm+jvp428OW6DaeNl/NU+J67 XJPk0A0A154nPcUKI2y8I5CaHveAmKBvPI3k0jB7CN/4dSpahkLayzPcMW0jtm4qjhTFUs un+oWY0ymaB23Wr9RhXYFBBdtT/rcfJBwMZMFxtYgV3/r6uVZVTbQIRC+MK8ump84ILWfE VggfevvfoKUjRL6Tav3Hr9Cqe/Jr4uYVQBW8ShpEAeocTroan7b+yAVSP6CB5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164092; 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=U8guLcvQ0clzHarsbsAJE2WzpW8hNPHHcCVJi7iAdS0=; b=RSX89AQqJRhBv8o0Nlid68D7T7T3CZ1qpC0VExE1Tb4V8JTsjZMCEd5WxmdqzY8LxOMSRn roTlKtvDZvkbBQVDRM0mJXRlwhngNZRuZQLSp4k0RdLcrfKGbwEcBJpqC71ns6ll1RvQOS iva9aVCyIY15QN9LsCuXQEcxCF85Kgj0cqUi1HCnF5egdkmce0fvh7Mf6hrnXaAklpxMMq u9Tbxd+jNHUYBVxUFAQWzGKGuXIa3fN79wywN3xK0vG/fD6YWO8JFRBcs0i/0P2wUfnIpU jOQE3cCwlooOLhoMJTx3/bSZRuCz7IiUSSwNqUjp4Q4t6ybu4XdzsNTRV6SHkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692164092; a=rsa-sha256; cv=none; b=md7ikGJz2IPRTOo67cJEAFSJVDxzYTpBrWJwuKCOuSeGPd5FozHSNT3bBR2WC9r0I1Rrht PWc82t9t8S5ROSzGIwZNKIByIjXXnwQF1zoE6Reh1IGIwvIfxj566h6pv215JoWrQguq1l +c3sFOEtBzeuKjlCrY8sjxpC0YOpa7nBRayH2QupnF13ZadZE+uFlYDF/q4jX0BsdVUN13 QGNWsDfyZXvBYHmlIYcGliyTw5gNFofc7l91PrPgFM9H+Dmd2NqUxDbecImW7ui6rvNZGm 3aOXOsfjR+aPBKLa04pLFwzwAvOT5mCt/bWvMeSzOxQjV4YHsNbX4vbUkBurPw== 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 4RQcK82l7zzg0k; Wed, 16 Aug 2023 05:34:52 +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 37G5YqQb024144; Wed, 16 Aug 2023 05:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G5Yq1w024141; Wed, 16 Aug 2023 05:34:52 GMT (envelope-from git) Date: Wed, 16 Aug 2023 05:34:52 GMT Message-Id: <202308160534.37G5Yq1w024141@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: 75e02c01491f - main - sysutils/bareos-*: 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: 75e02c01491fa2c93d3cc7f10149ed5857a7476e Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=75e02c01491fa2c93d3cc7f10149ed5857a7476e commit 75e02c01491fa2c93d3cc7f10149ed5857a7476e Author: Muhammad Moinur Rahman AuthorDate: 2023-08-16 04:57:30 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-16 05:34:37 +0000 sysutils/bareos-*: Fix build on 14 - Utilize USES=localbase - Utilize OPTIONSNG where possible Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- sysutils/bareos-server/Makefile | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index eb58c5994d9d..0769e08c25be 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -18,7 +18,7 @@ CONFLICTS?= bareos20-server bareos19-server bareos18-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 @@ -34,8 +34,7 @@ SHEBANG_GLOB= *.py SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in \ ${WRKSRC}/contrib/misc/bsmc/bin/bsmc -CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/readline OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO @@ -167,22 +166,15 @@ CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild_client_only=OFF # Server default database +MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx +MYSQL_VARS= DBTYPE=mysql +MYSQL_SUB_LIST= REQ_MYSQL=mysql REQ_PGSQL="" PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql +PGSQL_VARS= DBTYPE=postgresql +PGSQL_SUB_LIST= REQ_MYSQL="" REQ_PGSQL=postgresql +SQLITE3_VARS= DBTYPE=sqlite3 -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 @@ -235,4 +227,14 @@ post-install: .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -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