Adapt to bglibs 2. Bump PKGREVISION.

4 files changed, 21 insertions, 10 deletions

diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index f5f89bdcf5b..ea33fdfefbd 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2016/05/17 10:32:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/02 02:19:26 schmonz Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/mail/qmail-qfilter/distinfo b/mail/qmail-qfilter/distinfo
index e3a07dcec51..1bf2688cb4e 100644
--- a/mail/qmail-qfilter/distinfo
+++ b/mail/qmail-qfilter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:27:18 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/01/02 02:19:26 schmonz Exp $
 
 SHA1 (qmail-qfilter-2.1.tar.gz) = 5ac595a9b6f7c14efa1bca3621fa16abfc382fc0
 RMD160 (qmail-qfilter-2.1.tar.gz) = 4336fef69e7f5216d11b4ee71110b7c9504d3970
 SHA512 (qmail-qfilter-2.1.tar.gz) = a515969b60aaa08a06513a9d88f3bfb36fa9d1333ea87613facb1d65055d44e69c4cad2298870607c012dffdec4d03c36dc87b24b3b3c0602ba1d7df6cb1ff2c
 Size (qmail-qfilter-2.1.tar.gz) = 22242 bytes
-SHA1 (patch-aa) = c328833d52e25f33d89a03711948b45e031c090d
-SHA1 (patch-qmail-qfilter.c) = adfe0c1b1369874c21049f3df401fd83366616e6
+SHA1 (patch-aa) = 725808ffda8bdd78be82f84d5249c05a086aab81
+SHA1 (patch-qmail-qfilter.c) = e33e9224012b356e7d17c138300a9686c81d37e8
diff --git a/mail/qmail-qfilter/patches/patch-aa b/mail/qmail-qfilter/patches/patch-aa
index b1b7e51913d..a192a430b03 100644
--- a/mail/qmail-qfilter/patches/patch-aa
+++ b/mail/qmail-qfilter/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2014/11/17 02:56:04 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2017/01/02 02:19:26 schmonz Exp $
 
-Dynamic linking fixes.
+Dynamic linking fixes, and adapt for bglibs 2.
 
---- Makefile.orig	2005-08-12 19:40:51.000000000 -0400
+--- Makefile.orig	2005-08-12 23:40:51.000000000 +0000
 +++ Makefile
 @@ -37,7 +37,7 @@ load: conf-ld conf-bglibs
  	( bglibs=`head -n 1 conf-bglibs`; \
  	  echo '#!/bin/sh';\
  	  echo 'main="$$1"; shift';\
 -	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
-+	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
++	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}'; \
  	) >load
  	chmod 755 load
  
diff --git a/mail/qmail-qfilter/patches/patch-qmail-qfilter.c b/mail/qmail-qfilter/patches/patch-qmail-qfilter.c
index 4d5e13ae95a..d2fc32873b3 100644
--- a/mail/qmail-qfilter/patches/patch-qmail-qfilter.c
+++ b/mail/qmail-qfilter/patches/patch-qmail-qfilter.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-qmail-qfilter.c,v 1.1 2014/11/17 02:56:04 schmonz Exp $
+$NetBSD: patch-qmail-qfilter.c,v 1.2 2017/01/02 02:19:26 schmonz Exp $
 
 Apply patch (submitted upstream) to set QMAILPPID for filters to
 know grandparent PID.
@@ -7,8 +7,19 @@ With this change, my homegrown badrcptto-alike filter can log
 rejections in the same format as Paul Jarc's realrcptto, thereby
 allowing me to correlate each rejection with a qmail-smtpd session.
 
+Also adapt to bglibs 2.
+
 --- qmail-qfilter.c.orig	2005-08-12 23:40:51.000000000 +0000
 +++ qmail-qfilter.c
+@@ -15,7 +15,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-#include <sysdeps.h>
++#include <bglibs/sysdeps.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
 @@ -332,6 +332,8 @@ int main(int argc, char* argv[])
    if ((qqargv[0] = getenv("QQF_QMAILQUEUE")) == 0)
      qqargv[0] = QMAIL_QUEUE;