3 files changed, 29 insertions, 4 deletions
diff --git a/comms/malsync/distinfo b/comms/malsync/distinfo
index 03ef275e58b..84bcbaf7b47 100644
--- a/comms/malsync/distinfo
+++ b/comms/malsync/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2007/01/26 01:50:54 markd Exp $
+$NetBSD: distinfo,v 1.7 2012/02/16 17:25:16 hans Exp $
 
 SHA1 (malsync_2.2.0.src.tar.gz) = c8400205b3f8770c105c9f62afdba20c94b85c26
 RMD160 (malsync_2.2.0.src.tar.gz) = 14be8ba01c20969eed8d7b718284880e0bbd424f
 Size (malsync_2.2.0.src.tar.gz) = 173851 bytes
-SHA1 (patch-aa) = 412ed5a2257241cd41c3b56689965eb550f4374f
+SHA1 (patch-aa) = 616a237452a3f408b6cce199ce338746e8fa3149
 SHA1 (patch-ab) = de38ceb03f777bac1f4612517850e023dee946b7
 SHA1 (patch-ac) = a0ffae72d282e6b9276b8e16b909010e6e9c9b1e
 SHA1 (patch-ad) = 2c9f6f3b60ba1d198e6752c7f0ec239727ae78e7
+SHA1 (patch-mal_common_AGUtilUnix.h) = 3e8a09ef8a9d6e6e56a3cfdddb42e91bb9a9995a
diff --git a/comms/malsync/patches/patch-aa b/comms/malsync/patches/patch-aa
index 6dff16376c9..97b2f1012b9 100644
--- a/comms/malsync/patches/patch-aa
+++ b/comms/malsync/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2007/01/26 01:50:54 markd Exp $
+$NetBSD: patch-aa,v 1.5 2012/02/16 17:25:16 hans Exp $
 
 --- Makefile.orig	2003-05-31 11:42:14.000000000 +1200
 +++ Makefile
@@ -18,7 +18,18 @@ $NetBSD: patch-aa,v 1.4 2007/01/26 01:50:54 markd Exp $
  
  CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
    -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \
-@@ -72,8 +73,8 @@ DYNLINK = -rdynamic
+@@ -59,10 +60,6 @@ SRC = malsync.c  \
+   $(TREETOP)/mal/client/common/AGSyncProcessor.c \
+   $(TREETOP)/mal/common/AGServerConfig.c
+ 
+-ifeq ($(PLAT),SunOS)
+-SRC += ap_snprintf.c
+-endif
+-
+ OBJS = $(SRC:.c=.o)
+ 
+ ifeq ($(PLAT),Darwin)
+@@ -72,8 +69,8 @@ DYNLINK = -rdynamic
  endif
  
  $(TARGET): $(OBJS)
diff --git a/comms/malsync/patches/patch-mal_common_AGUtilUnix.h b/comms/malsync/patches/patch-mal_common_AGUtilUnix.h
new file mode 100644
index 00000000000..35b6fa508b5
--- /dev/null
+++ b/comms/malsync/patches/patch-mal_common_AGUtilUnix.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mal_common_AGUtilUnix.h,v 1.1 2012/02/16 17:25:16 hans Exp $
+
+--- mal/common/AGUtilUnix.h.orig	2000-05-14 23:17:36.000000000 +0200
++++ mal/common/AGUtilUnix.h	2012-01-26 17:39:25.909557059 +0100
+@@ -46,8 +46,6 @@ extern "C" {
+ #include <httpd.h>
+ #include <ap.h>
+ #endif
+-#define snprintf ap_snprintf
+-#define vsnprintf ap_vsnprintf
+ #endif
+ 
+ #endif /* __unix__ */