From dcc195481cb84f295a364c2c7cb023f33899745e Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Sun, 17 Dec 2017 22:47:15 +0100 Subject: [PATCH] gnu: surfraw: Find path to perl. * gnu/packages/patches/surfraw-find-perl.patch: New file. * gnu/packages/web.scm (surfraw)[native-inputs]: Add autoconf, automake. [package]: Add surfraw-find-perl.patch. [arguments]: Add 'autoreconf phase. --- gnu/packages/patches/surfraw-find-perl.patch | 35 ++++++++++++++++++++++++++++ gnu/packages/web.scm | 9 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/surfraw-find-perl.patch diff --git a/gnu/packages/patches/surfraw-find-perl.patch b/gnu/packages/patches/surfraw-find-perl.patch new file mode 100644 index 000000000..b995ab025 --- /dev/null +++ b/gnu/packages/patches/surfraw-find-perl.patch @@ -0,0 +1,35 @@ +diff -Naur surfraw-2.2.9-orig/configure.in surfraw-2.2.9/configure.in +--- surfraw-2.2.9-orig/configure.in 2013-12-10 18:07:06.000000000 +0100 ++++ surfraw-2.2.9/configure.in 2017-12-17 22:19:14.648432687 +0100 +@@ -53,6 +53,8 @@ + dnl Checks for programs. + AC_PROG_INSTALL + AC_PROG_AWK ++AC_PATH_PROG([PERL], [perl], [perl]) ++AC_SUBST(PERL) + + AC_CONFIG_FILES([Makefile surfraw.lsm surfraw.spec elvi/Makefile test/Makefile examples/Makefile]) + AC_OUTPUT +diff -Naur surfraw-2.2.9-orig/Makefile.am surfraw-2.2.9/Makefile.am +--- surfraw-2.2.9-orig/Makefile.am 2013-12-10 18:07:06.000000000 +0100 ++++ surfraw-2.2.9/Makefile.am 2017-12-17 22:13:48.205031190 +0100 +@@ -35,6 +35,7 @@ + sed -e 's,@VERSION\@,${VERSION},g; '\ + -e 's,@ELVIDIR\@,${ELVIDIR},g; '\ + -e 's,@AWK\@,${AWK},g; '\ ++ -e 's,@PERL\@,${PERL},g; '\ + -e 's,@sysconfdir\@,${sysconfdir},g ' $? > address@hidden + chmod +x address@hidden + mv address@hidden $@ +diff -Naur surfraw-2.2.9-orig/surfraw.IN surfraw-2.2.9/surfraw.IN +--- surfraw-2.2.9-orig/surfraw.IN 2013-12-10 18:07:06.000000000 +0100 ++++ surfraw-2.2.9/surfraw.IN 2017-12-17 22:14:01.613171144 +0100 +@@ -160,7 +160,7 @@ + + quote_ifs () { + if [ -z "$1" ]; then return; fi +- perl -e '$ifs=$ENV{IFS} || " "; $arg=shift;if($arg =~/[$ifs]/) { $arg="\"$arg\""; } print "$arg\n"; ' -- "$1" ++ @PERL@ -e '$ifs=$ENV{IFS} || " "; $arg=shift;if($arg =~/[$ifs]/) { $arg="\"$arg\""; } print "$arg\n"; ' -- "$1" + } + + bookmark_file_search () { diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eb0436cb3..766582ab1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4701,11 +4701,15 @@ handling many of the web standards in use today.") name "-" version ".tar.gz")) (sha256 (base32 - "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa")))) + "1fy4ph5h9kp0jzj1m6pfylxnnmgdk0mmdppw76z9jhna4jndk5xa")) + (patches (search-patches "surfraw-find-perl.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autoreconf ; required for the patch + (lambda* _ + (zero? (system* "autoreconf")))) (add-after 'install 'compress-elvi.1sr (lambda* (#:key outputs #:allow-other-keys) ;; The manpages of the elvis are symlinks to elvi.1sr.gz @@ -4714,6 +4718,9 @@ handling many of the web standards in use today.") (man (string-append out "/share/man/man1"))) (with-directory-excursion man (zero? (system* "gzip" "elvi.1sr"))))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) (inputs `(("perl" ,perl) ("perl-www-opensearch" ,perl-www-opensearch) -- 2.15.1