From owner-svn-ports-head@FreeBSD.ORG  Sun Dec  1 07:29:18 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2D087567;
 Sun,  1 Dec 2013 07:29:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1A028157D;
 Sun,  1 Dec 2013 07:29:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB17THlk025539;
 Sun, 1 Dec 2013 07:29:17 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB17THeY025538;
 Sun, 1 Dec 2013 07:29:17 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201312010729.rB17THeY025538@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 1 Dec 2013 07:29:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335367 - head/security/bro
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Dec 2013 07:29:18 -0000

Author: antoine
Date: Sun Dec  1 07:29:17 2013
New Revision: 335367
URL: http://svnweb.freebsd.org/changeset/ports/335367

Log:
  - Fix packaging with pkgng: create empty dirs to be packed in STAGEDIR
  - Fix build on FreeBSD 8: depend on libmagic ABI version from ports
  - While here, use new LIB_DEPENDS syntax
  
  PR:		ports/184194
  PR:		ports/184381
  Submitted by:	Craig Leres (maintainer)
  Reported by:	Mark Martinec and pkg-fallout

Modified:
  head/security/bro/Makefile

Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile	Sun Dec  1 07:15:49 2013	(r335366)
+++ head/security/bro/Makefile	Sun Dec  1 07:29:17 2013	(r335367)
@@ -13,7 +13,7 @@ LICENSE=	BSD
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 
 USES=		cmake:outsource perl5
 USE_PYTHON=	yes
@@ -56,13 +56,13 @@ OPTIONS_EXCLUDE=NLS DOCS
 
 # Bro 2.2 requires libmagic >= 5.04
 .if ${OSVERSION} < 901000
-LIB_DEPENDS+=	magic:${PORTSDIR}/sysutils/file
+LIB_DEPENDS+=	libmagic.so.1:${PORTSDIR}/sysutils/file
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBROCCOLI}
-LIB_DEPENDS+=	broccoli:${PORTSDIR}/security/broccoli
+LIB_DEPENDS+=	libbroccoli.so:${PORTSDIR}/security/broccoli
 .endif
 
 .if ${PORT_OPTIONS:MBROCTL}
@@ -111,8 +111,10 @@ RUN_DEPENDS+=	ipsumdump:${PORTSDIR}/net/
 .if ${PORT_OPTIONS:MBROCTL}
 post-stage::
 .if defined(BRO_PREFIX)
-	@${MKDIR} ${PREFIX}
+	@${MKDIR} ${STAGEDIR}${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