From nobody Sun Jan 14 20:36:48 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TCnB84ggHz5749x; Sun, 14 Jan 2024 20:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TCnB83dWYz3wmW; Sun, 14 Jan 2024 20:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705264608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKAdZymqJzY5WYwfU+N1gc4VNQbsxt4yG4ct1TSD3MU=; b=n9apRB+Splk8X02YBxDZxfoZ0nPeAJ65n8qTAFODElaLZa7HhtG2ZHfPoMA4ZnpxCP3tcG naElJ/VCarBUd0+OnbY+bXV1XK2F801QOD+bT7SPMSECTw9982YrQHbB8+zecJfbz0u6Gd HUAWTqUFeuAQufBGnllYaP0gOchhf4P+oNDEwZfkfcUeB/wCXMniKUS0UG4h24QESmMZIS u8rTQ+5iB+KJ9KRrPOaQ5wtlAPUQ1r3xSixUv+5t7t0wbLvsJbVICTDg8Amdh0M3lXNiHx KsmS6pC6T556y0Gx70O+Uno+4p1OHP150yD2igp0FcYBlDbcBAwYJ4BuU+vUVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705264608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKAdZymqJzY5WYwfU+N1gc4VNQbsxt4yG4ct1TSD3MU=; b=qqW1UUB+rx0kWjMmfw6Rh1sspDkq6mvcpvhZJtE9Igowm0NAQIQCrvxm/K4y23FPPbFBVt e1fpLJaX5uxNj24wGoI8YFGxOJEFai0Xu5KAZi3oFSgh9eQdIbG2EHXk7rqGqP+Hhk+TS5 X6oDZ/S4Jh/udHLqinbDW9fI19yDqr1j6Mpxjs2PfoQhRGRFD1SVQKabaoopSS+lcmYOV7 nskbYe4mxoafe6FeH0AEz49Qs5NN0UEWkAqL468BQkCrW9S+Dq1uR+WU/dIdan15edG+hp B+gyDUxscAysWva3sN8Y/msvPXG9QmBwE5RyzrPnVbl8SlCbhn8rtlmVv8UkDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705264608; a=rsa-sha256; cv=none; b=Pbjqb11yD/+krIJ9iu1ERNy79vDxP7GDux/5B5k+S/DiYd60HHYHrnjm4ekWcDZGfGK/1d hR+oAe2ICC9ds8eR8eg9xwJO/+njTCwa4ejnrLWhYYDvVnbTBuj6js7xvf8fgsGDxjNW8x 1vG35rCFghclVksCWWBy6SCBCQAbBHbLakBL+/ZiN8m/3dIQQsgEcoVkPaxLVHEmSlmZtK MzQXGvYVzNS8d872gce25iuqj0S4+7sOEHdZXU+UnWkrVrA9xDX+P10Oqba67EBqEVAsgS uwAtc63RrGI5CG20Zt6v/W1AVoceP6CIl/o1diG3C15WSfEuM9D726catVn/3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TCnB82drQzSf7; Sun, 14 Jan 2024 20:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40EKamhn007054; Sun, 14 Jan 2024 20:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40EKamLZ007051; Sun, 14 Jan 2024 20:36:48 GMT (envelope-from git) Date: Sun, 14 Jan 2024 20:36:48 GMT Message-Id: <202401142036.40EKamLZ007051@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 03dfdf49875c - main - sysutils/apachetop: Update to 0.23.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03dfdf49875c7634f458e4eddad9db2a850d6e41 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=03dfdf49875c7634f458e4eddad9db2a850d6e41 commit 03dfdf49875c7634f458e4eddad9db2a850d6e41 Author: Hung-Yi Chen AuthorDate: 2024-01-14 08:04:41 +0000 Commit: Daniel Engberg CommitDate: 2024-01-14 20:28:30 +0000 sysutils/apachetop: Update to 0.23.2 Changelog: https://github.com/tessus/apachetop/blob/master/ChangeLog PR: 276300 Reviewed by: Lukasz Wasikowski (maintainer) --- sysutils/apachetop/Makefile | 9 ++++--- sysutils/apachetop/distinfo | 6 ++--- sysutils/apachetop/files/patch-src_inlines.cc | 37 -------------------------- sysutils/apachetop/files/patch-src_ohtbl.cc | 38 --------------------------- 4 files changed, 8 insertions(+), 82 deletions(-) diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile index cac6e66c9ad7..87317aa98576 100644 --- a/sysutils/apachetop/Makefile +++ b/sysutils/apachetop/Makefile @@ -1,5 +1,5 @@ PORTNAME= apachetop -DISTVERSION= 0.19.7 +DISTVERSION= 0.23.2 CATEGORIES= sysutils MASTER_SITES= https://github.com/tessus/${PORTNAME}/releases/download/${DISTVERSION}/ @@ -18,7 +18,7 @@ CONFIGURE_ENV+= NCURSES_CFLAGS="-I${NCURSESINC}" NCURSES_LIBS="-lncursesw" PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -OPTIONS_DEFINE= ADNS FAM PCRE +OPTIONS_DEFINE= ADNS FAM PCRE2 ADNS_DESC= Asynchronous-capable DNS support ADNS_LIB_DEPENDS= libadns.so:dns/adns @@ -27,7 +27,8 @@ ADNS_CONFIGURE_WITH= adns=${LOCALBASE} FAM_LIB_DEPENDS= libfam.so:devel/fam FAM_CONFIGURE_WITH= fam=${LOCALBASE} -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_CONFIGURE_WITH= pcre=${LOCALBASE} +PCRE2_DESC= Use Perl Compatible Regular Expressions (v2) +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +PCRE2_CONFIGURE_WITH= pcre2=${LOCALBASE} .include diff --git a/sysutils/apachetop/distinfo b/sysutils/apachetop/distinfo index 00b68e76ab2c..65ba839f3d59 100644 --- a/sysutils/apachetop/distinfo +++ b/sysutils/apachetop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660844272 -SHA256 (apachetop-0.19.7.tar.gz) = 7f0ad1cd11cd1f86052bbfd63f27ecb6cb74012a17321354af70abf05998c4eb -SIZE (apachetop-0.19.7.tar.gz) = 132665 +TIMESTAMP = 1705166125 +SHA256 (apachetop-0.23.2.tar.gz) = f94a34180808c3edb24c1779f72363246dd4143a89f579ef2ac168a45b04443f +SIZE (apachetop-0.23.2.tar.gz) = 169381 diff --git a/sysutils/apachetop/files/patch-src_inlines.cc b/sysutils/apachetop/files/patch-src_inlines.cc deleted file mode 100644 index de6746fd2c0b..000000000000 --- a/sysutils/apachetop/files/patch-src_inlines.cc +++ /dev/null @@ -1,37 +0,0 @@ ---- 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; diff --git a/sysutils/apachetop/files/patch-src_ohtbl.cc b/sysutils/apachetop/files/patch-src_ohtbl.cc deleted file mode 100644 index da8877a4e9b5..000000000000 --- a/sysutils/apachetop/files/patch-src_ohtbl.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- 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) - {