Update to 3.5.0. Changes since 3.1:

3.2  released on Sat 13 Jan 2001
Added '-i' switch to display whether a file contains seek information
Cleaned up endian-conversion code
Fixed a file naming bug - now, when only an input file name is given,
output files are named according to the following rules:
If shortening a file:

If the input file name ends in .wav, then change
extension to .shn; otherwise, append .shn to the
input file name.  Examples:

file.wav  ->  file.shn
file.ext  ->  file.ext.shn

If extracting a file:

If the input file name ends in .shn, then change
extension to .wav; otherwise, append .wav to the
input file name.

file.shn  ->  file.wav
file.ext  ->  file.ext.wav

When the caller specifies -v2 on the command line, seek tables are
not generated (neither appended nor created in separate files).
The default behavior is to generate/append seek tables.

3.3  released on Sun 12 Aug 2001
Converted to autoconf/automake build system
Made seek table code 64-bit clean
Changed seek table data structures to compensate for compilers that don't
properly implement #pragma pack(1)
Various minor cleanups/updates that don't impact the shorten algorithm

3.4  released on Sun 10 Feb 2002
Fix for reading/writing binary data on stdin/stdout for operating systems
that do not have a single '\x0A' as a line separator (Frank Klemm)
Shorten now refuses to input data from or output data to a tty
Fixed crash when trying to create seek tables from a non-shorten file
-s and -S options can now create seek table files from data read on stdin
(with -s, output filename is 'stdin.skt')
Seek tables are now appended to non-stdout output file when reading
uncompressed data from stdin (e.g. shorten - outfile.shn < data.wav)

3.5.0  released on Mon 18 Nov 2002
Support for compression of AIFF files contributed by Brian Willoughby of
Sound Consulting
Changed file naming convention during extraction - when only an input file
name is given, output files are named according to the following rules:

If the input file name contains more than one '.' and
ends in .shn, then drop the .shn; otherwise, if the input
file name ends in .shn, then change the extension to .wav;
otherwise, append .wav to the input file name.

file.aiff.shn  ->  file.aiff
file.aiff.ext  ->  file.aiff.ext.wav
file.shn       ->  file.wav
file.ext       ->  file.ext.wav

This change was made so that non-wav files would be properly named after
shortening and unshortening.  For example, 'shorten file.aiff' creates
file.aiff.shn, and with the change above, 'shorten -x file.aiff.shn'
will now create file.aiff (instead of file.aiff.wav).

6 files changed, 10 insertions, 91 deletions

diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 9d54c0c2efa..5b7e19f9739 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 22:23:34 zuntum Exp $
-# FreeBSD: ports/audio/shorten/Makefile,v 1.6 2000/11/02 22:40:59 fenner Exp 
+# $NetBSD: Makefile,v 1.2 2002/12/23 21:20:47 wiz Exp $
 #
 
-DISTNAME=	shorten-3.1
+DISTNAME=	shorten-3.5.0
 CATEGORIES=	audio archivers
-MASTER_SITES=	http://www.etree.org/software/
+MASTER_SITES=	http://www.etree.org/shnutils/shorten/source/
 
 MAINTAINER=	collver@linuxfreemail.com
-HOMEPAGE=	http://www.softsound.com/Shorten.html
+HOMEPAGE=	http://www.etree.org/shnutils/shorten/
 COMMENT=	lossless audio compressor
 
 LICENSE=	no-commercial-use
 
-MAKE_ENV+=	MKDIR="${MKDIR}"
+GNU_CONFIGURE=	YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/shorten
-	${INSTALL_DATA} ${WRKSRC}/tr156.tex ${PREFIX}/share/doc/shorten
-	${INSTALL_DATA} ${WRKSRC}/tr156.ps ${PREFIX}/share/doc/shorten
+	${INSTALL_DATA} ${WRKSRC}/doc/tr156.tex ${PREFIX}/share/doc/shorten
+	${INSTALL_DATA} ${WRKSRC}/doc/tr156.ps ${PREFIX}/share/doc/shorten
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/shorten/distinfo b/audio/shorten/distinfo
index bcb55e6ba48..df3b8ae27d2 100644
--- a/audio/shorten/distinfo
+++ b/audio/shorten/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/07/21 19:53:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/12/23 21:20:47 wiz Exp $
 
-SHA1 (shorten-3.1.tar.gz) = 4f5b939614bc8a6c756f92a95909a39a499932f5
-Size (shorten-3.1.tar.gz) = 162942 bytes
-SHA1 (patch-aa) = eeb637249df8eb5a28018ada92a7e270c8c40ba7
-SHA1 (patch-ab) = ed8ce4a276bf6250600cb6e5559400295d14ed7e
-SHA1 (patch-ac) = c82529b4c1824a1be80834d018782b70dfa17f0d
-SHA1 (patch-ad) = a7adfbfd24c4f214739e2a07f7df8f03ab026c2a
+SHA1 (shorten-3.5.0.tar.gz) = 3f85c0d8144e009ea9dd760a561a97d2075edccd
+Size (shorten-3.5.0.tar.gz) = 575027 bytes
diff --git a/audio/shorten/patches/patch-aa b/audio/shorten/patches/patch-aa
deleted file mode 100644
index d2d3aa186ba..00000000000
--- a/audio/shorten/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/16 22:23:34 zuntum Exp $
-
---- Makefile.orig	Tue Oct 10 19:45:29 2000
-+++ Makefile
-@@ -2,10 +2,8 @@
- BOBJS = mkbshift.o
- COBJS = exit.o array.o Sulawalaw.o
- SOBJS = main.o shorten.o fixio.o vario.o poly.o lpc.o hsgetopt.o dupfinfo.o riffwave.o license.o
--CC    = cc
--CFLAGS= -O
- 
--DESTDIR = /usr/local
-+DESTDIR = ${PREFIX}
- prefix = $(DESTDIR)
- exec_prefix = $(prefix)/bin
- man_prefix = $(prefix)/man/man$(manext)
-@@ -17,9 +15,9 @@
- all: shorten shorten.man
- 
- install: shorten
--	mkdir -p $(exec_prefix) $(man_prefix)
--	cp shorten $(exec_prefix)
--	cp shorten.1 $(man_prefix)
-+	${MKDIR} $(exec_prefix) $(man_prefix)
-+	${BSD_INSTALL_PROGRAM} shorten $(exec_prefix)
-+	${BSD_INSTALL_MAN} shorten.1 $(man_prefix)
- 
- install-debian: shorten
- 	install -s shorten $(DESTDIR)/usr/bin
diff --git a/audio/shorten/patches/patch-ab b/audio/shorten/patches/patch-ab
deleted file mode 100644
index 840e5a752e1..00000000000
--- a/audio/shorten/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/16 22:23:34 zuntum Exp $
-
---- shorten.h.orig	Tue Oct 10 10:34:50 2000
-+++ shorten.h	Sun Apr  8 21:56:42 2001
-@@ -105,7 +105,7 @@
- #define MAX(a,b) (((a)>(b))?(a):(b))
- #endif
- 
--#if defined(unix) && !defined(linux)
-+#if defined(eunuchs) && !defined(linux)
- #define labs abs
- #endif
- 
-@@ -143,7 +143,7 @@
- #undef	ulong
- #define ulong	unsigned long
- 
--#if defined(__STDC__) || defined(__GNUC__) || defined(sgi) || !defined(unix)
-+#if defined(__STDC__) || defined(__GNUC__) || defined(sgi) || !defined(eunuchs)
- typedef signed char schar;
- #define PROTO(ARGS)	ARGS
- #else
diff --git a/audio/shorten/patches/patch-ac b/audio/shorten/patches/patch-ac
deleted file mode 100644
index 7811494d7b7..00000000000
--- a/audio/shorten/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/16 22:23:34 zuntum Exp $
-
---- dupfinfo.c.orig	Sun Apr  8 21:58:00 2001
-+++ dupfinfo.c	Sun Apr  8 21:58:26 2001
-@@ -35,7 +35,7 @@
-     ftime.actime  = buf.st_atime;
-     ftime.modtime = buf.st_mtime;
-     (void) utime(path1, &ftime);
--#ifdef unix
-+#ifdef eunuchs
-     (void) chown(path1, buf.st_uid, -1);
-     (void) chown(path1, -1, buf.st_gid);
- #endif
diff --git a/audio/shorten/patches/patch-ad b/audio/shorten/patches/patch-ad
deleted file mode 100644
index 3801d0edf02..00000000000
--- a/audio/shorten/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/07/21 19:53:49 wiz Exp $
-
---- shorten.c.orig	Tue Oct 10 13:14:47 2000
-+++ shorten.c	Sat Jul 21 14:24:39 2001
-@@ -669,7 +669,6 @@
-       	  if(strcasecmp(filenamei + newfilelen, WAVESUFFIX))
- 	#endif
-           {
--            tmpfilename[newfilelen] = '\0';
- 	    strcat(tmpfilename,".wav");
-           }
-     	}