openbsd-ports/lang/php/5.3/patches/patch-main_php_h

$OpenBSD: patch-main_php_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- main/php.h.orig.port	Sat Jun 18 12:14:46 2011
+++ main/php.h	Sat Jun 18 12:14:52 2011
@@ -146,7 +146,7 @@ char *strtok_r(char *s, const char *delim, char **last
 END_EXTERN_C()
 #endif
 
-#ifndef HAVE_SOCKLEN_T
+#if !defined(HAVE_SOCKLEN_T) && !defined(__OpenBSD__)
 typedef unsigned int socklen_t;
 #endif
Use PATCHORIG, regen patches and rename the files which didn't match the normal update-patches filenames. This avoids update-patches picking up the .orig files in PHP distfiles and make it easier to keep in-sync. ok robert@ 2011-06-18 15:49:22 -04:00			$OpenBSD: patch-main_php_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
			`--- main/php.h.orig.port Sat Jun 18 12:14:46 2011`
			`+++ main/php.h Sat Jun 18 12:14:52 2011`
update both to their current version 5.3.4 and 5.2.16 and fix wantlibs. update patches while here 2011-01-05 04:31:22 -05:00			`@@ -146,7 +146,7 @@ char strtok_r(char s, const char delim, char *last`
Import a reworked port of php to lang/php. The basic difference is that there are no core and extensions packages anymore, everything is built by the main ports itself and the package names have changed to php-${V} or php-mysql-${V} for modules. The new ports allows you to install all of the php versions just like python so you can actually run different webservers with different versions of php because you can't load two modules to one. You can only do that with fastcgi. The port tries to share all the files that can be shared and the different extensions are located in the local version's Makefile instead of Makefile.inc. The other change is that all of the configuration has moved to /etc out of /var/www because that was a realy stupid concept, since apache if you use it chrooted, will load all of the extensions before doing the actual chroot. This port is not linked to the build yet because several issues have to be resolved first, like providing a way to update from php5-* packages, and probably other things that do not come into my mind right now, because the Bullfrog is making me crazy. 2010-06-27 16:28:44 -04:00			`END_EXTERN_C()`
			`#endif`

			`-#ifndef HAVE_SOCKLEN_T`
			`+#if !defined(HAVE_SOCKLEN_T) && !defined(__OpenBSD__)`
			`typedef unsigned int socklen_t;`
			`#endif`