- Update to 1.4.2

PR:		ports/83609
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 57 insertions, 6 deletions

diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 4aed014830ad..1fd78ea2f26d 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	mhwaveedit
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.mtek.chalmers.se/~hjormagn/
+MASTER_SITES=	http://download.gna.org/mhwaveedit/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical program for editing sound files
@@ -74,6 +74,7 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^AM_CFLAGS=|#AM_CFLAGS=|g ; \
+		 s|-ldl||g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/audio/mhwaveedit/distinfo b/audio/mhwaveedit/distinfo
index e0725d3d378e..d2c86e83dfc9 100644
--- a/audio/mhwaveedit/distinfo
+++ b/audio/mhwaveedit/distinfo
@@ -1,2 +1,2 @@
-MD5 (mhwaveedit-1.4.1.tar.bz2) = e46fe045eaf04f5f2ef6313cbbf55864
-SIZE (mhwaveedit-1.4.1.tar.bz2) = 374051
+MD5 (mhwaveedit-1.4.2.tar.bz2) = 0139741165af149d3d014d3fecbb4cbd
+SIZE (mhwaveedit-1.4.2.tar.bz2) = 375874
diff --git a/audio/mhwaveedit/files/patch-src-dataformat.c b/audio/mhwaveedit/files/patch-src-dataformat.c
new file mode 100644
index 000000000000..8b9db136549d
--- /dev/null
+++ b/audio/mhwaveedit/files/patch-src-dataformat.c
@@ -0,0 +1,14 @@
+--- src/dataformat.c.orig	Wed Jul 13 07:44:46 2005
++++ src/dataformat.c	Wed Jul 13 22:33:54 2005
+@@ -353,10 +353,10 @@
+ 	  memcpy(outdata,indata,count*indata_format->samplesize);
+      } else if (indata_format->type == DATAFORMAT_PCM) {
+ 	  if (outdata_format->type == DATAFORMAT_PCM) {
++	       char *c;
+ 	       /* PCM -> PCM conversion */
+ 	       if (outdata_format->samplesize > indata_format->samplesize)
+ 		    dither_mode = DITHER_NONE;
+-	       char *c;
+ 	       c = g_malloc(count * sizeof(sample_t));	       
+ 	       convert_array(indata,indata_format,c,&dataformat_sample_t,
+ 			     count,dither_mode);
diff --git a/audio/mhwaveedit/files/patch-src-filetypes.c b/audio/mhwaveedit/files/patch-src-filetypes.c
new file mode 100644
index 000000000000..7b3950220dae
--- /dev/null
+++ b/audio/mhwaveedit/files/patch-src-filetypes.c
@@ -0,0 +1,36 @@
+--- src/filetypes.c.orig	Wed Jul 13 07:44:46 2005
++++ src/filetypes.c	Thu Jul 14 01:59:03 2005
+@@ -97,15 +97,6 @@
+      return FALSE;
+ }
+ 
+-static gboolean xunsetenv(char *varname)
+-{
+-     if (unsetenv(varname) != 0) {
+-	  console_message(_("unsetenv failed!"));
+-	  return TRUE;
+-     }
+-     return FALSE;
+-}
+-
+ static void register_file_type(gchar *name, gchar *ext, 
+ 			       gboolean (*typecheck)(gchar *filename),
+ 			       Chunk *(*load)(gchar *filename, 
+@@ -922,7 +913,7 @@
+      b = pipe_dialog_send_chunk(y,c,FALSE,dither_mode,bar);
+      g_free(c);     
+      if (x != NULL) gtk_object_sink(GTK_OBJECT(x));
+-     if (!xunsetenv("OUTFILE")) g_free(d);
++     if (!xputenv("OUTFILE")) g_free(d);
+      if (b || !file_exists(filename)) {
+ 	  *fatal = TRUE;
+ 	  return TRUE;
+@@ -980,7 +971,7 @@
+ 	       gtk_object_sink(GTK_OBJECT(x));
+ 	  }
+      }
+-     if (!xunsetenv("OUTFILE")) g_free(c);
++     if (!xputenv("OUTFILE")) g_free(c);
+      if (b || !file_exists(filename)) {
+ 	  *fatal = TRUE;
+ 	  return TRUE;
diff --git a/audio/mhwaveedit/pkg-descr b/audio/mhwaveedit/pkg-descr
index cfc65206ad85..e4740ed09a3f 100644
--- a/audio/mhwaveedit/pkg-descr
+++ b/audio/mhwaveedit/pkg-descr
@@ -11,4 +11,4 @@ Features
    - You can always undo, all the way back to the original state of the file
      (even when editing large files.)
 
-WWW: http://www.mtek.chalmers.se/~hjormagn/mhwaveedit.html
+WWW: http://gna.org/projects/mhwaveedit/