4 files changed, 71 insertions, 6 deletions

diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 0f9dcb6acd3b..181377b875f6 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -6,18 +6,26 @@
 #
 
 PORTNAME=	normalize
-PORTVERSION=	0.7.5
-PORTREVISION=	2
+PORTVERSION=	0.7.6
 CATEGORIES=	audio
-MASTER_SITES=	http://www.cs.columbia.edu/~cvaill/normalize/
+MASTER_SITES=	http://www1.cs.columbia.edu/~cvaill/normalize/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for adjusting the volume of wave/MP3 files to a standard level
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	mad.1:${PORTSDIR}/audio/mad \
+		intl.5:${PORTSDIR}/devel/gettext
+
+USE_BZIP2=	yes
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--disable-xmms
 
 MAN1=		normalize.1 normalize-mp3.1
 
-GNU_CONFIGURE=	yes
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/audio/normalize/distinfo b/audio/normalize/distinfo
index a36cb7506b1d..dd0347646040 100644
--- a/audio/normalize/distinfo
+++ b/audio/normalize/distinfo
@@ -1 +1 @@
-MD5 (normalize-0.7.5.tar.gz) = 8416433fa2213d0879de79a6c589babe
+MD5 (normalize-0.7.6.tar.bz2) = 7476f028304791595e91610bb0cd4e97
diff --git a/audio/normalize/files/patch-src::Makefile.in b/audio/normalize/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..e8d9819021a9
--- /dev/null
+++ b/audio/normalize/files/patch-src::Makefile.in
@@ -0,0 +1,55 @@
+--- src/Makefile.in.orig	Mon Sep  9 06:33:08 2002
++++ src/Makefile.in	Sun Nov 16 02:33:16 2003
+@@ -146,7 +146,7 @@
+ @MAD_FALSE@MADSOURCES = 
+ 
+ normalize_SOURCES = normalize.c volume.c adjust.c mpegadjust.c \
+-	common.h version.c getopt.c getopt1.c getopt.h \
++	common.h version.c \
+ 	$(AUDIOFILESOURCES) $(MADSOURCES)
+ 
+ 
+@@ -184,7 +184,6 @@
+ am_normalize_OBJECTS = normalize-normalize.$(OBJEXT) \
+ 	normalize-volume.$(OBJEXT) normalize-adjust.$(OBJEXT) \
+ 	normalize-mpegadjust.$(OBJEXT) normalize-version.$(OBJEXT) \
+-	normalize-getopt.$(OBJEXT) normalize-getopt1.$(OBJEXT) \
+ 	$(am__objects_1) $(am__objects_2)
+ normalize_OBJECTS = $(am_normalize_OBJECTS)
+ normalize_LDFLAGS =
+@@ -199,8 +198,6 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/normalize-adjust.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/normalize-getopt.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/normalize-getopt1.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/normalize-mpegadjust.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/normalize-mpegvolume.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/normalize-normalize.Po \
+@@ -265,8 +262,6 @@
+ normalize-adjust.$(OBJEXT): adjust.c
+ normalize-mpegadjust.$(OBJEXT): mpegadjust.c
+ normalize-version.$(OBJEXT): version.c
+-normalize-getopt.$(OBJEXT): getopt.c
+-normalize-getopt1.$(OBJEXT): getopt1.c
+ normalize-wiener_af.$(OBJEXT): wiener_af.c
+ normalize-riff.$(OBJEXT): riff.c
+ normalize-mpegvolume.$(OBJEXT): mpegvolume.c
+@@ -301,8 +296,6 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize-adjust.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize-getopt.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize-getopt1.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize-mpegadjust.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize-mpegvolume.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize-normalize.Po@am__quote@
+@@ -678,7 +635,7 @@
+ 
+ # test program targets follow
+ 
+-mktestwav: mktestwav.o riff.o version.o getopt.o getopt1.o
++mktestwav: mktestwav.o riff.o version.o
+ 	$(LINK) $^ -lm
+ 
+ mktestwav.o: mktestwav.c riff.h
diff --git a/audio/normalize/pkg-descr b/audio/normalize/pkg-descr
index 414eda7450d6..2d36e131cb04 100644
--- a/audio/normalize/pkg-descr
+++ b/audio/normalize/pkg-descr
@@ -3,5 +3,7 @@ wave files to a standard volume level.  This is useful for things like
 creating mp3 mixes, where different recording levels on different
 albums can cause the volume to vary greatly from song to song.
 
+WWW: http://www1.cs.columbia.edu/~cvaill/normalize/
+
 - George Reid
 greid@ukug.uk.freebsd.org