From aef5a666706db2a5b97c1cc3d1fcc2ca05b22fcb Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 3 Aug 2016 12:47:05 +0000
Subject: Don't use extension.ini any more, and have each extension install in
 its file, so the order remains the same.

Every PHP (or Zend) extension now installs its own .ini file in
/usr/local/etc/php.  A PHP extension will be automatically activated
when installed.  The order into which extensions are loaded is
automatically guessed.  In some very rare cases, the guess will be
wrong, and PHP_MOD_PRIO will need to be set.  Refer to the USES=php
section of the Porter's Handbook for more information.

Convert ports touching etc/php/extensions.ini manually, or telling the
OP to do it.

And finally, bump PORTREVISION for all php extensions.

PR:		210697
Submitted by:	mat
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D7022
---
 graphics/mapserver/Makefile  | 28 ++++++++++++----------------
 graphics/mapserver/pkg-plist |  3 ++-
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'graphics/mapserver')

diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index bf55fc1fee75..82929e1451ab 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -125,11 +125,9 @@ CMAKE_ARGS+=		-DWITH_POSTGIS=0
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:lang/php56
-RUN_BUILDS+=		${LOCALBASE}/bin/php-config:lang/php56
-PHP_EXTENSION_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e "s,/usr/local/,,"
+USES+=			php:build
+IGNORE_WITH_PHP=	55 70
 CMAKE_ARGS+=		-DWITH_PHP=1
-PLIST_SUB+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 PLIST_SUB+=		PHP=""
 .else
 CMAKE_ARGS+=		-DWITH_PHP=0
@@ -188,22 +186,20 @@ do-install:
 .endfor
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
 
-.if ${PORT_OPTIONS:MPHP}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}
+	@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
+	@${LN} -s ${PREFIX}/lib/libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
+
+do-install-PHP-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \
-		${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}/
-.endif
+		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
+	@${ECHO_CMD} "extension=php_mapscript.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-php_mapscript.ini
 
-.if ${PORT_OPTIONS:MPYTHON}
+
+do-install-PYTHON-on:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
-.endif
-
-	@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
-	@${LN} -s ${PREFIX}/lib/libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
 
-.if ${PORT_OPTIONS:MPHP}
-	@${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${PREFIX}/etc/php/extensions.ini"
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist
index 85d35e2ad67a..2a5cc2634d16 100644
--- a/graphics/mapserver/pkg-plist
+++ b/graphics/mapserver/pkg-plist
@@ -8,9 +8,10 @@ bin/shptreetst
 bin/shptreevis
 bin/sortshp
 bin/tile4ms
+%%PHP%%etc/php/ext-20-php_mapscript.ini
 lib/libmapserver.so
 lib/libmapserver.so.2
 lib/libmapserver.so.7.0.1
-%%PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
+%%PHP%%lib/php/%%PHP_EXT_DIR%%/php_mapscript.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so
-- 
cgit v1.2.3