[pkgsrc/trunk]: pkgsrc/mail/qmail-qfilter Remove unnecessary special-case TMP...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f79a5a7a337a
branches:  trunk
changeset: 370946:f79a5a7a337a
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat Oct 28 15:56:06 2017 +0000

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

diffstat:

 mail/qmail-qfilter/Makefile               |  11 ++++-------
 mail/qmail-qfilter/distinfo               |   4 ++--
 mail/qmail-qfilter/patches/patch-Makefile |  15 +++++++++++++++
 mail/qmail-qfilter/patches/patch-aa       |  15 ---------------
 4 files changed, 21 insertions(+), 24 deletions(-)

diffs (91 lines):

diff -r e25cba1cded5 -r f79a5a7a337a mail/qmail-qfilter/Makefile
--- a/mail/qmail-qfilter/Makefile       Sat Oct 28 14:42:20 2017 +0000
+++ b/mail/qmail-qfilter/Makefile       Sat Oct 28 15:56:06 2017 +0000
@@ -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 @@
 
 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 @@
 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
diff -r e25cba1cded5 -r f79a5a7a337a mail/qmail-qfilter/distinfo
--- a/mail/qmail-qfilter/distinfo       Sat Oct 28 14:42:20 2017 +0000
+++ b/mail/qmail-qfilter/distinfo       Sat Oct 28 15:56:06 2017 +0000
@@ -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
diff -r e25cba1cded5 -r f79a5a7a337a mail/qmail-qfilter/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail-qfilter/patches/patch-Makefile Sat Oct 28 15:56:06 2017 +0000
@@ -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
+ 
diff -r e25cba1cded5 -r f79a5a7a337a mail/qmail-qfilter/patches/patch-aa
--- a/mail/qmail-qfilter/patches/patch-aa       Sat Oct 28 14:42:20 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2017/01/02 02:19:26 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
-