diff options
| -rw-r--r-- | graphics/GraphicsMagick/Makefile | 3 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/files/patch-coders-png.c | 39 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/files/patch-utility | 21 | ||||
| -rw-r--r-- | graphics/GraphicsMagick12/Makefile | 3 | ||||
| -rw-r--r-- | graphics/GraphicsMagick12/files/patch-coders-png.c | 39 | ||||
| -rw-r--r-- | graphics/GraphicsMagick12/files/patch-utility | 21 | ||||
| -rw-r--r-- | graphics/GraphicsMagick13/Makefile | 3 | ||||
| -rw-r--r-- | graphics/GraphicsMagick13/files/patch-coders-png.c | 39 | ||||
| -rw-r--r-- | graphics/GraphicsMagick13/files/patch-utility | 21 |
9 files changed, 0 insertions, 189 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 6dd5af54fc34..5d2c390aff32 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/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/GraphicsMagick/files/patch-coders-png.c b/graphics/GraphicsMagick/files/patch-coders-png.c deleted file mode 100644 index f1a5ed6f8d36..000000000000 --- a/graphics/GraphicsMagick/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/GraphicsMagick/files/patch-utility b/graphics/GraphicsMagick/files/patch-utility deleted file mode 100644 index 6dd5fb61c3d3..000000000000 --- a/graphics/GraphicsMagick/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); diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index 6dd5af54fc34..5d2c390aff32 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/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/GraphicsMagick12/files/patch-coders-png.c b/graphics/GraphicsMagick12/files/patch-coders-png.c deleted file mode 100644 index f1a5ed6f8d36..000000000000 --- a/graphics/GraphicsMagick12/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/GraphicsMagick12/files/patch-utility b/graphics/GraphicsMagick12/files/patch-utility deleted file mode 100644 index 6dd5fb61c3d3..000000000000 --- a/graphics/GraphicsMagick12/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); 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); |