Since devel/libnet has been removed from pkgsrc, this package now needs

to depend on devel/libnet11. Because the default option had been to use
libnet and now is libnet11, PKGREVISION++.

There are no more PKG_OPTIONS left.

2 files changed, 4 insertions, 55 deletions

diff --git a/net/arping/Makefile b/net/arping/Makefile
index 03aee17d4dc..94a3a774dd6 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:01 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/21 16:43:56 rillig Exp $
 #
 
 DISTNAME=		arping-2.05
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.habets.pp.se/pub/synscan/
 
@@ -9,35 +10,13 @@ MAINTAINER=		cube@NetBSD.org
 HOMEPAGE=		http://www.habets.pp.se/synscan/programs.php?prog=arping
 COMMENT=		ARP-level ping utility
 
-NO_CONFIGURE=		yes
-
 LIBS.SunOS+=		-lsocket -lnsl
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-BUILD_FOR=		openbsd
-.elif ${OPSYS} == "Linux"
-BUILD_FOR=		linux
-.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-BUILD_FOR=		freebsd
-.elif ${OPSYS} == "SunOS"
-BUILD_FOR=		solaris
-.elif ${OPSYS} == "Darwin"
-BUILD_FOR=		macosx
-.endif
-
-.if !empty(PKG_OPTIONS:Marping1)
-BUILD_TARGET=		arping1 ${BUILD_FOR}
-.endif
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
-.include "../../net/libpcap/buildlink3.mk"
-
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/arping.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/arping ${PREFIX}/bin
 
+.include "../../devel/libnet11/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/arping/options.mk b/net/arping/options.mk
deleted file mode 100644
index bdb3db7745a..00000000000
--- a/net/arping/options.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/12/03 21:48:54 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.arping
-PKG_OPTIONS_REQUIRED_GROUPS=	libnet
-PKG_OPTIONS_GROUP.libnet=	arping1 arping2
-PKG_SUGGESTED_OPTIONS= 	arping1
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Can't support both versions of arping
-###
-.if !empty(PKG_OPTIONS:Marping1) && !empty(PKG_OPTIONS:Marping2)
-PKG_FAIL_REASON+=	"arping1 and arping2 cannot both be selected." \
-			"This is due to the conflicting versions of libnet."
-.endif
-
-###
-### Build arping1 which uses libnet 1.0.x branch as is more tested
-###
-.if !empty(PKG_OPTIONS:Marping1)
-.	include "../../devel/libnet/buildlink3.mk"
-.endif
-
-###
-### Build arping2 which uses libnet 1.1.x branch as is less tested
-###
-.if !empty(PKG_OPTIONS:Marping2)
-.	include "../../devel/libnet11/buildlink3.mk"
-.endif