Subject: Re: [bug#30971] Add package definition for fpm2
From: Marius Bakke <[email-masked]>
To: Ton <[email-masked]>
Cc: [email-masked]
Date: Thu, 29 Mar 2018 18:44:38 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Ton <[email-masked]> writes:

> Here is new patch changed as requested for fpm2.
> From 02298195711674089ce5904c3aae71f7f74f1ccd Mon Sep 17 00:00:00 2001
> From: Tonton <[email-masked]>
> Date: Thu, 29 Mar 2018 12:11:31 +0200
> Subject: [PATCH] * gnu/packages/password-utils.scm (fpm2): New variable

Thank you!  Applied with the cosmetic changes below.

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 54369851b..eb2c276b3 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -664,14 +664,13 @@ by GnuPG's symmetrical encryption.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before
-             'configure 'pre-configure
+         (add-before 'configure 'pre-configure
            ;; The file po/POTFILES.in ends up missing for some reason in
            ;; both nix and guix builds. Adding the file with contents
            ;; found during troubleshooting.
            (lambda _
-             (let* ((port (open-output-file "po/POTFILES.in")))
-               (begin
+             (call-with-output-file "po/POTFILES.in"
+               (lambda (port)
                  (format port "data/fpm2.desktop.in
 data/fpm2.desktop.in.in
 fpm2.glade
@@ -681,13 +680,13 @@ src/fpm_file.c
 src/interface.c
 src/support.c
 fpm2.glade
-")
-                 (close-port port))))))))
+")))
+             #t)))))
     (synopsis "Manage, generate and store passwords encrypted")
     (description "FPM2 is GTK2 port from Figaro's Password Manager
 originally developed by John Conneely, with some new enhancements.
 
 Upstream development seems to have stopped.  It is therefore recommended
-to use a different password manager.  ")
+to use a different password manager.")
     (home-page "https://als.regnet.cz/fpm2/")
-     (license license:gpl2)))
+     (license license:gpl2+)))