Date: Sat, 20 Mar 2004 01:30:16 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64466: Update port: audio/cmp3 to 2.0.p6 Message-ID: <20040320013016.599dbdbb.tkato@prontomail.com> Resent-Message-ID: <200403191640.i2JGeFWT011309@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64466 >Category: ports >Synopsis: Update port: audio/cmp3 to 2.0.p6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 19 08:40:14 PST 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 2.0.p6 New file: files/patch-Makefile.in files/patch-cmp3volume.c files/patch-nevlib::Makefile.in Remove file: files/patch-aa files/patch-ab pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/cmp3/Makefile audio/cmp3/Makefile --- /usr/ports/audio/cmp3/Makefile Wed Feb 4 18:55:16 2004 +++ audio/cmp3/Makefile Sat Mar 20 00:53:14 2004 @@ -6,10 +6,10 @@ # PORTNAME= cmp3 -PORTVERSION= 2.0.p5 -PORTREVISION= 2 +PORTVERSION= 2.0.p6 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_NETBSD} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org @@ -17,9 +17,17 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-kenrevs/ USE_GMAKE= yes +GNU_CONFIGURE= yes + +PORTDOCS= README sample.cmp3rc +PLIST_FILES= bin/cmp3 bin/rnmp3 + +.if !defined(WITHOUT_VORBIS) +RUN_DEPENDS+= ogg123:${PORTSDIR}/audio/vorbis-tools +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin diff -urN /usr/ports/audio/cmp3/distinfo audio/cmp3/distinfo --- /usr/ports/audio/cmp3/distinfo Wed Jan 28 18:44:30 2004 +++ audio/cmp3/distinfo Sat Mar 20 00:21:59 2004 @@ -1,2 +1,2 @@ -MD5 (cmp3-2.0pre5.tar.gz) = 830b2bcf3c7d7daba67bf8752ddb102b -SIZE (cmp3-2.0pre5.tar.gz) = 40207 +MD5 (cmp3-2.0pre6.tar.gz) = 3c58301334de2cbc58c4e37433a0b760 +SIZE (cmp3-2.0pre6.tar.gz) = 183749 diff -urN /usr/ports/audio/cmp3/files/patch-Makefile.in audio/cmp3/files/patch-Makefile.in --- /usr/ports/audio/cmp3/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 +++ audio/cmp3/files/patch-Makefile.in Sat Mar 20 00:21:59 2004 @@ -0,0 +1,34 @@ +--- Makefile.in.orig Sun Jul 29 14:43:49 2001 ++++ Makefile.in Thu Mar 18 22:27:35 2004 +@@ -5,19 +5,19 @@ + # initial_directory is now set in the config file + mpg123_location := "mpg123" + ogg123_location := "ogg123" +-install_directory := "$(HOME)/bin" ++install_directory := "$(PREFIX)/bin" + + # + # Location of config file - Please edit this file before installing + # +-config_file := "$(HOME)/.cmp3rc" ++#config_file := "$(HOME)/.cmp3rc" + + # + # Uncomment and set if desired + # + + ## An ass repository is a nice thing to have. See README +-ass_repository := "$(HOME)/.cmp3ass" ++#ass_repository := "$(HOME)/.cmp3ass" + + ## Define this for bufferring or add other parameters to mpg123 and ogg123 + mpg123_params := -b 320 +@@ -42,7 +42,7 @@ + # stands. Change the code to do something else you want it to do... + #PARAMS +=-DMY_CD + LIBS= -lform -lncurses +-CFLAGS= -g -O -Inevlib ++CFLAGS= @CFLAGS@ -Inevlib + CC= @CC@ + OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \ + cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \ diff -urN /usr/ports/audio/cmp3/files/patch-aa audio/cmp3/files/patch-aa --- /usr/ports/audio/cmp3/files/patch-aa Wed Jan 17 00:13:25 2001 +++ audio/cmp3/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,49 +0,0 @@ ---- Makefile.orig Fri Mar 17 10:35:33 2000 -+++ Makefile Fri Jan 12 03:02:20 2001 -@@ -3,22 +3,22 @@ - # - # initial_directory is now set in the config file - mpg123_location := "mpg123" --install_directory := "$(HOME)/bin" -+install_directory := "$(PREFIX)/bin" - - # - # Location of config file - Please edit this file before installing - # --config_file := "$(HOME)/.cmp3rc" -+#config_file := "$(HOME)/.cmp3rc" - - # - # Uncomment and set if desired - # - - ## An ass repository is a nice thing to have. See README --ass_repository := "$(HOME)/.cmp3ass" -+#ass_repository := "$(HOME)/.cmp3ass" - - ## Define this for bufferring or add other parameters to mpg123 --mpg123_params := -b 320 -+#mpg123_params := -b 320 - - # You need debugging info? Uncomment this and check /tmp/cmp3log - #debugging := 1 -@@ -38,8 +38,8 @@ - # stands. Change the code to do something else you want it to do... - #PARAMS +=-DMY_CD - LIBS= -lform -lncurses --CFLAGS= -g -O -Inevlib --CC= gcc -+CFLAGS+= -Inevlib -+CC?= gcc - OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \ - cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \ - cmp3general.o cmp3id3.o -@@ -78,7 +78,7 @@ - $(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3 - - lib: -- @$(MAKE) -C nevlib lib -+ @$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -C nevlib lib - - cleanlib: - @$(MAKE) -C nevlib clean diff -urN /usr/ports/audio/cmp3/files/patch-ab audio/cmp3/files/patch-ab --- /usr/ports/audio/cmp3/files/patch-ab Wed Dec 27 00:07:53 2000 +++ audio/cmp3/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ ---- cmp3.h.orig Fri Mar 17 10:14:10 2000 -+++ cmp3.h Sat Dec 23 09:46:16 2000 -@@ -1,7 +1,12 @@ - #ifndef _CMP3_H - #define _CMP3_H - --#include<curses.h> -+#if defined(__FreeBSD__) -+#include <ncurses.h> -+#include <termios.h> -+#else -+#include <curses.h> -+#endif - - #ifndef NCURSES_VERSION - #error "This program requires ncurses to function" diff -urN /usr/ports/audio/cmp3/files/patch-cmp3volume.c audio/cmp3/files/patch-cmp3volume.c --- /usr/ports/audio/cmp3/files/patch-cmp3volume.c Thu Jan 1 09:00:00 1970 +++ audio/cmp3/files/patch-cmp3volume.c Sat Mar 20 00:24:07 2004 @@ -0,0 +1,14 @@ +--- cmp3volume.c.orig Sun Jul 1 13:38:08 2001 ++++ cmp3volume.c Sat Mar 20 00:23:51 2004 +@@ -3,11 +3,7 @@ + */ + + #include "cmp3funcs.h" +-#if defined(__FreeBSD__) +-#include <machine/soundcard.h> +-#else + #include<sys/soundcard.h> +-#endif + + static int mixernum, /* ID number for the mixer */ + vol; /* Current volume level */ diff -urN /usr/ports/audio/cmp3/files/patch-nevlib::Makefile.in audio/cmp3/files/patch-nevlib::Makefile.in --- /usr/ports/audio/cmp3/files/patch-nevlib::Makefile.in Thu Jan 1 09:00:00 1970 +++ audio/cmp3/files/patch-nevlib::Makefile.in Sat Mar 20 00:21:59 2004 @@ -0,0 +1,10 @@ +--- nevlib/Makefile.in.orig Sun Jul 29 14:09:13 2001 ++++ nevlib/Makefile.in Thu Mar 18 22:26:26 2004 +@@ -1,6 +1,6 @@ + CC = @CC@ + +-CFLAGS = -Wall -ansi -O2 -g ++CFLAGS = @CFLAGS@ + + FILES=llist.o inifile.o + LIBNAME=libnev.a diff -urN /usr/ports/audio/cmp3/pkg-descr audio/cmp3/pkg-descr --- /usr/ports/audio/cmp3/pkg-descr Thu Aug 24 06:42:39 2000 +++ audio/cmp3/pkg-descr Sat Mar 20 01:23:09 2004 @@ -2,4 +2,4 @@ playlist support, volume control and tools to help with file management. The author is Neville Kadwa <pandama@psu.edu>. -WWW: http://www.personal.psu.edu/users/n/k/nkk104/cmp3/ +WWW: http://cmp3.sourceforge.net/ diff -urN /usr/ports/audio/cmp3/pkg-plist audio/cmp3/pkg-plist --- /usr/ports/audio/cmp3/pkg-plist Sat Jul 19 11:47:43 2003 +++ audio/cmp3/pkg-plist Thu Jan 1 09:00:00 1970 @@ -1,5 +0,0 @@ -bin/cmp3 -bin/rnmp3 -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/sample.cmp3rc -%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040320013016.599dbdbb.tkato>