ports/83609: Update port: audio/mhwaveedit to 1.4.2

[KATO Tsuguru]

>Number:         83609
>Category:       ports
>Synopsis:       Update port: audio/mhwaveedit to 1.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 17 14:10:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 1.4.2

New file:
files/patch-src-dataformat.c
files/patch-src-filetypes.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/mhwaveedit/Makefile audio/mhwaveedit/Makefile
--- /usr/ports/audio/mhwaveedit/Makefile	Fri Jun 10 21:23:38 2005
+++ audio/mhwaveedit/Makefile	Wed Jul 13 20:49:16 2005
@@ -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 at FreeBSD.org
 COMMENT=	A graphical program for editing sound files
@@ -74,6 +74,7 @@
 	@${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 -urN /usr/ports/audio/mhwaveedit/distinfo audio/mhwaveedit/distinfo
--- /usr/ports/audio/mhwaveedit/distinfo	Fri Jun 10 21:23:38 2005
+++ audio/mhwaveedit/distinfo	Wed Jul 13 19:47:35 2005
@@ -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 -urN /usr/ports/audio/mhwaveedit/files/patch-src-dataformat.c audio/mhwaveedit/files/patch-src-dataformat.c
--- /usr/ports/audio/mhwaveedit/files/patch-src-dataformat.c	Thu Jan  1 09:00:00 1970
+++ audio/mhwaveedit/files/patch-src-dataformat.c	Wed Jul 13 22:34:16 2005
@@ -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 -urN /usr/ports/audio/mhwaveedit/files/patch-src-filetypes.c audio/mhwaveedit/files/patch-src-filetypes.c
--- /usr/ports/audio/mhwaveedit/files/patch-src-filetypes.c	Thu Jan  1 09:00:00 1970
+++ audio/mhwaveedit/files/patch-src-filetypes.c	Thu Jul 14 01:59:12 2005
@@ -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 -urN /usr/ports/audio/mhwaveedit/pkg-descr audio/mhwaveedit/pkg-descr
--- /usr/ports/audio/mhwaveedit/pkg-descr	Fri Apr 19 23:11:37 2002
+++ audio/mhwaveedit/pkg-descr	Wed Jul 13 19:43:32 2005
@@ -11,4 +11,4 @@
    - 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/
>Release-Note:
>Audit-Trail:
>Unformatted: