switch to MESSAGE and UNMESSAGE; fix the redefinition of socklen_t;

bump PKGNAME

www/php5/core/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2004/11/24 13:15:09 alek Exp $
+# $OpenBSD: Makefile,v 1.3 2004/11/24 17:27:22 robert Exp $
 
 MULTI_PACKAGES=	-pear
 SUBPACKAGE?=
 
 COMMENT=	"server-side HTML-embedded scripting language"
 COMMENT-pear=	"base classes for common PHP tasks"
-PKGNAME=	php5-core-${V}
+PKGNAME=	php5-core-${V}p1
 FULLPKGNAME-pear= php5-pear-${V}
 
 CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \

www/php5/core/pkg/DEINSTALL

@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
-#
-# php5 de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-CONF=`apxs -q SYSCONFDIR`/httpd.conf
-
-rm -f /usr/lib/apache/modules/libphp5.so
-
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you"
-echo "| need to perform these steps as root:"
-echo "|"
-echo "|        edit ${CONF}"
-echo "|        remove the line LoadModule php5_module"
-echo "|"
-echo "| Do not do this if you plan on re-installing php5"
-echo "| package at some future time."
-echo "+---------------"
-echo
-
-exit 0

www/php5/core/pkg/INSTALL

@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
-#
-# php5 installation
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| To finish the install, enable the php5 module with:"
-    echo "|	$PREFIX/sbin/phpxs -s"
-    echo "|"
-    echo "| To enable parsing of PHP scripts, add the following to"
-    echo "| /var/www/conf/httpd.conf:"
-    echo "|"
-    echo "|       AddType application/x-httpd-php .php"
-    echo "|"
-    echo "| Copy the config file below into ${PHP_CONFIG_FILE}"
-    echo "| ${PREFIX}/share/doc/php5/php.ini-recommended"
-    echo "|"
-    echo "| Don't forget that the default OpenBSD httpd is chrooted"
-    echo "| into /var/www by default, so you may need to create support"
-    echo "| directories such as /var/www/tmp for PHP to work correctly."
-    echo "+---------------"
-    echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	do_notice $1
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0

www/php5/core/pkg/MESSAGE

@@ -0,0 +1,14 @@
+To finish the install, enable the php5 module with:
+    ${PREFIX}/sbin/phpxs -s
+
+To enable parsing of PHP scripts, add the following to
+/var/www/conf/httpd.conf:
+    
+    AddType application/x-httpd-php .php
+
+Copy the config file below into ${PHP_CONFIG_FILE}
+${PREFIX}/share/doc/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
+directories such as /var/www/tmp for PHP to work correctly.

www/php5/core/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/11/24 17:27:22 robert Exp $
 @conflict php4-core-*
 %%SHARED%%
 bin/pear
@@ -12,3 +12,4 @@ sbin/phpxs
 share/doc/php5/
 share/doc/php5/php.ini-dist
 share/doc/php5/php.ini-recommended
+@unexec rm -f /usr/lib/apache/modules/libphp5.so

www/php5/core/pkg/UNMESSAGE

@@ -0,0 +1,8 @@
+To completely deinstall the package you need to
+perform these steps as root:
+
+    edit /var/www/conf/httpd.conf
+    remove the line LoadModule php5_module
+
+Do not do this if you plan on re-installing php5
+package at some future time.

www/php5/patches/patch-main_php_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-main_php_h,v 1.1 2004/11/24 17:27:22 robert Exp $
+--- main/php.h.orig	Thu Nov 18 18:09:47 2004
++++ main/php.h	Thu Nov 18 18:29:09 2004
+@@ -149,7 +149,7 @@
+ END_EXTERN_C()
+ #endif
+ 
+-#ifndef HAVE_SOCKLEN_T
++#if !defined(HAVE_SOCKLEN_T) && !defined(__OpenBSD__)
+ typedef unsigned int socklen_t;
+ #endif
+