diff mbox series

bug#34262: [PATCH]Add: nkf

Message ID 20190226041751.GA15689@jasmine.lan
State Accepted
Headers show
Series bug#34262: [PATCH]Add: nkf | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Leo Famulari Feb. 26, 2019, 4:17 a.m. UTC 
> From aab08237d2ece4a1f190522d1357b5b9e872ce57 Mon Sep 17 00:00:00 2001
> From: Yoshinori Arai <kumagusu08@gmail.com>
> Date: Fri, 1 Feb 2019 12:55:46 +0900
> Subject: [PATCH] Add nkf
> 
> ---
>  gnu/packages/textutils.scm | 42 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)

Thank you!

I made the changes shown below and pushed as
933ac939d6d2de64c43e068e7c0ebfaaaf2dcdd8
diff mbox series

Patch

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 2d3a090056..71f03b7568 100644
  1 gnu: Add nkf.
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -800,14 +800,16 @@  Mainland China, Taiwan, and Hong-Kong.")
         (revision "1"))
     (package
       (name "nkf")
-      ;;look at https://ja.osdn.net/projects/nkf/scm/git/nkf/
+      ;; The commits corresponding to specific versions are published
+      ;; here:
+      ;; https://ja.osdn.net/projects/nkf/scm/git/nkf/
       (version "2.1.5")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url "https://github.com/nurse/nkf.git")
                       (commit commit)))
-                (file-name (string-append name version))
+                (file-name (git-file-name name version))
                 (sha256
                  (base32
                   "0anw0knr1iy4p9w3d3b3pbwzh1c43p1i2q4c28kw9zviw8kx2rly"))))
@@ -815,21 +817,11 @@  Mainland China, Taiwan, and Hong-Kong.")
       (arguments
        `(#:tests? #f ; test for perl module
          #:make-flags (list "CC=gcc" "CFLAGS=-O2 -Wall -pedantic"
-                            (string-append "prefix=" %output))
+                            (string-append "prefix=" %output)
+                            "MKDIR=mkdir -p")
          #:phases
          (modify-phases %standard-phases
-           (delete 'configure)
-           ;; mkdir can't create directory
-           (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (bin (string-append out "/bin"))
-                      (man1 (string-append out "/share/man/man1"))
-                      (man1j (string-append out "/share/man/ja/man1")))
-                 (install-file "nkf" bin)
-                 (install-file "nkf.1" man1)
-                 (install-file "nkf.1j" man1j)
-                 #t))))))
+           (delete 'configure)))) ; No ./configure script
       (home-page "https://ja.osdn.net/projects/nkf/")
       (synopsis "Network Kanji Filter")
       (description "Nkf is yet another kanji code converter among networks,