diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile index 7cc3f2cb182c..73371d98fd91 100644 --- a/net/ipsumdump/Makefile +++ b/net/ipsumdump/Makefile @@ -1,45 +1,45 @@ PORTNAME= ipsumdump DISTVERSION= 1.86 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://read.seas.harvard.edu/~kohler/ipsumdump/ MAINTAINER= leres@FreeBSD.org COMMENT= Produce ASCII summary of network traffic or tcpdump(1) file WWW= https://read.seas.harvard.edu/~kohler/ipsumdump LICENSE= CLICK LICENSE_NAME= Click license LICENSE_FILE= ${WRKSRC}/libclick-2.1/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= gmake perl5 GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share USE_PERL5= build PORTDOCS= README.md PLIST_FILES= bin/ipaggcreate bin/ipsumdump bin/ipaggmanip \ share/man/man1/${PORTNAME}.1.gz \ share/man/man1/ipaggmanip.1.gz \ share/man/man1/ipaggcreate.1.gz OPTIONS_DEFINE= IPV6 DOCS OPTIONS_SUB= yes IPV6_CONFIGURE_ENABLE= ipv6 # Try to unbreak parallel (-jX) builds post-patch: @${ECHO_CMD} 'src: @LIBCLICK_TARGET@' >> ${WRKSRC}/Makefile.in post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ipsumdump @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ipaggcreate @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ipaggmanip post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include 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 --#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 --#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;