From nobody Sat Feb 11 00:48:44 2023 X-Original-To: dev-commits-ports-all@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 4PDBmr29JXz3ncwp; Sat, 11 Feb 2023 00:48:44 +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 4PDBmr1kZZz4LX5; Sat, 11 Feb 2023 00:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676076524; 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=KyS3HVhwYaGybmmeQApSx58pdHRaSMuAmy0FhRP9okc=; b=QosYqcpgYkwMmpP8bTEGZ4bQXSfWoNJKqJr7ZS9R7rpaXe35vDoLt8BpeuVe18Gg5G3tWN rKyJ77On3Di2Z+8YTLsp5BPjZtuCGi8t1eskAea1CD2HLx/MxnJ9GzJOi8QsuinGmC/pcE vu9kaXveWSi433JK62QTPplKmoZUDFYE0+ybyhQ25wVzXN0MmuEhRb++v0K0KHMNxKhK7e GJm1Rg4yuyXVNxnIAQAorDHHnGTjoe7aGVaER9LcAjrwOhtsxQ76ZSosTB2Xnvj4BjjHOk m1wEapNpVtgH6jFqBUmMR664/S/shDWGqLwLjgUD60GR9Dszd+dcxppKRZ0Ugw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676076524; 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=KyS3HVhwYaGybmmeQApSx58pdHRaSMuAmy0FhRP9okc=; b=trnHwEUok0VhOUCutZbHLb1StUYKmuvgg/jMRRv9wol71jtL2IxQmTHT4p1qEgu5jyTN/j O2AH6+aCiAHCeDa/zN0Gcvg85ntUe6IsXHH7vEl1K9igei8GpCZvWwP+q4kFtEJ1hCd0wP k5zZcOBwgV1orlnFYyq58KyQBK+SfYK19OA+m+KlWarmx6AH/vAG+D0GRcoFqslmawoKGs rCBBW6hBluog9pP6KRVAwq0sp9GB7i8yVYK7jtr4BIC5wQiN6aHSF2w5tFb1nFZpAGxU6b JigbpHoIwX4eDAUqpZbPUhyI7lNB1c1d4dylriMt+xzP0ZND6TmdKMoXfuIWVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676076524; a=rsa-sha256; cv=none; b=FnXIx1lBHJl1fCto5QIYAHG6kx28gsPHrbfGnq8nftAgnpR6HxozaQyaRh8V3hOQvMXbiD WbglWKOkuwWegX26lAsviubLn4voL50b74L9bZXpXay6808Jr6RUdnw31Qj+BGvWV96Qcj 3amrwfOzpQOAMJYh2pkoj6Qp+gPzUGeBCSdfhGzeVdeTQ6i88ej1I0+Pl96rXwOJbE7y9z IwN3ExJOFD18FnNw4yrYylT4dWuux4V8tpe5qLfJBuYUANKKQoqSdl2rKWcpGXGbIJn+z5 7z4DhHzGLxK4XpZ72dzxQiwZHyZCmNP5kfHOyxaDAO8DnoPOAJWykUYTFb66Ig== 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 4PDBmr0k4RzfYX; Sat, 11 Feb 2023 00:48:44 +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 31B0mi7M002761; Sat, 11 Feb 2023 00:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31B0miTl002760; Sat, 11 Feb 2023 00:48:44 GMT (envelope-from git) Date: Sat, 11 Feb 2023 00:48:44 GMT Message-Id: <202302110048.31B0miTl002760@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: b64d2f1e5acf - main - www/lighttpd: switch to cmake List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b64d2f1e5acfb7dc3b4a97fe6474408db352288f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b64d2f1e5acfb7dc3b4a97fe6474408db352288f commit b64d2f1e5acfb7dc3b4a97fe6474408db352288f Author: Piotr Kubaj AuthorDate: 2023-02-11 00:45:33 +0000 Commit: Piotr Kubaj CommitDate: 2023-02-11 00:48:24 +0000 www/lighttpd: switch to cmake --- www/lighttpd/Makefile | 52 +++++++++++++++++--------------------------------- www/lighttpd/pkg-plist | 4 ++-- 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 3c9f46452fb0..cd106cd509aa 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 -USES= autoreconf compiler:c11 gmake libtool localbase pkgconfig tar:xz -USE_CSTD= gnu99 +USES= compiler:c11 cmake libtool localbase:ldflags pkgconfig tar:xz .if !defined(_BUILDING_LIGHTTPD_MODULE) USES+= cpe @@ -24,7 +23,6 @@ USES+= cpe GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd -INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIGHTTPD_MODULE) TEST_TARGET= check @@ -34,8 +32,8 @@ PORTDOCS= AUTHORS COPYING INSTALL NEWS README USE_RC_SUBR= lighttpd REQUIRE= LOGIN -OPTIONS_DEFINE= ATTR DBI DOCS IPV6 KRB5 LUA MAXMINDDB NETTLE LDAP SPAWNFCGI \ - VALGRIND WEBDAV ZSTD +OPTIONS_DEFINE= ATTR DBI DOCS KRB5 LUA MAXMINDDB NETTLE LDAP SPAWNFCGI \ + WEBDAV ZSTD OPTIONS_GROUP= SSL OPTIONS_GROUP_SSL= OPENSSL GNUTLS MBEDTLS NSS WOLFSSL @@ -50,52 +48,41 @@ LUA_DESC= lua support (mod_magnet) MAXMINDDB_DESC= IP-based geolocation lookup (mod_maxminddb) NETTLE_DESC= Crypto support from Nettle SPAWNFCGI_DESC= Depend on spawn-fcgi utility -VALGRIND_DESC= valgrind support WEBDAV_DESC= WebDAV support ZSTD_DESC= mod_deflate support for zstd (Zstandard) -ATTR_CONFIGURE_WITH= attr -DBI_CONFIGURE_WITH= dbi=${LOCALBASE} +ATTR_CMAKE_BOOL= WITH_XATTR +DBI_CMAKE_BOOL= WITH_DBI DBI_LIB_DEPENDS= libdbi.so:databases/libdbi -GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} +GNUTLS_CMAKE_BOOL= WITH_GNUTLS GNUTLS_LIBS= -lgnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -IPV6_CONFIGURE_OFF= --disable-ipv6 -KRB5_CONFIGURE_WITH= krb5 +KRB5_CMAKE_BOOL= WITH_KRB5 KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit -LDAP_CONFIGURE_WITH= ldap +LDAP_CMAKE_BOOL= WITH_LDAP LDAP_USES= ldap LDAP_VARS= REQUIRE+=slapd LUA_USES= lua -LUA_CONFIGURE_WITH= lua -LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" -MAXMINDDB_CONFIGURE_WITH= maxminddb=${LOCALBASE} +LUA_CMAKE_BOOL= WITH_LUA +LUA_CMAKE_ON= -DWITH_LUA_VERSION:STRING="lua-${LUA_VER}" +MAXMINDDB_CMAKE_BOOL= WITH_MAXMINDDB MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb -MBEDTLS_CONFIGURE_WITH= mbedtls=${LOCALBASE} +MBEDTLS_CMAKE_BOOL= WITH_MBEDTLS MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls -NETTLE_CONFIGURE_WITH= nettle=${LOCALBASE} +NETTLE_CMAKE_BOOL= WITH_NETTLE NETTLE_LIB_DEPENDS= libnettle.so:security/nettle -NSS_CONFIGURE_WITH= nss=${LOCALBASE} +NSS_CMAKE_BOOL= WITH_NSS NSS_CPPFLAGS= -I${LOCALBASE}/include/nspr NSS_LIB_DEPENDS= libnss3.so:security/nss OPENSSL_USES= ssl -OPENSSL_CONFIGURE_WITH= openssl -OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} +OPENSSL_CMAKE_BOOL= WITH_OPENSSL SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/spawn-fcgi -VALGRIND_BUILD_DEPENDS= valgrind:devel/valgrind -VALGRIND_RUN_DEPENDS= valgrind:devel/valgrind -VALGRIND_CONFIGURE_WITH=valgrind -WEBDAV_USES= gnome -WEBDAV_USE= GNOME=libxml2 -WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ - libsqlite3.so:databases/sqlite3 -WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks -WOLFSSL_CONFIGURE_WITH= wolfssl=${LOCALBASE} +WOLFSSL_CMAKE_BOOL= WITH_WOLFSSL WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl -ZSTD_CONFIGURE_WITH= zstd +ZSTD_CMAKE_BOOL= WITH_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf @@ -150,11 +137,8 @@ post-patch: -e "s|^(var.state_dir.*=).*|\1 \"${RUNDIR}\"|" \ -e "s|^(var.cache_dir.*=).*|\1 \"${CACHEDIR}\"|" \ ${WRKSRC}/doc/config/lighttpd.conf - @${REINPLACE_CMD} -e "s|/etc/lighttpd|${ETCDIR}|g" \ - ${WRKSRC}/doc/config/conf.d/auth.conf @${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \ - ${WRKSRC}/doc/config/conf.d/cgi.conf \ - ${WRKSRC}/tests/*.conf + ${WRKSRC}/doc/config/conf.d/cgi.conf @${ECHO} >> ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "# IPv4 listening socket" >> \ ${WRKSRC}/doc/config/lighttpd.conf diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist index 0d8ec81c9ed0..c77623806297 100644 --- a/www/lighttpd/pkg-plist +++ b/www/lighttpd/pkg-plist @@ -60,8 +60,8 @@ lib/lighttpd/mod_vhostdb.so lib/lighttpd/mod_webdav.so lib/lighttpd/mod_wstunnel.so %%WOLFSSL%%lib/lighttpd/mod_wolfssl.so -man/man8/lighttpd.8.gz -%%KRB5%%man/man8/lighttpd-angel.8.gz +share/man/man8/lighttpd.8.gz +%%KRB5%%share/man/man8/lighttpd-angel.8.gz sbin/lighttpd sbin/lighttpd-angel @dir %%WWWDIR%%