-Update to 4.40.0.

-Use USE_DOS2UNIX and get rid of ^M in our files/patch-*.
-INSTALLS_SHLIB -> USE_LDCONFIG.

5 files changed, 48 insertions, 49 deletions

diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index 13e261aebf1f..14ec53eb248f 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	wavpack
-PORTVERSION=	4.32
+PORTVERSION=	4.40.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.wavpack.com/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Compress (and restore) both 16 and 24-bit audio files in .wav format
 
-GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_ICONV=	yes
+USE_DOS2UNIX=	cli/*.[ch] include/*.h src/*.[ch]
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-USE_GNOME=	gnomehack gnometarget
-INSTALLS_SHLIB=	yes
-FILES=	wavpack.h unpack3.c words.c md5.c
+
+FILES=		include/wavpack.h src/unpack3.c src/words.c cli/md5.c
 
 post-patch:
 .for i in ${FILES}
diff --git a/audio/wavpack/distinfo b/audio/wavpack/distinfo
index ce0d5d8d6e62..1b52706155c3 100644
--- a/audio/wavpack/distinfo
+++ b/audio/wavpack/distinfo
@@ -1,3 +1,3 @@
-MD5 (wavpack-4.32.tar.bz2) = e40ff238477c0007155bce4ada3f7eba
-SHA256 (wavpack-4.32.tar.bz2) = bb6374deb9b1091481c84d6bde57eb333a52bfbbb8ad002c11c17492c3faefa9
-SIZE (wavpack-4.32.tar.bz2) = 275586
+MD5 (wavpack-4.40.0.tar.bz2) = d41daa63926ad731df2a2922626819e9
+SHA256 (wavpack-4.40.0.tar.bz2) = f2d167842cbc92262ee5541ef1c0d87d46a6b9fe14cc298b625547720c82beca
+SIZE (wavpack-4.40.0.tar.bz2) = 320445
diff --git a/audio/wavpack/files/patch-wavpack.c b/audio/wavpack/files/patch-wavpack.c
index c6da495ee3e6..5a9a166ea527 100644
--- a/audio/wavpack/files/patch-wavpack.c
+++ b/audio/wavpack/files/patch-wavpack.c
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- wavpack.c.orig
-+++ wavpack.c
+--- cli/wavpack.c.orig
++++ cli/wavpack.c
 @@ -1604,6 +1604,7 @@
-     MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1);

-     WideCharToUTF8 (temp, (uchar *) string, len);

- #else

-+    iconv_t converter;

-     char *temp = malloc (len);

-     char *outp = temp;

-     char *inp = string;

+     MultiByteToWideChar (CP_ACP, 0, string, -1, temp, max_chars + 1);
+     WideCharToUTF8 (temp, (uchar *) string, len);
+ #else
++    iconv_t converter;
+     char *temp = malloc (len);
+     char *outp = temp;
+     char *inp = string;
 @@ -1614,7 +1615,7 @@
- 

-     memset(temp, 0, len);

-     old_locale = setlocale (LC_CTYPE, "");

--    iconv_t converter = iconv_open ("UTF-8", "");

-+    converter = iconv_open ("UTF-8", "");

-     err = iconv (converter, &inp, &insize, &outp, &outsize);

-     iconv_close (converter);

-     setlocale (LC_CTYPE, old_locale);

+ 
+     memset(temp, 0, len);
+     old_locale = setlocale (LC_CTYPE, "");
+-    iconv_t converter = iconv_open ("UTF-8", "");
++    converter = iconv_open ("UTF-8", "");
+     err = iconv (converter, &inp, &insize, &outp, &outsize);
+     iconv_close (converter);
+     setlocale (LC_CTYPE, old_locale);
diff --git a/audio/wavpack/files/patch-wvunpack.c b/audio/wavpack/files/patch-wvunpack.c
index 7fed79334e60..950e59c5c2e5 100644
--- a/audio/wavpack/files/patch-wvunpack.c
+++ b/audio/wavpack/files/patch-wvunpack.c
@@ -1,20 +1,20 @@
---- wvunpack.c.orig	Thu Apr  6 05:48:33 2006
-+++ wvunpack.c	Mon May 15 03:42:14 2006
-@@ -1040,6 +1040,8 @@
- static UTF8ToAnsi (char *string, int len)

- {

-     int max_chars = strlen (string);

+--- cli/wvunpack.c.orig	Thu Apr  6 05:48:33 2006
++++ cli/wvunpack.c	Mon May 15 03:42:14 2006
+@@ -1374,6 +1374,8 @@
+ static void UTF8ToAnsi (char *string, int len)
+ {
+     int max_chars = (int) strlen (string);
 +
 +    iconv_t converter;
- #if defined (WIN32)

-     unsigned short *temp = malloc ((max_chars + 1) * 2);

-     int act_chars = UTF8ToWideChar (string, temp);

-@@ -1066,7 +1068,7 @@
- 

-     memset(temp, 0, len);

-     old_locale = setlocale (LC_CTYPE, "");

--    iconv_t converter = iconv_open ("", "UTF-8");

-+    converter = iconv_open ("", "UTF-8");

-     err = iconv (converter, &inp, &insize, &outp, &outsize);

-     iconv_close (converter);

-     setlocale (LC_CTYPE, old_locale);

+ #if defined (WIN32)
+     unsigned short *temp = malloc ((max_chars + 1) * 2);
+     int act_chars = UTF8ToWideChar (string, temp);
+@@ -1400,7 +1402,7 @@
+ 
+     memset(temp, 0, len);
+     old_locale = setlocale (LC_CTYPE, "");
+-    iconv_t converter = iconv_open ("", "UTF-8");
++    converter = iconv_open ("", "UTF-8");
+     err = iconv (converter, &inp, &insize, &outp, &outsize);
+     iconv_close (converter);
+     setlocale (LC_CTYPE, old_locale);
diff --git a/audio/wavpack/pkg-plist b/audio/wavpack/pkg-plist
index 9689b4645eed..f29540b7f5f2 100644
--- a/audio/wavpack/pkg-plist
+++ b/audio/wavpack/pkg-plist
@@ -1,13 +1,10 @@
 bin/wavpack
-bin/wvunpack
 bin/wvgain
-include/wavpack/md5.h
-include/wavpack/unpack3.h
+bin/wvunpack
 include/wavpack/wavpack.h
-include/wavpack/wputils.h
 lib/libwavpack.a
 lib/libwavpack.la
 lib/libwavpack.so
-lib/libwavpack.so.0
+lib/libwavpack.so.1
 libdata/pkgconfig/wavpack.pc
 @dirrm include/wavpack