- Update to 3.50

- Allow a flag NO_X11 which builds without using GTK

PR:		14876
Submitted by:	Aaron Smith <aaron@mutex.org>
Reviewed by:	maintainer

5 files changed, 35 insertions, 32 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index ced5859c716a..ffc226e0066a 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,5 +1,5 @@
 # ports collection makefile for:   lame
-# Version required:    3.13
+# Version required:    3.50
 # Date created:        11 January 1998
 # Whom:                yoshiaki Uchikawa
 #
@@ -7,24 +7,29 @@
 #
 
 DISTNAME=	dist10
-PKGNAME=	lame-3.13
+PKGNAME=	lame-3.50
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.sunet.se/pub/multimedia/Berkeley/mpeg2/conformance-bitstreams/audio/mpeg2/software/technical_report/
 
 PATCH_SITES=	http://www.sulaco.org/mp3/download/patches/
-PATCHFILES=	lame3.13.patch.gz
+PATCHFILES=	lame3.50.patch.gz
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 
-LIB_DEPENDS=	gtk12:${PORTSDIR}/x11-toolkits/gtk12
+.if !defined(NO_X11)
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+.endif
 
 PATCH_DIST_STRIP = -p1
 
 WRKSRC= 	${WRKDIR}/dist10/lsf/encoder/
 USE_GMAKE=	YES
+MAKE_ENV=	NO_X11=${NO_X11}
 ALL_TARGET=	lame
 RESTRICTED=	Condition is not clear
 
+MAN1=		lame.1
+
 do-install:
 	@( cd ${WRKSRC}; ${INSTALL_PROGRAM} lame ${PREFIX}/bin )
 	@( cd ${WRKSRC}; ${INSTALL_MAN} doc/man/lame.1 \
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 6cfbebdc4bd3..0c54a4a68941 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,2 +1,2 @@
 MD5 (dist10.tar.gz) = 62cee8daa6041b8a2d0a9a1ef18163b4
-MD5 (lame3.13.patch.gz) = 67aacae4b77f2a1f377552cc366fe0eb
+MD5 (lame3.50.patch.gz) = eb5e35131bcb7933212165f7d3f2add1
diff --git a/audio/lame/files/patch-aa b/audio/lame/files/patch-aa
index 79959a82dfcd..4bd8ef8510c0 100644
--- a/audio/lame/files/patch-aa
+++ b/audio/lame/files/patch-aa
@@ -1,11 +1,22 @@
---- Makefile.orig	Wed Jun  2 15:59:37 1999
-+++ Makefile	Wed Jun  9 01:19:47 1999
-@@ -10,7 +10,7 @@
+--- Makefile.orig	Fri Nov 12 01:28:34 1999
++++ Makefile	Fri Nov 12 01:39:22 1999
+@@ -12,7 +12,7 @@
  # defaults:
  PGM = lame
  CC = gcc
--CC_OPTS = -O 	
-+CC_OPTS =  ${CFLAGS}	
+-CC_OPTS = -O   	
++CC_OPTS = ${CFLAGS}
  GTK = 
  GTKLIBS = 
- LIBS = -lm
+ SNDLIB = 
+@@ -106,8 +106,10 @@
+ ##########################################################################
+ ifeq ($(UNAME),FreeBSD)
+ #  remove if you do not have GTK or do not want the GTK frame analyzer
++ifndef NO_X11
+    GTK = -DHAVEGTK `gtk12-config --cflags`
+    GTKLIBS = `gtk12-config --libs` 
++endif
+ # Comment out next 2 lines if you want to remove VBR histogram capability
+    BRHIST_SWITCH = -DBRHIST
+    LIBTERMCAP = -lncurses
diff --git a/audio/lame/files/patch-ab b/audio/lame/files/patch-ab
index c288040990fc..fb990c627bd9 100644
--- a/audio/lame/files/patch-ab
+++ b/audio/lame/files/patch-ab
@@ -1,11 +1,11 @@
---- musicin.c.orig	Sat Sep 18 14:46:40 1999
-+++ musicin.c	Sat Sep 18 14:47:01 1999
-@@ -1067,7 +1067,7 @@
-     int model, stereo;
-     layer info;
+--- lame.c.orig	Fri Nov 12 01:44:46 1999
++++ lame.c	Fri Nov 12 01:44:35 1999
+@@ -1288,7 +1288,7 @@
+ void lame_init(int nowrite)
+ {
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && !defined(__alpha__)
++#if defined (__FreeBSD__) && !defined(__alpha__)
+ #include <floatingpoint.h>
    {
-   fp_except_t mask;
-   mask=fpgetmask();
+   /* seet floating point mask to the Linux default */
diff --git a/audio/lame/pkg-plist b/audio/lame/pkg-plist
index 8c7f9c6aad4d..872940209405 100644
--- a/audio/lame/pkg-plist
+++ b/audio/lame/pkg-plist
@@ -1,23 +1,10 @@
 bin/lame
-share/doc/lame/advanced.html
-share/doc/lame/basics.html
 share/doc/lame/contributors.html
 share/doc/lame/history.html
 share/doc/lame/index.html
 share/doc/lame/lame.css
-share/doc/lame/node10.html
-share/doc/lame/node11.html
-share/doc/lame/node12.html
-share/doc/lame/node13.html
-share/doc/lame/node14.html
-share/doc/lame/node15.html
-share/doc/lame/node16.html
-share/doc/lame/node17.html
-share/doc/lame/node18.html
 share/doc/lame/node5.html
 share/doc/lame/node6.html
 share/doc/lame/node7.html
-share/doc/lame/node8.html
-share/doc/lame/node9.html
 share/doc/lame/switchs.html
 @dirrm share/doc/lame