11 files changed, 14 insertions, 22 deletions

diff --git a/net/acx100/Makefile b/net/acx100/Makefile
index 5ef5f7fa40e7..aaa257863fc6 100644
--- a/net/acx100/Makefile
+++ b/net/acx100/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	acx100
 PORTVERSION=	20040701
 PORTREVISION=	1
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	http://dev.kewl.org/download/:file_0 \
 		ftp://ftp.dlink.co.uk/wireless/dwl-650+/:file_1
 DISTFILES=	${DISTFILE_0}:file_0 \
diff --git a/net/ipvs/Makefile b/net/ipvs/Makefile
index af783c26d853..57dce406ba3f 100644
--- a/net/ipvs/Makefile
+++ b/net/ipvs/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ipvs
 PORTVERSION=	0.4.0
 PORTREVISION=	2
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	http://www.cultdeadsheep.org/~clement/FreeBSD/ipvs/
 DISTNAME=	ipvs-${PORTVERSION}_${PORTREVISION}
 
diff --git a/net/ipw-firmware-kmod/Makefile b/net/ipw-firmware-kmod/Makefile
index 72ce9a97eb85..60aa1127a1b7 100644
--- a/net/ipw-firmware-kmod/Makefile
+++ b/net/ipw-firmware-kmod/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	ipw-firmware
 PORTVERSION=	${FWVERSION}
 PORTREVISION?=	3
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/ipw
 PKGNAMESUFFIX=	-kmod
diff --git a/net/ipw-firmware/Makefile b/net/ipw-firmware/Makefile
index 3d7ba663bc78..63b87c7490eb 100644
--- a/net/ipw-firmware/Makefile
+++ b/net/ipw-firmware/Makefile
@@ -9,7 +9,7 @@ PORTNAME?=	ipw-firmware
 RELNAME?=	ipw2100
 PORTVERSION?=	1.3
 PORTREVISION?=	8
-CATEGORIES=	net sysutils
+CATEGORIES=	net sysutils kld
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/ipw
 DISTFILES=	${RELNAME}-fw-${PORTVERSION}.tgz
diff --git a/net/iwi-firmware-kmod/Makefile b/net/iwi-firmware-kmod/Makefile
index 61aa114361c6..a82a5edbec2f 100644
--- a/net/iwi-firmware-kmod/Makefile
+++ b/net/iwi-firmware-kmod/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iwi-firmware
 PORTREVISION=	3
-CATEGORIES=	net sysutils
+CATEGORIES=	net sysutils kld
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Intel PRO/Wireless 2200 Firmware Kernel Module
diff --git a/net/iwi-firmware/Makefile b/net/iwi-firmware/Makefile
index 53eda83a1374..f8c1111aaf7f 100644
--- a/net/iwi-firmware/Makefile
+++ b/net/iwi-firmware/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	iwi-firmware
 RELNAME=	ipw2200
 PORTVERSION=	2.4
 PORTREVISION=	7
-CATEGORIES=	net sysutils
+CATEGORIES=	net sysutils kld
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Intel PRO/Wireless 2200 Driver Firmware
diff --git a/net/ng_car/Makefile b/net/ng_car/Makefile
index 3eb7f9b5c431..b59667ca3eff 100644
--- a/net/ng_car/Makefile
+++ b/net/ng_car/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ng_car
 PORTVERSION=	0.4
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
 
diff --git a/net/ng_daphne/Makefile b/net/ng_daphne/Makefile
index e898b2524c2b..693521828ea3 100644
--- a/net/ng_daphne/Makefile
+++ b/net/ng_daphne/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ng_daphne
 PORTVERSION=	1.0
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	http://newton.ee.auth.gr/ng_daphne/
 
 MAINTAINER=	gedimitr@auth.gr
@@ -21,14 +21,7 @@ IGNORE=		"Requires kernel source (/usr/src/sys) to build"
 .endif
 MAKE_ENV+=	WERROR=
 
-.if ${OSVERSION} < 500000
-IGNORE=		"Requires new netgraph architecture ng_item to build"
-.endif
-
-.if ${OSVERSION} > 502010
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-ng_daphne.c
-.endif
-
 PLIST_FILES=	lib/ng_daphne.ko
 PORTDOCS=	README
 
diff --git a/net/ng_netflow/Makefile b/net/ng_netflow/Makefile
index 5eb87de7d59a..6a00f42e6854 100644
--- a/net/ng_netflow/Makefile
+++ b/net/ng_netflow/Makefile
@@ -7,13 +7,16 @@
 
 PORTNAME=	ng_netflow
 PORTVERSION=	0.2.5
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	http://cell.sick.ru/~glebius/ng_netflow/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ng-netflow
 
 MAINTAINER=	glebius@FreeBSD.org
 COMMENT=	Netgraph node implementing Cisco (c) netflow
+DEPRECATED=	already in base in all supported versions of FreeBSD
+EXPIRATION_DATE=	2007-08-29
+
 
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
@@ -25,10 +28,6 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 503101
-IGNORE=		"already exists in base system"
-.endif
-
 pre-fetch:
 
 .if !exists(${SRC_BASE}/sys/Makefile)
diff --git a/net/nvnet/Makefile b/net/nvnet/Makefile
index 4295ee909524..cf26974c93c2 100644
--- a/net/nvnet/Makefile
+++ b/net/nvnet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvnet
 PORTVERSION=	1.0.0301
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	http://www.onthenet.com.au/~q/nvnet/
 DISTFILES=	${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
 
diff --git a/net/p54u/Makefile b/net/p54u/Makefile
index 89b638778097..a008501cdda4 100644
--- a/net/p54u/Makefile
+++ b/net/p54u/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	p54u
 PORTVERSION=	0.8
-CATEGORIES=	net
+CATEGORIES=	net kld
 MASTER_SITES=	http://www.prism54.org/p54u/releases/
 
 MAINTAINER=	lekernel@prism54.org