Attachment #247629 for bug #276300

View | Details | Raw Unified | Return to bug 276300
Collapse All | Expand All




PORTNAME=	apachetop
DISTVERSION=	0.23.2
CATEGORIES=	sysutils
MASTER_SITES=	https://github.com/tessus/${PORTNAME}/releases/download/${DISTVERSION}/



PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz

OPTIONS_DEFINE=	ADNS FAM PCRE2

ADNS_DESC=	Asynchronous-capable DNS support
ADNS_LIB_DEPENDS=	libadns.so:dns/adns

FAM_LIB_DEPENDS=	libfam.so:devel/fam
FAM_CONFIGURE_WITH=	fam=${LOCALBASE}

PCRE2_DESC=	Use Perl Compatible Regular Expressions (v2)
PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
PCRE2_CONFIGURE_WITH=	pcre2=${LOCALBASE}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/sysutils/apachetop/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1660844272	1	TIMESTAMP = 1705166125
2	SHA256 (apachetop-0.19.7.tar.gz) = 7f0ad1cd11cd1f86052bbfd63f27ecb6cb74012a17321354af70abf05998c4eb	2	SHA256 (apachetop-0.23.2.tar.gz) = f94a34180808c3edb24c1779f72363246dd4143a89f579ef2ac168a45b04443f
3	SIZE (apachetop-0.19.7.tar.gz) = 132665	3	SIZE (apachetop-0.23.2.tar.gz) = 169381




--- 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;




--- 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)
 	{

Return to bug 276300

Lines 1-5 Link Here

(-)b/sysutils/apachetop/Makefile (-4 / +5 lines)
1	PORTNAME= apachetop	1	PORTNAME= apachetop
2	DISTVERSION= 0.19.7	2	DISTVERSION= 0.23.2
3	CATEGORIES= sysutils	3	CATEGORIES= sysutils
4	MASTER_SITES= https://github.com/tessus/${PORTNAME}/releases/download/${DISTVERSION}/	4	MASTER_SITES= https://github.com/tessus/${PORTNAME}/releases/download/${DISTVERSION}/
5		5
Lines 18-24 CONFIGURE_ENV+= NCURSES_CFLAGS="-I${NCURSESINC}" NCURSES_LIBS="-lncursesw" Link Here
18		18
19	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz	19	PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
20		20
21	OPTIONS_DEFINE= ADNS FAM PCRE	21	OPTIONS_DEFINE= ADNS FAM PCRE2
22		22
23	ADNS_DESC= Asynchronous-capable DNS support	23	ADNS_DESC= Asynchronous-capable DNS support
24	ADNS_LIB_DEPENDS= libadns.so:dns/adns	24	ADNS_LIB_DEPENDS= libadns.so:dns/adns
Lines 27-33 ADNS_CONFIGURE_WITH= adns=${LOCALBASE} Link Here
27	FAM_LIB_DEPENDS= libfam.so:devel/fam	27	FAM_LIB_DEPENDS= libfam.so:devel/fam
28	FAM_CONFIGURE_WITH= fam=${LOCALBASE}	28	FAM_CONFIGURE_WITH= fam=${LOCALBASE}
29		29
30	PCRE_LIB_DEPENDS= libpcre.so:devel/pcre	30	PCRE2_DESC= Use Perl Compatible Regular Expressions (v2)
31	PCRE_CONFIGURE_WITH= pcre=${LOCALBASE}	31	PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
		32	PCRE2_CONFIGURE_WITH= pcre2=${LOCALBASE}
32		33
33	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Removed Link Here

(-)a/sysutils/apachetop/files/patch-src_inlines.cc (-37 lines)
1	--- src/inlines.cc.orig 2018-08-28 11:21:23 UTC
2	+++ src/inlines.cc
3	@@ -4,10 +4,10 @@
4	#define ONE_EIGHTH 4
5	#define HIGH_BITS (~((unsigned int)(~0) >> ONE_EIGHTH))
6
7	-inline unsigned int StringHash(register const char *str)
8	+inline unsigned int StringHash( const char *str)
9	{
10	- register unsigned int val;
11	- register unsigned int i;
12	+ unsigned int val;
13	+ unsigned int i;
14
15	for (val = 0; *str; str++)
16	{
17	@@ -19,9 +19,9 @@ inline unsigned int StringHash(register const char *st
18	return val;
19	}
20
21	-inline unsigned int QuickHash(register const char *str)
22	+inline unsigned int QuickHash( const char *str)
23	{
24	- register unsigned int val, tmp;
25	+ unsigned int val, tmp;
26
27	for(val = 0 ; *str ; str++)
28	{
29	@@ -32,7 +32,7 @@ inline unsigned int QuickHash(register const char *str
30	return val;
31	}
32
33	-inline unsigned long TTHash(register const char *str)
34	+inline unsigned long TTHash( const char *str)
35	{
36	unsigned long hash = 5381;
37	int c;

Removed Link Here

(-)a/sysutils/apachetop/files/patch-src_ohtbl.cc (-38 lines)
1	--- src/ohtbl.cc.orig 2018-08-28 11:24:15 UTC
2	+++ src/ohtbl.cc
3	@@ -13,7 +13,7 @@ static int primes[] = {101, 241, 499, 1009, 2003, 3001
4
5	int OAHash::getNextPrime(int size)
6	{
7	- register int *prime;
8	+ int *prime;
9	for (prime = &primes[0] ; *prime ; prime++)
10	if (*prime > size)
11	return *prime;
12	@@ -51,7 +51,7 @@ void OAHash::destroy(void)
13
14	void OAHash::insert(char key, void *data)
15	{
16	- register unsigned int p, i;
17	+ unsigned int p, i;
18	void *d;
19
20	// Do not exceed the number of positions in the table.
21	@@ -81,7 +81,7 @@ void OAHash::insert(char key, void *data)
22
23	int OAHash::remove(char *key)
24	{
25	- register unsigned int p, i;
26	+ unsigned int p, i;
27
28	for (i = 0; i < positions; ++i)
29	{
30	@@ -108,7 +108,7 @@ int OAHash::remove(char *key)
31
32	void OAHash::lookup(char key)
33	{
34	- register unsigned int p, i;
35	+ unsigned int p, i;
36
37	for (i = 0; i < positions; ++i)
38	{