diff -urN /usr/ports/audio/mhwaveedit/Makefile audio/mhwaveedit/Makefile
--- /usr/ports/audio/mhwaveedit/Makefile	Fri Apr 19 23:11:37 2002
+++ audio/mhwaveedit/Makefile	Wed May 29 23:27:47 2002
@@ -8,19 +8,34 @@
 
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mtek.chalmers.se/~hjormagn/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
-		SDL-1.1:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS=	sndfile.0:${PORTSDIR}/audio/libsndfile
 
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--without-portaudio
+
+.if defined(WITH_SDL)
+LIB_DEPENDS+=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+CONFIGURE_ENV+=	SDL_CONFIG="${SDL_CONFIG}"
+.else
+CONFIGURE_ARGS+=	--without-sdl
+.endif
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+		's|^CFLAGS =.*$$|CFLAGS = \@CFLAGS\@|g'
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mhwaveedit ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/mhwaveedit/files/patch-Makefile.in audio/mhwaveedit/files/patch-Makefile.in
--- /usr/ports/audio/mhwaveedit/files/patch-Makefile.in	Fri Apr 19 23:11:38 2002
+++ audio/mhwaveedit/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Fri Apr 19 22:08:26 2002
-+++ src/Makefile.in	Fri Apr 19 22:08:46 2002
-@@ -171,7 +171,7 @@
- 	  if test -f $$p \
- 	  ; then \
- 	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
--	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-+	    f=`echo $$p1|sed 's/$$/$(EXEEXT)/'`; \
- 	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- 	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
- 	  else :; fi; \