[pkgsrc/trunk]: pkgsrc/lang/php5 Make sure to install the _CLI_ version to ${...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ccaa80c6f83
branches:  trunk
changeset: 482685:3ccaa80c6f83
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Mon Nov 01 19:46:18 2004 +0000

description:
Make sure to install the _CLI_ version to ${PREFIX}/bin/php, and _CGI_
to ${PREFIX}/libexec/cgi-bin; install also couple more files same way
as PHP4

Of particular note is that CLI ignores setting of register_argc_argv
(treats as if it would be On), so it's no longer necessary to do anything
special for Pear packages to work. g/c MESSAGE warning about the Pear issue.

diffstat:

 lang/php5/MESSAGE  |  10 ----------
 lang/php5/Makefile |  14 +++++++++++---
 lang/php5/PLIST    |   6 +++++-
 3 files changed, 16 insertions(+), 14 deletions(-)

diffs (72 lines):

diff -r dfc038dad51e -r 3ccaa80c6f83 lang/php5/MESSAGE
--- a/lang/php5/MESSAGE Mon Nov 01 18:07:24 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/10/29 20:31:54 jdolecek Exp $
-
-You must edit your "${PKG_SYSCONFDIR}/etc/php.ini" if you want
-to use PEAR packages:
-
-  register_argc_argv = On
-  register_globals = On
-
-===========================================================================
diff -r dfc038dad51e -r 3ccaa80c6f83 lang/php5/Makefile
--- a/lang/php5/Makefile        Mon Nov 01 18:07:24 2004 +0000
+++ b/lang/php5/Makefile        Mon Nov 01 19:46:18 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/29 20:31:54 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2004/11/01 19:46:18 jdolecek Exp $
 #
 
 PKGNAME=               php-${PHP5_VERSION}
+PKGREVISION=           1
 CATEGORIES=            lang
 
 MAINTAINER=            pancake%phreaker.net@localhost
@@ -15,13 +16,20 @@
 
 .include "Makefile.common"
 
+CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
 
 CONF_FILES=            ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=              ${PREFIX}/${PHP_EXTENSION_DIR}
 
 post-install:
-       @${INSTALL_DATA_DIR} ${EGDIR}
-       cd ${WRKSRC} && ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR}
+       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
+       ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
+       ${INSTALL_DATA_DIR} ${CGIDIR}
+       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php ${CGIDIR}
+       ${INSTALL_DATA_DIR} ${EGDIR}
+       cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR}
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/php
+       ${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php
 
 .include "../../mk/bsd.pkg.mk"
diff -r dfc038dad51e -r 3ccaa80c6f83 lang/php5/PLIST
--- a/lang/php5/PLIST   Mon Nov 01 18:07:24 2004 +0000
+++ b/lang/php5/PLIST   Mon Nov 01 19:46:18 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/29 20:31:54 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/01 19:46:18 jdolecek Exp $
 bin/pear
 bin/php
 bin/php-config
@@ -232,8 +232,12 @@
 lib/php/data/PEAR/template.spec
 lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
 lib/php/pearcmd.php
+libexec/cgi-bin/php
+man/man1/php.1
 share/examples/php/php.ini-dist
 share/examples/php/php.ini-recommended
+share/php/php.gif
+@dirrm share/php
 @dirrm share/examples/php
 @dirrm lib/php/doc/Archive_Tar/docs
 @dirrm lib/php/doc/Archive_Tar