svn commit: r419721 - head/net/xorp

[John Marino]

Author: marino
Date: Sat Aug  6 00:41:20 2016
New Revision: 419721
URL: https://svnweb.freebsd.org/changeset/ports/419721

Log:
  net/xorp: Fix dependency on libpcap (use ports version)
  
  The specification on libpcap came on the v1.6 => v.1.8.5 transition
  while the port was unmaintained.  Assume the change originator intended
  for the ports libpcap to be used, but didn't realize it needed an
  explicit version number to avoid the base library from satisfying the
  requirement.  While here, remove an obsolete CONFLICTS definition.
  
  PR:	211578

Modified:
  head/net/xorp/Makefile

Modified: head/net/xorp/Makefile
==============================================================================
--- head/net/xorp/Makefile	Sat Aug  6 00:26:50 2016	(r419720)
+++ head/net/xorp/Makefile	Sat Aug  6 00:41:20 2016	(r419721)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xorp
 PORTVERSION=	1.8.5
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	net
 
@@ -12,9 +13,7 @@ COMMENT=	EXtensible Open Router Platform
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
-		libpcap.so:net/libpcap
-
-CONFLICTS_INSTALL=	xorp-devel-*
+		libpcap.so.1:net/libpcap	# avoid base libpcap
 
 USES=		tar:bzip2 ncurses scons shebangfix compiler:env python:2,build
 USE_GITHUB=	yes