diff options
| -rw-r--r-- | audio/lame/Makefile | 17 | ||||
| -rw-r--r-- | audio/lame/distinfo | 12 | ||||
| -rw-r--r-- | audio/lame/patches/patch-aa | 36 | ||||
| -rw-r--r-- | audio/lame/patches/patch-ab | 8 | ||||
| -rw-r--r-- | audio/lame/patches/patch-ac | 12 |
5 files changed, 31 insertions, 54 deletions
diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 168b9171632..da64186528e 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.16 2001/09/27 23:17:44 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/01/07 16:38:31 wiz Exp $ # -VERS= 3.89 -DISTNAME= lame${VERS}beta -PKGNAME= lame-${VERS} -WRKSRC= ${WRKDIR}/lame-${VERS} +VERS= 3.91 +DISTNAME= lame-${VERS} CATEGORIES= audio -MASTER_SITES= ftp://lame.sourceforge.net/pub/lame/src/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/} \ + http://hive.me.gu.edu.au/not_lame/ \ + http://telia.dl.sourceforge.net/lame/ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.mp3dev.org/mp3/ @@ -16,6 +16,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +USE_BUILDLINK_ONLY= yes + LICENSE= fee-based-commercial-use CONFIGURE_ARGS+= --without-vorbis @@ -23,7 +25,7 @@ CONFIGURE_ARGS+= --without-vorbis .include "../../mk/bsd.prefs.mk" .if defined(LAME_USE_GTK) -DEPENDS= gtk+-1.2.*:../../x11/gtk +.include "../../x11/gtk/buildlink.mk" .else CONFIGURE_ARGS+= --enable-analyzer=no .endif @@ -36,4 +38,5 @@ CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \ -finline-functions -DFLOAT=double .endif +.include "../../devel/ncurses/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/lame/distinfo b/audio/lame/distinfo index ff59dd130dc..bceea5faa0d 100644 --- a/audio/lame/distinfo +++ b/audio/lame/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/09/15 06:58:54 simonb Exp $ +$NetBSD: distinfo,v 1.5 2002/01/07 16:38:32 wiz Exp $ -SHA1 (lame3.89beta.tar.gz) = b11dc3c88be25d91145cd6b0dc8e6703ef5e169c -Size (lame3.89beta.tar.gz) = 818839 bytes -SHA1 (patch-aa) = 63e19d3ca7e2745337e708e375d5280c260eaa51 -SHA1 (patch-ab) = 94f3252c2aeedf9be3b74f185b428ec8a4e6e95c -SHA1 (patch-ac) = 203427f0b455ab137301fee6d82c5adaba35d121 +SHA1 (lame-3.91.tar.gz) = 84759b675f000688cd287fb99a9b407d05df8da4 +Size (lame-3.91.tar.gz) = 873212 bytes +SHA1 (patch-aa) = cfab96bd36d765cb31c1dcb5259553e10b72af8e +SHA1 (patch-ab) = 9cde28d5ab39e3d10a832d49852d059c04af8419 +SHA1 (patch-ac) = d488e6fc8f98362a4750dede9e4c19bcded14ed3 diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa index 97e796bc2b7..eaec8643338 100644 --- a/audio/lame/patches/patch-aa +++ b/audio/lame/patches/patch-aa @@ -1,39 +1,13 @@ -$NetBSD: patch-aa,v 1.8 2001/09/15 06:58:55 simonb Exp $ +$NetBSD: patch-aa,v 1.9 2002/01/07 16:38:32 wiz Exp $ ---- configure.orig Mon Jul 2 06:19:07 2001 -+++ configure Sat Sep 15 16:47:18 2001 -@@ -4327,6 +4327,8 @@ - echo "$ac_t""no" 1>&6 - fi - -+# we don't want to use ncurses, curses are good enough -+if false; then - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 - echo "configure:4332: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` -@@ -4366,6 +4368,7 @@ - else - echo "$ac_t""no" 1>&6 - fi -+fi - - - echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -@@ -4415,7 +4418,7 @@ +--- configure.orig Tue Dec 25 18:59:42 2001 ++++ configure +@@ -4440,7 +4441,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lffm $LIBS" +LIBS="-lffm -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 4421 "configure" + #line 4446 "configure" #include "confdefs.h" -@@ -4443,7 +4446,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- USE_LIBM="-lffm" -+ USE_LIBM="-lffm -lm" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab index 00f8b6534b2..a6d2ce00e88 100644 --- a/audio/lame/patches/patch-ab +++ b/audio/lame/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2001/07/31 14:23:01 drochner Exp $ +$NetBSD: patch-ab,v 1.5 2002/01/07 16:38:32 wiz Exp $ ---- doc/html/Makefile.in.orig Thu Mar 15 19:58:56 2001 -+++ doc/html/Makefile.in Tue Jul 31 13:33:31 2001 -@@ -109,9 +109,9 @@ +--- doc/html/Makefile.in.orig Sun Nov 11 15:57:48 2001 ++++ doc/html/Makefile.in +@@ -106,9 +106,9 @@ AUTOMAKE_OPTIONS = foreign ansi2knr docdir = $(datadir)/doc diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac index 1aa24392262..15b5dc29476 100644 --- a/audio/lame/patches/patch-ac +++ b/audio/lame/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2001/07/31 14:23:01 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2002/01/07 16:38:32 wiz Exp $ ---- frontend/Makefile.in.orig Fri Jun 15 22:36:52 2001 -+++ frontend/Makefile.in Tue Jul 31 13:43:59 2001 -@@ -157,7 +157,7 @@ - @WITH_BRHIST_FALSE@mp3x_SOURCES = @WITH_BRHIST_FALSE@mp3x.c gtkanal.c gpkplotting.c $(common_sources) +--- frontend/Makefile.in.orig Sun Nov 11 15:57:48 2001 ++++ frontend/Makefile.in +@@ -162,7 +162,7 @@ + @WITH_BRHIST_FALSE@mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources) CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ -LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static +LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ - INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) + mp3x_LDADD = $(LDADD) @GTK_LIBS@ |