From owner-freebsd-ports Sun Nov 14 10: 0: 4 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 9016514DEB for ; Sun, 14 Nov 1999 10:00:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA92721; Sun, 14 Nov 1999 10:00:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from cube.gelatinous.com (cube.gelatinous.com [207.82.194.150]) by hub.freebsd.org (Postfix) with SMTP id 81F9814CCA for ; Sun, 14 Nov 1999 09:52:08 -0800 (PST) (envelope-from aaron@gelatinous.com) Received: (qmail 67572 invoked by uid 1000); 14 Nov 1999 17:52:08 -0000 Message-Id: <19991114175208.67571.qmail@cube.gelatinous.com> Date: 14 Nov 1999 17:52:08 -0000 From: aaron@mutex.org Reply-To: aaron@mutex.org To: FreeBSD-gnats-submit@freebsd.org Cc: aaron@mutex.org X-Send-Pr-Version: 3.2 Subject: ports/14876: update for lame port to 3.50 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14876 >Category: ports >Synopsis: update of lame port for 3.50, fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Nov 14 10:00:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Aaron Smith >Release: FreeBSD 3.3-RELEASE i386 >Organization: none >Environment: >Description: Hello, >>>> From: Aaron Smith >>>> Date: update for lame port to 3.50 > hello, > > here are patches for: > > - upgrading the lame port to v3.50 > - obeying NO_X11 and suppressing the GTK dependencies if it is set. > - some of the included docs appear to have changed, so the removals > have been reflected in PLIST. > > thanks, > aaron Good! I tried this patches. It's work well. I'm so busy to update lame ports, now. Can you send-pr this patches ? Thank you. -- yoshiaki@kt.rim.or.jp >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /usr/cvs/ports/audio/lame/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 1999/08/25 04:35:42 1.6 +++ Makefile 1999/11/12 09:40:29 @@ -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,21 +7,24 @@ # 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 +.if !defined(NO_X11) LIB_DEPENDS= gtk12:${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 Index: files/md5 =================================================================== RCS file: /usr/cvs/ports/audio/lame/files/md5,v retrieving revision 1.4 diff -u -r1.4 md5 --- md5 1999/07/27 16:37:56 1.4 +++ md5 1999/11/12 08:57:08 @@ -1,2 +1,2 @@ MD5 (dist10.tar.gz) = 62cee8daa6041b8a2d0a9a1ef18163b4 -MD5 (lame3.13.patch.gz) = 67aacae4b77f2a1f377552cc366fe0eb +MD5 (lame3.50.patch.gz) = eb5e35131bcb7933212165f7d3f2add1 Index: patches/patch-aa =================================================================== RCS file: /usr/cvs/ports/audio/lame/patches/patch-aa,v retrieving revision 1.2 diff -u -r1.2 patch-aa --- patch-aa 1999/06/11 14:28:25 1.2 +++ patch-aa 1999/11/12 09:39:43 @@ -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 Index: patches/patch-ab =================================================================== RCS file: /usr/cvs/ports/audio/lame/patches/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- patch-ab 1999/09/20 01:29:53 1.1 +++ patch-ab 1999/11/12 09:46:43 @@ -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 { - fp_except_t mask; - mask=fpgetmask(); + /* seet floating point mask to the Linux default */ Index: pkg/PLIST =================================================================== RCS file: /usr/cvs/ports/audio/lame/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- PLIST 1999/06/11 14:28:31 1.2 +++ PLIST 1999/11/08 11:48:05 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message