4 files changed, 21 insertions, 43 deletions

diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index e5bef0a8d6aa..5c18fe53d1e4 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -1,25 +1,22 @@
-# New ports collection makefile for:   shntool
-# Date created:        2 November 2000
-# Whom:                Bill Fenner <fenner@FreeBSD.Org>
+# New ports collection makefile for:	shntool
+# Date created:		2 November 2000
+# Whom:			Bill Fenner <fenner@FreeBSD.Org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	shntool
-PORTVERSION=	2.0.3
+PORTVERSION=	3.0.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.etree.org/shnutils/shntool/source/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner
+MASTER_SITES=	http://www.etree.org/shnutils/shntool/dist/src/ CSME LOCAL/fenner
 
 MAINTAINER=	fenner@FreeBSD.Org
-COMMENT=	Multi-purpose .wav/.shn processing utility
-
-RUN_DEPENDS=	shorten:${PORTSDIR}/audio/shorten
+COMMENT=	Multi-purpose .wav processing utility
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
+SHN_ALIASES=	tool len fix hash pad join split cat cmp cue conv info strip gen trim
+PLIST_FILES=	${SHN_ALIASES:S|^|bin/shn|}
 MAN1=		shntool.1
 
 .include <bsd.port.mk>
diff --git a/audio/shntool/distinfo b/audio/shntool/distinfo
index 9971b7432f82..ce9e0ff9965e 100644
--- a/audio/shntool/distinfo
+++ b/audio/shntool/distinfo
@@ -1,3 +1,3 @@
-MD5 (shntool-2.0.3.tar.gz) = 7cdc5049023067fa532ef7010c187349
-SHA256 (shntool-2.0.3.tar.gz) = 9a49ab0281b9f116f40fec816a8f74ce05565f30d88c5d2fbd413c81af265223
-SIZE (shntool-2.0.3.tar.gz) = 189583
+MD5 (shntool-3.0.0.tar.gz) = 9b1045fb78e2977568b69345b9a831ff
+SHA256 (shntool-3.0.0.tar.gz) = 8284fc6979e544d9a0a4757fd53e8f99b8c54301ea9e02fa42b79222936086dc
+SIZE (shntool-3.0.0.tar.gz) = 203653
diff --git a/audio/shntool/pkg-descr b/audio/shntool/pkg-descr
index 86bc16347dc1..c33dd63df2c2 100644
--- a/audio/shntool/pkg-descr
+++ b/audio/shntool/pkg-descr
@@ -1,18 +1,12 @@
-shntool is a multi-purpose .wav/.shn processing tool.  Input and
-output files are transparent to shntool, meaning that it can
-perform its functions upon both .wav and .shn data.
+shntool is a multi-purpose WAVE data processing and reporting utility.
+File formats are abstracted from its core, so it can process any file
+that contains WAVE data, compressed or not - provided there exists a
+format module to handle that particular file type.
 
-When in 'len' (length) mode, it reports .wav size and length information
-from both .wav and .shn files, including whether each file is (a) too
-short to be burned to disc, (b) not cut on a sector boundary, or (c)
-contains incorrect header information.
-
-When in 'fix' mode, shntool is capable of rewriting a set of input
-files so that they are all cut on sector boundaries.  You may specify
-whether shntool shifts the track boundaries (a) forward to the next
-multiple of the block size, or (b) backward to the previous multiple
-of the block size.  Alternatively, you may join the input files into
-one large output file, so you can do the splitting yourself (with
-another .wav editor - shntool isn't that advanced yet).
+shntool has native support for .wav files. If you want it to work with
+other formats, you must have the appropriate helper program installed.
+The "Helper programs" section below contains links to helper programs
+for each format that shntool supports. 
 
 WWW: http://www.etree.org/shnutils/shntool/
+Author: Jason Jordan <shnutils at freeshell dot org>
diff --git a/audio/shntool/pkg-plist b/audio/shntool/pkg-plist
deleted file mode 100644
index c93bc43b6dec..000000000000
--- a/audio/shntool/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/shncat
-bin/shncmp
-bin/shnconv
-bin/shncue
-bin/shnfix
-bin/shninfo
-bin/shnjoin
-bin/shnlen
-bin/shnmd5
-bin/shnpad
-bin/shnsplit
-bin/shnstrip
-bin/shntool