Hey.
Long overdue (minor) update to lame-3.97.
I'm taking over maintainership with jakob@'s agreement.
As a side note, this update fixes a bug with the soon to come avidemux
2.4.1 port update.
Comments/OK?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/lame/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile 4 Jan 2008 17:48:33 -0000 1.34
+++ Makefile 18 Feb 2008 15:02:48 -0000
@@ -2,37 +2,38 @@
COMMENT= lame ain't an MP3 encoder
-VERSION= 3.96.1
-
-DISTNAME= lame-${VERSION}
-PKGNAME= ${DISTNAME}p2
+DISTNAME= lame-3.97
+PKGNAME= ${DISTNAME}
CATEGORIES= audio
+
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/}
+
SHARED_LIBS += mp3lame 0.1 # .0.1
-HOMEPAGE= http://www.mp3dev.org/
+HOMEPAGE= http://lame.sourceforge.net/
-MAINTAINER= Jakob Schlyter <[EMAIL PROTECTED]>
+MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
-PERMIT_PACKAGE_CDROM= MP3 patent, http://mp3licensing.com/royalty/swenc.html
+# GPLv2 - patent restriction
+PERMIT_PACKAGE_CDROM= MP3 patent, http://mp3licensing.com/royalty/
PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= MP3 patent,
http://mp3licensing.com/royalty/swenc.html
+PERMIT_DISTFILES_CDROM= MP3 patent, http://mp3licensing.com/royalty/
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m ncurses
-USE_GMAKE= Yes
+WANTLIB= c m ncurses
-CONFIGURE_STYLE= gnu
+USE_GMAKE= Yes
FLAVORS= no_x11
FLAVOR?=
-CONFIGURE_ARGS+= --enable-mp3rtp
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --enable-mp3rtp
+
MAKE_FLAGS= pkghtmldir=${TRUEPREFIX}/share/doc/lame
USE_LIBTOOL= Yes
-# XXX gcc3/nasm issue
-.if (${MACHINE_ARCH} == "i386") && (${CC} != "egcc")
+.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS= ::devel/nasm
CONFIGURE_ARGS+= --enable-nasm
.else
@@ -40,11 +41,12 @@
.endif
.if ${FLAVOR:L} != "no_x11"
-USE_X11= Yes
-CONFIGURE_ARGS+= --enable-mp3x \
- --with-gtk-prefix=${LOCALBASE}
-LIB_DEPENDS+= gtk.>=1.2,gdk.>=1.2::x11/gtk+
-WANTLIB+= X11 Xau Xdmcp Xext Xi glib gmodule iconv intl
+USE_X11= Yes
+CONFIGURE_ARGS+=--enable-mp3x \
+ --with-gtk-prefix=${LOCALBASE}
+LIB_DEPENDS+= gtk.>=1.2,gdk.>=1.2::x11/gtk+
+MODULES+= devel/gettext
+WANTLIB+= X11 Xau Xdmcp Xext Xi glib gmodule
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/lame/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 5 Apr 2007 15:37:42 -0000 1.8
+++ distinfo 18 Feb 2008 15:02:48 -0000
@@ -1,5 +1,5 @@
-MD5 (lame-3.96.1.tar.gz) = 4SBsRqXidv7KEacUni/GrA==
-RMD160 (lame-3.96.1.tar.gz) = FO7jMocGFB1VRvM1kqqr+2gbTp0=
-SHA1 (lame-3.96.1.tar.gz) = Oo5tF8ix01WOgXpb+bcO1o+TmI8=
-SHA256 (lame-3.96.1.tar.gz) = 9PCT43HJmaKgeWB7dFgqjvXBw8mzIuPpl6R8HqKv4qU=
-SIZE (lame-3.96.1.tar.gz) = 1255629
+MD5 (lame-3.97.tar.gz) = kKSsu3MNFQ3+gN4UUSbu9w==
+RMD160 (lame-3.97.tar.gz) = XEzwLA9OEMTNKrYQ1iR4tVTNCHM=
+SHA1 (lame-3.97.tar.gz) = rPVgZfTjHOAjsPmQAtU3rbHsCd8=
+SHA256 (lame-3.97.tar.gz) = CiM0ptEQhSmKmjxG1dMQzKAS8uYdbvrpCECnajZNvhc=
+SIZE (lame-3.97.tar.gz) = 1328058
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/lame/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 26 Aug 2001 12:00:38 -0000 1.1
+++ patches/patch-configure 18 Feb 2008 15:02:48 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2001/08/26 12:00:38 espie Exp $
---- configure.orig Sat Aug 25 14:23:30 2001
-+++ configure Sat Aug 25 14:23:55 2001
-@@ -1842,7 +1842,7 @@ LIB_MAJOR_VERSION=0
+--- configure.orig Sun Sep 24 15:53:31 2006
++++ configure Mon Feb 18 15:45:31 2008
+@@ -19943,7 +19943,7 @@ LIB_MAJOR_VERSION=0
# increase this when changes are made, but they are upward compatible
# to previous versions
-LIB_MINOR_VERSION=0
+LIB_MINOR_VERSION=1
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
- echo "configure:1849: checking for AIX" >&5
+ if test "${ac_cv_cygwin}" = "yes"; then
+ if test "${CC}" != "gcc"; then
Index: patches/patch-frontend_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/lame/patches/patch-frontend_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-frontend_Makefile_in
--- patches/patch-frontend_Makefile_in 23 Mar 2005 21:02:30 -0000 1.1
+++ patches/patch-frontend_Makefile_in 18 Feb 2008 15:02:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-frontend_Makefile_in,v 1.1 2005/03/23 21:02:30 alek Exp $
---- frontend/Makefile.in.orig Mon Mar 14 08:28:15 2005
-+++ frontend/Makefile.in Mon Mar 14 08:28:20 2005
-@@ -91,7 +91,7 @@ LDADD = @LDADD@ \
+--- frontend/Makefile.in.orig Sun Sep 24 15:53:31 2006
++++ frontend/Makefile.in Mon Feb 18 15:45:31 2008
+@@ -156,7 +156,7 @@ LDADD = @LDADD@ \
$(top_builddir)/libmp3lame/libmp3lame.la \
@FRONTEND_LDADD@
