From ccd12ccd577604add511aad4ea4e71c32b3e2f06 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Wed, 31 Jan 2007 14:09:55 +0000
Subject: - Patch net/libnet* to versioned libraries and header files, so they
 can   coexist

PR:		ports/103861
Submitted by:	alepulver
Tested by:	pointyhat
With hat:	portmgr
---
 net/xipdump/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'net/xipdump')

diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 1781c589fe5..057eb15bf77 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xipdump
 PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
 EXTRACT_SUFX=	.tgz
@@ -15,20 +15,20 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Displays ip packets using X window
 
-BUILD_DEPENDS=	libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
 
 USE_X_PREFIX=	yes
-LIBNET_CONFIG=	${LOCALBASE}/bin/libnet-config
-CFLAGS+=	`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
-CFLAGS+=	-I${LOCALBASE}/include
-LIBS=		`${LIBNET_CONFIG} --libs`
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}"
+CONFIGURE_ENV=	LDFLAGS="`${LIBNET_CONFIG} --libs`"
+CFLAGS+=	`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \
+		-I/usr/include
 
 PLIST=	${WRKDIR}/PLIST
 
 MAN8=	xipdump.8
 
+LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
+
 post-build:
 	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 	@(cd ${WRKSRC}/data; ${FIND} pkc pkt ! -type d | \
-- 
cgit