summaryrefslogtreecommitdiff
path: root/app-admin/apachetop
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/apachetop')
-rw-r--r--app-admin/apachetop/Manifest6
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r1.ebuild44
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r2.ebuild30
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch4
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch166
5 files changed, 190 insertions, 60 deletions
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 4e54bb6ab43e..2347fbf5881a 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,8 +1,8 @@
AUX apachetop-0.12.6-ac_config_header.patch 458 BLAKE2B 714adf5ee34629abae9cfe38d630e4e1c0829a99c823bc00a5276fe424264378316e18274976c71b974e970a25329413ab720f6621dcf3a6dcf61f02bc7d46d7 SHA512 dc10e46cac980a3544579222c5859d8baf4a1b5fd86a4700b07661e202270ff59b746b14661ca548d83322965e789bf70c7eddf8bf07b51d97d9e13256040109
AUX apachetop-0.12.6-configure.patch 2884 BLAKE2B 34310a487b0dc68e184c9facce01d8ca95364c6c8ed041fa5ccf9dbbdce3ca4ac944fff91aafb4866e7086e8fd9ebeb961026f84bd3c77ccaabdbc5e1be97997 SHA512 7c399fd434476291504cd7674fe63559c59a7b32628477ad4fbd1386e936be4d1f49d4faa2d8d95839c74908e755d50400ab8f4f30163967b94dc058456c9c15
-AUX apachetop-0.12.6-gcc41.patch 243 BLAKE2B c9e13df4700b49d9ee6e96eab29a5a79462b8d955502a699ac0921115e2b80ed7bf64a4f88552fbc3f2d94b3ee7df7980a629892ff478e5012db920f37c5d682 SHA512 5aeff6bb7b08d792fc02526eb0c10491d217c11c157670d6b8380db4a748ca63c8c35dc8fb58851c6188ef2bd8da811a11fa556c3b3db513f77f3b785f927123
+AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95ecb49f8c0f4039260eb6b2aaf6e5a45131682d68d38f474d384b9d6d35c27a5233b57949da8b6ff54d29b9634c86e SHA512 710b8e3b381dcf9aac58544f9afe0f2a3cc598b38e87145caad29404fc19983bc683b160f0f80dd003ffa57d246fbc5b0fa5754aa1012e985b4c2ffc7e01f50f
AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
+AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
-EBUILD apachetop-0.12.6-r1.ebuild 998 BLAKE2B 864fe883b2894c5c495e97fe88ce8370c6e057be4b0dbab2bdf5cc7c8fc242702cab60fd2fa1b315c8182b78bf3f518062c0223471ce98fa5af6dc17b795668d SHA512 52a9927874a2aea63c19983df262a4e0ec701ccf5a45531d99b835e2be4c3007963c1862a648c4b3ba7860a9cafb5ea12e49c9d24a45643d7999dffdb5a13b58
-EBUILD apachetop-0.12.6-r2.ebuild 796 BLAKE2B 99efe0544c2eda3878d1c97a216b2481203ecd4e7dd27d0cd3eee8095d345dddaa62e3b0190a296daa8d4fb6f294c1103bb14e3fdd4329cd9ab833a4c07077b3 SHA512 e9cfd9880a3ad4fd9b633dcc0aeab3fd967ed26cfb5854d2257a108a59d5fb5c64609edafb0b88389415a551551f435e8bdde50633369e788b29943595fd15b5
+EBUILD apachetop-0.12.6-r2.ebuild 891 BLAKE2B 78beb12571bac11da21de4f95b5267f4f8b2339cc75379e5e1b39d2b97b0bb5826b9dd015819d8a3f92aaf9af863ebabf93c6c88f144e83798246ecabb5a27bb SHA512 a1f79048bd8570b5f658d01e9b42c136251973500561d68aa09ab5e2fc54e758ce23e3bd1c3d745cad79d5a35f54baa4120cdf4b3e661231455c19dcea570c06
MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
deleted file mode 100644
index 2b4638b436a1..000000000000
--- a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="http://www.webta.org/projects/apachetop"
-SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE="fam pcre adns"
-
-DEPEND="fam? ( virtual/fam )
- pcre? ( dev-libs/libpcre )
- adns? ( net-libs/adns )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc41.patch
- epatch "${FILESDIR}"/${P}-configure.patch
- epatch "${FILESDIR}"/${P}-maxpathlen.patch
- epatch "${FILESDIR}"/${P}-ac_config_header.patch
- eautoreconf
-}
-
-src_configure() {
- econf --with-logfile=/var/log/apache2/access_log \
- $(use_with fam) \
- $(use_with pcre) \
- $(use_with adns)
-}
-
-src_compile() {
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
index bb433b83e580..bff79f6bb3b7 100644
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils autotools
+EAPI=6
+
+inherit autotools
DESCRIPTION="A realtime Apache log analyzer"
HOMEPAGE="http://www.webta.org/projects/apachetop"
@@ -14,22 +15,29 @@ KEYWORDS="amd64 hppa ~mips ppc sparc x86"
IUSE="fam pcre"
RDEPEND="
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
fam? ( virtual/fam )
- pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}"
+ pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc41.patch
+ "${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${P}-maxpathlen.patch
+ "${FILESDIR}"/${P}-ac_config_header.patch
+ "${FILESDIR}"/${P}-ncurses.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc41.patch
- epatch "${FILESDIR}"/${P}-configure.patch
- epatch "${FILESDIR}"/${P}-maxpathlen.patch
- epatch "${FILESDIR}"/${P}-ac_config_header.patch
+ default
eautoreconf
}
src_configure() {
econf \
- --with-logfile=/var/log/apache2/access_log \
+ --with-logfile="${EPREFIX}"/var/log/apache2/access_log \
--without-adns \
$(use_with fam) \
$(use_with pcre)
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
index 566c9226a3f7..6bfb49d9f9d8 100644
--- a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
+++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
@@ -1,5 +1,5 @@
---- src/resolver.h
-+++ src/resolver.h
+--- a/src/resolver.h
++++ b/src/resolver.h
@@ -10,8 +10,8 @@
class Resolver
{
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
new file mode 100644
index 000000000000..f12c989c3407
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
@@ -0,0 +1,166 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@
+ AC_CONFIG_SRCDIR(src/apachetop.cc)
+
+ AC_CONFIG_AUX_DIR(config)
+-#AC_CONFIG_MACRO_DIR(m4) # 2.58
++AC_CONFIG_MACRO_DIR(m4)
+
+ AC_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
+@@ -29,7 +29,6 @@
+ #AC_PROG_CC
+ #AC_PROG_CPP
+ AC_PROG_CXX
+-AC_LANG_CPLUSPLUS
+
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -120,24 +119,9 @@
+
+ AC_SEARCH_LIBS([socket], [socket])
+ AC_SEARCH_LIBS([inet_addr], [nsl])
+-AC_SEARCH_LIBS([attron], [ncurses])
+-AC_SEARCH_LIBS([tgetstr], [termcap])
+-AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
+- [] ,
+- [
+- AC_MSG_ERROR([No useful curses library found!])
+- ]
+-)
+
+-AC_SEARCH_LIBS([readline], [readline],
+- [
+- AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
+- AC_SUBST(HAVE_READLINE)
+- ] ,
+- [
+- AC_MSG_ERROR(readline library not found)
+- ]
+-)
++PKG_CHECK_MODULES([NCURSES], [ncurses])
++AX_LIB_READLINE
+
+
+ # everything is in CPPFLAGS up to this point, now we move to CXXFLAGS
+--- a/m4/ax_lib_readline.m4
++++ b/m4/ax_lib_readline.m4
+@@ -0,0 +1,107 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_LIB_READLINE
++#
++# DESCRIPTION
++#
++# Searches for a readline compatible library. If found, defines
++# `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
++# sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
++# necessary include files and sets `HAVE_READLINE_H' or
++# `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
++# 'HAVE_HISTORY_H' if the corresponding include files exists.
++#
++# The libraries that may be readline compatible are `libedit',
++# `libeditline' and `libreadline'. Sometimes we need to link a termcap
++# library for readline to work, this macro tests these cases too by trying
++# to link with `libtermcap', `libcurses' or `libncurses' before giving up.
++#
++# Here is an example of how to use the information provided by this macro
++# to perform the necessary includes or declarations in a C file:
++#
++# #ifdef HAVE_LIBREADLINE
++# # if defined(HAVE_READLINE_READLINE_H)
++# # include <readline/readline.h>
++# # elif defined(HAVE_READLINE_H)
++# # include <readline.h>
++# # else /* !defined(HAVE_READLINE_H) */
++# extern char *readline ();
++# # endif /* !defined(HAVE_READLINE_H) */
++# char *cmdline = NULL;
++# #else /* !defined(HAVE_READLINE_READLINE_H) */
++# /* no readline */
++# #endif /* HAVE_LIBREADLINE */
++#
++# #ifdef HAVE_READLINE_HISTORY
++# # if defined(HAVE_READLINE_HISTORY_H)
++# # include <readline/history.h>
++# # elif defined(HAVE_HISTORY_H)
++# # include <history.h>
++# # else /* !defined(HAVE_HISTORY_H) */
++# extern void add_history ();
++# extern int write_history ();
++# extern int read_history ();
++# # endif /* defined(HAVE_READLINE_HISTORY_H) */
++# /* no history */
++# #endif /* HAVE_READLINE_HISTORY */
++#
++# LICENSE
++#
++# Copyright (c) 2008 Ville Laurikari <vl@iki.fi>
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 7
++
++AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
++AC_DEFUN([AX_LIB_READLINE], [
++ AC_CACHE_CHECK([for a readline compatible library],
++ ax_cv_lib_readline, [
++ ORIG_LIBS="$LIBS"
++ for readline_lib in readline edit editline; do
++ for termcap_lib in "" termcap curses ncurses; do
++ if test -z "$termcap_lib"; then
++ TRY_LIB="-l$readline_lib"
++ else
++ TRY_LIB="-l$readline_lib -l$termcap_lib"
++ fi
++ LIBS="$ORIG_LIBS $TRY_LIB"
++ AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
++ if test -n "$ax_cv_lib_readline"; then
++ break
++ fi
++ done
++ if test -n "$ax_cv_lib_readline"; then
++ break
++ fi
++ done
++ if test -z "$ax_cv_lib_readline"; then
++ ax_cv_lib_readline="no"
++ fi
++ LIBS="$ORIG_LIBS"
++ ])
++
++ if test "$ax_cv_lib_readline" != "no"; then
++ LIBS="$LIBS $ax_cv_lib_readline"
++ AC_DEFINE(HAVE_LIBREADLINE, 1,
++ [Define if you have a readline compatible library])
++ AC_CHECK_HEADERS(readline.h readline/readline.h)
++ AC_CACHE_CHECK([whether readline supports history],
++ ax_cv_lib_readline_history, [
++ ax_cv_lib_readline_history="no"
++ AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
++ ])
++ if test "$ax_cv_lib_readline_history" = "yes"; then
++ AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++ [Define if your readline library has \`add_history'])
++ AC_CHECK_HEADERS(history.h readline/history.h)
++ fi
++ fi
++])dnl
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,6 +6,7 @@
+ display.cc hits_circle.cc timed_circle.cc filters.cc \
+ resolver.cc
+
++apachetop_LDADD = $(NCURSES_LIBS)
+
+ noinst_HEADERS = apachetop.h log.h ohtbl.h map.h queue.h \
+ display.h hits_circle.h circle.h timed_circle.h filters.h \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-16 21:02:50 +0000