From 1da3d2a3a1b53bdd71774194f4afc13f35bb18e3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 28 Nov 2017 14:57:16 +0100
Subject: gnu: perl-markdown-discount: Use a shorter patch file name.

* gnu/packages/patches/perl-text-markdown-discount-use-system-markdown.patch:
Rename to...
* gnu/packages/patches/perl-text-markdown-discount-unbundle.patch:
... this.
* gnu/packages/markup.scm (perl-text-markdown-discount): Adjust accordingly.
---
 gnu/packages/markup.scm                            |  2 +-
 .../perl-text-markdown-discount-unbundle.patch     | 32 ++++++++++++++++++++++
 ...ext-markdown-discount-use-system-markdown.patch | 32 ----------------------
 3 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 gnu/packages/patches/perl-text-markdown-discount-unbundle.patch
 delete mode 100644 gnu/packages/patches/perl-text-markdown-discount-use-system-markdown.patch

(limited to 'gnu/packages')

diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index 6a0902c03e..4426258db6 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -161,7 +161,7 @@ convert it to structurally valid XHTML (or HTML).")
         (base32
          "1xx7v3wnla7m6wa3h33whxw3vvincaicg4yra1b9wbzf2aix9rnw"))
        (patches
-        (search-patches "perl-text-markdown-discount-use-system-markdown.patch"))))
+        (search-patches "perl-text-markdown-discount-unbundle.patch"))))
     (build-system perl-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/patches/perl-text-markdown-discount-unbundle.patch b/gnu/packages/patches/perl-text-markdown-discount-unbundle.patch
new file mode 100644
index 0000000000..e0df632a04
--- /dev/null
+++ b/gnu/packages/patches/perl-text-markdown-discount-unbundle.patch
@@ -0,0 +1,32 @@
+Description: Use the markdown library provided by the libmarkdown2 package.
+Author: Alessandro Ghedini <al3xbio@gmail.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2012-01-01
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -57,12 +57,6 @@
+ 
+ 
+ 
+-sub MY::postamble {
+-    return sprintf('
+-$(MYEXTLIB):
+-	%s
+-', qq{( cd $extdir; CC='cc -fPIC' sh configure.sh; make )\n});
+-}
+ 
+ WriteMakefile(
+     NAME              => 'Text::Markdown::Discount',
+@@ -71,8 +65,6 @@
+     ($] >= 5.005 ?
+       (ABSTRACT_FROM  => 'lib/Text/Markdown/Discount.pm',
+        AUTHOR         => 'Masayoshi Sekimura <sekimura@cpan.org>') : ()),
+-    LIBS               => '-L' . $extdir,
+-    INC               => '-I. -I' . $extdir,
+-    MYEXTLIB          => $myextlib,
+-    clean             => { FILES => $clean_files },
++    LIBS               => '-lmarkdown',
++    INC               => '-I.',
+ );
diff --git a/gnu/packages/patches/perl-text-markdown-discount-use-system-markdown.patch b/gnu/packages/patches/perl-text-markdown-discount-use-system-markdown.patch
deleted file mode 100644
index e0df632a04..0000000000
--- a/gnu/packages/patches/perl-text-markdown-discount-use-system-markdown.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Use the markdown library provided by the libmarkdown2 package.
-Author: Alessandro Ghedini <al3xbio@gmail.com>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2012-01-01
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -57,12 +57,6 @@
- 
- 
- 
--sub MY::postamble {
--    return sprintf('
--$(MYEXTLIB):
--	%s
--', qq{( cd $extdir; CC='cc -fPIC' sh configure.sh; make )\n});
--}
- 
- WriteMakefile(
-     NAME              => 'Text::Markdown::Discount',
-@@ -71,8 +65,6 @@
-     ($] >= 5.005 ?
-       (ABSTRACT_FROM  => 'lib/Text/Markdown/Discount.pm',
-        AUTHOR         => 'Masayoshi Sekimura <sekimura@cpan.org>') : ()),
--    LIBS               => '-L' . $extdir,
--    INC               => '-I. -I' . $extdir,
--    MYEXTLIB          => $myextlib,
--    clean             => { FILES => $clean_files },
-+    LIBS               => '-lmarkdown',
-+    INC               => '-I.',
- );
-- 
cgit 1.4.1