From 826690701f417a6afd139bf2d55dd207c7b9a71a Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 24 Nov 2004 17:37:49 +0000 Subject: [PATCH] Let's use ${PREFIX}/share/examples/php5/ for the example configuration files. --- www/php5/core/Makefile | 6 +++--- www/php5/core/files/phpxs | 4 ++-- www/php5/core/pkg/MESSAGE | 2 +- www/php5/core/pkg/PLIST | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/www/php5/core/Makefile b/www/php5/core/Makefile index f7ba9d57242..fd8e3582c6f 100644 --- a/www/php5/core/Makefile +++ b/www/php5/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2004/11/24 17:27:22 robert Exp $ +# $OpenBSD: Makefile,v 1.4 2004/11/24 17:37:49 robert Exp $ MULTI_PACKAGES= -pear SUBPACKAGE?= @@ -60,13 +60,13 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKBUILD}/.libs/libphp5.so ${PREFIX}/${APACHE_MODULE_SUBDIR} - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php5 + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php5 ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin .for i in dist recommended @sed -e 's,MODULES_DIR,${MODULES_DIR},' \ -e 's,OPENBSD_INCLUDE_PATH,/pear/lib:${CHROOT_DIR}/pear/lib,' \ <${WRKSRC}/php.ini-${i} \ - >${PREFIX}/share/doc/php5/php.ini-${i} + >${PREFIX}/share/examples/php5/php.ini-${i} .endfor @sed ${PHPXS_SUBST} <${FILESDIR}/phpxs >${PREFIX}/sbin/phpxs @chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/phpxs diff --git a/www/php5/core/files/phpxs b/www/php5/core/files/phpxs index 7787339fe70..8dcf269e511 100755 --- a/www/php5/core/files/phpxs +++ b/www/php5/core/files/phpxs @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: phpxs,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $ +# $OpenBSD: phpxs,v 1.2 2004/11/24 17:37:49 robert Exp $ # # Copyright (c) 2002-2004 Anil Madhavapeddy # @@ -25,7 +25,7 @@ php_version=PHP_VERSION php_module_path=MODULES_DIR apache_module_path=APACHE_MODULE_DIR php_cfg=PHP_CONFIG_FILE -php_example=TRUEPREFIX/share/doc/php5 +php_example=TRUEPREFIX/share/examples/php5 php_module=${apache_module_path}/libphp5.so showusage() { diff --git a/www/php5/core/pkg/MESSAGE b/www/php5/core/pkg/MESSAGE index 083dc9ae5cb..29f57a334a6 100644 --- a/www/php5/core/pkg/MESSAGE +++ b/www/php5/core/pkg/MESSAGE @@ -7,7 +7,7 @@ To enable parsing of PHP scripts, add the following to AddType application/x-httpd-php .php Copy the config file below into ${PHP_CONFIG_FILE} -${PREFIX}/share/doc/php5/php.ini-recommended +${PREFIX}/share/examples/php5/php.ini-recommended Don't forget that the default OpenBSD httpd is chrooted into /var/www by default, so you may need to create support diff --git a/www/php5/core/pkg/PLIST b/www/php5/core/pkg/PLIST index 44a87a0db07..1fb1c4d6397 100644 --- a/www/php5/core/pkg/PLIST +++ b/www/php5/core/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/11/24 17:27:22 robert Exp $ +@comment $OpenBSD: PLIST,v 1.3 2004/11/24 17:37:49 robert Exp $ @conflict php4-core-* %%SHARED%% bin/pear @@ -9,7 +9,7 @@ bin/phpize lib/php/ @man man/man1/php.1 sbin/phpxs -share/doc/php5/ -share/doc/php5/php.ini-dist -share/doc/php5/php.ini-recommended +share/examples/php5/ +share/examples/php5/php.ini-dist +share/examples/php5/php.ini-recommended @unexec rm -f /usr/lib/apache/modules/libphp5.so