summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/lame/Makefile21
-rw-r--r--audio/lame/distinfo10
-rw-r--r--audio/lame/patches/patch-aa36
-rw-r--r--audio/lame/patches/patch-ab16
-rw-r--r--audio/lame/patches/patch-ac13
-rw-r--r--audio/lame/pkg/PLIST12
6 files changed, 56 insertions, 52 deletions
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 785b6ab43b5..4e01f465e06 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2001/06/12 20:33:01 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/07/31 14:23:01 drochner Exp $
#
-VERS= 3.87
+VERS= 3.89
DISTNAME= lame${VERS}beta
PKGNAME= lame-${VERS}
-WRKSRC= ${WRKDIR}/lame${VERS}
+WRKSRC= ${WRKDIR}/lame-${VERS}
CATEGORIES= audio
MASTER_SITES= ftp://lame.sourceforge.net/pub/lame/src/
@@ -14,21 +14,12 @@ COMMENT= Fast, high quality MP3 encoder
GNU_CONFIGURE= yes
USE_GMAKE= yes
+USE_LIBTOOL= yes
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
LICENSE= fee-based-commercial-use
CONFIGURE_ARGS+= --without-vorbis
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/man/lame.1 ${PREFIX}/man/man1/lame.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/lame
- for f in contributors.html examples.html history.html id3.html \
- index.html lame.css modes.html node5.html node6.html \
- node7.html switchs.html; do \
- ${INSTALL_DATA} ${WRKSRC}/doc/html/$$f \
- ${PREFIX}/share/doc/html/lame; \
- done
-
.include "../../mk/bsd.prefs.mk"
.if defined(LAME_USE_GTK)
@@ -43,8 +34,6 @@ DEPENDS+= libffm-*:../../math/libffm
CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
-mfp-regs -fschedule-insns -fschedule-insns2 \
-finline-functions -DFLOAT=double
-# optimized libffm (free fast math library)
-LIBS+= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lffm -lm
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 589a7cd301b..7937cb9ac0f 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/31 14:23:01 drochner Exp $
-SHA1 (lame3.87beta.tar.gz) = d1c23fddf6418249fb7f843572cc4a13df7b563c
-Size (lame3.87beta.tar.gz) = 470753 bytes
-SHA1 (patch-aa) = 7971f9979571f5206c4c24508fea003b0964933e
+SHA1 (lame3.89beta.tar.gz) = b11dc3c88be25d91145cd6b0dc8e6703ef5e169c
+Size (lame3.89beta.tar.gz) = 818839 bytes
+SHA1 (patch-aa) = 6512826364e36e0f44d847504f55822c1003524e
+SHA1 (patch-ab) = 94f3252c2aeedf9be3b74f185b428ec8a4e6e95c
+SHA1 (patch-ac) = 203427f0b455ab137301fee6d82c5adaba35d121
diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa
index 6b5d155ff58..7cb14166d72 100644
--- a/audio/lame/patches/patch-aa
+++ b/audio/lame/patches/patch-aa
@@ -1,43 +1,21 @@
-$NetBSD: patch-aa,v 1.6 2000/11/15 13:52:59 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2001/07/31 14:23:01 drochner Exp $
---- configure.orig Mon Sep 25 23:23:23 2000
-+++ configure
-@@ -970,8 +970,9 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
--CONFIG_LIBS=
--CONFIG_OPTS=
-+# pass CFLAGS and LIBS (else they get ignored)
-+CONFIG_LIBS="$LIBS"
-+CONFIG_OPTS="$CFLAGS"
- CONFIG_LDFLAGS=
-
-
-@@ -1055,6 +1056,8 @@
+--- configure.orig Sun Jul 1 22:19:07 2001
++++ configure Tue Jul 31 12:43:26 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:1060: checking for initscr in -lncurses" >&5
+ echo "configure:4332: checking for initscr in -lncurses" >&5
ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
-@@ -1094,6 +1097,7 @@
+@@ -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
- echo "configure:1100: checking for cos in -lm" >&5
-@@ -1681,7 +1685,8 @@
- fi
- echo "$ac_t""$CONFIG_BRHIST" 1>&6
-
--CONFIG_LIBS="$HAVE_LIBM $CONFIG_LIBS"
-+# take care that -lm appears after -lffm (for alpha)
-+CONFIG_LIBS="$CONFIG_LIBS $HAVE_LIBM"
-
-
-
diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab
new file mode 100644
index 00000000000..00f8b6534b2
--- /dev/null
+++ b/audio/lame/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.4 2001/07/31 14:23:01 drochner 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 @@
+ AUTOMAKE_OPTIONS = foreign ansi2knr
+
+ docdir = $(datadir)/doc
+-pkgdocdir = $(docdir)/$(PACKAGE)
++pkgdocdir = $(docdir)
+ htmldir = $(docdir)/html
+-pkghtmldir = $(pkgdocdir)/html
++pkghtmldir = $(pkgdocdir)/html/$(PACKAGE)
+
+ pkghtml_DATA = \
+ basic.html \
diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac
new file mode 100644
index 00000000000..1aa24392262
--- /dev/null
+++ b/audio/lame/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/07/31 14:23:01 drochner 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)
+
+ 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)
+
diff --git a/audio/lame/pkg/PLIST b/audio/lame/pkg/PLIST
index 893b7385284..56be04c9bfa 100644
--- a/audio/lame/pkg/PLIST
+++ b/audio/lame/pkg/PLIST
@@ -1,6 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2000/11/15 13:52:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/07/31 14:23:02 drochner Exp $
bin/lame
+include/lame/lame.h
+lib/libmp3lame.so.0.0
+lib/libmp3lame.so.0
+lib/libmp3lame.so
+lib/libmp3lame.la
+lib/libmp3lame.a
man/man1/lame.1
+share/doc/html/lame/basic.html
share/doc/html/lame/contributors.html
share/doc/html/lame/examples.html
share/doc/html/lame/history.html
@@ -8,8 +15,7 @@ share/doc/html/lame/id3.html
share/doc/html/lame/index.html
share/doc/html/lame/lame.css
share/doc/html/lame/modes.html
-share/doc/html/lame/node5.html
share/doc/html/lame/node6.html
-share/doc/html/lame/node7.html
share/doc/html/lame/switchs.html
+@dirrm include/lame
@dirrm share/doc/html/lame
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 15:34:52 +0000