fixes to find libnet in its new home

ok pvalchev@ msf@
This commit is contained in:
mjc 2005-05-23 23:58:03 +00:00
parent 34ce8ea33a
commit dc473fd8ed
2 changed files with 15 additions and 10 deletions

View File

@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.22 2005/02/15 03:30:52 jcs Exp $
# $OpenBSD: Makefile,v 1.23 2005/05/23 23:58:03 mjc Exp $
DISTNAME= arping-2.05
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
PERMIT_PACKAGE_CDROM= Yes
@ -16,7 +17,7 @@ MASTER_SITES= ftp://ftp.habets.pp.se/pub/synscan/ \
MAINTAINER= joshua stein <jcs@openbsd.org>
LIB_DEPENDS= net::net/libnet
LIB_DEPENDS= lib/libnet-1.0/net.=0:libnet-1.0*:net/libnet/1.0
ALL_TARGET= openbsd
NO_REGRESS= Yes

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.4 2004/10/28 04:47:36 jcs Exp $
--- Makefile.orig Sun Aug 29 13:47:37 2004
+++ Makefile Wed Oct 27 23:46:10 2004
@@ -19,9 +19,9 @@
$OpenBSD: patch-Makefile,v 1.5 2005/05/23 23:58:03 mjc Exp $
--- Makefile.orig Fri Sep 24 10:43:37 2004
+++ Makefile Sun May 22 14:11:27 2005
@@ -19,9 +19,9 @@ SOLARIS=0
FREEBSD=0
MACOSX=0
@ -13,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.4 2004/10/28 04:47:36 jcs Exp $
all: message arping2
@@ -83,8 +83,10 @@
@@ -83,20 +83,22 @@ solaris:
$(MAKE) USE_NETIF=0 SOLARIS=1 arping1-make
install:
@ -25,9 +25,13 @@ $OpenBSD: patch-Makefile,v 1.4 2004/10/28 04:47:36 jcs Exp $
+ ${BSD_INSTALL_DATA} README ${PREFIX}/share/doc/arping/README
arping.o: arping.c
$(CC) -Wall $(CFLAGS) -c `libnet-config --defines` `libnet-config --cflags` arping.c
@@ -94,9 +96,9 @@
$(CC) $(CFLAGS) -g -o arping $(O_arping) `libnet-config --libs` -lpcap
- $(CC) -Wall $(CFLAGS) -c `libnet-config --defines` `libnet-config --cflags` arping.c
+ $(CC) -Wall `libnet-config-1.0 --defines` `libnet-config-1.0 --cflags` $(CFLAGS) -c arping.c
O_arping=arping.o
arping1-make: $(O_arping)
- $(CC) $(CFLAGS) -g -o arping $(O_arping) `libnet-config --libs` -lpcap
+ $(CC) `libnet-config-1.0 --libs` $(CFLAGS) -g -o arping $(O_arping) -lpcap
SYS=$(shell uname -s)
-ifeq ($(SYS),SunOS)