summaryrefslogtreecommitdiff
path: root/graphics/GraphicsMagick13
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2006-12-12 18:21:31 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2006-12-12 18:21:31 +0000
commite5c6be44d9eb8c8bb9094282240e9b27fd671a3f (patch)
tree0958c3da67cd041569193f85b8f7038ad34ac873 /graphics/GraphicsMagick13
parentPrepare bsd.gstreamer.mk for removal of multimedia/gstreamer-plugins-dirac80 (diff)
Fix build on 4.x
Notes
Notes: svn path=/head/; revision=179582
Diffstat (limited to 'graphics/GraphicsMagick13')
-rw-r--r--graphics/GraphicsMagick13/Makefile3
-rw-r--r--graphics/GraphicsMagick13/files/patch-coders-png.c39
-rw-r--r--graphics/GraphicsMagick13/files/patch-utility21
3 files changed, 0 insertions, 63 deletions
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 6dd5af54fc34..5d2c390aff32 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -79,7 +79,4 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
PLIST_SUB+= Q=16
.endif
-post-build test:
- cd ${WRKSRC}/tests && ${MAKE} check
-
.include <bsd.port.post.mk>
diff --git a/graphics/GraphicsMagick13/files/patch-coders-png.c b/graphics/GraphicsMagick13/files/patch-coders-png.c
deleted file mode 100644
index f1a5ed6f8d36..000000000000
--- a/graphics/GraphicsMagick13/files/patch-coders-png.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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);
diff --git a/graphics/GraphicsMagick13/files/patch-utility b/graphics/GraphicsMagick13/files/patch-utility
deleted file mode 100644
index 6dd5fb61c3d3..000000000000
--- a/graphics/GraphicsMagick13/files/patch-utility
+++ /dev/null
@@ -1,21 +0,0 @@
---- magick/utility.c Sat Apr 2 17:35:06 2005
-+++ magick/utility.c Sun Jul 24 18:22:40 2005
-@@ -47,4 +47,8 @@
- #include "magick/utility.h"
-
-+#if defined(POSIX)
-+# include <sys/types.h>
-+# include <sys/wait.h>
-+#endif
-
- /*
-@@ -3874,4 +3878,9 @@
- #if defined(POSIX)
- status=system(command);
-+ if (status == -1)
-+ perror(command);
-+ else if (WIFSIGNALED(status)) {
-+ fprintf(stderr, "Command ``\n%s\n'' terminated due to signal %d\n", command, WTERMSIG(status));
-+ }
- #elif defined(vms)
- status=!system(command);