4 files changed, 13 insertions, 9 deletions
diff --git a/net/waste/Makefile b/net/waste/Makefile
index aa21ae78a5a..86362a626f7 100644
--- a/net/waste/Makefile
+++ b/net/waste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/08 21:42:41 joerg Exp $
 #
 
 DISTNAME=	waste-source
@@ -24,8 +24,11 @@ NO_BIN_ON_FTP=          ${RESTRICTED}
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 NO_BIN_ON_CDROM=        ${RESTRICTED}
 
+.include "../../mk/bsd.prefs.mk"
 
-MAKE_ENV+=	LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib"
+.if ${OPSYS} == "DragonFly"
+LDFLAGS+=	-lmd
+.endif
 
 INSTALLATION_DIRS=	sbin
 
diff --git a/net/waste/distinfo b/net/waste/distinfo
index 6e5c38d5879..5945ba7140a 100644
--- a/net/waste/distinfo
+++ b/net/waste/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:14:06 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/01/08 21:42:41 joerg Exp $
 
 SHA1 (waste-source.tar.gz) = 93583fb2577ee08f331d438bc1aa84aaa83d6386
 RMD160 (waste-source.tar.gz) = 3f3b53df78d1f0c457fc088ecdd8828050d07906
 Size (waste-source.tar.gz) = 214730 bytes
-SHA1 (patch-aa) = 14cd257dad060c713d070e03be341653d0116310
-SHA1 (patch-ab) = 078632b83f41e20fd129d592d638300e5cf364d6
+SHA1 (patch-aa) = 65757f6acad934ef0aeeed37a303afb0f72059c5
+SHA1 (patch-ab) = c258a86191c141a6c4a0246a34abbd2446f52130
 SHA1 (patch-ac) = ee2ce447f4c27be68fde47861a1e74965f3d4ea3
 SHA1 (patch-ad) = 186a602f74728378d1de01e3eb35b4880cd821ac
 SHA1 (patch-ae) = 2d21c439a1635ccad9824811d553bb9d33f04a67
+SHA1 (patch-af) = d3b3a005a605d4746b40297283bf0f2e49689287
diff --git a/net/waste/patches/patch-aa b/net/waste/patches/patch-aa
index c2b35f1d5dc..5483e7a078d 100644
--- a/net/waste/patches/patch-aa
+++ b/net/waste/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/02/19 19:03:17 kristerw Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/08 21:42:42 joerg Exp $
 
 --- /dev/null	2003-05-31 11:34:06.000000000 -0400
 +++ Makefile	2003-05-31 11:52:33.000000000 -0400
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 2004/02/19 19:03:17 kristerw Exp $
 +
 +
 +wastesrv: $(OBJS) $(RSAOBJS)
-+	$(CXX) $(DEBUGFLAG) -o wastesrv $(OBJS) $(RSAOBJS) ${LDFLAGS} -lpthread
++	$(CXX) $(DEBUGFLAG) -o wastesrv $(OBJS) $(RSAOBJS) ${LDFLAGS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 +
 +md5c.o: rsa/md5c.c
 +nn.o: rsa/nn.c
diff --git a/net/waste/patches/patch-ab b/net/waste/patches/patch-ab
index a03bbbfd74d..1f072e7558f 100644
--- a/net/waste/patches/patch-ab
+++ b/net/waste/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/05 01:00:45 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/08 21:42:42 joerg Exp $
 
 --- xfers.cpp.orig	2003-05-31 11:54:02.000000000 -0400
 +++ xfers.cpp	2003-05-31 11:54:27.000000000 -0400
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/06/05 01:00:45 jschauma Exp $
  #define IS_VALID(x) (m_validbf[(x)>>3]&(1<<(x&7)))
  #define SET_VALID(x) m_validbf[(x)>>3]|=(1<<(x&7))
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#define RemoveDirectory(x) rmdir(x)
 +#endif