Date: Sat, 20 Aug 2005 14:36:54 +0200 (CEST) From: Lupe Christoph <lupe@lupe-christoph.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85152: security/tripwire does not compile on 4.10 anymore does not Message-ID: <20050820123654.D1107A88A@firewally.lupe-christoph.de> Resent-Message-ID: <200508201240.j7KCeLvx078971@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85152
>Category: ports
>Synopsis: security/tripwire does not compile on 4.10 anymore does not
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 20 12:40:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Lupe Christoph
>Release: FreeBSD 4.10-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD firewally.lupe-christoph.de 4.10-RELEASE-p5 FreeBSD 4.10-RELEASE-p5 #2: Sat Dec 11 17:38:51 CET 2004 lupe@firewally.lupe-christoph.de:/usr/obj/usr/src/sys/FIREWALLY i386
FreeBSD 4.10-RELEASE-p5
>Description:
Due to recent changes to support FreeBSD 5.x, compilation fails on FreeBSD 4.x
>How-To-Repeat:
cd /usr/ports/security/tripwire
make
>Fix:
This patch is one way to make the port compile on 4.10 again. one
could just as well use a conditional depending on OSVERSION for
the whole stuff. Just a matter of taste...
--- tripwire-Makefile.patch begins here ---
--- Makefile.orig Sat Aug 20 03:07:27 2005
+++ Makefile Sat Aug 20 13:59:34 2005
@@ -54,6 +54,7 @@
.include <bsd.port.pre.mk>
PLIST_SUB+= TWCFG=${TWCFG} TWDB=${TWDB}
+CXX_regex= ${CXX:S/+/\\+/g}
pre-configure:
@ ${CP} ${TWPOL_TXT} ${WRKSRC}/policy/twpol.txt
@@ -64,14 +65,18 @@
post-extract:
- @ ${REINPLACE_CMD} -e "s|CC \= gcc|CC \= gcc295|g" ${WRKSRC}/src/STLport-4.0/src/gcc.mak
- @ ${REINPLACE_CMD} -e "s|CXX \= c\+\+|CXX \= g\+\+295|g" ${WRKSRC}/src/STLport-4.0/src/gcc.mak
+ @ ${REINPLACE_CMD} -e "s|CC \= gcc|CC \= ${CC}|g" ${WRKSRC}/src/STLport-4.0/src/gcc.mak
+ @ ${REINPLACE_CMD} -e "s|CXX \= c\+\+|CXX \= ${CXX_regex}|g" ${WRKSRC}/src/STLport-4.0/src/gcc.mak
+.if "CXX"!=c++"
@ ${REINPLACE_CMD} -e "s|ln \-s \/usr\/include\/g\+\+ include|ln \-s ${PREFIX}\/lib\/gcc\-lib\/${ARCH}\-portbld\-freebsd${OSREL}\/2.95.3\/include include|g" ${WRKSRC}/src/STLport-4.0/STLport.mak
- @ ${REINPLACE_CMD} -e "s|CC \= cc|CC \= gcc295|g" ${WRKSRC}/src/make_include/i386-unknown-freebsd.inc
- @ ${REINPLACE_CMD} -e "s|CXX \= c\+\+|CXX \= g\+\+295|g" ${WRKSRC}/src/make_include/i386-unknown-freebsd.inc
+.endif
+ @ ${REINPLACE_CMD} -e "s|CC \= cc|CC \= ${CC}|g" ${WRKSRC}/src/make_include/i386-unknown-freebsd.inc
+ @ ${REINPLACE_CMD} -e "s|CXX \= c\+\+|CXX \= ${CXX_regex}|g" ${WRKSRC}/src/make_include/i386-unknown-freebsd.inc
+.if ${OSVERSION}>=500016
@ ${REINPLACE_CMD} -e "s|LINKFLAGS_R \= \-pthread|LINKFLAGS_R \+\= \-lpthread|g" ${WRKSRC}/src/make_include/i386-unknown-freebsd.inc
@ ${REINPLACE_CMD} -e "s|LINKFLAGS_D \= \-pthread|LINKFLAGS_D \+\= \-lpthread|g" ${WRKSRC}/src/make_include/i386-unknown-freebsd.inc
- @ ${REINPLACE_CMD} -e "s|CC \= g\+\+|CC \= g\+\+295|g" ${WRKSRC}/src/cryptlib/i386-unknown-freebsd.mak
+.endif
+ @ ${REINPLACE_CMD} -e "s|CC \= g\+\+|CC \= ${CXX_regex}|g" ${WRKSRC}/src/cryptlib/i386-unknown-freebsd.mak
@ ${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/src/core/msystem.cpp
@ ${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/src/twparser/yylex.cpp
@ ${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/src/tripwire/tripwiremain.cpp
--- tripwire-Makefile.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050820123654.D1107A88A>