summaryrefslogtreecommitdiff
path: root/app-admin/apachetop
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/apachetop')
-rw-r--r--app-admin/apachetop/Manifest14
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r2.ebuild44
-rw-r--r--app-admin/apachetop/apachetop-0.17.4.ebuild36
-rw-r--r--app-admin/apachetop/apachetop-0.18.4.ebuild38
-rw-r--r--app-admin/apachetop/apachetop-0.19.7.ebuild2
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch12
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-configure.patch101
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch13
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch39
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch166
-rw-r--r--app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch11
11 files changed, 2 insertions, 474 deletions
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index bcec1a0db7a0..01b0183d2153 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,15 +1,3 @@
-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 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
-AUX apachetop-0.18.4-tinfo.patch 313 BLAKE2B 389a6d0715b00de166dff543b53abda45a52497497d66c4d0b4b2e4b0c4407a8dee90d7401088f9b99e408738d523211741f579b70ca8f64826e3dbd46619fd1 SHA512 0a9ef0782498e67cca07b642e796b1abaffad3bc3b330ca83b579d75a34fba1225453a52aadd720a830d8b51d342d34ed87c3b10cb8441bcf4c71b375ee03e66
-DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
-DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
-DIST apachetop-0.18.4.tar.gz 128849 BLAKE2B 912f060984da326b2e005cc0e3eb99c28182bc6a0930e6781d5a0a990dbbe56b5dbfe871baea1c86a5ac2bc02faa1e583ca104d3c8bd00cc3617599601b2d8bd SHA512 e32f94ab6223578aa5b8c11083de762e8f916ba6d057d93f99208333632a8362b421c41fff76bf60a52f0b377a70d69c17ed02abfb95f86474ad3719016e59f7
DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
-EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb8382a4797c08be644ac17958c4c804c2594c3c5809c9b82fc413010230f5a83a70a74f4616fce507a1726bcbed204e231 SHA512 b5368a948c0b4f4e6c2d754335de9dd20cb263985192631703d437f7f1c833758b11e4a17cd18fa6f5d09a2edba8de91966d9d72c453e17c6145012686ad68ca
-EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
-EBUILD apachetop-0.18.4.ebuild 756 BLAKE2B 5dfdc856a095e583b707fbfeb2afa79f7a7f9486c8792a814bbb2823d8e92cbd3f78b1aa2fff34a2cf236923abe189e7e7ebc00cf2841cc5b100c0e43fd64391 SHA512 07fd2b11883cccc65befd13045f5d4fdf454e6dede3b2a97f46dc3487364daab176777d928aa575118c63806b1a8b7997c55961d895359504f02e97e20df5ba2
-EBUILD apachetop-0.19.7.ebuild 669 BLAKE2B 1f9df2058e40543b50f678e4323aa22bb9465d8fdba922fa1d21daf4979b53bbdc0f9c5bc9b17a70f0ffa7daef29cdd7514dd639407d3d15d1814819dda29b5d SHA512 273cda324222fc816102c0d8302da0f915f634d7e664273358fc82de12494bb3129b084118c5a7eac8ed0b85a6b113d0b525684fcc59dba07f8973480ffb9069
+EBUILD apachetop-0.19.7.ebuild 667 BLAKE2B 5ddffed81f4dd1398477e08a2a9a7267af9a68a3eaaa6fb078c73a81fa4113b43eb1dd5398724b6fb713b502903555dd023b273395d3608365f38120dfbc4998 SHA512 7c5a9554291d6cbe44642efe119702618b64a8e0c78afa84933f2db9775eb263a75540d192203e8dcfdfeccbe831e30c60d8b845cfeff69d0f12b1831ce4d3ac
MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
deleted file mode 100644
index 00e66ae0691c..000000000000
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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}
- 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() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-logfile="${EPREFIX}"/var/log/apache2/access_log \
- --without-adns \
- $(use_with fam) \
- $(use_with pcre)
-}
diff --git a/app-admin/apachetop/apachetop-0.17.4.ebuild b/app-admin/apachetop/apachetop-0.17.4.ebuild
deleted file mode 100644
index 2f5954eb82bf..000000000000
--- a/app-admin/apachetop/apachetop-0.17.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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}
- virtual/pkgconfig"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-logfile="${EPREFIX}"/var/log/apache2/access_log \
- --without-adns \
- $(use_with fam) \
- $(use_with pcre)
-}
diff --git a/app-admin/apachetop/apachetop-0.18.4.ebuild b/app-admin/apachetop/apachetop-0.18.4.ebuild
deleted file mode 100644
index c0a18315d1da..000000000000
--- a/app-admin/apachetop/apachetop-0.18.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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}"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.18.4-tinfo.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-logfile="${EPREFIX}"/var/log/apache2/access_log \
- --without-adns \
- $(use_with fam) \
- $(use_with pcre)
-}
diff --git a/app-admin/apachetop/apachetop-0.19.7.ebuild b/app-admin/apachetop/apachetop-0.19.7.ebuild
index 52ec4864333f..f02920cb2954 100644
--- a/app-admin/apachetop/apachetop-0.19.7.ebuild
+++ b/app-admin/apachetop/apachetop-0.19.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 hppa ~mips ~ppc sparc x86"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
IUSE="fam pcre"
RDEPEND="
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
deleted file mode 100644
index aabdb13d75f3..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac
---- apachetop-0.12.6.orig/configure.ac 2013-07-09 14:06:14.000000000 -0400
-+++ apachetop-0.12.6/configure.ac 2013-07-09 14:07:36.000000000 -0400
-@@ -6,7 +6,7 @@
- AC_CONFIG_AUX_DIR(config)
- #AC_CONFIG_MACRO_DIR(m4) # 2.58
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
-
- # Add non-standard directories to the include path
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
deleted file mode 100644
index 38a1fc7f6a1a..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: apachetop-0.12.6/configure.ac
-===================================================================
---- apachetop-0.12.6.orig/configure.ac
-+++ apachetop-0.12.6/configure.ac
-@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])
-
- # pcre {{{
--AC_ARG_WITH(pcre,
-- [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
-- [
-- CPPFLAGS="$CPPFLAGS -I $withval/include"
-- LDFLAGS="$LDFLAGS -L $withval/lib"
-- ]
--)
--
--AC_CHECK_HEADERS(pcre.h,
-- AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
-- AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
--)
-+AC_ARG_WITH([pcre],
-+ [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
-+ [case "${withval}" in
-+ yes) with_pcre="/usr";;
-+ no) with_pcre="no";;
-+ *) with_pcre="/usr";;
-+ esac],
-+ [with_pcre="/usr"])
-+
-+if test x$with_pcre != xno; then
-+ CPPFLAGS="$CPPFLAGS -I $withval/include"
-+ LDFLAGS="$LDFLAGS -L $withval/lib"
-+ AC_CHECK_HEADERS(pcre.h,
-+ AC_SEARCH_LIBS([pcre_compile], [pcre]),
-+ AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]))
-+fi
- # }}}
-
- # fam {{{
--AC_ARG_WITH(fam,
-- [ --with-fam=<path> prefix of fam installation (eg /usr/local)],
-- [
-- CPPFLAGS="$CPPFLAGS -I $withval/include"
-- LDFLAGS="$LDFLAGS -L $withval/lib"
-- ]
--)
--
--AC_CHECK_HEADERS(fam.h,
-- AC_SEARCH_LIBS([FAMOpen], [fam]) ,
-- AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
--)
-+AC_ARG_WITH([fam],
-+ [ --with-fam=<path> prefix of fam installation (eg /usr/local)],
-+ [case "${withval}" in
-+ yes) with_fam="/usr";;
-+ no) with_fam="no";;
-+ *) with_fam="/usr";;
-+ esac],
-+ [with_fam="/usr"])
-+
-+if test x$with_fam != xno; then
-+ CPPFLAGS="$CPPFLAGS -I $with_fam/include"
-+ LDFLAGS="$LDFLAGS -L $with_fam/lib"
-+ AC_CHECK_HEADERS(fam.h,
-+ AC_SEARCH_LIBS([FAMOpen], [fam]),
-+ AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]))
-+fi
- # }}}
-
- # adns {{{
--AC_ARG_WITH(adns,
-- [ --with-adns=<path> prefix of adns installation (eg /usr/local)],
-- [
-- CPPFLAGS="$CPPFLAGS -I $withval/include"
-- LDFLAGS="$LDFLAGS -L $withval/lib"
-- ]
--)
--
--AC_CHECK_HEADERS(adns.h,
-- AC_SEARCH_LIBS([adns_submit], [adns]) ,
-- AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
--)
-+AC_ARG_WITH([adns],
-+ [ --with-adns=<path> prefix of adns installation (eg /usr/local)],
-+ [case "${withval}" in
-+ yes) with_adns="/usr";;
-+ no) with_adns="no";;
-+ *) with_adns="/usr";;
-+ esac],
-+ [with_adns="/usr"])
-+
-+if test x$with_adns != xno; then
-+ CPPFLAGS="$CPPFLAGS -I $with_adns/include"
-+ LDFLAGS="$LDFLAGS -L $with_adns/lib"
-+ AC_CHECK_HEADERS(adns.h,
-+ AC_SEARCH_LIBS([adns_submit], [adns]),
-+ AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]))
-+fi
- # }}}
-
- # --with-logfile {{{
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
deleted file mode 100644
index 6bfb49d9f9d8..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/resolver.h
-+++ b/src/resolver.h
-@@ -10,8 +10,8 @@
- class Resolver
- {
- public:
-- Resolver::Resolver(void);
-- Resolver::~Resolver(void);
-+ Resolver(void);
-+ ~Resolver(void);
- int add_request(char *request, enum resolver_action act);
-
-
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
deleted file mode 100644
index b648b07cbfc5..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
-adds some includes in order to have a real change to get MAXPATHLEN defined with
-a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
-buffer overflow.
-
-See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
-for more information. This patch should solve the mentioned bug report and should
-be sane enough to get included by upstream of apachetop for the next release. It
-is important to run autoheader before ./configure to get these changes activated.
-
---- apachetop-0.12.6/configure.ac 2005-10-27 18:39:25.000000000 +0200
-+++ apachetop-0.12.6/configure.ac.maxpathlen 2008-06-21 16:00:38.000000000 +0200
-@@ -34,7 +34,8 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
-- string.h strings.h sys/socket.h time.h sys/time.h])
-+ string.h strings.h sys/socket.h time.h sys/time.h \
-+ limits.h sys/param.h])
-
- # Checks for typedefs, structures, and compiler characteristics.
- #AC_HEADER_STDBOOL # not in 2.53?
---- apachetop-0.12.6/src/apachetop.h 2005-10-15 18:10:01.000000000 +0200
-+++ apachetop-0.12.6/src/apachetop.h.maxpatlen 2008-06-21 16:02:00.000000000 +0200
-@@ -89,8 +89,12 @@
- #define getMIN(a,b) (a < b ? a : b)
- #define getMAX(a,b) (a > b ? a : b)
-
--#ifndef MAXPATHLEN
--# define MAXPATHLEN 128
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+
-+#if HAVE_LIMITS_H
-+# include <limits.h>
- #endif
-
- /* upon startup, each input file is put into an element of this array,
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
deleted file mode 100644
index f12c989c3407..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- 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 \
diff --git a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch b/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
deleted file mode 100644
index d975a430914f..000000000000
--- a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,7 +133,7 @@
- AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([inet_addr], [nsl])
- AC_SEARCH_LIBS([attron], [ncurses])
--AC_SEARCH_LIBS([tgetstr], [termcap])
-+AC_SEARCH_LIBS([tgetstr], [tinfo termcap])
- AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
- [] ,
- [
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 14:47:35 +0000