ports/184381: [PATCH] security/bro: Fix pkg-fallout issue.

[Craig Leres]

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

From: Craig Leres <leres at ee.lbl.gov>
To: bug-followup at FreeBSD.org
Cc: Craig Leres <leres at ee.lbl.gov>
Subject: Re: ports/184381: [PATCH] security/bro: Fix pkg-fallout issue.
Date: Fri, 29 Nov 2013 17:40:39 -0800

 This is a multi-part message in MIME format.
 --------------040403040103040900000900
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 The patch I attached to this PR does not address pkg-fallout for FreeBSD
 8.3-RELEASE:
 
     [REL - 83amd64-default][security/bro] Failed for bro-2.2 in configure
     [REL - 83i386-default][security/bro] Failed for bro-2.2 in configure
 
 The basic problem is that Bro's binpac requires libmagic 5.04 or newer
 but FreeBSD 8 shipped with 5.03.
 
 The Makefile already has:
 
     .include <bsd.port.options.mk>
 
     .if ${PORT_OPTIONS:MBROCCOLI}
     LIB_DEPENDS+=   broccoli:${PORTSDIR}/security/broccoli
     .endif
 
 Which should be sufficient based on my read of the porters handbook:
 
 
 http://www.freebsd.org/doc/en/books/porters-handbook/makefile-depend.html
 
     5.8.1. LIB_DEPENDS
 
 	This variable specifies the shared libraries this port
 	depends on. It is a list of lib:dir tuples where lib is the
 	name of the shared library, dir is the directory in which
 	to find it in case it is not available. For example,
 
 	    LIB_DEPENDS=   libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 	will check for a shared jpeg library with any version, and
 	descend into the graphics/jpeg subdirectory of your ports
 	tree to build and install it if it is not found.
 
 	*The dependency is checked twice, once from within the build
 	target and then from within the install target.* Also, the
 	name of the dependency is put into the package so that
 	pkg_add(1) will automatically install it if it is not on
 	the user's system.
 
 However it doesn't appear to actually work that way so the revised patch
 (attached) adds a BUILD_DEPENDS for sysutils/file. This was tested on
 8.2-RELEASE.
 
 		Craig
 
 --------------040403040103040900000900
 Content-Type: text/plain; charset=us-ascii;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 --- Makefile.orig	2013-11-23 04:25:30.000000000 -0800
 +++ Makefile	2013-11-29 17:33:17.000000000 -0800
 @@ -56,6 +56,7 @@
  
  # Bro 2.2 requires libmagic >= 5.04
  .if ${OSVERSION} < 901000
 +BUILD_DEPENDS+=	magic:${PORTSDIR}/sysutils/file
  LIB_DEPENDS+=	magic:${PORTSDIR}/sysutils/file
  .endif
  
 @@ -113,6 +114,8 @@
  .if defined(BRO_PREFIX)
  	@${MKDIR} ${PREFIX}
  .endif
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site
  .for F in broctl.cfg
  	@${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example
  .endfor
 
 --------------040403040103040900000900--