From nobody Sun Jan 21 12:51:46 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 4THtXL4GLlz57PL6;
Sun, 21 Jan 2024 12:51:46 +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 4THtXL3cQKz4T0Q;
Sun, 21 Jan 2024 12:51:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1705841506;
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=OVArwCyUvsPg6wXr9SK/U914up1O06lCg3kffZvKPcY=;
b=aYH5vjp1+pXmUtg/0XAG8pntIhiyOgKzYIiJO5LXiqLfBT4hoVqsXJDTWR+ynrQImXOKlb
9R/tFtdmbM35J2YBmi2XAJ33tRr3hWJWiQ2Blvfw9bF1/aI+tu0WVUs9wPV2KIltv6x7D+
AR7CmhyLJdZdN5Clk00kDgEX2Vj5u21XF4n+esYbIAwz3o/yQJcnhmiJ2jCSB1VgLPSCNY
xx1mtUUhhNvuUecdrWEESWgAcSNZP62Wx9qjOoj76aNnFfuGjwGVPj9Kf2+WIO/dqVDFFV
HjHpjl24hRCikbVh2g/oYqOvmKGNKxYxqX1Jt7coTpr/nmp8v6Bu4i8CwyL8+A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1705841506;
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=OVArwCyUvsPg6wXr9SK/U914up1O06lCg3kffZvKPcY=;
b=UjYnWkh4EtbldOTKR10JEDbwqplPK1yIRc3LD7cP1sO86a+GreIB8DFBDVOsm353QV3zMc
DHAGguMSovhOo0WIi3e7Cf7w3T0+PbYfpGYxET0TNfH3iZLawg0ciVLSBc14NtebHwnqrZ
armVZPlh8h4M69n6fvV2gXSL+GlNNlDsGJIyShGZZsF9stA5K/mJnDsIHw9b/MKvG6KrW1
C5+XO8xSRCXxkKOdIasJyMyWYDOAQcUW2n2wcyMVU/EDWs9fi92e3eHRmuTAHiGaed/dHN
fWBDhxRC30z4HlJLydE17OpTWdAxXpXWMX3uHoZaUxxfsvrKOwcRf1dkwFRAAA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705841506; a=rsa-sha256; cv=none;
b=IpZegkTNgl5DAyM52I5Y6aqsulJcvqUnFeMmBjiS1iodBMYxor99Ifve8/s7xrJsIJAXtg
w1tTHHauNkUVN6DsijozPA2jgVfM+Ud6u83kSeEuXKjT6tBmUOqUjTWhpu4enpwYohGAWi
w3Dq6O7mp6k9wjw+kNNdM6hET0dIbKhGGu676CZI7pUnfmRFl41dI5kAQYDbgaei1mPzE6
RAiESIio8hiwQDGu9oquPfOpABPqNx9hn2dR+gS+1zPoJWQns0BW1IzxXKjoVNR0UELkcZ
kstyd988EvS2fgUwkIjblvyiApgUbRTn2nfmWJwzgnTvj18EQ7KLm9+omPhhpw==
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 4THtXL2jhmzJs2;
Sun, 21 Jan 2024 12:51:46 +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 40LCpkXB007617;
Sun, 21 Jan 2024 12:51:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LCpkXE007614;
Sun, 21 Jan 2024 12:51:46 GMT
(envelope-from git)
Date: Sun, 21 Jan 2024 12:51:46 GMT
Message-Id: <202401211251.40LCpkXE007614@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Subject: git: 6d8dd71bd798 - main - benchmarks/spp: Sanitize MANPREFIX
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
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: bofh
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 6d8dd71bd798c6830a873e65124d75b19b596130
Auto-Submitted: auto-generated
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6d8dd71bd798c6830a873e65124d75b19b596130
commit 6d8dd71bd798c6830a873e65124d75b19b596130
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-21 12:50:37 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-21 12:51:18 +0000
benchmarks/spp: Sanitize MANPREFIX
Approved by: portmgr (blanket)
---
benchmarks/spp/Makefile | 2 +-
benchmarks/spp/files/patch-Makefile | 44 +++++++++++++++++++++++++++++++------
2 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/benchmarks/spp/Makefile b/benchmarks/spp/Makefile
index 055bcc2b8f13..3c64e73cd088 100644
--- a/benchmarks/spp/Makefile
+++ b/benchmarks/spp/Makefile
@@ -16,6 +16,6 @@ USES= tar:bzip2
BB_TAGNAME= 8cfe6814ce52
WRKSRC= ${WRKDIR}/caia-swin-${PORTNAME}-${BB_TAGNAME}
-PLIST_FILES= bin/spp man/man1/spp.1.gz
+PLIST_FILES= bin/spp share/man/man1/spp.1.gz
.include <bsd.port.mk>
diff --git a/benchmarks/spp/files/patch-Makefile b/benchmarks/spp/files/patch-Makefile
index 30fa5a51f9a5..461471f1989b 100644
--- a/benchmarks/spp/files/patch-Makefile
+++ b/benchmarks/spp/files/patch-Makefile
@@ -1,17 +1,32 @@
---- Makefile.orig 2015-05-21 00:10:33 UTC
+--- Makefile.orig 2020-11-09 06:43:39 UTC
+++ Makefile
-@@ -39,8 +39,8 @@ INCLUDES = $(SRCDIR)/crc32.h \
- SLIBS= -pthread -lpcap
+@@ -5,7 +5,7 @@
+ #
+ # <default> : see target "all"
+ # all : build all source and binaries
+-# clean : clean up object files and binaries
++# clean : clean up object files and binaries
+ #
+ # Amiel Heyde
+ #
+@@ -36,13 +36,13 @@ INCLUDES = $(SRCDIR)/crc32.h \
+ $(SRCDIR)/rtp.h \
+ $(SRCDIR)/config.h
+
+-
+
++
+ SLIBS= -pthread -lpcap -lm
BINDIR=./bin
PROGRAM= $(BINDIR)/$(NAME)
-CFLAGS += -I/usr/local/include
-LDFLAGS += -L/usr/local/lib
-+CFLAGS += -I$(LOCALBASE)/include
++CFLAGS += -I$(LOCALBASE)/include
+LDFLAGS += -L$(LOCALBASE)/lib
INSTALL= install
-@@ -48,11 +48,11 @@ INSTALL= install
+@@ -50,11 +50,11 @@ INSTALL= install
# If, for some reason, you don't want debugging info to bewww
# logged, then comment the following line.
#
@@ -25,7 +40,14 @@
# turn on optimisation
CFLAGS += -O2
-@@ -79,13 +79,10 @@ clean:
+@@ -76,19 +76,16 @@ $(PROGRAM): $(OBJECTS)
+
+ $(PROGRAM): $(OBJECTS)
+ mkdir -p bin
+- $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(SLIBS)
++ $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(SLIBS)
+
+ clean:
rm -f $(PROGRAM) *.o $(SRCDIR)/*.o *~
install:
@@ -37,7 +59,15 @@
+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/
@echo "Installing manual page"
- $(INSTALL) -c -m 644 doc/spp.1 /usr/local/man/man1/
-+ $(BSD_INSTALL_MAN) doc/spp.1 $(DESTDIR)$(PREFIX)/man/man1/
++ $(BSD_INSTALL_MAN) doc/spp.1 $(DESTDIR)$(PREFIX)/share/man/man1/
# target 'distro'
#
+@@ -99,7 +96,3 @@ distro:
+ distro:
+ #Make a gzip archive with only the necessary files
+ mkdir $(DISTRONAME); rsync -av --exclude .hgtags --exclude .hg --exclude bin --exclude spp-0.4.2 . $(DISTRONAME); tar --exclude="*.svn*" --exclude="*.o" --exclude="*~" --exclude="*.old" --exclude="*.orig" --exclude="*.kde*" --exclude="*.out" --exclude="*.new" --exclude="*Doxyfile*" --exclude="*bin/spp*" --exclude="src-fork" --exclude="spp-*.tar.gz" --format=ustar -cvf ${DISTRONAME}.tar ${DISTRONAME}; rm -rf $(DISTRONAME); gzip $(DISTRONAME).tar;
+-
+-
+-
+-