From 82db272da558bc2ce7d7e275707a6c269269ddcf Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 3 May 2012 04:36:11 +0000 Subject: [PATCH] Update man to 1.6g --- sys-apps/man/man-1.6g.bep | 21 ++++++++ sys-apps/man/patches/man-1.6g.patch | 82 +++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 sys-apps/man/man-1.6g.bep create mode 100644 sys-apps/man/patches/man-1.6g.patch diff --git a/sys-apps/man/man-1.6g.bep b/sys-apps/man/man-1.6g.bep new file mode 100644 index 000000000..593d7f308 --- /dev/null +++ b/sys-apps/man/man-1.6g.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Standard commands to read man pages." +HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" +SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" +CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-apps/groff >= 1.20.1" +BUILD { + cd man-1.6g + ./configure -prefix=`finddir B_COMMON_DIRECTORY` \ + -sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` + make +} + +INSTALL { + cd man-1.6g + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="1989-2012 Free Software Foundation, Inc." diff --git a/sys-apps/man/patches/man-1.6g.patch b/sys-apps/man/patches/man-1.6g.patch new file mode 100644 index 000000000..e3171b3ca --- /dev/null +++ b/sys-apps/man/patches/man-1.6g.patch @@ -0,0 +1,82 @@ +diff -up man-1.6g/configure.orig man-1.6g/configure +--- man-1.6g/configure.orig 2010-12-31 13:28:46.006291456 -0700 ++++ man-1.6g/configure 2012-05-02 21:57:49.683147264 -0600 +@@ -287,6 +287,12 @@ if test -f /xenix; then + esac + fi + ++echo checking for Haiku ++if test `uname` = "Haiku"; then ++ LIBS="$LIBS -L/boot/system/lib -llocale" ++ mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ++fi ++ + echo checking how to get alloca + echo ' + #ifdef __GNUC__ +diff -up man-1.6g/man2html/Makefile.in.orig man-1.6g/man2html/Makefile.in +--- man-1.6g/man2html/Makefile.in.orig 2010-12-31 13:28:46.010747904 -0700 ++++ man-1.6g/man2html/Makefile.in 2012-05-02 21:58:50.621805568 -0600 +@@ -2,7 +2,7 @@ CC = @CC@ + CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes + OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o + EXEEXT = @EXEEXT@ +-bindir = $(DESTDIR)$(PREFIX)/usr/bin ++bindir = $(DESTDIR)$(PREFIX)/bin + mandir = $(DESTDIR)$(PREFIX)@mandir@ + vardir = $(DESTDIR)$(PREFIX)/var + httpdir = $(DESTDIR)$(PREFIX)/home/httpd +diff -up man-1.6g/src/Makefile.in.orig man-1.6g/src/Makefile.in +--- man-1.6g/src/Makefile.in.orig 2010-12-31 13:28:46.006815744 -0700 ++++ man-1.6g/src/Makefile.in 2012-05-02 21:59:22.845938688 -0600 +@@ -30,6 +30,8 @@ LDFLAGS ?= -s + + LIBOBJS = @LIBOBJS@ + ++LIBS = @LIBS@ ++ + all: man$(EXEEXT) man.conf apropos whatis makewhatis + + MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ +diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in +--- man-1.6g/src/man.conf.in.orig 2010-10-25 18:22:24.008388608 -0600 ++++ man-1.6g/src/man.conf.in 2012-05-02 21:57:49.699400192 -0600 +@@ -36,11 +36,14 @@ + # + # Every automatically generated MANPATH includes these fields + # +-MANPATH /usr/man +-MANPATH /usr/share/man +-MANPATH /usr/local/man +-MANPATH /usr/local/share/man +-MANPATH /usr/X11R6/man ++MANPATH /boot/common/man ++MANPATH /boot/common/share/man ++MANPATH /boot/home/config/man ++MANPATH /boot/home/config/share/man ++MANPATH /boot/common/*/man ++MANPATH /boot/common/*/share/man ++MANPATH /boot/home/config/*/man ++MANPATH /boot/home/config/*/share/man + # + # Uncomment if you want to include one of these by default + # +@@ -58,15 +61,9 @@ MANPATH /usr/X11R6/man + # in the mandatory manpath already, but will keep man from statting + # lots of other nearby files and directories. + # +-MANPATH_MAP /bin /usr/share/man +-MANPATH_MAP /sbin /usr/share/man +-MANPATH_MAP /usr/bin /usr/share/man +-MANPATH_MAP /usr/sbin /usr/share/man +-MANPATH_MAP /usr/local/bin /usr/local/share/man +-MANPATH_MAP /usr/local/sbin /usr/local/share/man +-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man +-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man +-MANPATH_MAP /usr/bin/mh /usr/share/man ++MANPATH_MAP /bin /boot/common/share/man ++MANPATH_MAP /boot/common/bin /boot/common/share/man ++MANPATH_MAP /boot/home/config/bin /boot/home/config/share/man + # + # NOAUTOPATH keeps man from automatically adding directories that look like + # manual page directories to the path.