Hi,

On Fri, Jun 08, 2018 at 01:08:40PM -0300, Elias M. Mariani wrote:
> I found that in /var/www/conf/modules.example is a binary file named
> php-7.0.conf.
> I'm guessing that the content is the result of apxs2, not testing that
> binary anyways...
> Shouldn't be equal to the old file with the module extension
> configuration? I mean... text, not binary...
> I think there is a example in /usr/local/share/examples/php-7.0/php.conf

That example did miss the move from -main to -apache, and the result is
that the module itself is installed into /var/www/conf/modules.example.

The diff below should fix this problem (still untested at the
moment).

CIao,
        Kili

Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- 5.6/Makefile        5 Jun 2018 12:50:29 -0000       1.76
+++ 5.6/Makefile        8 Jun 2018 17:55:26 -0000
@@ -3,6 +3,8 @@
 PV=            5.6
 V=             ${PV}.36
 REVISION=      8
+REVISION-main= 9
+REVISION-apache=       9
 
 MASTER_SITES0= https://download.suhosin.org/
 
Index: 5.6/pkg/PLIST-apache
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-apache,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-apache
--- 5.6/pkg/PLIST-apache        27 May 2018 19:54:17 -0000      1.1
+++ 5.6/pkg/PLIST-apache        8 Jun 2018 17:55:26 -0000
@@ -5,4 +5,5 @@
 @conflict php-apache->=5.6,<5.7
 lib/php-${PV}/libphp5.so
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/php.conf
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf
Index: 5.6/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST-main
--- 5.6/pkg/PLIST-main  5 Jun 2018 12:50:29 -0000       1.19
+++ 5.6/pkg/PLIST-main  8 Jun 2018 17:55:26 -0000
@@ -37,7 +37,6 @@ share/examples/php-${PV}/opcache.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
 share/examples/php-${PV}/php-fpm.conf
 @sample ${SYSCONFDIR}/php-fpm.conf
-share/examples/php-${PV}/php.conf
 share/examples/php-${PV}/php.ini-development
 share/examples/php-${PV}/php.ini-production
 @sample ${SYSCONFDIR}/php-${PV}.ini
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- 7.0/Makefile        5 Jun 2018 12:50:29 -0000       1.59
+++ 7.0/Makefile        8 Jun 2018 17:55:26 -0000
@@ -3,6 +3,8 @@
 PV=            7.0
 V=             ${PV}.30
 REVISION=      8
+REVISION-main= 9
+REVISION-apache=       9
 
 BUILD_DEPENDS+=        devel/bison
 
Index: 7.0/pkg/PLIST-apache
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-apache,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-apache
--- 7.0/pkg/PLIST-apache        27 May 2018 19:54:17 -0000      1.1
+++ 7.0/pkg/PLIST-apache        8 Jun 2018 17:55:26 -0000
@@ -5,4 +5,5 @@
 @conflict php-apache->=7.0,<7.1
 lib/php-${PV}/libphp7.so
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/
+share/examples/php-${PV}/php.conf
 @sample ${MODPHP_CONFIG_PATH}/modules.sample/php-${PV}.conf
Index: 7.0/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- 7.0/pkg/PLIST-main  5 Jun 2018 12:50:29 -0000       1.15
+++ 7.0/pkg/PLIST-main  8 Jun 2018 17:55:26 -0000
@@ -36,7 +36,6 @@ share/examples/php-${PV}/opcache.ini
 @sample ${SYSCONFDIR}/php-${PV}.sample/opcache.ini
 share/examples/php-${PV}/php-fpm.conf
 @sample ${SYSCONFDIR}/php-fpm.conf
-share/examples/php-${PV}/php.conf
 share/examples/php-${PV}/php.ini-development
 share/examples/php-${PV}/php.ini-production
 @sample ${SYSCONFDIR}/php-${PV}.ini

Reply via email to