svn commit: r460020 - head/databases/php-xapian

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Jan 26 18:11:12 2018
New Revision: 460020
URL: https://svnweb.freebsd.org/changeset/ports/460020

Log:
  Fix packaging with PHP 7.x
  
  - Sort PLIST
  
  Reported by:	Oliver Schonrock <oliver at schonrocks.com>

Modified:
  head/databases/php-xapian/Makefile
  head/databases/php-xapian/pkg-plist

Modified: head/databases/php-xapian/Makefile
==============================================================================
--- head/databases/php-xapian/Makefile	Fri Jan 26 18:11:07 2018	(r460019)
+++ head/databases/php-xapian/Makefile	Fri Jan 26 18:11:12 2018	(r460020)
@@ -40,8 +40,10 @@ PLIST_SUB=	PHP_EXT_DIR=${PHP_EXT_DIR} PHP_MAJOR_VER=${
 
 .if ${PHP_VER} >= 70
 CONFIGURE_ARGS+=--with-php7 --without-php
+PLIST_SUB+=	PHP5="@comment " PHP7=""
 .else
 CONFIGURE_ARGS+=--with-php --without-php7
+PLIST_SUB+=	PHP5="" PHP7="@comment "
 .endif
 
 post-patch:

Modified: head/databases/php-xapian/pkg-plist
==============================================================================
--- head/databases/php-xapian/pkg-plist	Fri Jan 26 18:11:07 2018	(r460019)
+++ head/databases/php-xapian/pkg-plist	Fri Jan 26 18:11:12 2018	(r460020)
@@ -1,8 +1,9 @@
 lib/php/%%PHP_EXT_DIR%%/xapian.a
 lib/php/%%PHP_EXT_DIR%%/xapian.so
-%%DATADIR%%/php%%PHP_MAJOR_VER%%/xapian.php
 %%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php%%PHP_MAJOR_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php%%PHP_MAJOR_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php%%PHP_MAJOR_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php%%PHP_MAJOR_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/php/index.html
+%%PHP7%%%%DATADIR%%/php/xapian.php
+%%PHP5%%%%DATADIR%%/php%%PHP_MAJOR_VER%%/xapian.php