git: 399a4274d24f - main - */bareos19-*: Fix build on 14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 16 Aug 2023 05:34:45 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=399a4274d24f900d61073c1a1e5da3f285f6a58c commit 399a4274d24f900d61073c1a1e5da3f285f6a58c Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-16 04:05:44 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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 <bsd.port.options.mk> - -.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 <bsd.port.options.mk> + +.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 <bsd.port.mk> 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