From e24b918487875bdf3ee4e6f1706b95fe13312246 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sat, 9 Aug 2008 17:26:36 +0000
Subject: Update "milter-regex" package to version 1.7. Changes since 1.6: -
 Support filtering sendmail macros, like {auth_type}.

---
 mail/milter-regex/Makefile         | 10 ++--------
 mail/milter-regex/distinfo         | 10 +++++-----
 mail/milter-regex/patches/patch-ab | 22 +++++++++++++---------
 3 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'mail/milter-regex')

diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 99e71a6525b..99e6c5ba537 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/08/09 17:26:36 tron Exp $
 
-DISTNAME=	milter-regex-1.6
-PKGREVISION=	1
+DISTNAME=	milter-regex-1.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -30,11 +29,6 @@ SUBST_STAGE.var=	do-configure
 SUBST_FILES.var=	milter-regex.8 milter-regex.c
 SUBST_SED.var=		-e 's|/var/spool|${VARBASE}|g'
 
-# Work arround to avoid naming clash between the source directory
-# and our "rc.d" script.
-post-extract:
-	${MV} ${WRKDIR}/${PKGBASE} ${WRKSRC}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/milter-regex.8 \
diff --git a/mail/milter-regex/distinfo b/mail/milter-regex/distinfo
index 123068c834f..820f2aa5498 100644
--- a/mail/milter-regex/distinfo
+++ b/mail/milter-regex/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2006/06/14 19:24:15 tron Exp $
+$NetBSD: distinfo,v 1.9 2008/08/09 17:26:36 tron 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 (milter-regex-1.7.tar.gz) = de337bc12dade1ed4b715657c4317040f08ef902
+RMD160 (milter-regex-1.7.tar.gz) = 66868b21eb095f203ef8391e99744506d7ee3cc4
+Size (milter-regex-1.7.tar.gz) = 19321 bytes
 SHA1 (patch-aa) = fdeaa835b6827f7deced58bf0c26a69e8bfca1f6
-SHA1 (patch-ab) = 07054cd076dfd54e1536ad1bf4dcbf7faa383f51
+SHA1 (patch-ab) = a275ed424ba7c61c837688f0b9793d6f55e22a2f
 SHA1 (patch-ac) = 1877281e0c53065c4d81a565bf55ef6927077d25
diff --git a/mail/milter-regex/patches/patch-ab b/mail/milter-regex/patches/patch-ab
index 4d5962e34ed..ce5d6e06bad 100644
--- a/mail/milter-regex/patches/patch-ab
+++ b/mail/milter-regex/patches/patch-ab
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2006/04/30 17:11:25 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2008/08/09 17:26:36 tron Exp $
 
---- Makefile.orig	2006-04-30 17:05:50.000000000 +0000
-+++ Makefile
-@@ -6,7 +6,7 @@ MAN=	milter-regex.8
+--- Makefile.orig	2007-01-11 15:49:52.000000000 +0000
++++ Makefile	2008-07-31 11:53:15.000000000 +0100
+@@ -4,9 +4,9 @@
+ SRCS=	milter-regex.c eval.c parse.y
+ MAN=	milter-regex.8
  
- CFLAGS+=	-Wall -Wstrict-prototypes -g
- CFLAGS+=	-I/usr/src/gnu/usr.sbin/sendmail/include
--LDADD+=		-lmilter -lpthread
+-CFLAGS+=	-Wall -Wstrict-prototypes -O0 -g
+-CFLAGS+=	-I/usr/src/gnu/usr.sbin/sendmail/include -I..
+-LDADD+=		-lmilter -lpthread -g
++CFLAGS+=	-Wall -Wstrict-prototypes
++#CFLAGS+=	-I/usr/src/gnu/usr.sbin/sendmail/include -I..
 +LDADD+=		-lmilter ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
- .include <bsd.prog.mk>
- 
+ install:
+ 	sudo rm -rf /usr/local/libexec/milter-regex
-- 
cgit v1.2.3