Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Nov 2018 09:39:51 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486241 - head/www/hiawatha
Message-ID:  <201811300939.wAU9dpOM063069@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <ross@exitzero.uk>
  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' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811300939.wAU9dpOM063069>