From 51e144151a22ae7e40ffe78553985bdd68c2a366 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:52:46 +0200 Subject: [PATCH] nano: update recipe * Fix location of HTML documentation. * BUILD_REQUIRES: ncurses -> devel:libncurses * Use jobArgs. --- app-editors/nano/nano-2.2.6.recipe | 11 ++++++---- app-editors/nano/patches/nano-2.2.6.patchset | 22 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 app-editors/nano/patches/nano-2.2.6.patchset diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 74951a39e..e57222eb7 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -5,9 +5,11 @@ SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" LICENSE="GNU GPL v3" COPYRIGHT="1999-2010 Free Software Foundation, Inc. " -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="nano-2.2.6.patchset" + PROVIDES=" nano = $portVersion compat >= 2 cmd:nano = $portVersion compat >= 2 @@ -19,12 +21,13 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + cmd:autoreconf cmd:gcc cmd:groff cmd:ld cmd:libtoolize cmd:make - ncurses + devel:libncurses " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -34,12 +37,12 @@ SOURCE_DIR="$portVersionedName" BUILD() { + autoreconf runConfigure ./configure - make + make $jobArgs } INSTALL() { make install } - diff --git a/app-editors/nano/patches/nano-2.2.6.patchset b/app-editors/nano/patches/nano-2.2.6.patchset new file mode 100644 index 000000000..eb3f5435b --- /dev/null +++ b/app-editors/nano/patches/nano-2.2.6.patchset @@ -0,0 +1,22 @@ +From 46be39445685504279a76f9eb09a961708d7e497 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 22:50:15 +0200 +Subject: doc/Makefile.am: use docdir instead of hard-coded path + + +diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am +index fbcdce8..2d7ad47 100644 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -19,7 +19,7 @@ endif + nano_man_mans = nano.1 nanorc.5 rnano.1 + if GROFF_HTML + htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html +-htmlmandir = $(datadir)/nano/man-html ++htmlmandir = $(docdir) + nano_built_sources = nano.1.html nanorc.5.html rnano.1.html + + nano.1.html: nano.1 +-- +1.7.5 +