diff options
| author |   Joe Peterson <lavajoe@gentoo.org> | 2007-06-15 23:54:44 +0000 |
|---|---|---|
| committer | Joe Peterson <lavajoe@gentoo.org> | 2007-06-15 23:54:44 +0000 |
| commit | c0b224a02fb7683bbff92927c284edd6f2d82178 (patch) | |
| tree | 46006a8dfdc822dea8e41012d8ca055ea12ea63e /sys-apps/more/files | |
| parent | Add blocker for sys-apps/more (diff) | |
| download | historical-c0b224a02fb7683bbff92927c284edd6f2d82178.tar.gz historical-c0b224a02fb7683bbff92927c284edd6f2d82178.tar.bz2 historical-c0b224a02fb7683bbff92927c284edd6f2d82178.zip | |
New package providing the "more" pager for non-linux platforms
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'sys-apps/more/files')
| -rw-r--r-- | sys-apps/more/files/digest-more-2.12r | 3 | ||||
| -rw-r--r-- | sys-apps/more/files/more-2.12r-freebsd.patch | 65 |
2 files changed, 68 insertions, 0 deletions
diff --git a/sys-apps/more/files/digest-more-2.12r b/sys-apps/more/files/digest-more-2.12r new file mode 100644 index 000000000000..9cc9830fd599 --- /dev/null +++ b/sys-apps/more/files/digest-more-2.12r @@ -0,0 +1,3 @@ +MD5 af9d9e03038481fbf79ea3ac33f116f9 util-linux-2.12r.tar.bz2 1370907 +RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 util-linux-2.12r.tar.bz2 1370907 +SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b util-linux-2.12r.tar.bz2 1370907 diff --git a/sys-apps/more/files/more-2.12r-freebsd.patch b/sys-apps/more/files/more-2.12r-freebsd.patch new file mode 100644 index 000000000000..09a1ac60f717 --- /dev/null +++ b/sys-apps/more/files/more-2.12r-freebsd.patch @@ -0,0 +1,65 @@ +diff -Nur util-linux-2.12r.orig/text-utils/Makefile util-linux-2.12r/text-utils/Makefile +--- util-linux-2.12r.orig/text-utils/Makefile 2007-06-14 13:37:07 -0600 ++++ util-linux-2.12r/text-utils/Makefile 2007-06-14 15:11:01 -0600 +@@ -30,13 +30,19 @@ + CFLAGS:=$(CFLAGS) -DPGNOBELL + endif + ++# On FreeBSD, we need to include libcompat (more uses re_comp & re_exec) ++OS=$(shell uname) ++ifeq "$(OS)" "FreeBSD" ++ LIBCOMPAT=-lcompat ++endif ++ + all: $(BIN) $(USRBIN) + + # more and pg and ul use curses - maybe we can't compile them + ifeq "$(HAVE_NCURSES)" "yes" + # Have ncurses - make more and pg and ul + more pg ul: +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES) ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES) $(LIBCOMPAT) + more: more.o $(LIB)/xstrncpy.o + pg: pg.o + ul: ul.o +diff -Nur util-linux-2.12r.orig/text-utils/more.c util-linux-2.12r/text-utils/more.c +--- util-linux-2.12r.orig/text-utils/more.c 2007-06-14 13:37:07 -0600 ++++ util-linux-2.12r/text-utils/more.c 2007-06-14 13:28:34 -0600 +@@ -63,6 +63,16 @@ + #include <regex.h> + #undef _REGEX_RE_COMP + ++/* Include limits.h on FreeBSD */ ++#ifdef __FreeBSD__ ++#include <limits.h> ++#endif ++ ++/* Define CBAUD for FreeBSD */ ++#ifndef CBAUD ++#define CBAUD 0010017 ++#endif ++ + #define VI "vi" /* found on the user's path */ + + #define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m)) +@@ -1560,7 +1570,7 @@ + } + if (feof (file)) { + if (!no_intty) { +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(__FreeBSD__) + /* No longer in libc 4.5.8. . . */ + file->_flags &= ~STDIO_S_EOF_SEEN; /* why doesn't fseek do this ??!!??! */ + #endif +@@ -1805,7 +1815,11 @@ + tcgetattr(fileno(stderr), &otty); + savetty0 = otty; + slow_tty = (otty.c_cflag & CBAUD) < B1200; ++#ifdef __FreeBSD__ ++ hardtabs = 1; ++#else + hardtabs = (otty.c_oflag & TABDLY) != XTABS; ++#endif + if (!no_tty) { + otty.c_lflag &= ~(ICANON|ECHO); + otty.c_cc[VMIN] = 1; |