Christian Weisgerber <[EMAIL PROTECTED]> wrote: > ===> audio/normalize > /usr/ports/packages/amd64/all/normalize-0.7.4.tgz: > Extra: intl.3 > Extra: iconv.4
Following diff updates normalize to the latest release and fixes WANTLIB issue. Please test, comment and OK that diff. Especially FLAC support. Index: Makefile =================================================================== RCS file: /cvs/ports/audio/normalize/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 21 Nov 2004 17:51:46 -0000 1.10 +++ Makefile 18 Nov 2005 21:44:25 -0000 @@ -2,9 +2,9 @@ COMMENT= "audio file volume normalizer" -DISTNAME= normalize-0.7.4 +DISTNAME= normalize-0.7.6 CATEGORIES= audio -MASTER_SITES= http://www.cs.columbia.edu/~cvaill/normalize/ +MASTER_SITES= http://www1.cs.columbia.edu/~cvaill/normalize/ HOMEPAGE= http://www.cs.columbia.edu/~cvaill/normalize/ @@ -17,13 +17,10 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c m -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* gcc-* -.endif - MODULES= devel/gettext CONFIGURE_STYLE=gnu +USE_LIBTOOL= Yes # Do not build xmms plugin for now. CONFIGURE_ARGS= --disable-xmms \ Index: distinfo =================================================================== RCS file: /cvs/ports/audio/normalize/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 5 Jan 2005 15:47:08 -0000 1.3 +++ distinfo 18 Nov 2005 21:44:25 -0000 @@ -1,4 +1,4 @@ -MD5 (normalize-0.7.4.tar.gz) = 78ab6c24d8f1bfb1ebfa4ea80345bf61 -RMD160 (normalize-0.7.4.tar.gz) = d523d540b4e1763025ea8aa0e8372cfc2fd9feed -SHA1 (normalize-0.7.4.tar.gz) = 49b65ba026583f7ba910e9050adc7d542a0aa04d -SIZE (normalize-0.7.4.tar.gz) = 364696 +MD5 (normalize-0.7.6.tar.gz) = 02186731e7cf68f1430b76fe0c592926 +RMD160 (normalize-0.7.6.tar.gz) = 1a3904efc40eb8d77a623a672a2156fd33bc38a2 +SHA1 (normalize-0.7.6.tar.gz) = db42d155bc75ae64a222888de96ea966ccf484a7 +SIZE (normalize-0.7.6.tar.gz) = 383659 Index: patches/gcc-src_Makefile_in =================================================================== RCS file: /cvs/ports/audio/normalize/patches/gcc-src_Makefile_in,v retrieving revision 1.1 diff -u -r1.1 gcc-src_Makefile_in --- patches/gcc-src_Makefile_in 27 Jan 2004 20:19:13 -0000 1.1 +++ patches/gcc-src_Makefile_in 18 Nov 2005 21:44:25 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: gcc-src_Makefile_in,v 1.1 2004/01/27 20:19:13 sturm Exp $ ---- src/Makefile.in.orig 2002-04-28 23:22:57.000000000 +0200 -+++ src/Makefile.in 2004-01-27 20:45:58.000000000 +0100 -@@ -368,7 +368,7 @@ normalize-adjust.o: adjust.c - @AMDEP_TRUE@ source='adjust.c' object='normalize-adjust.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/normalize-adjust.Po' tmpdepfile='$(DEPDIR)/normalize-adjust.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(normalize_CFLAGS) $(CFLAGS) -c -o normalize-adjust.o `test -f 'adjust.c' || echo '$(srcdir)/'`adjust.c -+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(normalize_CFLAGS) $(CFLAGS) -O0 -c -o normalize-adjust.o `test -f 'adjust.c' || echo '$(srcdir)/'`adjust.c - - normalize-adjust.obj: adjust.c - @AMDEP_TRUE@ source='adjust.c' object='normalize-adjust.obj' libtool=no @AMDEPBACKSLASH@ Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/normalize/patches/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- patches/patch-configure 13 May 2003 00:12:38 -0000 1.1 +++ patches/patch-configure 18 Nov 2005 21:44:25 -0000 @@ -1,37 +1,12 @@ -$OpenBSD: patch-configure,v 1.1 2003/05/13 00:12:38 naddy Exp $ ---- configure.orig Mon May 12 17:29:18 2003 -+++ configure Mon May 12 17:30:28 2003 -@@ -13288,7 +13288,6 @@ else - #include "confdefs.h" - #include <libintl.h> - extern int _nl_msg_cat_cntr; --extern int *_nl_domain_bindings; - extern - #ifdef __cplusplus - "C" -@@ -13304,7 +13303,7 @@ int - main () - { - bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) -+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) - ; - return 0; - } -@@ -13335,7 +13334,6 @@ rm -f conftest.$ac_objext conftest$ac_ex - #include "confdefs.h" - #include <libintl.h> - extern int _nl_msg_cat_cntr; --extern int *_nl_domain_bindings; - extern - #ifdef __cplusplus - "C" -@@ -13351,7 +13349,7 @@ int - main () - { - bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) -+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) - ; - return 0; - } +$OpenBSD$ +--- configure.orig Fri Nov 18 20:50:01 2005 ++++ configure Fri Nov 18 20:50:28 2005 +@@ -14340,7 +14340,7 @@ s,@USE_NLS@,$USE_NLS,;t t + s,@LIBICONV@,$LIBICONV,;t t + s,@LTLIBICONV@,$LTLIBICONV,;t t + s,@INTLLIBS@,$INTLLIBS,;t t +-s,@LIBINTL@,$LIBINTL,;t t ++s,@LIBINTL@,$LTLIBINTL,;t t + s,@LTLIBINTL@,$LTLIBINTL,;t t + s,@POSUB@,$POSUB,;t t + CEOF Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/audio/normalize/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -r1.2 patch-src_Makefile_in --- patches/patch-src_Makefile_in 4 Jun 2002 21:17:04 -0000 1.2 +++ patches/patch-src_Makefile_in 18 Nov 2005 21:44:25 -0000 @@ -1,7 +1,16 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2002/06/04 21:17:04 jasoni Exp $ ---- src/Makefile.in.orig Sun Apr 28 14:22:57 2002 -+++ src/Makefile.in Tue Jun 4 07:03:12 2002 -@@ -675,31 +675,31 @@ install-exec-hook: +--- src/Makefile.in.orig Sun Sep 8 23:33:08 2002 ++++ src/Makefile.in Fri Nov 18 21:02:27 2005 +@@ -163,7 +163,7 @@ normalize_CFLAGS = @AUDIOFILE_CFLAGS@ $( + localedir = $(datadir)/locale + + INCLUDES = -I$(top_srcdir)/nid3lib \ +- -I$(top_builddir)/intl -DLOCALEDIR=\"$(localedir)\" ++ -DLOCALEDIR=\"$(localedir)\" + + + EXTRA_DIST = normalize-mp3.in mktestwav.c +@@ -679,31 +679,31 @@ install-exec-hook: # test program targets follow mktestwav: mktestwav.o riff.o version.o getopt.o getopt1.o Index: patches/patch-src_normalize-mp3_in =================================================================== RCS file: /cvs/ports/audio/normalize/patches/patch-src_normalize-mp3_in,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-src_normalize-mp3_in --- patches/patch-src_normalize-mp3_in 28 Apr 2002 09:11:37 -0000 1.1.1.1 +++ patches/patch-src_normalize-mp3_in 18 Nov 2005 21:44:25 -0000 @@ -1,18 +1,22 @@ $OpenBSD: patch-src_normalize-mp3_in,v 1.1.1.1 2002/04/28 09:11:37 jasoni Exp $ ---- src/normalize-mp3.in.orig Sat Feb 23 12:49:57 2002 -+++ src/normalize-mp3.in Wed Apr 24 11:59:06 2002 -@@ -27,10 +27,10 @@ +--- src/normalize-mp3.in.orig Sun Sep 8 23:31:26 2002 ++++ src/normalize-mp3.in Fri Nov 18 20:42:53 2005 +@@ -27,12 +27,12 @@ # %b becomes bitrate of re-encoded file, as specified by the -b option # Example: $OGGENCODE="oggenc -Q -b %b -o %m %w" --$MP3DECODE = "@MP3DECODE@"; --$MP3ENCODE = "@MP3ENCODE@"; --$OGGDECODE = "@OGGDECODE@"; --$OGGENCODE = "@OGGENCODE@"; +-$MP3DECODE = "@MP3DECODE@"; +-$MP3ENCODE = "@MP3ENCODE@"; +-$OGGDECODE = "@OGGDECODE@"; +-$OGGENCODE = "@OGGENCODE@"; +-$FLACDECODE = "@FLACDECODE@"; +-$FLACENCODE = "@FLACENCODE@"; +$MP3DECODE = "mpg321 -q -w %w %m"; +$MP3ENCODE = "lame --quiet -h -b %b %w %m"; +$OGGDECODE = "ogg123 -q -d wav -f %w %m"; +$OGGENCODE = "oggenc -Q -b %b -o %m %w"; ++$FLACDECODE = "flac -s -d --force-raw-format -o %w %m"; ++$FLACENCODE = "flac -s -bps=%b -o %m %w"; - $VORBISCOMMENT = "@VORBISCOMMENT@"; - + # The %w etc. substitutions should *not* be used in the following, as + # this script knows about their options already.
