4 files changed, 20 insertions, 76 deletions

diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index ad6bfd16c106..9a2823a39e27 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	normalize
-PORTVERSION=	0.7.6
-PORTREVISION=	3
+PORTVERSION=	0.7.7
 CATEGORIES=	audio
-MASTER_SITES=	http://www1.cs.columbia.edu/~cvaill/normalize/
+MASTER_SITES=	http://download.savannah.gnu.org/releases/normalize/
 
-MAINTAINER=	itetcu@people.tecnik93.com
+MAINTAINER=	alex@fafula.com
 COMMENT=	A tool for adjusting the volume of wave/MP3 files to a standard level
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad
+
+USE_BZIP2=		yes
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=		yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS=		-I${LOCALBASE}/include
+LDFLAGS=		-L${LOCALBASE}/lib
+
+MAN1=		normalize.1 normalize-mp3.1
 
-USE_BZIP2=	yes	# XXX set before OPTIONS
 OPTIONS=	XMMS "Build XMMS plugin" off
+
 .include <bsd.port.pre.mk>
-.if defined(WITH_XMMS)
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-.endif
 
-USE_GETOPT_LONG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .if defined(WITH_XMMS)
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 PLIST_SUB+=	X11BASE="${X11BASE}"
 .else
@@ -43,9 +46,4 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-MAN1=		normalize.1 normalize-mp3.1
-
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
 .include <bsd.port.post.mk>
diff --git a/audio/normalize/distinfo b/audio/normalize/distinfo
index b9b40ce0a09b..4d775cb33408 100644
--- a/audio/normalize/distinfo
+++ b/audio/normalize/distinfo
@@ -1,3 +1,3 @@
-MD5 (normalize-0.7.6.tar.bz2) = 7476f028304791595e91610bb0cd4e97
-SHA256 (normalize-0.7.6.tar.bz2) = 3af7278715095a07d4fa377fb43b0b1095662337d16c932a33b29fac88080279
-SIZE (normalize-0.7.6.tar.bz2) = 299091
+MD5 (normalize-0.7.7.tar.bz2) = 1749b16fc7a08aa5d0cf9f76eeaa8436
+SHA256 (normalize-0.7.7.tar.bz2) = ef9d8558515cc942518981d3db8fa2490fba6d6b5b74e0a3b75336fbc66c6bd8
+SIZE (normalize-0.7.7.tar.bz2) = 388777
diff --git a/audio/normalize/files/patch-src::Makefile.in b/audio/normalize/files/patch-src::Makefile.in
deleted file mode 100644
index e8d9819021a9..000000000000
--- a/audio/normalize/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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-plist b/audio/normalize/pkg-plist
index 821734d6e640..203d15063447 100644
--- a/audio/normalize/pkg-plist
+++ b/audio/normalize/pkg-plist
@@ -4,4 +4,5 @@ bin/normalize-ogg
 %%NLS%%share/locale/en_GB/LC_MESSAGES/normalize.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/normalize.mo
 @cwd %%X11BASE%%
+%%XMMS%%lib/xmms/Effect/librva.la
 %%XMMS%%lib/xmms/Effect/librva.so