diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-04-05 18:57:39 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-04-05 18:57:39 +0000 |
| commit | 11443cddf9e0126a3e16a32332193fd52e881de1 (patch) | |
| tree | 494afd004394690e8e69b88212bd82d3ac7b97a6 | |
| parent | - Mark BROKEN: size mismatch (diff) | |
- fix build for png-1.4.1
- bump PORTREVISION
PR: 145247
Notes
Notes:
svn path=/head/; revision=252257
| -rw-r--r-- | graphics/php4-gd/files/patch-libgd_gd_png.c | 14 | ||||
| -rw-r--r-- | graphics/php5-gd/files/patch-libgd_gd_png.c | 14 | ||||
| -rw-r--r-- | lang/php4/Makefile | 2 | ||||
| -rw-r--r-- | lang/php5/Makefile | 2 | ||||
| -rw-r--r-- | lang/php53/Makefile | 2 |
5 files changed, 31 insertions, 3 deletions
diff --git a/graphics/php4-gd/files/patch-libgd_gd_png.c b/graphics/php4-gd/files/patch-libgd_gd_png.c new file mode 100644 index 000000000000..41aae43e89cf --- /dev/null +++ b/graphics/php4-gd/files/patch-libgd_gd_png.c @@ -0,0 +1,14 @@ +--- libgd/gd_png.c.orig 2007-05-17 00:54:11.000000000 +0200 ++++ libgd/gd_png.c 2010-04-05 20:43:02.000000000 +0200 +@@ -136,7 +136,11 @@ + * have used slightly more general png_sig_cmp() function instead + */ + gdGetBuf(sig, 8, infile); ++#if PNG_LIBPNG_VER >= 10400 ++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ ++#else + if (!png_check_sig (sig, 8)) { /* bad signature */ ++#endif + return NULL; + } + diff --git a/graphics/php5-gd/files/patch-libgd_gd_png.c b/graphics/php5-gd/files/patch-libgd_gd_png.c new file mode 100644 index 000000000000..95934bfc5089 --- /dev/null +++ b/graphics/php5-gd/files/patch-libgd_gd_png.c @@ -0,0 +1,14 @@ +--- libgd/gd_png.c.orig 2009-03-14 18:48:42.000000000 +0100 ++++ libgd/gd_png.c 2010-04-05 19:54:05.000000000 +0200 +@@ -139,7 +139,11 @@ + return NULL; + } + ++#if PNG_LIBPNG_VER >= 10400 ++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ ++#else + if (!png_check_sig (sig, 8)) { /* bad signature */ ++#endif + return NULL; + } + diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 688cb63f0f76..e53b34ba916f 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -7,7 +7,7 @@ PORTNAME= php4 PORTVERSION= 4.4.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 0a1e1a9bdc2a..ffa10b498b51 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.2.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 0a1e1a9bdc2a..ffa10b498b51 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.2.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions |