From 9dd27661b0baf9bfb309a36b25b38de3c98a782c Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sun, 30 Apr 2006 17:11:25 +0000
Subject: No seteuid needed on DragonFly. Link correctly with pthread.

---
 mail/milter-regex/distinfo         |  5 +++--
 mail/milter-regex/patches/patch-aa |  4 ++--
 mail/milter-regex/patches/patch-ab | 13 +++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 mail/milter-regex/patches/patch-ab

(limited to 'mail/milter-regex')

diff --git a/mail/milter-regex/distinfo b/mail/milter-regex/distinfo
index cfa689a8905..9e77f333a66 100644
--- a/mail/milter-regex/distinfo
+++ b/mail/milter-regex/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/03/08 22:01:21 tron Exp $
+$NetBSD: distinfo,v 1.6 2006/04/30 17:11:25 joerg Exp $
 
 SHA1 (milter-regex-1.6.tar.gz) = 4035f9ed20b54bc9c8409b1e7ffffde86dfc61af
 RMD160 (milter-regex-1.6.tar.gz) = 1cb60a063ac3e7cada2c9800710c6a0cc4862174
 Size (milter-regex-1.6.tar.gz) = 16969 bytes
-SHA1 (patch-aa) = 86f23d34f994e0039a46861470af0aaca3396248
+SHA1 (patch-aa) = 1d081605f5ade07ffa6f5680c7e4888f0510c1d0
+SHA1 (patch-ab) = 07054cd076dfd54e1536ad1bf4dcbf7faa383f51
diff --git a/mail/milter-regex/patches/patch-aa b/mail/milter-regex/patches/patch-aa
index e880b224cae..3651c5091d2 100644
--- a/mail/milter-regex/patches/patch-aa
+++ b/mail/milter-regex/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2004/06/11 23:11:48 jdarrow Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/30 17:11:25 joerg Exp $
 
 --- milter-regex.c.orig	Fri Mar 19 13:21:40 2004
 +++ milter-regex.c	Mon Jun  7 16:35:18 2004
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2004/06/11 23:11:48 jdarrow Exp $
  		}
  		if (
 -#if ! ( __linux__ || __sun__ )
-+#if ! ( __linux__ || __sun__ || __NetBSD__ )
++#if ! ( __linux__ || __sun__ || __NetBSD__ || defined(__DragonFly__) )
  		    seteuid(pw->pw_uid) ||
  #endif
  		    setuid(pw->pw_uid)) {
diff --git a/mail/milter-regex/patches/patch-ab b/mail/milter-regex/patches/patch-ab
new file mode 100644
index 00000000000..4d5962e34ed
--- /dev/null
+++ b/mail/milter-regex/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/04/30 17:11:25 joerg Exp $
+
+--- Makefile.orig	2006-04-30 17:05:50.000000000 +0000
++++ Makefile
+@@ -6,7 +6,7 @@ MAN=	milter-regex.8
+ 
+ CFLAGS+=	-Wall -Wstrict-prototypes -g
+ CFLAGS+=	-I/usr/src/gnu/usr.sbin/sendmail/include
+-LDADD+=		-lmilter -lpthread
++LDADD+=		-lmilter ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ 
+ .include <bsd.prog.mk>
+ 
-- 
cgit v1.2.3