svn commit: r487774 - in head/sysutils/apachetop: . files
Kurt Jaeger
pi at FreeBSD.org
Tue Dec 18 22:03:44 UTC 2018
Author: pi
Date: Tue Dec 18 22:03:42 2018
New Revision: 487774
URL: https://svnweb.freebsd.org/changeset/ports/487774
Log:
sysutils/apachetop: update 0.12.6 -> 0.18.4
- moved to github
- Fix compile
- Fix mis-spelled word
PR: 227865
Submitted by: ndowens at yahoo.com
Reported by: Thomas-Henning von Kamptz <tomsoft at mac.com>
Reviewed by: koobs, danfe
Approved by: Lukasz Wasikowski <lukasz at wasikowski.net> (maintainer)
Added:
head/sysutils/apachetop/files/patch-src_inlines.cc (contents, props changed)
head/sysutils/apachetop/files/patch-src_ohtbl.cc (contents, props changed)
Deleted:
head/sysutils/apachetop/files/patch-apachetop.h
head/sysutils/apachetop/files/patch-resolver.h
head/sysutils/apachetop/files/patch-src_apachetop.cc
head/sysutils/apachetop/files/patch-src_display.cc
head/sysutils/apachetop/files/patch-src_hits__circle.cc
Modified:
head/sysutils/apachetop/Makefile
head/sysutils/apachetop/distinfo
head/sysutils/apachetop/files/patch-src_log.cc
head/sysutils/apachetop/pkg-descr
Modified: head/sysutils/apachetop/Makefile
==============================================================================
--- head/sysutils/apachetop/Makefile Tue Dec 18 21:15:29 2018 (r487773)
+++ head/sysutils/apachetop/Makefile Tue Dec 18 22:03:42 2018 (r487774)
@@ -2,38 +2,34 @@
# $FreeBSD$
PORTNAME= apachetop
-PORTVERSION= 0.12.6
-PORTREVISION= 5
+PORTVERSION= 0.18.4
CATEGORIES= sysutils
-MASTER_SITES= https://www.freebsd.systems/files/
MAINTAINER= lukasz at wasikowski.net
COMMENT= Apache realtime log stats
LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
-GNU_CONFIGURE= yes
-USES= ncurses readline
+USES= autoreconf ncurses readline
+USE_GITHUB= yes
+GH_ACCOUNT= tessus
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= --mandir=${PREFIX}/man
+
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
OPTIONS_DEFINE= ADNS FAM PCRE
-ADNS_DESC= Asynchronous-capable DNS support
+ADNS_DESC= Asynchronous-capable DNS support
ADNS_LIB_DEPENDS= libadns.so:dns/adns
-ADNS_CONFIGURE_ON= --with-adns=${LOCALBASE}
+ADNS_CONFIGURE_WITH= adns=${LOCALBASE}
FAM_LIB_DEPENDS= libfam.so:devel/fam
-FAM_CONFIGURE_ON= --with-fam=${LOCALBASE}
+FAM_CONFIGURE_WITH= fam=${LOCALBASE}
PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
-PCRE_COFNIGURE_ON= --with-pcre=${LOCALBASE}
-
-post-patch:
- @${REINPLACE_CMD} -E -e 's,struct (circle_struct),\1,g' \
- ${WRKSRC}/src/hits_circle.*
- @${REINPLACE_CMD} -E -e 's,enum (adns_queryflags),\1,g' \
- ${WRKSRC}/src/log.*
- @cd ${WRKSRC} && ${TOUCH} -r configure.ac aclocal.m4 stamp-h.in
+PCRE_CONFIGURE_WITH= pcre=${LOCALBASE}
.include <bsd.port.mk>
Modified: head/sysutils/apachetop/distinfo
==============================================================================
--- head/sysutils/apachetop/distinfo Tue Dec 18 21:15:29 2018 (r487773)
+++ head/sysutils/apachetop/distinfo Tue Dec 18 22:03:42 2018 (r487774)
@@ -1,2 +1,3 @@
-SHA256 (apachetop-0.12.6.tar.gz) = 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29
-SIZE (apachetop-0.12.6.tar.gz) = 126930
+TIMESTAMP = 1535255129
+SHA256 (tessus-apachetop-0.18.4_GH0.tar.gz) = 1cbbfd1bf12275fb21e0cb6068b9050b2fee8c276887054a015bf103a1ae9cc6
+SIZE (tessus-apachetop-0.18.4_GH0.tar.gz) = 43047
Added: head/sysutils/apachetop/files/patch-src_inlines.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/apachetop/files/patch-src_inlines.cc Tue Dec 18 22:03:42 2018 (r487774)
@@ -0,0 +1,37 @@
+--- src/inlines.cc.orig 2018-08-28 11:21:23 UTC
++++ src/inlines.cc
+@@ -4,10 +4,10 @@
+ #define ONE_EIGHTH 4
+ #define HIGH_BITS (~((unsigned int)(~0) >> ONE_EIGHTH))
+
+-inline unsigned int StringHash(register const char *str)
++inline unsigned int StringHash( const char *str)
+ {
+- register unsigned int val;
+- register unsigned int i;
++ unsigned int val;
++ unsigned int i;
+
+ for (val = 0; *str; str++)
+ {
+@@ -19,9 +19,9 @@ inline unsigned int StringHash(register const char *st
+ return val;
+ }
+
+-inline unsigned int QuickHash(register const char *str)
++inline unsigned int QuickHash( const char *str)
+ {
+- register unsigned int val, tmp;
++ unsigned int val, tmp;
+
+ for(val = 0 ; *str ; str++)
+ {
+@@ -32,7 +32,7 @@ inline unsigned int QuickHash(register const char *str
+ return val;
+ }
+
+-inline unsigned long TTHash(register const char *str)
++inline unsigned long TTHash( const char *str)
+ {
+ unsigned long hash = 5381;
+ int c;
Modified: head/sysutils/apachetop/files/patch-src_log.cc
==============================================================================
--- head/sysutils/apachetop/files/patch-src_log.cc Tue Dec 18 21:15:29 2018 (r487773)
+++ head/sysutils/apachetop/files/patch-src_log.cc Tue Dec 18 22:03:42 2018 (r487774)
@@ -1,56 +1,11 @@
---- src/log.cc.orig 2018-02-04 09:36:17 UTC
+--- src/log.cc.orig 2018-08-28 11:26:42 UTC
+++ src/log.cc
-@@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi
- if (!bufcp)
- return -1;
-
-- *bufcp = (char) NULL;
-+ *bufcp = '\0';
- ++bufcp;
+@@ -72,7 +72,7 @@ int CommonLogParser::parse(char *logline, struct logbi
+ /* fire off a query with adns */
+ b->dns_query = new adns_query;
+ adns_submit(adns, ptr, adns_r_a,
+- (adns_queryflags) NULL, NULL, b->dns_query);
++ (adns_queryflags) 0, 0, b->dns_query);
- /* quickly figure out if this is an IP or a host. We do this by
-@@ -172,7 +172,7 @@ int CommonLogParser::parse(char *logline, struct logbi
- /* find the end of referrer and null it */
- if (!(bufcp = strchr(bufsp, '"')))
- return -1;
-- *bufcp = (char) NULL;
-+ *bufcp = '\0';
-
- /* unless they want to keep it, skip over the protocol, ie http:// */
- if ((cf.preserve_ref_protocol == 0) && (bufcp = strstr(bufsp, "://")))
-@@ -230,7 +230,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
- return NULL;
-
- /* null the space in front of it */
-- *endptr = (char) NULL;
-+ *endptr = '\0';
-
- /* TODO maybe we can use the protocol someday.. */
-
-@@ -258,7 +258,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
- char *bufcp, *endptr, *workptr;
-
- endptr = *url + *length;
-- *endptr = (char) NULL;
-+ *endptr = '\0';
-
- /* do we want to keep the query string? */
- if (!cf.keep_querystring)
-@@ -273,7 +273,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
- if (workptr < endptr)
- {
- /* we're ok */
-- *workptr = (char) NULL;
-+ *workptr = '\0';
- bufcp = workptr+1;
- }
- }
-@@ -308,7 +308,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
- if (workptr == endptr)
- bufcp = workptr;
- }
-- *bufcp = (char) NULL;
-+ *bufcp = '\0';
- }
-
-
+ b->ip_pos = im->insert(RESOLVING_STRING);
+ b->ip_hash = TTHash(RESOLVING_STRING);
Added: head/sysutils/apachetop/files/patch-src_ohtbl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/apachetop/files/patch-src_ohtbl.cc Tue Dec 18 22:03:42 2018 (r487774)
@@ -0,0 +1,38 @@
+--- src/ohtbl.cc.orig 2018-08-28 11:24:15 UTC
++++ src/ohtbl.cc
+@@ -13,7 +13,7 @@ static int primes[] = {101, 241, 499, 1009, 2003, 3001
+
+ int OAHash::getNextPrime(int size)
+ {
+- register int *prime;
++ int *prime;
+ for (prime = &primes[0] ; *prime ; prime++)
+ if (*prime > size)
+ return *prime;
+@@ -51,7 +51,7 @@ void OAHash::destroy(void)
+
+ void *OAHash::insert(char *key, void *data)
+ {
+- register unsigned int p, i;
++ unsigned int p, i;
+ void *d;
+
+ // Do not exceed the number of positions in the table.
+@@ -81,7 +81,7 @@ void *OAHash::insert(char *key, void *data)
+
+ int OAHash::remove(char *key)
+ {
+- register unsigned int p, i;
++ unsigned int p, i;
+
+ for (i = 0; i < positions; ++i)
+ {
+@@ -108,7 +108,7 @@ int OAHash::remove(char *key)
+
+ void *OAHash::lookup(char *key)
+ {
+- register unsigned int p, i;
++ unsigned int p, i;
+
+ for (i = 0; i < positions; ++i)
+ {
Modified: head/sysutils/apachetop/pkg-descr
==============================================================================
--- head/sysutils/apachetop/pkg-descr Tue Dec 18 21:15:29 2018 (r487773)
+++ head/sysutils/apachetop/pkg-descr Tue Dec 18 22:03:42 2018 (r487774)
@@ -1,4 +1,4 @@
ApacheTop watches a logfile generated by Apache (in standard common or
combined log format) and generates human-parsable output in realtime.
-WWW: http://www.webta.org/projects/apachetop/
+WWW: https://github.com/tessus/apachetop
More information about the svn-ports-all
mailing list