Remove unneeded bglibs dependency. Bump PKGREVISION.

mail/qmail-qfilter/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2020/11/19 09:35:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2021/01/01 15:07:59 schmonz Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 
@@ -24,19 +24,21 @@ SUBST_SED.paths+=	-e 's|/var/qmail|${QMAILDIR}|g'
 SUBST_MESSAGE.paths=	Fixing paths.
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/qmail-qfilter
-INSTALL_ENV+=		install_prefix=${DESTDIR:Q}
 BUILD_DEFS+=		QMAILDIR
 
 DJB_MAKE_TARGETS=	NO
 
 .include "../../mk/bsd.prefs.mk"
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/qmail-qfilter			\
+		${DESTDIR}${PREFIX}/bin
 	for i in ${REPLACE_PERL}; do					\
 		${INSTALL_SCRIPT} ${WRKSRC}/$${i}			\
 			${DESTDIR}${PREFIX}/share/examples/qmail-qfilter; \
 	done
+	${INSTALL_MAN} ${WRKSRC}/qmail-qfilter.1			\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../devel/bglibs/buildlink3.mk"
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"

mail/qmail-qfilter/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2017/10/28 15:56:06 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2021/01/01 15:07:59 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-Makefile) = 725808ffda8bdd78be82f84d5249c05a086aab81
-SHA1 (patch-qmail-qfilter.c) = e33e9224012b356e7d17c138300a9686c81d37e8
+SHA1 (patch-Makefile) = 6d511223e12c22b84f384318b33b205384424c82
+SHA1 (patch-qmail-qfilter.c) = 694cf8e942ebb9753d4d9325bdece3d0cab47e66

mail/qmail-qfilter/patches/patch-Makefile

@@ -1,15 +1,37 @@
-$NetBSD: patch-Makefile,v 1.1 2017/10/28 15:56:06 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2021/01/01 15:07:59 schmonz Exp $
 
-Dynamic linking fixes, and adapt for bglibs 2.
+Remove unneeded bglibs dependency.
 
 --- 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';\
+@@ -14,12 +14,11 @@ clean: TARGETS
+ clean-spac: clean AUTOFILES
+ 	rm -f `cat AUTOFILES`
+ 
+-compile: conf-cc conf-bgincs
+-	( bgincs=`head -n 1 conf-bgincs`; \
+-	  echo '#!/bin/sh'; \
++compile: conf-cc
++	( echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec `head -n 1 conf-cc` -I. "-I'$${bgincs}'" '-o $${base}.o -c $$source $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-cc` -I. '-o $${base}.o -c $$source $${1+"$$@"}'; \
+ 	) >compile
+ 	chmod 755 compile
+ 
+@@ -33,11 +32,10 @@ install: BIN conf-bin MAN conf-man
+ 
+ libraries: 
+ 
+-load: conf-ld conf-bglibs
+-	( bglibs=`head -n 1 conf-bglibs`; \
+-	  echo '#!/bin/sh';\
++load: conf-ld
++	( 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+"$$@"}'; \
++	  echo exec `head -n 1 conf-ld` -L. '-o "$$main" "$$main.o" $${1+"$$@"}'; \
  	) >load
  	chmod 755 load
  

mail/qmail-qfilter/patches/patch-qmail-qfilter.c

@@ -1,4 +1,4 @@
-$NetBSD: patch-qmail-qfilter.c,v 1.2 2017/01/02 02:19:26 schmonz Exp $
+$NetBSD: patch-qmail-qfilter.c,v 1.3 2021/01/01 15:07:59 schmonz Exp $
 
 Apply patch (submitted upstream) to set QMAILPPID for filters to
 know grandparent PID.
@@ -7,20 +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.
+Also remove unneeded bglibs dependency.
 
 --- qmail-qfilter.c.orig	2005-08-12 23:40:51.000000000 +0000
 +++ qmail-qfilter.c
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,6 @@
   * 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[])
+@@ -332,6 +331,8 @@ int main(int argc, char* argv[])
    if ((qqargv[0] = getenv("QQF_QMAILQUEUE")) == 0)
      qqargv[0] = QMAIL_QUEUE;