Attachment #94173 for bug #132268

View | Details | Raw Unified | Return to bug 132268
Collapse All | Expand All

Lines 10-15 Link Here

(-)ports/ftp/php5-curl/Makefile (-1 lines)
10	MASTERDIR= ${.CURDIR}/../../lang/php5	10	MASTERDIR= ${.CURDIR}/../../lang/php5
11		11
12	PKGNAMESUFFIX= -curl	12	PKGNAMESUFFIX= -curl
13	PORTREVISION= 1
14		13
15	.include "${MASTERDIR}/Makefile"	14	.include "${MASTERDIR}/Makefile"

Lines 5-11 Link Here

(-)ports/graphics/php5-gd/Makefile (-1 lines)
5	# $FreeBSD: ports/graphics/php5-gd/Makefile,v 1.2 2009/02/04 06:42:35 ale Exp $	5	# $FreeBSD: ports/graphics/php5-gd/Makefile,v 1.2 2009/02/04 06:42:35 ale Exp $
6	#	6	#
7		7
8	PORTREVISION= 1
9	CATEGORIES= graphics	8	CATEGORIES= graphics
10		9
11	MASTERDIR= ${.CURDIR}/../../lang/php5	10	MASTERDIR= ${.CURDIR}/../../lang/php5

Removed Link Here

(-)ports/graphics/php5-gd/files/patch-libgd_gd.c (-11 lines)
1	--- libgd/gd.c.orig 2009-01-05 14:54:19.000000000 +0100
2	+++ libgd/gd.c 2009-01-05 14:54:53.000000000 +0100
3	@@ -3136,7 +3136,7 @@
4	return NULL;
5	}
6
7	- if (!gdImageTrueColor(src) && clrBack>=gdImageColorsTotal(src)) {
8	+ if (!gdImageTrueColor(src) && (clrBack < 0 \|\| clrBack>=gdImageColorsTotal(src))) {
9	return NULL;
10	}
11

Lines 6-12 Link Here

(-)ports/lang/php5/Makefile (-1 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.2.8	9	PORTVERSION= 5.2.9
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= lang devel www	11	CATEGORIES?= lang devel www
12	MASTER_SITES= ${MASTER_SITE_PHP}	12	MASTER_SITES= ${MASTER_SITE_PHP}
Lines 152-160 Link Here
152	CONFIGURE_ARGS+=--disable-ipv6	152	CONFIGURE_ARGS+=--disable-ipv6
153	.endif	153	.endif
154		154
		155	.if !defined(WITHOUT_SUHOSIN)
		156	pre-patch:
		157	@${REINPLACE_CMD} "s\|(c) 1997-2009\|(c) 1997-2008\|g" \
		158	${WRKSRC}/sapi/cgi/cgi_main.c \
		159	${WRKSRC}/sapi/cli/php_cli.c
		160	.endif
		161
155	post-patch:	162	post-patch:
156	@${TOUCH} ${WRKSRC}/ext/php_config.h	163	@${TOUCH} ${WRKSRC}/ext/php_config.h
157	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*	164	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*
		165	.if !defined(WITHOUT_SUHOSIN)
		166	@${REINPLACE_CMD} "s\|(c) 1997-2008\|(c) 1997-2009\|g" \
		167	${WRKSRC}/sapi/cgi/cgi_main.c \
		168	${WRKSRC}/sapi/cli/php_cli.c
		169	.endif
158		170
159	pre-configure:	171	pre-configure:
160	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4	172	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4

Lines 1-6 Link Here

(-)ports/lang/php5/distinfo (-3 / +3 lines)
1	MD5 (php-5.2.8.tar.bz2) = 8760a833cf10433d3e72271ab0d0eccf	1	MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
2	SHA256 (php-5.2.8.tar.bz2) = a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67	2	SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
3	SIZE (php-5.2.8.tar.bz2) = 9827180	3	SIZE (php-5.2.9.tar.bz2) = 10203122
4	MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa	4	MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa
5	SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46	5	SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
6	SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125	6	SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125

Lines 77-83 Link Here

(-)ports/lang/php5/pkg-plist (-1 lines)
77	include/php/ext/pcre/pcrelib/pcre_internal.h	77	include/php/ext/pcre/pcrelib/pcre_internal.h
78	include/php/ext/pcre/pcrelib/pcreposix.h	78	include/php/ext/pcre/pcrelib/pcreposix.h
79	include/php/ext/pcre/pcrelib/ucp.h	79	include/php/ext/pcre/pcrelib/ucp.h
80	include/php/ext/pcre/pcrelib/ucptable.h
81	include/php/ext/pcre/php_pcre.h	80	include/php/ext/pcre/php_pcre.h
82	include/php/ext/standard/base64.h	81	include/php/ext/standard/base64.h
83	include/php/ext/standard/basic_functions.h	82	include/php/ext/standard/basic_functions.h

Removed Link Here

(-)ports/lang/php5/files/patch-ext_date_lib_timelib_structs.h (-11 lines)
1	--- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005
2	+++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005
3	@@ -21,7 +21,7 @@
4	#ifndef __TIMELIB_STRUCTS_H__
5	#define __TIMELIB_STRUCTS_H__
6
7	-#include <timelib_config.h>
8	+#include "timelib_config.h"
9
10	#ifdef HAVE_SYS_TYPES_H
11	#include <sys/types.h>

Removed Link Here

(-)ports/mail/php5-imap/files/patch-php_imap.c (-11 lines)
1	--- php_imap.c.orig 2008-12-30 11:06:18.000000000 +0100
2	+++ php_imap.c 2008-12-30 11:06:56.000000000 +0100
3	@@ -2172,7 +2172,7 @@
4
5	/* rfc822_parse_adrlist() modifies passed string. Copy it. */
6	str_copy = estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));
7	- rfc822_parse_adrlist(&env->to, str_copy, defaulthost);
8	+ rfc822_parse_adrlist(&env->to, str_copy, Z_STRVAL_PP(defaulthost));
9	efree(str_copy);
10
11	array_init(return_value);

Lines 5-11 Link Here

(-)ports/net/php5-ldap/Makefile (-1 lines)
5	# $FreeBSD: ports/net/php5-ldap/Makefile,v 1.2 2009/01/05 19:04:28 delphij Exp $	5	# $FreeBSD: ports/net/php5-ldap/Makefile,v 1.2 2009/01/05 19:04:28 delphij Exp $
6	#	6	#
7		7
8	PORTREVISION= 1
9	CATEGORIES= net	8	CATEGORIES= net
10		9
11	MASTERDIR= ${.CURDIR}/../../lang/php5	10	MASTERDIR= ${.CURDIR}/../../lang/php5

Lines 5-11 Link Here

(-)ports/net-mgmt/php5-snmp/Makefile (-1 lines)
5	# $FreeBSD: ports/net-mgmt/php5-snmp/Makefile,v 1.3 2008/03/29 11:02:36 kuriyama Exp $	5	# $FreeBSD: ports/net-mgmt/php5-snmp/Makefile,v 1.3 2008/03/29 11:02:36 kuriyama Exp $
6	#	6	#
7		7
8	PORTREVISION= 2
9	CATEGORIES= net-mgmt	8	CATEGORIES= net-mgmt
10		9
11	MASTERDIR= ${.CURDIR}/../../lang/php5	10	MASTERDIR= ${.CURDIR}/../../lang/php5

Return to bug 132268