Attachment #41120 for bug #64466

View | Details | Raw Unified | Return to bug 64466
Collapse All | Expand All




#

PORTNAME=	cmp3
PORTVERSION=	2.0.p6
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}

MAINTAINER=	ports@FreeBSD.org


RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123

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

Lines 1-2 Link Here

(-)audio/cmp3/distinfo (-2 / +2 lines)
1	MD5 (cmp3-2.0pre5.tar.gz) = 830b2bcf3c7d7daba67bf8752ddb102b	1	MD5 (cmp3-2.0pre6.tar.gz) = 3c58301334de2cbc58c4e37433a0b760
2	SIZE (cmp3-2.0pre5.tar.gz) = 40207	2	SIZE (cmp3-2.0pre6.tar.gz) = 183749




--- 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 \




--- 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




--- 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"




--- 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 */

Line 0 Link Here

(-)audio/cmp3/files/patch-nevlib::Makefile.in (+10 lines)
	1	--- nevlib/Makefile.in.orig Sun Jul 29 14:09:13 2001
	2	+++ nevlib/Makefile.in Thu Mar 18 22:26:26 2004
	3	@@ -1,6 +1,6 @@
	4	CC = @CC@
	5
	6	-CFLAGS = -Wall -ansi -O2 -g
	7	+CFLAGS = @CFLAGS@
	8
	9	FILES=llist.o inifile.o
	10	LIBNAME=libnev.a

Lines 2-5 Link Here

(-)audio/cmp3/pkg-descr (-1 / +1 lines)
2	playlist support, volume control and tools to help with file	2	playlist support, volume control and tools to help with file
3	management. The author is Neville Kadwa <pandama@psu.edu>.	3	management. The author is Neville Kadwa <pandama@psu.edu>.
4		4
5	WWW: http://www.personal.psu.edu/users/n/k/nkk104/cmp3/	5	WWW: http://cmp3.sourceforge.net/

Lines 1-5 Link Here

(-)audio/cmp3/pkg-plist (-5 lines)
1	bin/cmp3
2	bin/rnmp3
3	%%PORTDOCS%%%%DOCSDIR%%/README
4	%%PORTDOCS%%%%DOCSDIR%%/sample.cmp3rc
5	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 64466

Lines 6-15 Link Here

(-)audio/cmp3/Makefile (-4 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= cmp3	8	PORTNAME= cmp3
9	PORTVERSION= 2.0.p5	9	PORTVERSION= 2.0.p6
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_NETBSD}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		12	MASTER_SITE_SUBDIR= ${PORTNAME}
13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}	13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
Lines 17-25 Link Here
17		17
18	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123	18	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
19		19
20	WRKSRC= ${WRKDIR}/${PORTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}-kenrevs/
21		21
22	USE_GMAKE= yes	22	USE_GMAKE= yes
		23	GNU_CONFIGURE= yes
		24
		25	PORTDOCS= README sample.cmp3rc
		26	PLIST_FILES= bin/cmp3 bin/rnmp3
		27
		28	.if !defined(WITHOUT_VORBIS)
		29	RUN_DEPENDS+= ogg123:${PORTSDIR}/audio/vorbis-tools
		30	.endif
23		31
24	do-install:	32	do-install:
25	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin	33	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin

Line 0 Link Here

(-)audio/cmp3/files/patch-Makefile.in (+34 lines)
	1	--- Makefile.in.orig Sun Jul 29 14:43:49 2001
	2	+++ Makefile.in Thu Mar 18 22:27:35 2004
	3	@@ -5,19 +5,19 @@
	4	# initial_directory is now set in the config file
	5	mpg123_location := "mpg123"
	6	ogg123_location := "ogg123"
	7	-install_directory := "$(HOME)/bin"
	8	+install_directory := "$(PREFIX)/bin"
	9
	10	#
	11	# Location of config file - Please edit this file before installing
	12	#
	13	-config_file := "$(HOME)/.cmp3rc"
	14	+#config_file := "$(HOME)/.cmp3rc"
	15
	16	#
	17	# Uncomment and set if desired
	18	#
	19
	20	## An ass repository is a nice thing to have. See README
	21	-ass_repository := "$(HOME)/.cmp3ass"
	22	+#ass_repository := "$(HOME)/.cmp3ass"
	23
	24	## Define this for bufferring or add other parameters to mpg123 and ogg123
	25	mpg123_params := -b 320
	26	@@ -42,7 +42,7 @@
	27	# stands. Change the code to do something else you want it to do...
	28	#PARAMS +=-DMY_CD
	29	LIBS= -lform -lncurses
	30	-CFLAGS= -g -O -Inevlib
	31	+CFLAGS= @CFLAGS@ -Inevlib
	32	CC= @CC@
	33	OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
	34	cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \

Lines 1-49 Link Here

(-)audio/cmp3/files/patch-aa (-49 lines)
1	--- Makefile.orig Fri Mar 17 10:35:33 2000
2	+++ Makefile Fri Jan 12 03:02:20 2001
3	@@ -3,22 +3,22 @@
4	#
5	# initial_directory is now set in the config file
6	mpg123_location := "mpg123"
7	-install_directory := "$(HOME)/bin"
8	+install_directory := "$(PREFIX)/bin"
9
10	#
11	# Location of config file - Please edit this file before installing
12	#
13	-config_file := "$(HOME)/.cmp3rc"
14	+#config_file := "$(HOME)/.cmp3rc"
15
16	#
17	# Uncomment and set if desired
18	#
19
20	## An ass repository is a nice thing to have. See README
21	-ass_repository := "$(HOME)/.cmp3ass"
22	+#ass_repository := "$(HOME)/.cmp3ass"
23
24	## Define this for bufferring or add other parameters to mpg123
25	-mpg123_params := -b 320
26	+#mpg123_params := -b 320
27
28	# You need debugging info? Uncomment this and check /tmp/cmp3log
29	#debugging := 1
30	@@ -38,8 +38,8 @@
31	# stands. Change the code to do something else you want it to do...
32	#PARAMS +=-DMY_CD
33	LIBS= -lform -lncurses
34	-CFLAGS= -g -O -Inevlib
35	-CC= gcc
36	+CFLAGS+= -Inevlib
37	+CC?= gcc
38	OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
39	cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \
40	cmp3general.o cmp3id3.o
41	@@ -78,7 +78,7 @@
42	$(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3
43
44	lib:
45	- @$(MAKE) -C nevlib lib
46	+ @$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -C nevlib lib
47
48	cleanlib:
49	@$(MAKE) -C nevlib clean

Lines 1-16 Link Here

(-)audio/cmp3/files/patch-ab (-16 lines)
1	--- cmp3.h.orig Fri Mar 17 10:14:10 2000
2	+++ cmp3.h Sat Dec 23 09:46:16 2000
3	@@ -1,7 +1,12 @@
4	#ifndef _CMP3_H
5	#define _CMP3_H
6
7	-#include<curses.h>
8	+#if defined(__FreeBSD__)
9	+#include <ncurses.h>
10	+#include <termios.h>
11	+#else
12	+#include <curses.h>
13	+#endif
14
15	#ifndef NCURSES_VERSION
16	#error "This program requires ncurses to function"

Line 0 Link Here

(-)audio/cmp3/files/patch-cmp3volume.c (+14 lines)
	1	--- cmp3volume.c.orig Sun Jul 1 13:38:08 2001
	2	+++ cmp3volume.c Sat Mar 20 00:23:51 2004
	3	@@ -3,11 +3,7 @@
	4	*/
	5
	6	#include "cmp3funcs.h"
	7	-#if defined(__FreeBSD__)
	8	-#include <machine/soundcard.h>
	9	-#else
	10	#include<sys/soundcard.h>
	11	-#endif
	12
	13	static int mixernum, /* ID number for the mixer */
	14	vol; /* Current volume level */