git: 39a4ccbcc896 - main - net/ipsumdump: Unbreak amd64 build after 64825b9

The branch main has been updated by leres:

URL: https://cgit.FreeBSD.org/ports/commit/?id=39a4ccbcc896b3e67f9c1ab9f65dea77959c3ec5

commit 39a4ccbcc896b3e67f9c1ab9f65dea77959c3ec5
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2024-06-06 17:41:07 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2024-06-06 17:41:07 +0000

    net/ipsumdump: Unbreak amd64 build after 64825b9
    
    aggwtree.cc:859:7: error: use of undeclared identifier 'bswap_32'
                    add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                        ^
    aggwtree.cc:859:28: error: use of undeclared identifier 'bswap_32'
                    add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                                             ^
    2 errors generated.
    gmake[1]: *** [Makefile:46: aggwtree.o] Error 1
    gmake[1]: *** Waiting for unfinished jobs....
    aggtree.cc:1139:7: error: use of undeclared identifier 'bswap_32'
                    add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                        ^
    aggtree.cc:1139:28: error: use of undeclared identifier 'bswap_32'
                    add(bswap_32(ubuf[2*i]), bswap_32(ubuf[2*i + 1]));
                                             ^
    2 errors generated.
---
 net/ipsumdump/Makefile                    |  2 +-
 net/ipsumdump/files/patch-src_aggtree.cc  | 15 ++++++++-------
 net/ipsumdump/files/patch-src_aggwtree.cc | 15 ++++++++-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile
index 7cc3f2cb182c..73371d98fd91 100644
--- a/net/ipsumdump/Makefile
+++ b/net/ipsumdump/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ipsumdump
 DISTVERSION=	1.86
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://read.seas.harvard.edu/~kohler/ipsumdump/
 
diff --git a/net/ipsumdump/files/patch-src_aggtree.cc b/net/ipsumdump/files/patch-src_aggtree.cc
index dc49fccb44f5..1cbb8328fc40 100644
--- a/net/ipsumdump/files/patch-src_aggtree.cc
+++ b/net/ipsumdump/files/patch-src_aggtree.cc
@@ -1,13 +1,14 @@
---- src/aggtree.cc.orig	2024-06-01 22:57:34 UTC
+--- src/aggtree.cc.orig	2014-05-02 12:23:53 UTC
 +++ src/aggtree.cc
-@@ -10,10 +10,6 @@
- 
+@@ -11,9 +11,11 @@
  #ifdef HAVE_BYTEORDER_H
  #include <byteorder.h>
--#else
--static inline uint32_t bswap_32(uint32_t u) {
--    return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
--}
+ #else
++#if !defined(__powerpc64__) && !defined(POWERPC64)
+ static inline uint32_t bswap_32(uint32_t u) {
+     return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
+ }
++#endif
  #endif
  
  
diff --git a/net/ipsumdump/files/patch-src_aggwtree.cc b/net/ipsumdump/files/patch-src_aggwtree.cc
index ad10f30c1ef9..18eb0e674202 100644
--- a/net/ipsumdump/files/patch-src_aggwtree.cc
+++ b/net/ipsumdump/files/patch-src_aggwtree.cc
@@ -1,13 +1,14 @@
---- src/aggwtree.cc.orig	2024-06-01 22:57:44 UTC
+--- src/aggwtree.cc.orig	2014-05-02 12:23:53 UTC
 +++ src/aggwtree.cc
-@@ -9,10 +9,6 @@
- 
+@@ -10,9 +10,11 @@
  #ifdef HAVE_BYTEORDER_H
  #include <byteorder.h>
--#else
--static inline uint32_t bswap_32(uint32_t u) {
--    return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
--}
+ #else
++#if !defined(__powerpc64__) && !defined(POWERPC64)
+ static inline uint32_t bswap_32(uint32_t u) {
+     return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24));
+ }
++#endif
  #endif
  
  typedef AggregateWTree::WNode WNode;