Re: PHP 7 build dependency missing
On Thu, Apr 14, 2016 at 11:29:50AM +0100, Stuart Henderson wrote: > untested (no time right now) but this should work: It does indeed work, seems like a much nicer solution to me. Thanks! Could somebody commit this to -current and possibly -stable? Frank
Re: PHP 7 build dependency missing
On 2016/04/14 11:38, Frank Groeneveld wrote:
> On Wed, Apr 13, 2016 at 12:32:03PM +0200, Frank Groeneveld wrote:
> > ...
> >
> > One other small bug: files/php.conf contains "php5" in some places, it
> > should be dynamic, depending on the php major version. I'm not sure how
> > to capture only the first char from the $PV variable, otherwise I could
> > make a diff for you.
>
> I've made a diff that defines a new variable MV (major version) that is
> used to fix this bug. My diff is against 5.9-stable, but I think it will
> apply to -current without problems.
>
> Would be great to get this committed into -stable as well.
>
> Frank
untested (no time right now) but this should work:
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile.inc
--- Makefile.inc10 Apr 2016 19:38:13 - 1.78
+++ Makefile.inc14 Apr 2016 10:28:19 -
@@ -423,7 +423,7 @@ post-install:
${INSTALL_DATA} ${.CURDIR}/../files/php.conf \
${PREFIX}/share/examples/php-${PV}/php.conf
- @perl -pi -e "s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g" \
+ @perl -pi -e
"s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g;s,!!MV!!,${PV:R}" \
${PREFIX}/share/examples/php-${PV}/php.conf
.for m in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g}
Index: 5.4/Makefile
===
RCS file: /cvs/ports/lang/php/5.4/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- 5.4/Makefile1 Feb 2016 21:53:06 - 1.52
+++ 5.4/Makefile14 Apr 2016 10:28:19 -
@@ -2,6 +2,6 @@
PV=5.4
V= ${PV}.45
-REVISION= 2
+REVISION= 3
.include
Index: 5.5/Makefile
===
RCS file: /cvs/ports/lang/php/5.5/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- 5.5/Makefile4 Apr 2016 18:47:22 - 1.51
+++ 5.5/Makefile14 Apr 2016 10:28:19 -
@@ -2,5 +2,6 @@
PV=5.5
V= ${PV}.34
+REVISION= 0
.include
Index: 5.6/Makefile
===
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- 5.6/Makefile4 Apr 2016 18:56:11 - 1.27
+++ 5.6/Makefile14 Apr 2016 10:28:19 -
@@ -2,6 +2,7 @@
PV=5.6
V= ${PV}.20
+REVISION= 0
WANTLIB-main+= stdc++ ncurses readline
Index: 7.0/Makefile
===
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- 7.0/Makefile8 Apr 2016 20:26:13 - 1.8
+++ 7.0/Makefile14 Apr 2016 10:28:19 -
@@ -2,6 +2,7 @@
PV=7.0
V= ${PV}.5
+REVISION= 0
WANTLIB-main+= stdc++ ncurses readline
BUILD_DEPENDS+=devel/bison
Index: files/DESCR-bz2
===
RCS file: /cvs/ports/lang/php/files/DESCR-bz2,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-bz2
--- files/DESCR-bz2 27 Jun 2010 20:28:45 - 1.1.1.1
+++ files/DESCR-bz2 14 Apr 2016 10:28:19 -
@@ -1,2 +1,2 @@
The bzip2 functions are used to transparently read and write bzip2
-(.bz2) compressed files within PHP5.
+(.bz2) compressed files within PHP.
Index: files/DESCR-imap
===
RCS file: /cvs/ports/lang/php/files/DESCR-imap,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-imap
--- files/DESCR-imap27 Jun 2010 20:28:45 - 1.1.1.1
+++ files/DESCR-imap14 Apr 2016 10:28:19 -
@@ -1,3 +1,3 @@
-These PHP5 functions are not limited to the IMAP protocol, despite
+These PHP functions are not limited to the IMAP protocol, despite
their name. The underlying c-client library also supports NNTP,
POP3 and local mailbox access methods.
Index: files/DESCR-mssql
===
RCS file: /cvs/ports/lang/php/files/DESCR-mssql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-mssql
--- files/DESCR-mssql 27 Jun 2010 20:28:45 - 1.1.1.1
+++ files/DESCR-mssql 14 Apr 2016 10:28:19 -
@@ -1,3 +1,3 @@
-This PHP5 modules contains functions to access the Microsoft SQL
+This PHP module contains functions to access the Microsoft SQL
server database. It makes use of the FreeTDS implementation to
perform the actual communications.
Index: files/DESCR-sybase_ct
===
RCS file: /cvs/ports/lang/php/files/DESCR-sybase_ct,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-sybase_ct
--- files/DESCR-sybase_ct 27 Jun 2010 20:28:45 -
Re: PHP 7 build dependency missing
On Wed, Apr 13, 2016 at 12:32:03PM +0200, Frank Groeneveld wrote:
> ...
>
> One other small bug: files/php.conf contains "php5" in some places, it
> should be dynamic, depending on the php major version. I'm not sure how
> to capture only the first char from the $PV variable, otherwise I could
> make a diff for you.
I've made a diff that defines a new variable MV (major version) that is
used to fix this bug. My diff is against 5.9-stable, but I think it will
apply to -current without problems.
Would be great to get this committed into -stable as well.
Frank
? major_version.diff
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile.inc
--- Makefile.inc1 Feb 2016 21:53:06 - 1.72
+++ Makefile.inc14 Apr 2016 09:35:31 -
@@ -429,7 +429,7 @@ post-install:
${INSTALL_DATA} ${.CURDIR}/../files/php.conf \
${PREFIX}/share/examples/php-${PV}/php.conf
- @perl -pi -e "s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g" \
+ @perl -pi -e
"s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g;s,!!MV!!,${MV},g" \
${PREFIX}/share/examples/php-${PV}/php.conf
.for m in ${MULTI_PACKAGES:N-main:N-fastcgi:N-fpm:S/-//g}
Index: 5.4/Makefile
===
RCS file: /cvs/ports/lang/php/5.4/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- 5.4/Makefile1 Feb 2016 21:53:06 - 1.52
+++ 5.4/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.52 2016/02/01 21:53:06 sthen Exp $
-PV=5.4
+MV=5
+PV=${MV}.4
V= ${PV}.45
REVISION= 2
Index: 5.5/Makefile
===
RCS file: /cvs/ports/lang/php/5.5/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- 5.5/Makefile6 Feb 2016 23:31:20 - 1.49
+++ 5.5/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.49 2016/02/06 23:31:20 sthen Exp $
-PV=5.5
+MV=5
+PV=${MV}.5
V= ${PV}.32
.include
Index: 5.6/Makefile
===
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- 5.6/Makefile6 Feb 2016 23:30:25 - 1.25
+++ 5.6/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.25 2016/02/06 23:30:25 sthen Exp $
-PV=5.6
+MV=5
+PV=${MV}.6
V= ${PV}.18
WANTLIB-main+= stdc++ ncurses readline
Index: 7.0/Makefile
===
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- 7.0/Makefile1 Feb 2016 21:53:06 - 1.5
+++ 7.0/Makefile14 Apr 2016 09:35:31 -
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2016/02/01 21:53:06 sthen Exp $
-PV=7.0
+MV=7
+PV=${MV}.0
V= ${PV}.2
REVISION= 0
Index: files/php.conf
===
RCS file: /cvs/ports/lang/php/files/php.conf,v
retrieving revision 1.2
diff -u -p -r1.2 php.conf
--- files/php.conf 5 Jan 2011 09:31:23 - 1.2
+++ files/php.conf 14 Apr 2016 09:35:31 -
@@ -1,6 +1,6 @@
-LoadModule php5_module !!PREFIX!!/lib/php-!!PV!!/libphp5.so
+LoadModule php!!MV!!_module !!PREFIX!!/lib/php-!!PV!!/libphp!!MV!!.so
-
+
AddType application/x-httpd-php .php .phtml .php3
AddType application/x-httpd-php-source .phps
# Most php configs require this
Re: PHP 7 build dependency missing
On Wed, Apr 13, 2016 at 09:40:49AM +0100, Stuart Henderson wrote: > it's already there: > > $ cd /usr/ports/lang/php/7.0 > $ make show=BUILD_DEPENDS > devel/bison www/apache-httpd STEM->=0.10.38:devel/gettext devel/gettext-tools > devel/metaauto devel/autoconf/2.69 devel/ccache archivers/bzip2 > You're right. Thats weird, dpb didn't install it for me, I had to manually install it on my build machine. Would you know the reason? One other small bug: files/php.conf contains "php5" in some places, it should be dynamic, depending on the php major version. I'm not sure how to capture only the first char from the $PV variable, otherwise I could make a diff for you. Thanks, and keep up the great work! Frank
Re: PHP 7 build dependency missing
On 2016/04/13 09:00, Frank Groeneveld wrote: > Great work on getting php 7.0 in for 5.9 release! > Apparently you need to have apache-httpd installed before you can build > the php 7.0 port, though. Could somebody add it to the port? > > Thanks! > > Frank > it's already there: $ cd /usr/ports/lang/php/7.0 $ make show=BUILD_DEPENDS devel/bison www/apache-httpd STEM->=0.10.38:devel/gettext devel/gettext-tools devel/metaauto devel/autoconf/2.69 devel/ccache archivers/bzip2
