8 files changed, 20 insertions, 68 deletions

diff --git a/multimedia/cuse4bsd-kmod/Makefile b/multimedia/cuse4bsd-kmod/Makefile
index c6dcf2e298c2..89377c677cfd 100644
--- a/multimedia/cuse4bsd-kmod/Makefile
+++ b/multimedia/cuse4bsd-kmod/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cuse4bsd-kmod
 PORTVERSION=	0.1.30
-CATEGORIES=	multimedia kld
+CATEGORIES=	multimedia
 MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
 		http://home.selasky.org:8192/distfiles/
 
@@ -11,10 +11,8 @@ COMMENT=	Cuse4BSD character device loopback driver for userspace
 
 CONFLICTS=	video4bsd-kmod*
 
-SSP_UNSAFE=	kernel module does not support ssp
 USE_BZIP2=	yes
 
-KMODDIR=	/boot/modules
 KMODNAME=	cuse4bsd
 LIBDIR=		${PREFIX}/lib
 INCLUDEDIR=	${PREFIX}/include
@@ -22,7 +20,6 @@ MANDIR=		${PREFIX}/man/man
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	KMODNAME="${KMODNAME}" \
-		KMODDIR="${KMODDIR}" \
 		LIBDIR="${LIBDIR}" \
 		INCLUDEDIR="${INCLUDEDIR}" \
 		MANDIR="${MANDIR}"
@@ -30,6 +27,8 @@ PLIST_SUB=	KMODNAME="${KMODNAME}" \
 OPTIONS_DEFINE=	DEBUG
 
 NO_STAGE=	yes
+
+USES=		kmod
 .include <bsd.port.options.mk>
 
 MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}"
@@ -41,6 +40,5 @@ MAKE_ARGS+=" HAVE_DEBUG=YES"
 do-install:
 	${MAKE} -C ${WRKSRC} -f ${WRKSRC}/Makefile.lib ${PLIST_SUB} install
 	${INSTALL_KLD} ${WRKSRC}/${KMODNAME}.ko ${KMODDIR}
-	kldxref ${KMODDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/cuse4bsd-kmod/pkg-plist b/multimedia/cuse4bsd-kmod/pkg-plist
index 16bf682ae01f..09737923e877 100644
--- a/multimedia/cuse4bsd-kmod/pkg-plist
+++ b/multimedia/cuse4bsd-kmod/pkg-plist
@@ -24,5 +24,3 @@ man/man3/cuse_vmfree.3.gz
 man/man3/cuse_wait_and_process.3.gz
 @cwd %%KMODDIR%%
 %%KMODNAME%%.ko
-@exec kldxref %%KMODDIR%%
-@unexec kldxref %%KMODDIR%%
diff --git a/multimedia/linux_dvbwrapper-kmod/Makefile b/multimedia/linux_dvbwrapper-kmod/Makefile
index 38fc28c21105..eef6932a7e46 100644
--- a/multimedia/linux_dvbwrapper-kmod/Makefile
+++ b/multimedia/linux_dvbwrapper-kmod/Makefile
@@ -4,37 +4,24 @@
 PORTNAME=	linux_dvbwrapper-kmod
 PORTVERSION=	1.0
 PORTREVISION=	1
-CATEGORIES=	multimedia kld
+CATEGORIES=	multimedia
 DISTFILES=	# none
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Linux compatibility layer - DVB ioctl handler
 
-SSP_UNSAFE=	kernel module does not support ssp
 ONLY_FOR_ARCHS=	i386 amd64
 
 NO_STAGE=	yes
+
+USES=		kmod
 .include <bsd.port.pre.mk>
 
 PLIST_FILES+=	"@cwd /"
 PLIST_FILES+=	${KMODDIR:C,^/,,}/linux_dvbwrapper.ko
-PLIST_FILES+=	"@exec kldxref ${KMODDIR}"
-PLIST_FILES+=	"@unexec kldxref ${KMODDIR}"
-
-# install where x11/nvidia-driver does also:
-KMODDIR=	/boot/modules
-
-MAKE_ENV+=	KMODDIR="${KMODDIR}"
-
-SYSDIR?=	${SRC_BASE}/sys
-MAKE_ENV+=	SYSDIR="${SYSDIR}"
 
 CFLAGS+=	${DEBUG_FLAGS}
 
-.if !exists(${SYSDIR}/Makefile)
-IGNORE=		requires kernel source to be installed
-.endif
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/Makefile ${FILESDIR}/*.[ch] ${WRKSRC}
diff --git a/multimedia/linux_v4l2wrapper-kmod/Makefile b/multimedia/linux_v4l2wrapper-kmod/Makefile
index c7cec77b6ee5..875e3947362f 100644
--- a/multimedia/linux_v4l2wrapper-kmod/Makefile
+++ b/multimedia/linux_v4l2wrapper-kmod/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	linux_v4l2wrapper-kmod
 PORTVERSION=	1.0
 PORTREVISION=	2
-CATEGORIES=	multimedia kld
+CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/nox \
 		http://people.freebsd.org/~ae/
 DISTNAME=	linux_v4l2_kld
@@ -18,20 +18,12 @@ PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/linux_v4l2
 
 NO_STAGE=	yes
+
+USES=		kmod
 .include <bsd.port.pre.mk>
 
 PLIST_FILES+=	"@cwd /"
 PLIST_FILES+=	${KMODDIR:C,^/,,}/linux_v4l2wrapper.ko
-PLIST_FILES+=	"@exec kldxref ${KMODDIR}"
-PLIST_FILES+=	"@unexec kldxref ${KMODDIR}"
-
-# install where x11/nvidia-driver does also:
-KMODDIR=	/boot/modules
-
-MAKE_ENV+=	KMODDIR="${KMODDIR}"
-
-SYSDIR?=	${SRC_BASE}/sys
-MAKE_ENV+=	SYSDIR="${SYSDIR}"
 
 CFLAGS+=	${DEBUG_FLAGS}
 
@@ -39,10 +31,6 @@ CFLAGS+=	${DEBUG_FLAGS}
 
 .if ${LINUX_V4L2_AVAILABLE} == "1"
 IGNORE=		is already in kernel
-.else
-.if !exists(${SYSDIR}/Makefile)
-IGNORE=		requires kernel source to be installed
-.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/ptx-kmod/Makefile b/multimedia/ptx-kmod/Makefile
index 893d00c9ea15..abe5c71ed59e 100644
--- a/multimedia/ptx-kmod/Makefile
+++ b/multimedia/ptx-kmod/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ptx
 PORTVERSION=	0.0.20111212
-CATEGORIES=	multimedia kld
+CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
 PKGNAMESUFFIX=	-kmod
@@ -13,13 +13,12 @@ COMMENT=	Device driver for PT1/PT2 ISDB-S/T tuner cards
 
 LICENSE=	GPLv3
 
-SSP_UNSAFE=	kernel module does not support ssp
+#XXX rene: change KMODDIR from ${PREFIX}/libexec/${PORTNAME} to
+#          the default /boot/modules to get directories right
 
 ONLY_FOR_ARCHS=	amd64 i386
 BUILD_WRKSRC=	${WRKSRC}/dev/ptx
-MAKE_ENV=	KMODDIR=${PREFIX}/${KMODDIR} SYSDIR=${SYSDIR}
 PLIST_FILES=	${KMODDIR}/ptx.ko bin/recptx.pl
-PLIST_DIRS=	${KMODDIR}
 SUB_LIST=	KMODDIR=${KMODDIR}
 USE_RC_SUBR=	ptx
 PORTDOCS=	README
@@ -27,25 +26,12 @@ PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-KMODDIR=	libexec/${PORTNAME}
-SYSDIR?=	${SRC_BASE}/sys
-
-KERNCONF?=	GENERIC
 
-# Use the first component of ${KERNCONF}.
-.for K in ${KERNCONF}
-_KERNCONF?=$K
-.endfor
-
-.if !exists(${SRC_BASE}/sys/${ARCH}/conf/${_KERNCONF})
-IGNORE=		requires kernel source to be installed
-.endif
+USES=		kmod
+.include <bsd.port.pre.mk>
 
 do-install:
-	@${MKDIR} ${PREFIX}/${KMODDIR}
-	${INSTALL_KLD} ${BUILD_WRKSRC}/ptx.ko ${PREFIX}/${KMODDIR}
+	${INSTALL_KLD} ${BUILD_WRKSRC}/ptx.ko ${KMODDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/recptx.pl ${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
diff --git a/multimedia/ptx-kmod/files/ptx.in b/multimedia/ptx-kmod/files/ptx.in
index 498196bf256c..b9121b17c5b5 100644
--- a/multimedia/ptx-kmod/files/ptx.in
+++ b/multimedia/ptx-kmod/files/ptx.in
@@ -14,7 +14,7 @@ stop_cmd="ptx_stop"
 
 ptx_start()
 {
-	load_kld %%PREFIX%%/%%KMODDIR%%/ptx.ko
+	load_kld %%KMODDIR%%/ptx.ko
 }
 ptx_stop()
 {
diff --git a/multimedia/sms1xxx-kmod/Makefile b/multimedia/sms1xxx-kmod/Makefile
index cad8573675b8..517b050e8981 100644
--- a/multimedia/sms1xxx-kmod/Makefile
+++ b/multimedia/sms1xxx-kmod/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	sms1xxx
 PORTVERSION=	20120113
 PORTREVISION=	1
-CATEGORIES=	multimedia kld
+CATEGORIES=	multimedia
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-siano/
 PKGNAMESUFFIX=	-kmod
 DISTNAME=	siano-${PORTVERSION}
@@ -32,9 +32,6 @@ NOVA_DESC=	Build Hauppauge WinTV MiniStick FW
 ONLY_FOR_ARCHS=	i386 amd64
 
 SUB_FILES=	pkg-message
-KMODDIR?=	/boot/modules
-PLIST_SUB+=	KMODDIR=${KMODDIR}
-MAKE_ENV+=	KMODDIR=${KMODDIR}
 
 PORTDOCS=	CHANGELOG README COPYING
 
@@ -47,11 +44,11 @@ NOVA_FW=	novab0_dvbbda
 BUILD_FWS=
 
 NO_STAGE=	yes
+
+USES=		kmod
 .include <bsd.port.pre.mk>
 
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=		requires kernel source files
-.elif ${OSVERSION} <= 800063
+.if ${OSVERSION} <= 800063
 IGNORE=		requires FreeBSD 8.0 or superior
 .endif
 
diff --git a/multimedia/sms1xxx-kmod/pkg-plist b/multimedia/sms1xxx-kmod/pkg-plist
index ae48475dded9..eae1ff525231 100644
--- a/multimedia/sms1xxx-kmod/pkg-plist
+++ b/multimedia/sms1xxx-kmod/pkg-plist
@@ -3,5 +3,3 @@
 %%PL_NOVA%%novab0_dvbbda.ko
 %%PL_STELLAR%%stellar_dvbt.ko
 sms1xxx.ko
-@exec kldxref %D
-@unexec kldxref %D