Drop GCC check. Fix missing includes. Fix memset call. Bump revision.

9 files changed, 114 insertions, 4 deletions

diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index e3d264653ca..bdb916c91bc 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2015/04/25 14:24:51 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2015/04/26 13:30:58 joerg Exp $
 #
 
 DISTNAME=		dvdisaster-0.72.4
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		sysutils
 MASTER_SITES=		http://dvdisaster.net/downloads/
 EXTRACT_SUFX=		.tar.bz2
@@ -19,7 +19,6 @@ BUILD_DEPENDS+=		gettext-tools>=0.14:../../devel/gettext-tools
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
-ONLY_FOR_COMPILER=	gcc
 USE_LANGUAGES=		c
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bash gmake pkg-config
diff --git a/sysutils/dvdisaster/distinfo b/sysutils/dvdisaster/distinfo
index 2c4fbd06456..ea1ed574e78 100644
--- a/sysutils/dvdisaster/distinfo
+++ b/sysutils/dvdisaster/distinfo
@@ -1,7 +1,14 @@
-$NetBSD: distinfo,v 1.7 2012/08/10 15:52:12 drochner Exp $
+$NetBSD: distinfo,v 1.8 2015/04/26 13:30:58 joerg Exp $
 
 SHA1 (dvdisaster-0.72.4.tar.bz2) = 2b47fb5a5535d90641f24a599cd8ae8ffd86b972
 RMD160 (dvdisaster-0.72.4.tar.bz2) = a134fa0adf04dc2a921acfccf0c10292112a28fa
 Size (dvdisaster-0.72.4.tar.bz2) = 5097738 bytes
 SHA1 (patch-aa) = 97fe33bdc514925041718992b28d75b672b4be0c
 SHA1 (patch-ah) = 04045e26cba6772d7b46d0bdd927aa97984e8ea0
+SHA1 (patch-md5.c) = f91077add57db35e10256916cd1ede3d8d9df3bc
+SHA1 (patch-scripts_bash-based-configure) = 23f4f91bb28a495005cc391ab9d11e4563adc34b
+SHA1 (patch-tools_codec.c) = 381a666d82465f3e509f623c2f0f312e1e83c190
+SHA1 (patch-tools_decimate.c) = 928e3fd62b423efee32f33396477e7b839d524a2
+SHA1 (patch-tools_memory.c) = 5adedb6553ffe844f34afb892dbb9beeace479bb
+SHA1 (patch-tools_pngio.c) = ed3ea53d93f41ff477267e457f1b26b9da224686
+SHA1 (patch-tools_pngpack.c) = d58665f2c26c0dfc97dd413f07c419b0f7f3d3bb
diff --git a/sysutils/dvdisaster/patches/patch-md5.c b/sysutils/dvdisaster/patches/patch-md5.c
new file mode 100644
index 00000000000..959ac96d33e
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-md5.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-md5.c,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- md5.c.orig	2015-04-26 11:58:37.000000000 +0000
++++ md5.c
+@@ -159,7 +159,7 @@ MD5Final(unsigned char digest[16], struc
+ 	MD5Transform(ctx->buf, (guint32 *) ctx->in);
+ 	byteReverse((unsigned char *) ctx->buf, 4);
+ 	memmove(digest, ctx->buf, 16);
+-	memset(ctx, 0, sizeof (ctx));	/* In case it's sensitive */
++	memset(ctx, 0, sizeof (*ctx));	/* In case it's sensitive */
+ }
+ 
+ /* The four core functions - F1 is optimized somewhat */
diff --git a/sysutils/dvdisaster/patches/patch-scripts_bash-based-configure b/sysutils/dvdisaster/patches/patch-scripts_bash-based-configure
new file mode 100644
index 00000000000..e105066f25f
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-scripts_bash-based-configure
@@ -0,0 +1,30 @@
+$NetBSD: patch-scripts_bash-based-configure,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- scripts/bash-based-configure.orig	2015-04-26 11:58:05.000000000 +0000
++++ scripts/bash-based-configure
+@@ -328,24 +328,7 @@ function REQUIRE_GMAKE()
+ 
+ function REQUIRE_GCC()
+ {
+-   if test -n "$cfg_help_mode"; then
+-      return 0
+-   fi
+-
+-   echo -n "Checking for gcc: "
+-
+-   if gcc -v >/dev/null 2>&1; then
+-     if (gcc -v 2>&1 | grep "gcc") > /dev/null 2>&1 ;
+-       then echo "yes"
+-	    echo "CC = `which gcc`" >>Makefile.config
+-	    CC=gcc
+-	    return 0
+-     fi;
+-   fi;
+-
+-   echo "no"
+-   echo "This package requires the GNU C compiler (gcc)."
+-   exit 1;
++   return 0
+ }
+ 
+ #
diff --git a/sysutils/dvdisaster/patches/patch-tools_codec.c b/sysutils/dvdisaster/patches/patch-tools_codec.c
new file mode 100644
index 00000000000..e46ac2eac6a
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-tools_codec.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_codec.c,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- tools/codec.c.orig	2015-04-26 12:06:58.000000000 +0000
++++ tools/codec.c
+@@ -20,6 +20,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <bzlib.h>
+ 
diff --git a/sysutils/dvdisaster/patches/patch-tools_decimate.c b/sysutils/dvdisaster/patches/patch-tools_decimate.c
new file mode 100644
index 00000000000..1cdbd35ce9c
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-tools_decimate.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_decimate.c,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- tools/decimate.c.orig	2015-04-26 12:06:48.000000000 +0000
++++ tools/decimate.c
+@@ -21,6 +21,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "pngio.h"
+ #include "memory.h"
diff --git a/sysutils/dvdisaster/patches/patch-tools_memory.c b/sysutils/dvdisaster/patches/patch-tools_memory.c
new file mode 100644
index 00000000000..5229b8f3e86
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-tools_memory.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_memory.c,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- tools/memory.c.orig	2015-04-26 12:09:00.000000000 +0000
++++ tools/memory.c
+@@ -165,7 +165,7 @@ static void print_ptr(memchunk *mc, int 
+ static void print_ptrs(char *msg)
+ {  int bucket,i,n=0;
+ 
+-   fprintf(stdout, msg);
++   fprintf(stdout, "%s", msg);
+ 
+    for(bucket=0; bucket<64; bucket++)
+       for(i=0; i<phCnt[bucket]; i++)
diff --git a/sysutils/dvdisaster/patches/patch-tools_pngio.c b/sysutils/dvdisaster/patches/patch-tools_pngio.c
new file mode 100644
index 00000000000..271186b4670
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-tools_pngio.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_pngio.c,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- tools/pngio.c.orig	2015-04-26 12:05:25.000000000 +0000
++++ tools/pngio.c
+@@ -20,6 +20,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/stat.h>
+ 
+ #include "pngio.h"
diff --git a/sysutils/dvdisaster/patches/patch-tools_pngpack.c b/sysutils/dvdisaster/patches/patch-tools_pngpack.c
new file mode 100644
index 00000000000..4dcee456295
--- /dev/null
+++ b/sysutils/dvdisaster/patches/patch-tools_pngpack.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-tools_pngpack.c,v 1.1 2015/04/26 13:30:58 joerg Exp $
+
+--- tools/pngpack.c.orig	2015-04-26 12:04:56.000000000 +0000
++++ tools/pngpack.c
+@@ -22,6 +22,7 @@
+ #include <getopt.h>
+ #include <sys/stat.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "md5.h"
+ #include "pngio.h"