Index: head/audio/oss/Makefile
===================================================================
--- head/audio/oss/Makefile	(revision 512527)
+++ head/audio/oss/Makefile	(revision 512528)
@@ -1,109 +1,110 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	oss
 DISTVERSION=	4.2-build2019
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Open Sound System from 4Front Technologies
 
 LICENSE=	BSD2CLAUSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gnome tar:bzip2 kmod pkgconfig
 USE_GNOME=	gtk20 cairo gdkpixbuf2
 USE_RC_SUBR=	oss
 
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ENV=	HOSTCC="${CC}"
 ALL_TARGET=	all install
 
 SUB_FILES=	pkg-install pkg-deinstall
 LLD_UNSAFE=	yes
 
 KMODDIR=	${PREFIX}/lib/oss/modules
 
 OSS_CONF_FILES=	oss_audigyls oss_audioloop oss_cs461x oss_emu10k1x \
 		oss_envy24 oss_envy24ht oss_fmedia oss_hdaudio \
 		oss_ich oss_imux oss_madi oss_midiloop oss_sblive \
 		oss_sbpci oss_sbxfi oss_trident oss_usb oss_userdev \
 		oss_ymf7xx osscore
 
 PROTO_DIR=	${INSTALL_WRKSRC}/prototype
 PROTO_ETCDIR=	${PROTO_DIR}/etc
 PROTO_BINDIR=	${PROTO_DIR}/usr/bin
 PROTO_SBINDIR=	${PROTO_DIR}/usr/sbin
 PROTO_MANDIR=	${PROTO_DIR}/usr/share/man
 PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss
 
 OPTIONS_DEFINE=	VORBIS
 OPTIONS_DEFAULT=VORBIS
 
 VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_ENV=	OGG_SUPPORT=YES
 
 pre-patch:
 	${FIND} ${PATCH_WRKSRC} -name '*.man' -or \
 	    \( -name '*.[ch]' \! -name ossmkdep.c \) | \
 	    ${XARGS} ${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' \
 	    -e 's|/etc/oss|${PREFIX}/etc/oss|g'
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${PATCH_WRKSRC}/setup/srcconf.c
 	${FIND} ${PATCH_WRKSRC} -name configure -or \
 	    -name make.local -or -name soundoff -or -name soundon | \
 	    ${XARGS} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${STAGEDIR}${PREFIX}/bin/
 # @${ECHO_CMD} "OSSLIBDIR=${PREFIX}/lib/oss" > ${PROTO_ETCDIR}/oss.conf
 	${INSTALL_DATA} ${PROTO_ETCDIR}/oss.conf ${STAGEDIR}${PREFIX}/etc/
 	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss 2>/dev/null
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/soundon.user \
 	    ${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 \
 	    ${STAGEDIR}${PREFIX}/lib/oss/conf/${CONF_FILE}.conf.sample
 .endfor
 	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/etc 2>/dev/null
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/etc/devices.list \
 	    ${STAGEDIR}${PREFIX}/lib/oss/etc/
 	-@${MKDIR} ${STAGEDIR}${PREFIX}/lib/oss/include/sys 2>/dev/null
 	${INSTALL_DATA} ${PROTO_OSSLIBDIR}/include/sys/soundcard.h \
 	    ${STAGEDIR}${PREFIX}/lib/oss/include/sys/
 	${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>
Index: head/audio/oss/files/patch-setup_FreeBSD_sbin_soundon
===================================================================
--- head/audio/oss/files/patch-setup_FreeBSD_sbin_soundon	(revision 512527)
+++ head/audio/oss/files/patch-setup_FreeBSD_sbin_soundon	(revision 512528)
@@ -1,66 +1,84 @@
---- setup/FreeBSD/sbin/soundon.orig	2014-02-14 22:59:55 UTC
-+++ setup/FreeBSD/sbin/soundon
+--- setup/FreeBSD/sbin/soundon.orig	2014-02-14 22:59:55.000000000 +0000
++++ setup/FreeBSD/sbin/soundon	2019-09-21 19:07:29.295818000 +0100
 @@ -1,10 +1,10 @@
  #!/bin/sh
  
 -if test -f /etc/oss.conf
 +if test -f %%PREFIX%%/etc/oss.conf
  then
 -  . /etc/oss.conf
 +  . %%PREFIX%%/etc/oss.conf
  else
 -  OSSLIBDIR=/usr/lib/oss
 +  OSSLIBDIR=%%PREFIX%%/lib/oss
  fi
  
  LOG=/var/log/soundon.log
-@@ -29,7 +29,7 @@ fi
+@@ -29,7 +29,7 @@
  
  if test -f $OSSLIBDIR/etc/license.asc
  then
 -   /usr/sbin/ossdetect -l >> $LOG
 +   %%PREFIX%%/sbin/ossdetect -l >> $LOG
  fi
  
  OPTIONS=
-@@ -70,7 +70,7 @@ do
+@@ -42,6 +42,17 @@
+ 	fi
+ fi
+ 
++if kldstat -v |grep -q sound; then
++	if kldstat |grep -q sound\\\.ko; then
++		echo Please remove the FreeBSD sound modules and try again
++		echo 'You can do this with # kldunload sound'
++	else
++		echo You must recompile your kernel without the built in sound
++		echo drivers\; please refer to the FreeBSD Handbook
++	fi
++	exit 4
++fi
++
+ if ! /sbin/kldload $OSSLIBDIR/modules/osscore.ko
+ then
+ 	echo Loading the osscore module failed
+@@ -70,7 +81,7 @@
  done
  
  echo "+++ ossinfo -v3 +++" >> $LOG
 -/usr/bin/ossinfo -v3 >> $LOG 2>&1
 +%%PREFIX%%/bin/ossinfo -v3 >> $LOG 2>&1
  echo "+++ /dev/sndstat +++" >> $LOG
  cat /dev/sndstat >> $LOG 2>&1
  echo "+++ dmesg +++" >> $LOG
-@@ -85,11 +85,11 @@ then
+@@ -85,11 +96,11 @@
  	sh $OSSLIBDIR/etc/legacy_devices >> $LOG 2>&1
  fi
  
 -/usr/sbin/ossdevlinks -v >> $LOG 2>&1
 +%%PREFIX%%/sbin/ossdevlinks -v >> $LOG 2>&1
  
  ls -l /dev/dsp* /dev/sndstat /dev/mixer* /dev/oss/*/* >> $LOG 2>&1
  
 -/usr/sbin/savemixer -L -v >> $LOG 2>&1
 +%%PREFIX%%/sbin/savemixer -L -v >> $LOG 2>&1
  
  if test -x $OSSLIBDIR/soundon.user
  then
-@@ -97,7 +97,7 @@ then
+@@ -97,7 +108,7 @@
    $OSSLIBDIR/soundon.user >> $LOG 2>&1
  fi
  
 -if test "`ossinfo -g|grep TRIAL` " != " "
 +if test "`%%PREFIX%%/bin/ossinfo -g|grep TRIAL` " != " "
  then
  	echo
  	echo "************************************************************"
-@@ -108,7 +108,7 @@ then
+@@ -108,7 +119,7 @@
  	sleep 1
  fi
  
 -if test "`ossinfo -g|grep EXPIRED` " != " "
 +if test "`%%PREFIX%%/bin/ossinfo -g|grep EXPIRED` " != " "
  then
  	echo
  	echo "****************************************************************"
Index: head/audio/oss/pkg-message
===================================================================
--- head/audio/oss/pkg-message	(revision 512527)
+++ head/audio/oss/pkg-message	(revision 512528)
@@ -1,11 +1,16 @@
 [
 { type: install
   message: <<EOM
 This port uses installation procedure that is very different from
 the one used by 4Front and is not supported by them.  All bug reports
 should go to the port maintainer via the usual PR mechanism.
 
 To load OSS at boot, add oss_enable="YES" to your /etc/rc.conf.
+
+It is necessary to ensure that your kernel does not have sound.ko
+compiled in, which is always the case for GENERIC.  Please refer to
+the Handbook for advice on this.
+
 EOM
 }
 ]