diff options
| author | rillig <rillig@pkgsrc.org> | 2007-02-22 17:15:21 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-02-22 17:15:21 +0000 |
| commit | ce8ae05e7ad3165fac09eea2a2c17fbe45986f18 (patch) | |
| tree | f15726fb9212f725177e54d23c7f73e84e1e61c2 | |
| parent | a31b2a7c96924ca9206c8269faf094176fe15f49 (diff) | |
| download | pkgsrc-ce8ae05e7ad3165fac09eea2a2c17fbe45986f18.tar.gz | |
I know I had tested the package when I did the last change, and it had
worked. But somehow, today it didn't work anymore.
Fixed everything by removing the patch for the Makefile and doing the
whole build command in the package Makefile.
Fixes PR 35786.
| -rw-r--r-- | net/arping/Makefile | 7 | ||||
| -rw-r--r-- | net/arping/distinfo | 3 | ||||
| -rw-r--r-- | net/arping/patches/patch-aa | 29 |
3 files changed, 7 insertions, 32 deletions
diff --git a/net/arping/Makefile b/net/arping/Makefile index 94a3a774dd6..949c3fce118 100644 --- a/net/arping/Makefile +++ b/net/arping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/02/21 16:43:56 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2007/02/22 17:15:21 rillig Exp $ # DISTNAME= arping-2.05 @@ -10,8 +10,13 @@ MAINTAINER= cube@NetBSD.org HOMEPAGE= http://www.habets.pp.se/synscan/programs.php?prog=arping COMMENT= ARP-level ping utility +LIBS+= -lnet -lpcap LIBS.SunOS+= -lsocket -lnsl INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 +CPPFLAGS+= -I${LOCALBASE}/include/libnet11 + +do-build: + cd ${WRKSRC} && cc ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o arping arping-2/arping.c do-install: ${INSTALL_MAN} ${WRKSRC}/arping.8 ${PREFIX}/${PKGMANDIR}/man8 diff --git a/net/arping/distinfo b/net/arping/distinfo index 60654922370..1d905e72389 100644 --- a/net/arping/distinfo +++ b/net/arping/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:42 agc Exp $ +$NetBSD: distinfo,v 1.4 2007/02/22 17:15:21 rillig Exp $ SHA1 (arping-2.05.tar.gz) = 35434c22679284607a49319cf1ff566c0af935e6 RMD160 (arping-2.05.tar.gz) = de682f2dc4e2dc7a60dd584bbed0a7834b7e85fd Size (arping-2.05.tar.gz) = 32287 bytes -SHA1 (patch-aa) = bf47354f1c8d9157bea0a572d52ef5c9eea62dd4 SHA1 (patch-ab) = 17ef8cc62a202589bb9efb276d1bd99772648a22 diff --git a/net/arping/patches/patch-aa b/net/arping/patches/patch-aa deleted file mode 100644 index 31004fab3be..00000000000 --- a/net/arping/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2005/02/01 18:24:34 adrianp Exp $ - ---- Makefile.orig 2004-08-29 19:47:37.000000000 +0100 -+++ Makefile 2005-01-21 00:09:28.000000000 +0000 -@@ -19,9 +19,9 @@ - FREEBSD=0 - MACOSX=0 - --CC=gcc -+#CC=gcc - # explicit pcap include dir is for redhat which is fux0red --CFLAGS=-g -I/usr/local/include -L/usr/local/lib -DFINDIF=$(FINDIF) -DUSE_NETIF=$(USE_NETIF) -DOPENBSD=$(OPENBSD) -DLINUX=$(LINUX) -DSOLARIS=$(SOLARIS) -DFREEBSD=$(FREEBSD) -DMACOSX=$(MACOSX) -I/usr/include/pcap -+CFLAGS=-I$(BUILDLINK_DIR)/include -L$(BUILDLINK_DIR)/lib -DFINDIF=$(FINDIF) -DUSE_NETIF=$(USE_NETIF) -DOPENBSD=$(OPENBSD) -DLINUX=$(LINUX) -DSOLARIS=$(SOLARIS) -DFREEBSD=$(FREEBSD) -DMACOSX=$(MACOSX) - - all: message arping2 - -@@ -94,9 +94,9 @@ - $(CC) $(CFLAGS) -g -o arping $(O_arping) `libnet-config --libs` -lpcap - - SYS=$(shell uname -s) --ifeq ($(SYS),SunOS) --EXTRA_LIBS=-lsocket -lnsl --endif -+#ifeq ($(SYS),SunOS) -+#EXTRA_LIBS=-lsocket -lnsl -+#endif - - O_arping2=arping-2/arping.c - arping2: arping-2/arping |