Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Mar 2018 15:40:02 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r464182 - head/graphics/mapcache
Message-ID:  <201803111540.w2BFe2kb024361@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sun Mar 11 15:40:02 2018
New Revision: 464182
URL: https://svnweb.freebsd.org/changeset/ports/464182

Log:
  graphics/mapcache: Fix regression with Mk/Uses/apache.mk
  
  With hat:	apache
  Reported by:	antoine
  Approved by:	fixit blanket

Modified:
  head/graphics/mapcache/Makefile

Modified: head/graphics/mapcache/Makefile
==============================================================================
--- head/graphics/mapcache/Makefile	Sun Mar 11 15:38:21 2018	(r464181)
+++ head/graphics/mapcache/Makefile	Sun Mar 11 15:40:02 2018	(r464182)
@@ -30,8 +30,10 @@ OPTIONS_DEFAULT=	APACHE FASTCGI SQLITE GEOS GDAL
 OPTIONS_SUB=		yes
 
 APACHE_DESC=		Native apache module
-APACHE_USE=		APACHE=22+
-APACHE_CMAKE_ON=	-DWITH_APACHE=1
+APACHE_USES=		apache:2.2+
+APACHE_CMAKE_ON=	-DWITH_APACHE=1 \
+			-DAPACHE_INCLUDE_DIR=${LOCALBASE}/${APACHEINCLUDEDIR} \
+			-DAPACHE_MODULE_DIR=${LOCALBASE}/${APACHEMODDIR}
 APACHE_CMAKE_OFF=	-DWITH_APACHE=0
 
 FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
@@ -75,10 +77,5 @@ GDAL_CMAKE_OFF=		-DWITH_GDAL=0 -DWITH_OGR=0
 GEOS_LIB_DEPENDS=	libgeos_c.so:graphics/geos
 GEOS_CMAKE_ON=		-DWITH_GEOS=1
 GEOS_CMAKE_OFF=		-DWITH_GEOS=0
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|PATH_SUFFIXES|PATH_SUFFIXES \
-			${APACHE_SUPPORTED_VERSION:S/^/apache&/}|g' \
-		${WRKSRC}/cmake/FindAPACHE.cmake
 
 .include <bsd.port.mk>



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