diff options
| -rw-r--r-- | sys-apps/more/ChangeLog | 12 | ||||
| -rw-r--r-- | sys-apps/more/Manifest | 20 | ||||
| -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 | ||||
| -rw-r--r-- | sys-apps/more/metadata.xml | 8 | ||||
| -rw-r--r-- | sys-apps/more/more-2.12r.ebuild | 61 |
6 files changed, 169 insertions, 0 deletions
diff --git a/sys-apps/more/ChangeLog b/sys-apps/more/ChangeLog new file mode 100644 index 000000000000..27c68c9787ad --- /dev/null +++ b/sys-apps/more/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for sys-apps/more +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/more/ChangeLog,v 1.1 2007/06/15 23:54:44 lavajoe Exp $ + +*more-2.12r (15 Jun 2007) + + 15 Jun 2007; Joe Peterson <lavajoe@gentoo.org> + +files/more-2.12r-freebsd.patch, +metadata.xml, +more-2.12r.ebuild: + New package that provides just the "more" pager utility using the + sys-apps/util-linux upstream sources. Those running a non-linux Gentoo + platform can now have "more". + diff --git a/sys-apps/more/Manifest b/sys-apps/more/Manifest new file mode 100644 index 000000000000..bd46294320f0 --- /dev/null +++ b/sys-apps/more/Manifest @@ -0,0 +1,20 @@ +AUX more-2.12r-freebsd.patch 1917 RMD160 f44a46e8b8da55424b70242670d3817c01317e5e SHA1 6d814463ba0b949eced5eb7fbdc2abe9fa93916b SHA256 41c3049929a2b1bd7cfa481fe7e740f41b1128c72aed8b4e434fced04ec233a2 +MD5 a9048114d530263b4231907f43487598 files/more-2.12r-freebsd.patch 1917 +RMD160 f44a46e8b8da55424b70242670d3817c01317e5e files/more-2.12r-freebsd.patch 1917 +SHA256 41c3049929a2b1bd7cfa481fe7e740f41b1128c72aed8b4e434fced04ec233a2 files/more-2.12r-freebsd.patch 1917 +DIST util-linux-2.12r.tar.bz2 1370907 RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 SHA1 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b +EBUILD more-2.12r.ebuild 1546 RMD160 6196bd7079238043e8aacdbac0c6d161266f5dad SHA1 eee63024c1133d12cb6da42385a4b4d6317f0ccf SHA256 858d306d9c9c5802822f8791d57141a449b099525e3227c3de9369d74840d6e1 +MD5 99e4ba9f1574d1ee3f27f9839db278ff more-2.12r.ebuild 1546 +RMD160 6196bd7079238043e8aacdbac0c6d161266f5dad more-2.12r.ebuild 1546 +SHA256 858d306d9c9c5802822f8791d57141a449b099525e3227c3de9369d74840d6e1 more-2.12r.ebuild 1546 +MISC ChangeLog 434 RMD160 95bca431cbddc4cea4d92eaf37a4b773e6404e19 SHA1 f8a3376f4e4a1be94a2aa6ac7ec70203293d3c9d SHA256 abb68285ea933ea3aefa86a9eb560372e17829f3884d6845f241ee69166ea33e +MD5 293eecc2326477ae7b74a231cbfbc904 ChangeLog 434 +RMD160 95bca431cbddc4cea4d92eaf37a4b773e6404e19 ChangeLog 434 +SHA256 abb68285ea933ea3aefa86a9eb560372e17829f3884d6845f241ee69166ea33e ChangeLog 434 +MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055 +MD5 0ef201e70a5c0d73d25e83aa0cb8ec4c metadata.xml 223 +RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 metadata.xml 223 +SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055 metadata.xml 223 +MD5 5a9ae87f77604b9338e47b920603cc22 files/digest-more-2.12r 256 +RMD160 7b5651c2b56cd9eb618b8050914b382a9d1bc358 files/digest-more-2.12r 256 +SHA256 c75222390b561e3aec2748e163faaee9a337b939598d288badfd9c9becd61d3d files/digest-more-2.12r 256 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; diff --git a/sys-apps/more/metadata.xml b/sys-apps/more/metadata.xml new file mode 100644 index 000000000000..fa0705095167 --- /dev/null +++ b/sys-apps/more/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> + <email>lavajoe@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/sys-apps/more/more-2.12r.ebuild b/sys-apps/more/more-2.12r.ebuild new file mode 100644 index 000000000000..4d867fbd2dc8 --- /dev/null +++ b/sys-apps/more/more-2.12r.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/more/more-2.12r.ebuild,v 1.1 2007/06/15 23:54:44 lavajoe Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Primitive text file viewer" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" +SRC_URI="mirror://kernel/linux/utils/util-linux/util-linux-${PV}.tar.bz2" +S=${WORKDIR}/util-linux-${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86-fbsd" +IUSE="static nls selinux" + +RDEPEND=">=sys-libs/ncurses-5.2-r2 + selinux? ( sys-libs/libselinux ) + !sys-apps/util-linux" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" +PROVIDE="virtual/pager" + +yesno() { useq $1 && echo yes || echo no; } + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-freebsd.patch + + # Enable random features + local mconfigs="MCONFIG" + sed -i \ + -e "/^HAVE_SELINUX=/s:no:$(yesno selinux):" \ + -e "/^DISABLE_NLS=/s:no:$(yesno !nls):" \ + -e "/^HAVE_KILL=/s:no:yes:" \ + -e "/^HAVE_SLN=/s:no:yes:" \ + -e "/^HAVE_TSORT/s:no:yes:" \ + -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \ + -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ + -e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \ + ${mconfigs} || die "MCONFIG sed" +} + +src_compile() { + append-ldflags $(bindnow-flags) + use static && append-ldflags -static + export CC="$(tc-getCC)" + + econf || die "configure failed" + emake -C lib xstrncpy.o || die "emake xstrncpy.o failed" + emake -C text-utils more || die "emake more failed" +} + +src_install() { + exeinto /bin + doexe text-utils/more || die + doman text-utils/more.1 || die + dodoc HISTORY MAINTAINER README VERSION +} |