From cb240e58aed6f60a95fd87cdc87935707783d9bf Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Fri, 12 Sep 2008 21:00:07 +0000 Subject: [PATCH] - Unbreak on 64-bit, little-endian machines (read: amd64) Approved by: portmgr (marcus) --- security/tripwire12/Makefile | 2 ++ security/tripwire12/files/patch-aux_Makefile | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 security/tripwire12/files/patch-aux_Makefile diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile index 275427dfd381..57bd817857ae 100644 --- a/security/tripwire12/Makefile +++ b/security/tripwire12/Makefile @@ -28,6 +28,8 @@ post-extract: post-patch: @${PERL} -pi -e 's|/secureplace/bin|${PREFIX}/bin|g;' \ -e 's|/usr/man|${PREFIX}/man|g;' ${WRKSRC}/Makefile + ${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ + 's|bs_ntohl|ntohl|g;s|bs_htonl|htonl|g' pre-configure: @ ${CP} ${FILESDIR}/conf-freebsd2.h ${WRKSRC}/configs diff --git a/security/tripwire12/files/patch-aux_Makefile b/security/tripwire12/files/patch-aux_Makefile new file mode 100644 index 000000000000..40f6a69614e4 --- /dev/null +++ b/security/tripwire12/files/patch-aux_Makefile @@ -0,0 +1,12 @@ +--- aux/Makefile.orig 2008-09-12 17:24:07.293242000 +0000 ++++ aux/Makefile 2008-09-12 17:25:08.192241000 +0000 +@@ -13,7 +13,8 @@ + @echo "### Ignore warnings about shift count negative/too large on line 36" + @echo "###" + $(CC) $(CFLAGS) $(LDFLAGS) byteorder.c -o byteorder +- (./byteorder; cat ./ntohl.h) > $(BORDER) ++ (./byteorder; cat ./ntohl.h) > /dev/null ++ @touch $(BORDER) + + $(INODE): types.sh types.c types + $(SHELL) ./types.sh "$(CPP)" > $(INODE)