05/07: gnu: dovecot: Avoid unnecessary patching.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 37fc44eab9a557550a7b1304ac95388949c20eaa
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Fri Mar 8 01:15:21 2019 +0100

    gnu: dovecot: Avoid unnecessary patching.
    
    * gnu/packages/mail.scm (dovecot)[arguments]: Replace ‘pre-configure’
    patching with custom ‘make install sysconfdir=…’.
---
 gnu/packages/mail.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fb99037..e51d691 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1305,14 +1305,6 @@ facilities for checking incoming mail.")
                            "--localstatedir=/var")
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
-           (lambda _
-             ;; Simple hack to avoid installing in /etc.
-             (substitute* '("doc/Makefile.in"
-                            "doc/example-config/Makefile.in")
-               (("pkgsysconfdir = .*")
-                "pkgsysconfdir = /tmp/etc"))
-             #t))
          (add-after 'unpack 'patch-file-names
            (lambda _
              (substitute* "src/lib-program-client/test-program-client-local.c"
@@ -1325,7 +1317,12 @@ facilities for checking incoming mail.")
              (substitute* (list "src/lib-smtp/test-bin/sendmail-exit-1.sh"
                                 "src/lib-smtp/test-bin/sendmail-success.sh")
                (("cat") (which "cat")))
-             #t)))))
+             #t))
+         (replace 'install
+           (lambda* (#:key make-flags #:allow-other-keys)
+             ;; Simple hack to avoid installing a trivial README in /etc.
+             (apply invoke "make" "install" "sysconfdir=/tmp/bogus"
+                    make-flags))))))
     (home-page "https://www.dovecot.org";)
     (synopsis "Secure POP3/IMAP server")
     (description