Replace all INSTALL_DATA/INSTALL_SCRIPT and INSTALL_PROGRAM/STRIP=

hacks to install kernel loadable modules correctly on amd64 platforms
with the new INSTALL_KLD command.

All PORTREVISIONS have been bumped to show when the new version of
installing became available.

19 files changed, 41 insertions, 42 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 62b1ba694830..abf99bfdff29 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oss
 DISTVERSION=	4.0-build1006
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio kld
 MASTER_SITES=	http://developer.opensound.com/sources/stable/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-cddl
@@ -77,7 +77,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/version.dat ${PREFIX}/lib/oss
 	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/sysfiles.list ${PREFIX}/lib/oss
 	${MKDIR} ${PREFIX}/lib/oss/modules
-	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/modules/* ${PREFIX}/lib/oss/modules
+	${INSTALL_KLD} ${WRKSRC}/prototype/usr/lib/oss/modules/* ${PREFIX}/lib/oss/modules
 	${INSTALL_MAN} ${WRKSRC}/prototype/usr/man/man8/* ${PREFIX}/man/man8/
 	${INSTALL_MAN} ${WRKSRC}/prototype/usr/man/man1/* ${PREFIX}/man/man1/
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/comms/hcfmdm/Makefile b/comms/hcfmdm/Makefile
index 4f36c71409b1..6eaba2b337e1 100644
--- a/comms/hcfmdm/Makefile
+++ b/comms/hcfmdm/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	hcfmdm
 PORTVERSION=	0.99.1
+PORTREVISION=	1
 CATEGORIES=	comms kld
 MASTER_SITES=	http://lug.cbx.ru/files/modem/ \
 		http://www.int21.de/conexant/ \
@@ -34,8 +35,6 @@ RESTRICTED_FILES=	hcfpcimodem-0.99lnxtbeta03042700.tar.gz
 NO_CDROM=	No redistribution allowed
 NO_PACKAGE=	${NO_CDROM}
 
-STRIP=		# do not strip kernel module
-
 LNXTDOCS=	README FAQ BUGS
 PORTDOCS=	${LNXTDOCS} 100498D_RM_HxF_Released.pdf
 
@@ -65,7 +64,7 @@ pre-fetch:
 
 do-install:
 	@${MKDIR} ${KMODDIR}
-	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hcfmdm.ko ${KMODDIR}/
+	@${INSTALL_KLD} ${BUILD_WRKSRC}/hcfmdm.ko ${KMODDIR}/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${LNXTDOCS}
diff --git a/comms/ixj/Makefile b/comms/ixj/Makefile
index 5266fcaf17a5..c9a5494e9aec 100644
--- a/comms/ixj/Makefile
+++ b/comms/ixj/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ixj
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	comms kld
 MASTER_SITES=	http://ftp.osuosl.org/pub/FreeBSD/distfiles/
 DISTNAME=	ixj_freebsd-${PORTVERSION}
@@ -39,7 +40,7 @@ pre-build:
 
 do-install:
 	@${MKDIR} ${PREFIX}/modules
-	@${INSTALL_DATA} ${WRKSRC}/ixj.ko ${PREFIX}/modules
+	@${INSTALL_KLD} ${WRKSRC}/ixj.ko ${PREFIX}/modules
 	@${MKDIR} ${PREFIX}/include/sys
 	@${INSTALL_DATA} ${WRKSRC}/ixjuser.h ${PREFIX}/include/sys
 	@${INSTALL_DATA} ${WRKSRC}/telephony.h ${PREFIX}/include/sys
diff --git a/comms/ltmdm/Makefile b/comms/ltmdm/Makefile
index 650dfbfd5d98..09de7c6f6e10 100644
--- a/comms/ltmdm/Makefile
+++ b/comms/ltmdm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ltmdm
 PORTVERSION=	1.4
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	comms kld
 MASTER_SITES=	http://www.dons.net.au/~darius/
 EXTRACT_SUFX=	.tgz
@@ -34,7 +34,6 @@ MAKE_ARGS+=	LTMDM_OBJ_VERSION=595
 MAKE_ARGS+=	LTMDM_DEV_MAJOR=${LTMDM_DEV_MAJOR}
 MAKE_ARGS+=	LTMDM_OBJ_VERSION=${LTMDM_OBJ_VERSION}
 #MAKE_ENV+=	WERROR=
-STRIP=		# do not strip kernel module
 
 PORTDOCS=	README.TXT README-en.TXT INSTALL.TXT INSTALL-en.TXT
 SYSDIR?=	${SRC_BASE}/sys
@@ -57,7 +56,7 @@ pre-fetch:
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ltmdm.ko ${KMODDIR}
+	@${INSTALL_KLD} ${BUILD_WRKSRC}/ltmdm.ko ${KMODDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
diff --git a/emulators/snespp/Makefile b/emulators/snespp/Makefile
index ba512e18a95d..c47c31d77467 100644
--- a/emulators/snespp/Makefile
+++ b/emulators/snespp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snespp
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://www.cse.unsw.edu.au/~tbourke/software/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -30,6 +31,6 @@ IGNORE=		versions of FreeBSD before 6.0 are not supported
 
 do-install:
 	@${INSTALL_MAN} ${WRKSRC}/snespp.4 ${PREFIX}/man/man4
-	@${INSTALL_PROGRAM} ${WRKSRC}/snespp.ko ${KMODDIR}
+	@${INSTALL_KLD} ${WRKSRC}/snespp.ko ${KMODDIR}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index 07e06124eee9..f77f18e6a167 100644
--- a/emulators/vmware-guestd4/Makefile
+++ b/emulators/vmware-guestd4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators kld
 MASTER_SITES=	# bundled with VMware itself
 PKGNAMESUFFIX?=	-guestd
@@ -130,7 +130,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sbin/vmware-checkvm ${PREFIX}/sbin
 .if defined(WITH_VMWARE_VMMEMCTL)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
 .endif
 	-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
 .endif
diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index 57ee3e26a3c0..6bf25215a4cc 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	emulators kld
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-guestd
@@ -200,11 +200,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}/vmware-checkvm ${PREFIX}/sbin
 .if defined(WITH_VMWARE_VMMEMCTL)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
 .endif
 .if defined(WITH_VMWARE_VMXNET)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
 .endif
 	-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
 	${MKDIR} ${PREFIX}/share/vmware-tools
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index beebd1a5fe00..2228869e9dfc 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -221,11 +221,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-checkvm ${PREFIX}/sbin
 .if defined(WITH_VMWARE_VMMEMCTL)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKDIR}/vmmemctl-only/vmmemctl.ko ${VMWARE_KMODDIR}
 .endif
 .if defined(WITH_VMWARE_VMXNET)
 	${MKDIR} ${VMWARE_KMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
+	${INSTALL_KLD} ${WRKSRC}/lib/modules/binary/FreeBSD${VMWARE_VMXNET_PATH} ${VMWARE_KMODDIR}
 .endif
 	-${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1
 	${MKDIR} ${PREFIX}/share/vmware-tools
diff --git a/graphics/kix-kmod/Makefile b/graphics/kix-kmod/Makefile
index 204ff04419a5..b011ca1e4372 100644
--- a/graphics/kix-kmod/Makefile
+++ b/graphics/kix-kmod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=       kix
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=     graphics kld
 MASTER_SITES=   http://www.witchspace.com/files/
 PKGNAMESUFFIX=	-kmod
@@ -22,7 +23,7 @@ MAKE_ENV+=	WERROR=
 PLIST_FILES=	lib/kix_saver.ko
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kix_saver.ko ${PREFIX}/lib
+	${INSTALL_KLD} ${WRKSRC}/kix_saver.ko ${PREFIX}/lib
 
 post-install:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
diff --git a/graphics/plasma-kmod/Makefile b/graphics/plasma-kmod/Makefile
index 27376d58a460..c41ae58608d8 100644
--- a/graphics/plasma-kmod/Makefile
+++ b/graphics/plasma-kmod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	plasma
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	graphics kld
 MASTER_SITES=	SF/futurebsd
 PKGNAMESUFFIX=	-kmod
@@ -20,7 +21,7 @@ IGNORE=		requires kernel source (/usr/src/sys) to build
 PLIST_FILES=	lib/plasma_saver.ko
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/plasma_saver.ko ${PREFIX}/lib
+	${INSTALL_KLD} ${WRKSRC}/plasma_saver.ko ${PREFIX}/lib
 
 post-install:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
diff --git a/japanese/msdosfs/Makefile b/japanese/msdosfs/Makefile
index c9dcc147a19c..8e1feff82384 100644
--- a/japanese/msdosfs/Makefile
+++ b/japanese/msdosfs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	msdosfs
 PORTVERSION=	${LAST_UPDATED}
+PORTREVISION=	1
 CATEGORIES=	japanese kld
 MASTER_SITES=	http://www.linkclub.or.jp/~clover/ \
 		${MASTER_SITE_LOCAL}
@@ -58,7 +59,7 @@ post-build:
 do-install:
 	${MKDIR} ${PREFIX}/lib/ja-msdosfs
 	${INSTALL_PROGRAM} ${WRKDIR}/mount_msdos/mount_jamsdos ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/msdos_ja.ko ${PREFIX}/lib/ja-msdosfs
+	${INSTALL_KLD} ${WRKSRC}/msdos_ja.ko ${PREFIX}/lib/ja-msdosfs
 	${INSTALL_SCRIPT} ${WRKDIR}/ja-msdosfs.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.post.mk>
diff --git a/korean/msdosfs/Makefile b/korean/msdosfs/Makefile
index dd61c3130d3b..64a6572db09b 100644
--- a/korean/msdosfs/Makefile
+++ b/korean/msdosfs/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	msdosfs
 PORTVERSION=	${LAST_UPDATED}
+PORTREVISION=	1
 CATEGORIES=	korean kld
 MASTER_SITES=	http://www.kr.freebsd.org/~cjh/freebsd/msdosfs-ko/ \
 		ftp://ftp.kr.freebsd.org/pub/users/cjh/FreeBSD/ \
@@ -61,7 +62,7 @@ post-build:
 do-install:
 	${MKDIR} ${PREFIX}/lib/ko-msdosfs
 	${INSTALL_PROGRAM} ${WRKDIR}/mount_msdos/mount_komsdos ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/msdos_ko.ko ${PREFIX}/lib/ko-msdosfs
+	${INSTALL_KLD} ${WRKSRC}/msdos_ko.ko ${PREFIX}/lib/ko-msdosfs
 	${INSTALL_SCRIPT} ${WRKDIR}/ko-msdosfs.sh ${PREFIX}/etc/rc.d
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/pvr250/Makefile b/multimedia/pvr250/Makefile
index 81fe34693cf9..a389537e776b 100644
--- a/multimedia/pvr250/Makefile
+++ b/multimedia/pvr250/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pvr250
 PORTVERSION=	20051030
+PORTREVISION=	1
 CATEGORIES=	multimedia kld
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
 DISTFILES=	${CXMSHAR} hcwPVRP2.sys ${PVRTOOLS}.tar.gz
@@ -76,8 +77,8 @@ do-build:
 	cd ${WRKDIR}/${PVRTOOLS}; ${MAKE}
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${MODULESDIR}
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${MODULESDIR}
+	${INSTALL_KLD} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${MODULESDIR}
+	${INSTALL_KLD} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${MODULESDIR}
 	${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/cxm.4 ${PREFIX}/man/man4/cxm.4
 	${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/pvr250-setchannel.1 ${PREFIX}/man/man1/pvr250-setchannel.1
 	${INSTALL_PROGRAM} ${WRKDIR}/${PVRTOOLS}/setchannel ${PREFIX}/bin/pvr250-setchannel
diff --git a/multimedia/pvrxxx/Makefile b/multimedia/pvrxxx/Makefile
index 03e2705771d6..bd15598d525e 100644
--- a/multimedia/pvrxxx/Makefile
+++ b/multimedia/pvrxxx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pvrxxx
 PORTVERSION=	20060822
+PORTREVISION=	1
 CATEGORIES=	multimedia kld
 MASTER_SITES=	http://www.mavetju.org/download/adopted/
 DISTFILES=	${CXMSHAR} ${PVRTOOLS}.tar.gz hcwPVRP2.sys HcwMakoA.ROM pvrxxx_gpl.tgz
@@ -81,8 +82,8 @@ do-build:
 	cd ${WRKDIR}/${PVRTOOLS}; ${MAKE}
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${MODULESDIR}
-	${INSTALL_DATA} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${MODULESDIR}
+	${INSTALL_KLD} ${WRKDIR}/modules/cxm/cxm/cxm.ko ${MODULESDIR}
+	${INSTALL_KLD} ${WRKDIR}/modules/cxm/cxm_iic/cxm_iic.ko ${MODULESDIR}
 	${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/cxm.4 ${PREFIX}/man/man4/cxm.4
 	${INSTALL_MAN} ${WRKDIR}/${PVRTOOLS}/pvr250-setchannel.1 ${PREFIX}/man/man1/pvr250-setchannel.1
 	${INSTALL_PROGRAM} ${WRKDIR}/${PVRTOOLS}/setchannel ${PREFIX}/bin/pvr250-setchannel
diff --git a/net/ipw-firmware/Makefile b/net/ipw-firmware/Makefile
index 6828ab7dccd4..15838660d68c 100644
--- a/net/ipw-firmware/Makefile
+++ b/net/ipw-firmware/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	ipw-firmware
 RELNAME?=	ipw2100
 PORTVERSION?=	1.3
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	net sysutils kld
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/ipw
@@ -156,7 +156,7 @@ do-install:
 	${MKDIR} ${FWDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${FWDIR}/LICENSE.${DRIVERNAME}
 .for i in ${FIRMWARES}
-	${INSTALL_DATA} ${WRKSRC}/${i:C/:.*//} ${FWDIR}/${i:C/.*://}
+	${INSTALL_KLD} ${WRKSRC}/${i:C/:.*//} ${FWDIR}/${i:C/.*://}
 .endfor
 
 post-install:
diff --git a/net/ng_daphne/Makefile b/net/ng_daphne/Makefile
index 693521828ea3..1e66a12f5448 100644
--- a/net/ng_daphne/Makefile
+++ b/net/ng_daphne/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ng_daphne
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net kld
 MASTER_SITES=	http://newton.ee.auth.gr/ng_daphne/
 
@@ -26,7 +27,7 @@ PLIST_FILES=	lib/ng_daphne.ko
 PORTDOCS=	README
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ng_daphne.ko ${PREFIX}/lib
+	${INSTALL_KLD} ${WRKSRC}/ng_daphne.ko ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/net/nvnet/Makefile b/net/nvnet/Makefile
index cf26974c93c2..d0e5d29802a1 100644
--- a/net/nvnet/Makefile
+++ b/net/nvnet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nvnet
 PORTVERSION=	1.0.0301
+PORTREVISION=	1
 CATEGORIES=	net kld
 MASTER_SITES=	http://www.onthenet.com.au/~q/nvnet/
 DISTFILES=	${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
@@ -36,7 +37,7 @@ IGNORE=		Kernel source files required
 .endif
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/module/if_nv.ko ${KMODDIR}
+	${INSTALL_KLD} ${WRKSRC}/module/if_nv.ko ${KMODDIR}
 	${INSTALL_MAN} ${WRKSRC}/man/nvnet.4 ${PREFIX}/man/man4
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/palm/uppc-kmod/Makefile b/palm/uppc-kmod/Makefile
index 0c0d1458df89..17722b75a8e2 100644
--- a/palm/uppc-kmod/Makefile
+++ b/palm/uppc-kmod/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uppc
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	palm kld
 MASTER_SITES=	http://people.tecnik93.com/~sam/ports/
 PKGNAMESUFFIX=	-kmod
@@ -28,11 +28,6 @@ IGNORE=		Requires kernel source (/usr/src/sys) to build
 BROKEN=		Does not compile with GCC 4.2
 .endif
 
-# Don't strip module on amd64 systems
-.if ${ARCH} == "amd64"
-STRIP=
-.endif
-
 post-build:
 	@${REINPLACE_CMD} -e 's|%%INITIAL_INSTALLDIR%%|${PREFIX}/lib|g' ${BUILD_WRKSRC}/uppcsetup
 	@${REINPLACE_CMD} -e 's|%%INITIAL_MODDIR%%|${KMODDIR}|g' ${WRKSRC}/uppcsetup
@@ -41,7 +36,7 @@ post-build:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/uppc.ko ${PREFIX}/lib
+	${INSTALL_KLD} ${WRKSRC}/uppc.ko ${PREFIX}/lib
 	${INSTALL_SCRIPT} ${WRKSRC}/uppcsetup ${PREFIX}/sbin
 	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN4} ${MANPREFIX}/man/man4
 
diff --git a/sysutils/ipmi-kmod/Makefile b/sysutils/ipmi-kmod/Makefile
index ba4a259af92d..899f2baa0eb2 100644
--- a/sysutils/ipmi-kmod/Makefile
+++ b/sysutils/ipmi-kmod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ipmi-kmod
 PORTVERSION=	20060926
+PORTREVISION=	1
 CATEGORIES=	sysutils kld
 MASTER_SITES=	http://dpw.threerings.net/projects/ipmi-kmod/
 
@@ -28,11 +29,6 @@ KMODDIR=	/boot/modules
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-# Don't strip module on amd64 systems
-.if ${ARCH} == "amd64"
-STRIP=
-.endif
-
 .if !exists(${SRC_BASE}/sys/Makefile)
 IGNORE=		requires kernel source to be installed
 .endif
@@ -51,7 +47,7 @@ CFLAGS+=	-I@/contrib/dev/acpica
 do-install:
 	@${MKDIR} ${PREFIX}/include/sys
 	${INSTALL_DATA} ${WRKSRC}/sys/ipmi.h ${PREFIX}/include/sys
-	${INSTALL_PROGRAM} ${WRKSRC}/ipmi.ko ${KMODDIR}
+	${INSTALL_KLD} ${WRKSRC}/ipmi.ko ${KMODDIR}
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL