From owner-svn-ports-head@freebsd.org Fri Nov 30 09:39:51 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD0D4113C46A; Fri, 30 Nov 2018 09:39:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F6E879042; Fri, 30 Nov 2018 09:39:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DB2B26C1A; Fri, 30 Nov 2018 09:39:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAU9dpn1063070; Fri, 30 Nov 2018 09:39:51 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAU9dpOM063069; Fri, 30 Nov 2018 09:39:51 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811300939.wAU9dpOM063069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 30 Nov 2018 09:39:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486241 - head/www/hiawatha X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/www/hiawatha X-SVN-Commit-Revision: 486241 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7F6E879042 X-Spamd-Result: default: False [0.81 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.31)[0.307,0]; NEURAL_SPAM_SHORT(0.24)[0.244,0]; NEURAL_SPAM_MEDIUM(0.26)[0.256,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2018 09:39:52 -0000 Author: tobik Date: Fri Nov 30 09:39:50 2018 New Revision: 486241 URL: https://svnweb.freebsd.org/changeset/ports/486241 Log: www/hiawatha: Unbreak build with XSLT=off ${LOCALBASE}/include is implicitly added to the search path when Hiawatha is built with XSLT=on. Without it the system mbed TLS headers cannot be found anymore. Add USES=localbase:ldflags to the MBDEDTLS option to work around this. src/filehashes.c:27:10: fatal error: 'mbedtls/sha256.h' file not found #include "mbedtls/sha256.h" ^~~~~~~~~~~~~~~~~~ - While here reset maintainer and take maintainership after the third consecutive timeout PR: 224156 Reported by: Ross McKelvie Approved by: portmaster@BSDforge.com (maintainer timeout, 2 weeks) Modified: head/www/hiawatha/Makefile Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Fri Nov 30 09:31:23 2018 (r486240) +++ head/www/hiawatha/Makefile Fri Nov 30 09:39:50 2018 (r486241) @@ -6,7 +6,7 @@ PORTVERSION= 10.8.3 CATEGORIES= www MASTER_SITES= https://www.hiawatha-webserver.org/files/ -MAINTAINER= portmaster@BSDforge.com +MAINTAINER= tobik@FreeBSD.org COMMENT= Advanced and secure webserver for Unix LICENSE= GPLv2 @@ -21,7 +21,6 @@ USES= cmake compiler:c11 USE_LDCONFIG= yes USE_RC_SUBR= hiawatha -LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/man \ -DWEBROOT_DIR=${WWWDIR} \ @@ -49,6 +48,7 @@ XSLT_USE= GNOME=libxslt XSLT_CMAKE_BOOL= ENABLE_XSLT MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls +MBEDTLS_USES= localbase:ldflags post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \