From 01f0c78471d0519bbfe455e78141a1144ae2303e Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Sun, 21 Oct 2012 21:37:29 -0400 Subject: app-admin/ccze: build on ~x64-macos Signed-off-by: Jason Cooper --- app-admin/ccze/ChangeLog | 111 +++++++++++++++++++++++++++++++ app-admin/ccze/Manifest | 7 ++ app-admin/ccze/ccze-0.2.1-r4.ebuild | 44 ++++++++++++ app-admin/ccze/files/ccze-fbsd.patch | 25 +++++++ app-admin/ccze/files/ccze-ldflags.patch | 11 +++ app-admin/ccze/files/ccze-segfault.patch | 30 +++++++++ app-admin/ccze/metadata.xml | 15 +++++ 7 files changed, 243 insertions(+) create mode 100644 app-admin/ccze/ChangeLog create mode 100644 app-admin/ccze/Manifest create mode 100644 app-admin/ccze/ccze-0.2.1-r4.ebuild create mode 100644 app-admin/ccze/files/ccze-fbsd.patch create mode 100644 app-admin/ccze/files/ccze-ldflags.patch create mode 100644 app-admin/ccze/files/ccze-segfault.patch create mode 100644 app-admin/ccze/metadata.xml diff --git a/app-admin/ccze/ChangeLog b/app-admin/ccze/ChangeLog new file mode 100644 index 0000000..d32586a --- /dev/null +++ b/app-admin/ccze/ChangeLog @@ -0,0 +1,111 @@ +# ChangeLog for app-admin/ccze +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ChangeLog,v 1.32 2012/03/18 15:51:16 armin76 Exp $ + + 18 Mar 2012; Raúl Porcel ccze-0.2.1-r2.ebuild, + ccze-0.2.1-r3.ebuild: + Drop sparc keywords + + 16 Feb 2012; Pawel Hajdan jr ccze-0.2.1-r3.ebuild: + x86 stable wrt bug #396745 + + 04 Feb 2012; Brent Baude ccze-0.2.1-r3.ebuild: + Marking ccze-0.2.1-r3 ppc for bug 396745 + + 03 Feb 2012; Agostino Sarubbo ccze-0.2.1-r3.ebuild: + Stable for amd64, wrt bug #396745 + + 03 Feb 2012; Agostino Sarubbo ccze-0.2.1-r3.ebuild: + Cleanup before stabilization + + 17 May 2010; Christian Birchinger ccze-0.2.1-r2.ebuild, + ccze-0.2.1-r3.ebuild: + Changed SRC_URI to gentoo mirrors and HOMEPAGE to a dummy one. + +*ccze-0.2.1-r3 (22 Jan 2010) + + 22 Jan 2010; Jeroen Roovers +ccze-0.2.1-r3.ebuild, + +files/ccze-ldflags.patch: + Respect LDFLAGS. + + 23 Oct 2008; Christian Birchinger ccze-0.2.1-r2.ebuild: + Added tc-export CC. See bug #243314 + + 23 Jun 2007; Christian Birchinger + -ccze-0.2.1-r1.ebuild: + Removing -r1 version because it segfaults. + + 23 Jun 2007; Christoph Mende ccze-0.2.1-r2.ebuild: + Stable on amd64 wrt bug 182941 + + 07 Jun 2007; Christian Faulhammer ChangeLog: + modified ChangeLog to meet common standards + + 06 May 2007; Tobias Scherbaum + ccze-0.2.1-r2.ebuild: + ppc stable + + 09 Apr 2007; Christian Birchinger ccze-0.2.1-r2.ebuild: + Added sparc stable keyword + + 20 Mar 2007; Andrej Kacian ccze-0.2.1-r2.ebuild: + Stable on x86. + +*ccze-0.2.1-r2 (17 Dec 2006) + + 17 Dec 2006; Christian Birchinger + +files/ccze-segfault.patch, +ccze-0.2.1-r2.ebuild: + Added a patch for the missing optarg in recent glibcs + + 17 Dec 2006; Christian Birchinger -ccze-0.2.1.ebuild: + Remove old version + + 12 Dec 2006; Timothy Redaelli ccze-0.2.1-r1.ebuild: + Stable on ppc wrt bug #157930 + + 12 Dec 2006; Andrej Kacian ccze-0.2.1-r1.ebuild: + Stable on x86, bug #157930. + + 12 Dec 2006; Peter Weller ccze-0.2.1-r1.ebuild: + Added amd64 keyword wrt bug #157930 + + 12 Dec 2006; Christian Birchinger ccze-0.2.1-r1.ebuild: + Added sparc stable keyword + + 11 Dec 2006; Christian Birchinger ccze-0.2.1.ebuild, + ccze-0.2.1-r1.ebuild: + Removed unneeded dependencies + + 14 Oct 2006; Timothy Redaelli ccze-0.2.1-r1.ebuild: + Added ~x86-fbsd keyword + +*ccze-0.2.1-r1 (14 Oct 2006) + + 14 Oct 2006; Christian Birchinger + +files/ccze-fbsd.patch, +ccze-0.2.1-r1.ebuild: + Added a patch from drizzt@gentoo.org which fixes build on FreeBSD. Droped + useless virtual/libc dependency + + 11 Mar 2006; Christian Birchinger ccze-0.2.1.ebuild: + Added a build fix for gcc4 + + 18 Dec 2004; Simon Stelling ccze-0.2.1.ebuild: + was unstable for over a year without bug reports, marking stable on amd64 + + 05 Oct 2004; Pieter Van den Abeele ccze-0.2.1.ebuild: + Masked ccze-0.2.1.ebuild stable for ppc + + 30 Sep 2004; Tom Martin ccze-0.2.1.ebuild: + Marked ~amd64. + + 12 Aug 2004; Christian Birchinger ccze-0.2.1.ebuild: + Fixed bug #59939. Thanks to Aaron Walker + + 11 Mar 2004; Michael Sterrett ccze-0.2.1.ebuild: + IUSE, use standard src_compile, error message, header fix + +*ccze-0.2.1 (26 Jun 2003) + + 26 Jun 2003; Christian Birchinger + ccze-0.2.1.ebuild: + Initial release diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest new file mode 100644 index 0000000..ccdbd3a --- /dev/null +++ b/app-admin/ccze/Manifest @@ -0,0 +1,7 @@ +AUX ccze-fbsd.patch 635 SHA256 f80d6bea0b9a0655330e2e55e7abb4f31c9968c19f3d9e4ac06ab2e4ce8ee3b7 SHA512 23da78ddcc3d5ef71be064c04010ef01356a5707c985ba029964b2ea2803ee6d5355ea58fa7341e7d9bd85a29536123c8862a34cb74dc4135eadaaea7992c920 WHIRLPOOL 011b498a99eb91eaac5dc6e61ccabfcbc568ed02854adcbe3ecd36c3ee8bb84deed4b191193df0ae3db9affe3ae2fe5edc7649414ac653280f7f06baa3656af7 +AUX ccze-ldflags.patch 518 SHA256 61a8433565485ace98098e1da948f9e8b85bcb204b420aae0b1eb5b6f857d4af SHA512 6b843aadb1805229beae3a46be3bfceb4df5d943798b6c24c58547657d4e85d930d326a0398c95a86795da6687e093afd436f39ca0aaa4a3210f6c4e1880e0fa WHIRLPOOL 3530aef95bc08ebb15fad8c057f042845a181bacb80e9dd577a072d8e66d4d6c7cb568a23ead0b80f0a61b4bb74e82f02df29b8a9aca1aee920974c00b40d813 +AUX ccze-segfault.patch 814 SHA256 43d82cc9ecb9c3b4aeea311411ada9622094903f60861ed4bc0b2044f294dddc SHA512 2ec3cb432ced33361bc88eac6434f4d831f313ad104a1e2e1ff095189cb5df90898262df03ec33d18d020b9b9c551ec572305ff9193e3ff6d86b1b3c7bd8cc4e WHIRLPOOL 60eb551619a5230b108a6c657a70c104cdeabe8e2adfa80786dce8d89084218bdc48b88e871c1e9b4bd971a4f6e2e1b923db8509bd8d447aaf414dec1a1c1da5 +DIST ccze-0.2.1.tar.gz 139795 SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7 WHIRLPOOL 93f8891c3a7885ca264f7269493893e6555865c89dee5cf5c890754f55db0ac60dce26d76318c8f838d7ee6ff6fe8e2454e9b4490ab607e496a5fdc0ef4f7685 +EBUILD ccze-0.2.1-r4.ebuild 996 SHA256 dae7e3c1cbc33d3b23d9e7a40379f8e5ad85ac662f3425c395fd915a6a889337 SHA512 e920e7c5e0b83ec9a1c821eba94966ecde80bdeed44b3a04abbfddbea33b19e7a0898c5c99f308876aabee7e48633b12fe057d2fd7a7261aad71f7ee74c3054b WHIRLPOOL 07a568d3f237f87ca03d2e73411b47ff0c2d543cea7406a5e4bd26a37c8f2746a7ddc71602dd138045b4738f0ea01e2824ee77f245cd7033415f92976bcf373d +MISC ChangeLog 3869 SHA256 40ea147085670f8118665407a7bc8e56e7c47d3c8bc5650dbd70ac68d9bd304d SHA512 98ab16a3b895c09e650760bb2d77c0b3e71ac6a597df2d2bf9969ed65eea17cae276272a03def8e9c3e4eab891b67d8dbb9b14ea1abdeca015e52f10cff42298 WHIRLPOOL e5c9323133588c127180f86ca7f6c89d332a28379ba5d4dfa3d34a484ef87b5d21dc02c8add9c1ea378707a4e7291a5244642249b2accb88ddab419ae245b405 +MISC metadata.xml 623 SHA256 132a5ae27f2ea6536e84a525f645e3a2f2e4011187e94626e3998a989ea48a58 SHA512 a545353ff382d249d48e2ebd2e233122d89ec3c89c98bc00aec52ac75f44c9e31937f20b7700e175f4488b1eb9ee56d389888ce4c3a31bb5fb07c88f081c31de WHIRLPOOL 99720afb4b1e900a2d582c4eb72d699c6b22d96b26a3cab29825fe596b60178efaf6f8396e044b037c981e2353c239ce772a38df7cab31f69f9be442341175da diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild new file mode 100644 index 0000000..761e867 --- /dev/null +++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/ccze/ccze-0.2.1-r3.ebuild,v 1.8 2012/03/18 15:51:16 armin76 Exp $ + +EAPI=4 + +inherit fixheadtails autotools eutils toolchain-funcs + +DESCRIPTION="A flexible and fast logfile colorizer" +HOMEPAGE="http://dev.gentoo.org/~joker/ccze/ccze.txt" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +RESTRICT="test" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x64-macos" +IUSE="" + +DEPEND="dev-libs/libpcre + sys-libs/ncurses" + +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ ) + +src_prepare() { + + epatch "${FILESDIR}"/ccze-fbsd.patch + epatch "${FILESDIR}"/ccze-segfault.patch + epatch "${FILESDIR}"/ccze-ldflags.patch + + # GCC 4.x fixes + sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \ + -i src/Makefile.in || die + sed -e '/AC_CHECK_TYPE(error_t, int)/d' \ + -i configure.ac || die + + eautoreconf + + ht_fix_file Rules.mk.in + + tc-export CC +} diff --git a/app-admin/ccze/files/ccze-fbsd.patch b/app-admin/ccze/files/ccze-fbsd.patch new file mode 100644 index 0000000..d1f684a --- /dev/null +++ b/app-admin/ccze/files/ccze-fbsd.patch @@ -0,0 +1,25 @@ +--- src/ccze-compat.h.old 2006-10-13 12:50:16 +0200 ++++ src/ccze-compat.h 2006-10-13 12:49:21 +0200 +@@ -29,6 +29,11 @@ + #include + #include + ++# ifndef __error_t_defined ++typedef int error_t; ++# define __error_t_defined 1 ++# endif ++ + #ifndef HAVE_STRNDUP + char *strndup (const char *s, size_t size); + #endif +--- src/ccze-compat.c.old 2006-10-13 12:51:35 +0200 ++++ src/ccze-compat.c 2006-10-13 12:51:44 +0200 +@@ -275,7 +275,7 @@ + char **valuep) + { + int i = getsubopt (optionp, tokens, valuep); +-#if HAVE_SUBOPTARg ++#if HAVE_SUBOPTARG + if (!*valuep && suboptarg) + *valuep = strdup (suboptarg); + #endif diff --git a/app-admin/ccze/files/ccze-ldflags.patch b/app-admin/ccze/files/ccze-ldflags.patch new file mode 100644 index 0000000..acef31a --- /dev/null +++ b/app-admin/ccze/files/ccze-ldflags.patch @@ -0,0 +1,11 @@ +--- ccze-0.2.1/src/Makefile.in.org 2010-01-22 17:06:57.000000000 +0100 ++++ ccze-0.2.1/src/Makefile.in 2010-01-22 18:00:28.000000000 +0100 +@@ -75,7 +75,7 @@ + ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS} + ${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS} + ccze-dump ccze-cssdump: %: %.o ccze-compat.o ccze-color.c +- ${CC} ${ALL_CFLAGS} -o $@ $@.o ccze-compat.o ++ ${CC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -o $@ $@.o ccze-compat.o + ccze-builtins.c: Makefile + echo '#include ' >$@ + echo '#include "ccze-private.h"' >>$@ diff --git a/app-admin/ccze/files/ccze-segfault.patch b/app-admin/ccze/files/ccze-segfault.patch new file mode 100644 index 0000000..fa30d2f --- /dev/null +++ b/app-admin/ccze/files/ccze-segfault.patch @@ -0,0 +1,30 @@ +diff -ruN ccze-0.2.1.orig/src/ccze.c ccze-0.2.1/src/ccze.c +--- ccze-0.2.1.orig/src/ccze.c 2003-05-13 20:09:30.000000000 +0200 ++++ ccze-0.2.1/src/ccze.c 2006-12-12 20:36:09.000000000 +0100 +@@ -209,7 +209,7 @@ + } + break; + case 'a': +- plugin = strtok (optarg, "="); ++ plugin = strtok (arg, "="); + value = strtok (NULL, "\n"); + ccze_plugin_argv_set (plugin, value); + break; +@@ -249,7 +249,7 @@ + ccze_config.remfac = 1; + break; + case 'm': +- subopts = optarg; ++ subopts = arg; + while (*subopts != '\0') + { + switch (getsubopt (&subopts, m_subopts, &value)) +@@ -273,7 +273,7 @@ + } + break; + case 'o': +- subopts = optarg; ++ subopts = arg; + while (*subopts != '\0') + { + switch (getsubopt (&subopts, o_subopts, &value)) diff --git a/app-admin/ccze/metadata.xml b/app-admin/ccze/metadata.xml new file mode 100644 index 0000000..2c85fc4 --- /dev/null +++ b/app-admin/ccze/metadata.xml @@ -0,0 +1,15 @@ + + + + + joker@gentoo.org + Christian Birchinger + Please take over if you want it + + + CCZE is my C port of RASZi's colorize, with a set of bug fixes and enhancements. + It uses PCRE to do the matching, and NCurses for the output. The goal was to + create a log coloriser, that is fast and light on resources. Also, being extensible + via plug-ins is an important feature too. + + -- cgit v1.2.3-65-gdbad