From nobody Wed Aug 16 05:34:47 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 4RQcK419vzz4qFjB; Wed, 16 Aug 2023 05:34:48 +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 4RQcK36r9qz3FGD; Wed, 16 Aug 2023 05:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164088; 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=8Z2GP9KfSCDXvVJk0hHT/iUMfFwHqzFRT7jOvJYQA9g=; b=ramCbhTBxa3JHXrrivjjPRh1BFbpfGGFcETGENkyui8Whg1frrawruey8LyUhAAmB9yluz hA9faIZduwGgd6JG1fuEmnZP4nHiU8mPiQRmvaW9yB8Mw3ZCAByHEeBJN29IobbgxfXAHy /PlqKhQzc43EuSpEKgteH3Twtnks6wtLsqTi4T1E8Mq+uuPeU+HQnnpS9XaaZ/IqDZh21h N1MDgByYdwiv87eUgZObjVMv13FGfMCTteuByOiXYNRAe5Ku0qR0X8nP0zSlWNquA5SkcY ss2G+xLufaG7k8b1da33AeIz0al5eTfpDFqGAkQN6lTSdDrXp7afJl0L7gfWjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164088; 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=8Z2GP9KfSCDXvVJk0hHT/iUMfFwHqzFRT7jOvJYQA9g=; b=qYh54V6+e5mXr8EqMDEG6+NLrUpvEJOR2c3QLs7kBPokFU2VTQeYDcaHkNOpbp9sObU+uE evoNPQCL/4Bkh3XnZxKSIMnnqQ/ANml8KUU4uPac6szFOXka+EGULGC2RsxDsa/J5PXNTh stIxIs+0IHy54pqo3TJTS1+P+KC2i+/Bot/XtuywNxpWpFV0X3rdE1oK6IkcDJ4R/rFcet v4wM9xSPEMf0NSuNOtb+pQ0cHzwGjAaEP+8jWcpHVf54ZWrAxKkkHquAuI0LO/2jkzLrRB GyzcKlZIzEW0QF9e85chV26gGaQUpTp4NM+d6xASH5i5ACFjhbC10CkG5gy1dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692164088; a=rsa-sha256; cv=none; b=k7J6twShNZef6ULWEYd1EVVE+LC1ghKBJYfJ9RmqV0f1QY3+OJCBUzsnSTXj9DtkkwMVTw JRqDMWGWU4m0xYeIqBvpmcZfJDELze0Mv283X7kXrda62ogAxlfPl7bfL17VoTVFA4VAHp PsbG5gJ0XkahSQKphh2Nmohrp6Yhxdr0X20YSGFtTboVa2l+E5i3R1/9E56DYFrN8RWZjU G1fi47JDaCpeoMaY/X6m0sfvuudQTSea0jJSiGDPHumS1EOgzphi3Li1Ybiwv5PaXOWa0n JG0npqCQEqN9gVfdAPq/oomAnhy80rL5MbEcP0acKG/WCmWfK9oyhR3iWzC8gQ== 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 4RQcK35qZlzgBj; Wed, 16 Aug 2023 05:34:47 +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 37G5YlIS023962; Wed, 16 Aug 2023 05:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G5Yl1l023959; Wed, 16 Aug 2023 05:34:47 GMT (envelope-from git) Date: Wed, 16 Aug 2023 05:34:47 GMT Message-Id: <202308160534.37G5Yl1l023959@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: 5f76734bc7a3 - main - sysutils/bareos20-*: 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: 5f76734bc7a3e6c6f1d5fb72ab83cdc0d896c25a Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f76734bc7a3e6c6f1d5fb72ab83cdc0d896c25a commit 5f76734bc7a3e6c6f1d5fb72ab83cdc0d896c25a Author: Muhammad Moinur Rahman AuthorDate: 2023-08-16 04:29:00 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-16 05:34:36 +0000 sysutils/bareos20-*: Fix build on 14 - Utilize USES=localbase - Utilize OPTIONSNG where possible Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- sysutils/bareos20-server/Makefile | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sysutils/bareos20-server/Makefile b/sysutils/bareos20-server/Makefile index cb5eb245a7ab..a3b5916b8f7c 100644 --- a/sysutils/bareos20-server/Makefile +++ b/sysutils/bareos20-server/Makefile @@ -18,7 +18,7 @@ CONFLICTS?= bareos19-server bareos18-server bareos-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 @@ -32,8 +32,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 @@ -171,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 -SQLITE3_CMAKE_ON= -Dsqlite3=ON -SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +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_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +SQLITE3_CMAKE_ON= -Dsqlite3=ON +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 @@ -240,4 +232,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