ports/102311: [PATCH] graphics/GraphicsMagick: fix build, make portlint more happy

[User]

>Number:         102311
>Category:       ports
>Synopsis:       [PATCH] graphics/GraphicsMagick: fix build, make portlint more happy
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 20 07:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     User
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #1: Wed Aug 16 16:32:54 CST 2006
>Description:
 - Fix build error
 - Make portlint more happy

Added file(s):
- files/patch-coders-png.c

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- GraphicsMagick-1.1.6_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick/Makefile /usr/home/chinsan/project/GraphicsMagick/Makefile
--- /usr/ports/graphics/GraphicsMagick/Makefile	Wed Aug 16 00:07:24 2006
+++ /usr/home/chinsan/project/GraphicsMagick/Makefile	Sun Aug 20 15:28:30 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	GraphicsMagick
 PORTVERSION=	1.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
@@ -79,6 +79,10 @@
 CONFIGURE_ARGS+=	--with-quantum-depth=16
 PLIST_SUB+=		Q=16
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,tmpnam,mkstemp,;' \
+		${WRKSRC}/magick/tempfile.c
 
 post-build test:
 	cd ${WRKSRC}/tests && ${MAKE} check
diff -ruN --exclude=CVS /usr/ports/graphics/GraphicsMagick/files/patch-coders-png.c /usr/home/chinsan/project/GraphicsMagick/files/patch-coders-png.c
--- /usr/ports/graphics/GraphicsMagick/files/patch-coders-png.c	Thu Jan  1 08:00:00 1970
+++ /usr/home/chinsan/project/GraphicsMagick/files/patch-coders-png.c	Sun Aug 20 15:21:21 2006
@@ -0,0 +1,39 @@
+--- coders/png.c.orig	Thu Nov 11 07:14:54 2004
++++ coders/png.c	Sun Aug 20 15:21:14 2006
+@@ -71,7 +71,7 @@
+ #include "magick/transform.h"
+ #include "magick/utility.h"
+ #if defined(HasPNG)
+-#include "png.h"
++#include "libpng/png.h"
+ #include "zlib.h"
+ 
+ #if PNG_LIBPNG_VER > 95
+@@ -1567,6 +1567,8 @@
+     num_passes,
+     pass;
+ 
++  png_structp png_ptr;
++
+   PixelPacket
+     transparent_color;
+ 
+@@ -1709,18 +1711,6 @@
+ #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
+ && (PNG_LIBPNG_VER >= 10200)
+   /* Disable thread-unsafe features of pnggccrd */
+-  if (png_access_version() >= 10200)
+-  {
+-    png_uint_32 mmx_disable_mask=0;
+-    png_uint_32 asm_flags;
+-
+-    mmx_disable_mask |= ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
+-                        | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
+-                        | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
+-                        | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
+-    asm_flags=png_get_asm_flags(png_ptr);
+-    png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
+-  }
+ #endif
+ 
+   png_read_info(ping,ping_info);
--- GraphicsMagick-1.1.6_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: