Update to 4.2-build2009.

3 files changed, 95 insertions, 67 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 205ee9d5ba38..c37dd639b537 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	oss
-DISTVERSION=	4.2-build2008
-CATEGORIES=	audio kld
+DISTVERSION=	4.2-build2009
+CATEGORIES=	audio
 MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd
 
@@ -14,10 +14,8 @@ LICENSE=	BSD
 
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 
-SSP_UNSAFE=	kernel module does not support ssp
-USES=		pkgconfig
+USES=		kmod pkgconfig
 USE_BZIP2=	yes
-NO_STAGE=	yes
 ALL_TARGET=	all install
 USE_GNOME=	gtk20
 USE_RC_SUBR=	oss
@@ -25,20 +23,8 @@ WRKSRC=		${WRKDIR}/build
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 SUB_FILES=	pkg-install pkg-deinstall
 ONLY_FOR_ARCHS=	amd64 i386
-MANCOMPRESSED=	yes
-
-MAN1=		ossinfo.1 ossmix.1 osspartysh.1 ossphone.1 ossplay.1 \
-		ossrecord.1 osstest.1 ossxmix.1 soundoff.1 soundon.1
-MAN7=		oss_ali5455.7 oss_atiaudio.7 oss_audigyls.7 \
-		oss_audioloop.7 oss_audiopci.7 oss_cmi878x.7 \
-		oss_cmpci.7 oss_cs4281.7 oss_cs461x.7 oss_digi96.7 \
-		oss_emu10k1x.7 oss_envy24.7 oss_envy24ht.7 \
-		oss_fmedia.7 oss_geode.7 oss_hdaudio.7 oss_ich.7 \
-		oss_imux.7 oss_madi.7 oss_midiloop.7 oss_midimix.7 \
-		oss_sblive.7 oss_sbpci.7 oss_sbxfi.7 oss_solo.7 \
-		oss_trident.7 oss_userdev.7 oss_via823x.7 \
-		oss_via97.7 oss_ymf7xx.7 osscore.7
-MAN8=		ossdetect.8 ossdevlinks.8 savemixer.8 vmixctl.8
+
+KMODDIR=	${PREFIX}/lib/oss/modules
 
 OSS_CONF_FILES=	oss_audigyls oss_audioloop oss_cs461x oss_emu10k1x \
 		oss_envy24 oss_envy24ht oss_fmedia oss_hdaudio \
@@ -58,18 +44,8 @@ CONFIGURE_ENV=	CC="${CC}" HOSTCC="${CC}"
 OPTIONS_DEFINE=	VORBIS
 OPTIONS_DEFAULT=VORBIS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ENV+=	OGG_SUPPORT=YES
-.endif
-
-.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=		requires kernel source to be installed
-.elif !defined(SYSDIR)
-MAKE_ENV+=	SYSDIR="${SRC_BASE}/sys"
-.endif
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ENV=	OGG_SUPPORT=YES
 
 pre-patch:
 	${FIND} ${PATCH_WRKSRC} -name '*.man' -or \
@@ -90,39 +66,46 @@ do-configure:
 	    ${SETENV} ${CONFIGURE_ENV} ${PATCH_WRKSRC}/configure)
 
 do-install:
-	${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${STAGEDIR}${PREFIX}/bin/
 # @${ECHO_CMD} "OSSLIBDIR=${PREFIX}/lib/oss" > ${PROTO_ETCDIR}/oss.conf
-	${INSTALL_DATA} ${PROTO_ETCDIR}/oss.conf ${PREFIX}/etc/
-	-@${MKDIR} ${PREFIX}/lib/oss 2>/dev/null
+	${INSTALL_DATA} ${PROTO_ETCDIR}/oss.conf ${STAGEDIR}${PREFIX}/etc/
+	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss 2>/dev/null
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/soundon.user \
-	    ${PREFIX}/lib/oss/soundon.user.sample
-	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/sysfiles.list ${PREFIX}/lib/oss/
-	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/version.dat ${PREFIX}/lib/oss/
-	-@${MKDIR} ${PREFIX}/lib/oss/conf 2>/dev/null
+	    ${STAGEDIR}${PREFIX}/lib/oss/soundon.user.sample
+	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/sysfiles.list \
+	    ${STAGEDIR}${PREFIX}/lib/oss/
+	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/version.dat \
+	    ${STAGEDIR}${PREFIX}/lib/oss/
+	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/conf 2>/dev/null
 .for CONF_FILE in ${OSS_CONF_FILES}
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/conf/${CONF_FILE}.conf \
-	    ${PREFIX}/lib/oss/conf/${CONF_FILE}.conf.sample
+	    ${STAGEDIR}${PREFIX}/lib/oss/conf/${CONF_FILE}.conf.sample
 .endfor
-	-@${MKDIR} ${PREFIX}/lib/oss/etc 2>/dev/null
+	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/etc 2>/dev/null
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/etc/devices.list \
-	    ${PREFIX}/lib/oss/etc/
-	-@${MKDIR} ${PREFIX}/lib/oss/include/sys 2>/dev/null
+	    ${STAGEDIR}${PREFIX}/lib/oss/etc/
+	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/include/sys 2>/dev/null
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/include/sys/soundcard.h \
-	    ${PREFIX}/lib/oss/include/sys/
-	-@${MKDIR} ${PREFIX}/lib/oss/logs 2>/dev/null
-	@${MKDIR} ${PREFIX}/lib/oss/modules
-	${INSTALL_KLD} ${PROTO_OSSLIBDIR}/modules/*.ko \
-	    ${PREFIX}/lib/oss/modules/
-	${INSTALL_MAN} ${PROTO_MANDIR}/man1/*.1.gz ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${PROTO_MANDIR}/man7/*.7.gz ${PREFIX}/man/man7/
-	${INSTALL_MAN} ${PROTO_MANDIR}/man8/*.8.gz ${PREFIX}/man/man8/
-	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/ossdetect ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/ossdevlinks ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/savemixer ${PREFIX}/sbin/
-	${INSTALL_SCRIPT} ${PROTO_SBINDIR}/soundoff ${PREFIX}/sbin/
-	${INSTALL_SCRIPT} ${PROTO_SBINDIR}/soundon ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/vmixctl ${PREFIX}/sbin/
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
+	    ${STAGEDIR}${PREFIX}/lib/oss/include/sys/
+	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/logs 2>/dev/null
+	${INSTALL_KLD} ${PROTO_OSSLIBDIR}/modules/*.ko ${STAGEDIR}${KMODDIR}
+	${INSTALL_MAN} ${PROTO_MANDIR}/man1/*.1.gz \
+	    ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${PROTO_MANDIR}/man7/*.7.gz \
+	    ${STAGEDIR}${PREFIX}/man/man7/
+	${INSTALL_MAN} ${PROTO_MANDIR}/man8/*.8.gz \
+	    ${STAGEDIR}${PREFIX}/man/man8/
+	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/ossdetect \
+	    ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/ossdevlinks \
+	    ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/savemixer \
+	    ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_SCRIPT} ${PROTO_SBINDIR}/soundoff \
+	    ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_SCRIPT} ${PROTO_SBINDIR}/soundon \
+	    ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${PROTO_SBINDIR}/vmixctl \
+	    ${STAGEDIR}${PREFIX}/sbin/
 
 .include <bsd.port.mk>
diff --git a/audio/oss/distinfo b/audio/oss/distinfo
index b3161469acf6..d4dabb6d2e3c 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oss-v4.2-build2008-src-bsd.tar.bz2) = c5fd9d48dc9b1c3fdb0e4073bc43ea0f3822d93925764a30828e0f382253b777
-SIZE (oss-v4.2-build2008-src-bsd.tar.bz2) = 1641299
+SHA256 (oss-v4.2-build2009-src-bsd.tar.bz2) = 10cfe6b5130cf5adb0f17d211e3a09f37977587e22ccf9ec169abb2a89535a8b
+SIZE (oss-v4.2-build2009-src-bsd.tar.bz2) = 1665927
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 39868a1efdfb..6920b4418943 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -27,14 +27,9 @@ lib/oss/conf/oss_usb.conf.sample
 lib/oss/conf/oss_userdev.conf.sample
 lib/oss/conf/oss_ymf7xx.conf.sample
 lib/oss/conf/osscore.conf.sample
-@dirrmtry lib/oss/conf
 lib/oss/etc/devices.list
-@dirrmtry lib/oss/etc
 lib/oss/include/sys/soundcard.h
-@dirrm lib/oss/include/sys
-@dirrm lib/oss/include
 @exec mkdir -p %D/lib/oss/logs
-@dirrmtry lib/oss/logs
 lib/oss/modules/oss_ali5455.ko
 lib/oss/modules/oss_atiaudio.ko
 lib/oss/modules/oss_audigyls.ko
@@ -66,14 +61,64 @@ lib/oss/modules/oss_via823x.ko
 lib/oss/modules/oss_via97.ko
 lib/oss/modules/oss_ymf7xx.ko
 lib/oss/modules/osscore.ko
-@dirrm lib/oss/modules
 lib/oss/soundon.user.sample
 lib/oss/sysfiles.list
 lib/oss/version.dat
-@dirrmtry lib/oss
+man/man1/ossinfo.1.gz
+man/man1/ossmix.1.gz
+man/man1/osspartysh.1.gz
+man/man1/ossphone.1.gz
+man/man1/ossplay.1.gz
+man/man1/ossrecord.1.gz
+man/man1/osstest.1.gz
+man/man1/ossxmix.1.gz
+man/man1/soundoff.1.gz
+man/man1/soundon.1.gz
+man/man7/oss_ali5455.7.gz
+man/man7/oss_atiaudio.7.gz
+man/man7/oss_audigyls.7.gz
+man/man7/oss_audioloop.7.gz
+man/man7/oss_audiopci.7.gz
+man/man7/oss_cmi878x.7.gz
+man/man7/oss_cmpci.7.gz
+man/man7/oss_cs4281.7.gz
+man/man7/oss_cs461x.7.gz
+man/man7/oss_digi96.7.gz
+man/man7/oss_emu10k1x.7.gz
+man/man7/oss_envy24.7.gz
+man/man7/oss_envy24ht.7.gz
+man/man7/oss_fmedia.7.gz
+man/man7/oss_geode.7.gz
+man/man7/oss_hdaudio.7.gz
+man/man7/oss_ich.7.gz
+man/man7/oss_imux.7.gz
+man/man7/oss_madi.7.gz
+man/man7/oss_midiloop.7.gz
+man/man7/oss_midimix.7.gz
+man/man7/oss_sblive.7.gz
+man/man7/oss_sbpci.7.gz
+man/man7/oss_sbxfi.7.gz
+man/man7/oss_solo.7.gz
+man/man7/oss_trident.7.gz
+man/man7/oss_userdev.7.gz
+man/man7/oss_via823x.7.gz
+man/man7/oss_via97.7.gz
+man/man7/oss_ymf7xx.7.gz
+man/man7/osscore.7.gz
+man/man8/ossdetect.8.gz
+man/man8/ossdevlinks.8.gz
+man/man8/savemixer.8.gz
+man/man8/vmixctl.8.gz
 sbin/ossdetect
 sbin/ossdevlinks
 sbin/savemixer
 sbin/soundoff
 sbin/soundon
 sbin/vmixctl
+@dirrm lib/oss/modules
+@dirrmtry lib/oss/logs
+@dirrm lib/oss/include/sys
+@dirrm lib/oss/include
+@dirrmtry lib/oss/etc
+@dirrmtry lib/oss/conf
+@dirrmtry lib/oss