CVS commit: pkgsrc/mail/qmail-qfilter

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Oct 28 15:56:06 UTC 2017

Modified Files:
        pkgsrc/mail/qmail-qfilter: Makefile distinfo
Added Files:
        pkgsrc/mail/qmail-qfilter/patches: patch-Makefile
Removed Files:
        pkgsrc/mail/qmail-qfilter/patches: patch-aa

Log Message:
Remove unnecessary special-case TMPDIR handling. Upstream says typical
"/tmp" is just fine. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/qmail-qfilter/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/qmail-qfilter/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail-qfilter/patches/patch-Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/mail/qmail-qfilter/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail-qfilter/Makefile
diff -u pkgsrc/mail/qmail-qfilter/Makefile:1.25 pkgsrc/mail/qmail-qfilter/Makefile:1.26
--- pkgsrc/mail/qmail-qfilter/Makefile:1.25     Thu Apr 27 20:04:22 2017
+++ pkgsrc/mail/qmail-qfilter/Makefile  Sat Oct 28 15:56:06 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2017/04/27 20:04:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2017/10/28 15:56:06 schmonz Exp $
 #
 
 DISTNAME=              qmail-qfilter-2.1
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}
 
@@ -13,8 +13,6 @@ LICENSE=              gnu-gpl-v2
 
 DEPENDS+=              qmail>=1.03nb9:../../mail/qmail
 
-OWN_DIRS_PERMS+=       ${QMAIL_QFILTER_TMPDIR} ${QMAIL_DAEMON_USER} ${REAL_ROOT_GROUP} 700
-
 REPLACE_PERL=          samples/block-long-dates                        \
                        samples/deny-filetypes                          \
                        samples/rename-filetypes
@@ -22,13 +20,12 @@ REPLACE_PERL=               samples/block-long-dates        
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     qmail-qfilter.c
-SUBST_SED.paths=       -e 's|/tmp|${QMAIL_QFILTER_TMPDIR}|g'
 SUBST_SED.paths+=      -e 's|/var/qmail|${QMAILDIR}|g'
 SUBST_MESSAGE.paths=   Fixing paths.
 
-INSTALLATION_DIRS=     bin man ${PKGMANDIR}/man1 share/examples/qmail-qfilter
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/qmail-qfilter
 INSTALL_ENV+=          install_prefix=${DESTDIR:Q}
-BUILD_DEFS+=           QMAILDIR QMAIL_DAEMON_USER QMAIL_QFILTER_TMPDIR
+BUILD_DEFS+=           QMAILDIR
 
 DJB_RESTRICTED=                NO
 DJB_MAKE_TARGETS=      NO

Index: pkgsrc/mail/qmail-qfilter/distinfo
diff -u pkgsrc/mail/qmail-qfilter/distinfo:1.8 pkgsrc/mail/qmail-qfilter/distinfo:1.9
--- pkgsrc/mail/qmail-qfilter/distinfo:1.8      Mon Jan  2 02:19:26 2017
+++ pkgsrc/mail/qmail-qfilter/distinfo  Sat Oct 28 15:56:06 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2017/01/02 02:19:26 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2017/10/28 15:56:06 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) = 725808ffda8bdd78be82f84d5249c05a086aab81
+SHA1 (patch-Makefile) = 725808ffda8bdd78be82f84d5249c05a086aab81
 SHA1 (patch-qmail-qfilter.c) = e33e9224012b356e7d17c138300a9686c81d37e8

Added files:

Index: pkgsrc/mail/qmail-qfilter/patches/patch-Makefile
diff -u /dev/null pkgsrc/mail/qmail-qfilter/patches/patch-Makefile:1.1
--- /dev/null   Sat Oct 28 15:56:06 2017
+++ pkgsrc/mail/qmail-qfilter/patches/patch-Makefile    Sat Oct 28 15:56:06 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2017/10/28 15:56:06 schmonz Exp $
+
+Dynamic linking fixes, and adapt for bglibs 2.
+
+--- 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+"$$@"}'; \
+       ) >load
+       chmod 755 load
+