Use LAME_USE_GTK=NO to turn off the GTK+ interface for 'lame' rather than two

separate packages, lame and lame-gui.

4 files changed, 46 insertions, 15 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index c8efdbee877..712c54b4e31 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/09/30 16:41:05 explorer Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/13 05:54:07 explorer Exp $
 #
 
 #
@@ -6,33 +6,39 @@
 # to match up.  It will define LAME_GUI before including.
 #
 
-.ifndef LAME_GUI
-DISTNAME=	lame-3.31beta
-.else
-DISTNAME=	lame-gui-3.31beta
-.endif
+DISTNAME=	lame-3.33beta
 CATEGORIES=	audio
 MASTER_SITES=	http://www.sulaco.org/mp3/download/beta/
-DISTFILES=	lame3.31beta.tar.gz
+DISTFILES=	lame3.33beta.tar.gz
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.sulaco.org/mp3/
 
 DEPENDS=	ncurses-4.2:../../devel/ncurses
 
-.ifndef LAME_GUI
-CONFLICTS=	lame-gui-*
-.else
+CONFLICTS=	lame-*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(LAME_USE_GTK) && ${LAME_USE_GTK} != NO
 DEPENDS+=	gtk+-1.2.4:../../x11/gtk
-CONFLICTS=	lame-[0-9]*
 .endif
 
-WRKSRC=		${WRKDIR}/lame3.31
+WRKSRC=		${WRKDIR}/lame3.33
 USE_GMAKE=	yes
 ALL_TARGET=	lame
 MIRROR_DISTFILE=no
 LICENSE=	fee-based-commercial-use
 
+PATCHDIR=       ${WRKDIR}/.patches
+
+post-extract:
+	@${MKDIR} ${PATCHDIR}
+	@${CP} ${.CURDIR}/patches/patch-* ${PATCHDIR}/
+.if defined(LAME_USE_GTK) && ${LAME_USE_GTK} == NO
+	@${RM} -f ${PATCHDIR}/patch-gtk
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lame ${PREFIX}/bin
 
diff --git a/audio/lame/files/md5 b/audio/lame/files/md5
index 1ae1a4a6e86..1386346c782 100644
--- a/audio/lame/files/md5
+++ b/audio/lame/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/09/30 16:41:06 explorer Exp $
+$NetBSD: md5,v 1.4 1999/10/13 05:54:08 explorer Exp $
 
-MD5 (lame3.31beta.tar.gz) = 1c2ee677079d09aeee0aa0f85abc195c
+MD5 (lame3.33beta.tar.gz) = 761c573c0c00ba5212ae53624c891a24
diff --git a/audio/lame/patches/patch-gtk b/audio/lame/patches/patch-gtk
new file mode 100644
index 00000000000..37979ebcf8e
--- /dev/null
+++ b/audio/lame/patches/patch-gtk
@@ -0,0 +1,20 @@
+--- Makefile.orig	Tue Sep 28 22:35:33 1999
++++ Makefile	Wed Sep 29 12:44:42 1999
+@@ -113,6 +113,17 @@
+ 
+ endif
+ 
++##########################################################################
++# NetBSD
++##########################################################################
++ifeq ($(UNAME),NetBSD)
++#  remove if you do not have GTK or do not want the GTK frame analyzer
++   GTK = -DHAVEGTK `gtk-config --cflags`
++   GTKLIBS = `gtk-config --libs` 
++# Comment out next 2 lines if you want to remove VBR histogram capability
++   BRHIST_SWITCH = -DBRHIST
++   LIBTERMCAP = -lncurses
++endif
+ 
+ ##########################################################################
+ # SunOS
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 3175a7abe96..51de98d3729 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.80 1999/10/01 15:14:50 drochner Exp $
+# $NetBSD: mk.conf.example,v 1.81 1999/10/13 05:52:45 explorer Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -259,6 +259,11 @@
                                 # Possible: 4, 5, not defined
                                 # Default: not defined
 
+#LAME_USE_GTK=		YES	# The audio/lame mpeg audio encoder should
+                                # build with the GTK+ GUI.
+                                # Possible: YES, or NO.
+                                # Default: YES
+
 #LIBWRAP_FWD=			# Used in ssh package to make libwrap also
                                 # compare against forwarded connection attempts
                                 # Possible: not defined, YES