ports/73304: Tripwire on 5.3.x (with fix attached)

[Patrick Dung]

The following reply was made to PR ports/73304; it has been noted by GNATS.

From: Patrick Dung <patrick_dkt at yahoo.com.hk>
To: freebsd-gnats-submit at FreeBSD.org, patrick_dkt at yahoo.com.hk
Cc:  
Subject: Re: ports/73304: Tripwire on 5.3.x (with fix attached)
Date: Sat, 30 Oct 2004 21:32:06 +0800

 This is a multi-part message in MIME format.
 --------------050209050000090605000308
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Opps. I mixed up something. The attached files should be the correct patch.
 
 --------------050209050000090605000308
 Content-Type: text/plain;
  name="patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="patch"
 
 --- Makefile.orig	2004-10-30 21:20:58.000000000 +0800
 +++ Makefile	2004-10-30 14:10:36.000000000 +0800
 @@ -2,7 +2,7 @@
  # Date created:		Tue Mar  6 06:57:58 PST 2001
  # Whom:			Cy Schubert <Cy.Schubert at uumail.gov.bc.ca>
  #
 -# $FreeBSD: /repoman/r/pcvs/ports/security/tripwire/Makefile,v 1.26 2004/06/07 11:55:18 cy Exp $
 +# $FreeBSD: ports/security/tripwire/Makefile,v 1.26 2004/06/07 11:55:18 cy Exp $
  #
  
  PORTNAME=	tripwire
 @@ -26,6 +26,9 @@
  MAKE_ARGS=	SYSPRE=${ARCH}-unknown-freebsd
  IS_INTERACTIVE=	yes
  
 +USE_GCC=	2.95
 +USE_REINPLACE=	YES
 +
  # Tripwire config files are stored in TWCFG
  TWCFG?=		/usr/local/etc/tripwire
  # Tripwire policy files are stored in TWPOLICY.
 @@ -49,9 +52,9 @@
  
  .include <bsd.port.pre.mk>
  
 -.if ${OSVERSION} >= 500000
 -BROKEN=		"Fails to build under 5.X"
 -.endif
 +#.if ${OSVERSION} >= 500000
 +#BROKEN=		"Fails to build under 5.X"
 +#.endif
  
  PLIST_SUB+=	TWCFG=${TWCFG} TWDB=${TWDB}
  
 @@ -62,6 +65,20 @@
  	@ ${MV} ${WRKSRC}/man/man4/twconfig.4 ${WRKSRC}/man/man5/twconfig.5
  	@ ${MV} ${WRKSRC}/man/man4/twpolicy.4 ${WRKSRC}/man/man5/twpolicy.5
  
 +
 +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|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
 +	@ ${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
 +	@ ${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
 +	
  install-software:
  	@ ${ECHO_CMD} TWPOLICY=${TWPOLICY} >> ${WRKSRC}/install/install.cfg
  	@ ${ECHO_CMD} TWSITEKEYDIR=${TWSITEKEYDIR} >> ${WRKSRC}/install/install.cfg
 
 --------------050209050000090605000308--