- Do not remove legacy_devices while uninstalling. It is useful

for reinstallation.
- Use @dirrmtry instead of @dirrm for lib/oss, lib/oss/etc, and
lib/oss/logs to preserve user data and to avoid errors when
deinstalling.
- Move files/pkg-message.in to pkg-message because it is static.
- Sort pkg-plist by destination paths.

Approved by:	glewis (mentor)

4 files changed, 41 insertions, 43 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index abf99bfdff29..e090d85ce664 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -24,7 +24,7 @@ USE_GNOME=	gtk20
 USE_RC_SUBR=	oss
 WRKSRC=		${WRKDIR}/build
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
-SUB_FILES=	pkg-install pkg-message
+SUB_FILES=	pkg-install
 ONLY_FOR_ARCHS=	amd64 i386
 
 MAN1=		ossinfo.1 ossmix.1 ossplay.1 ossrecord.1 osstest.1 ossxmix.1
@@ -60,27 +60,26 @@ do-configure:
 	cd ${WRKSRC} && ${WRKDIR}/${DISTNAME}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/bin/* ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/savemixer ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdevlinks ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdetect ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossctl ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundon ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundoff ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/bin/* ${PREFIX}/bin/
 	@# oss.conf does not contain any user-configurable data; it's ok to overwrite it.
-	${INSTALL_DATA} ${WRKSRC}/prototype/etc/oss.conf ${PREFIX}/etc/oss.conf
-	${MKDIR} ${PREFIX}/include/sys
-	${MKDIR} ${PREFIX}/lib/oss
-	${MKDIR} ${PREFIX}/lib/oss/logs
-	${MKDIR} ${PREFIX}/lib/oss/etc
-	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/etc/devices.list ${PREFIX}/lib/oss/etc
-	${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_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
+	${INSTALL_DATA} ${WRKSRC}/prototype/etc/oss.conf ${PREFIX}/etc/
+	-@${MKDIR} ${PREFIX}/lib/oss 2>/dev/null
+	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/sysfiles.list ${PREFIX}/lib/oss/
+	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/version.dat ${PREFIX}/lib/oss/
+	-@${MKDIR} ${PREFIX}/lib/oss/etc 2>/dev/null
+	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/etc/devices.list ${PREFIX}/lib/oss/etc/
+	-@${MKDIR} ${PREFIX}/lib/oss/logs 2>/dev/null
+	@${MKDIR} ${PREFIX}/lib/oss/modules
+	${INSTALL_KLD} ${WRKSRC}/prototype/usr/lib/oss/modules/*.ko ${PREFIX}/lib/oss/modules/
+	${INSTALL_MAN} ${WRKSRC}/prototype/usr/man/man1/*.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/prototype/usr/man/man8/*.8 ${PREFIX}/man/man8/
+	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossctl ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdetect ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdevlinks ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/savemixer ${PREFIX}/sbin/
+	${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundoff ${PREFIX}/sbin/
+	${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundon ${PREFIX}/sbin/
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/oss/files/pkg-install.in b/audio/oss/files/pkg-install.in
index c816e101c77e..669954bc7bde 100644
--- a/audio/oss/files/pkg-install.in
+++ b/audio/oss/files/pkg-install.in
@@ -2,10 +2,10 @@
 
 case $2 in
 POST-INSTALL)
-	if ! test -f ${PKG_PREFIX}/lib/oss/etc/installed_drivers; then
-		${PKG_PREFIX}/sbin/ossdetect -v
+	if ! test -f %%PREFIX%%/lib/oss/etc/installed_drivers; then
+		%%PREFIX%%/sbin/ossdetect -v
 	fi
-	if ! test -f ${PKG_PREFIX}/lib/oss/etc/userdefs; then
-		echo "autosave_mixer yes" > ${PKG_PREFIX}/lib/oss/etc/userdefs
+	if ! test -f %%PREFIX%%/lib/oss/etc/userdefs; then
+		echo "autosave_mixer yes" > %%PREFIX%%/lib/oss/etc/userdefs
 	fi
 esac
diff --git a/audio/oss/files/pkg-message.in b/audio/oss/pkg-message
index 512622a0b914..512622a0b914 100644
--- a/audio/oss/files/pkg-message.in
+++ b/audio/oss/pkg-message
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 4a5121c29c25..09718d22affd 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -1,16 +1,14 @@
-etc/oss.conf
-bin/ossxmix
-bin/osstest
-bin/ossrecord
-bin/ossplay
-bin/ossmix
 bin/ossinfo
-sbin/savemixer
-sbin/ossdevlinks
-sbin/ossdetect
-sbin/ossctl
-sbin/soundon
-sbin/soundoff
+bin/ossmix
+bin/ossplay
+bin/ossrecord
+bin/osstest
+bin/ossxmix
+etc/oss.conf
+lib/oss/etc/devices.list
+@unexec rm -f %D/lib/oss/etc/installed_drivers 2>/dev/null || true
+@dirrmtry lib/oss/etc
+@dirrmtry lib/oss/logs
 lib/oss/modules/osscore.ko
 lib/oss/modules/ali5455.ko
 lib/oss/modules/allegro.ko
@@ -46,11 +44,12 @@ lib/oss/modules/vmix.ko
 lib/oss/modules/vortex.ko
 lib/oss/modules/ymf7xx.ko
 @dirrm lib/oss/modules
-lib/oss/etc/devices.list
-@unexec rm -f %D/lib/oss/etc/installed_drivers
-@unexec rm -f %D/lib/oss/etc/legacy_devices
-@dirrm lib/oss/logs
-@dirrm lib/oss/etc
 lib/oss/version.dat
 lib/oss/sysfiles.list
-@dirrm lib/oss
+@dirrmtry lib/oss
+sbin/ossctl
+sbin/ossdetect
+sbin/ossdevlinks
+sbin/savemixer
+sbin/soundoff
+sbin/soundon