Attachment #12284 for bug #23828

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




# New ports collection makefile for:	cmp3
# Date created:		10 April 1999
# Whom:			Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD: ports/audio/cmp3/Makefile,v 1.10 2000/08/23 21:42:39 cpiazza Exp $
#

PORTNAME=	cmp3
PORTVERSION=	2.0.p5
CATEGORIES=	audio
MASTER_SITES=	http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}

MAINTAINER= 	ports@FreeBSD.org

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

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_GMAKE=	yes

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin
.if !defined(NOPORTDOCS)
	@${MKDIR} ${PREFIX}/share/doc/cmp3
	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)audio/cmp3/distinfo (-1 / +1 lines)
1	MD5 (cmp3-2.0pre4.tar.gz) = 8d13ba6fa3e0b7b903b4d5fa122a94ab	1	MD5 (cmp3-2.0pre5.tar.gz) = 830b2bcf3c7d7daba67bf8752ddb102b




--- Makefile.orig	Fri Mar 17 10:35:33 2000
+++ Makefile	Sat Dec 23 10:34:05 2000
@@ -3,19 +3,19 @@
 #
 #  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
@@ -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

Lines 1-11 Link Here

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

Lines 1-2 Link Here

(-)audio/cmp3/pkg-plist (+3 lines)
1	bin/cmp3	1	bin/cmp3
2	bin/rnmp3	2	bin/rnmp3
		3	share/doc/cmp3/README
		4	share/doc/cmp3/sample.cmp3rc
		5	@dirrm share/doc/cmp3

Return to bug 23828

Lines 1-23 Link Here

(-)audio/cmp3/Makefile (-7 / +15 lines)
1	# New ports collection makefile for: cmp3	1	# New ports collection makefile for: cmp3
2	# Date created: 10 April 1999	2	# Date created: 10 April 1999
3	# Whom: Chris Piazza <cpiazza@FreeBSD.org>	3	# Whom: Chris Piazza <cpiazza@FreeBSD.org>
4	#	4	#
5	# $FreeBSD: ports/audio/cmp3/Makefile,v 1.10 2000/08/23 21:42:39 cpiazza Exp $	5	# $FreeBSD: ports/audio/cmp3/Makefile,v 1.10 2000/08/23 21:42:39 cpiazza Exp $
6	#	6	#
7		7
8	PORTNAME= cmp3	8	PORTNAME= cmp3
9	PORTVERSION= 2.0.p4	9	PORTVERSION= 2.0.p5
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://www.personal.psu.edu/users/n/k/nkk104/cmp3/	11	MASTER_SITES= http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
12	DISTNAME= cmp3-2.0pre4	12	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15		15
16	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123	16	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
17		17
		18	WRKSRC= ${WRKDIR}/${PORTNAME}
		19
18	USE_GMAKE= yes	20	USE_GMAKE= yes
19		21
20	WRKSRC= ${WRKDIR}/cmp3	22	do-install:
21	PKGMESSAGE= ${WRKSRC}/MESSAGE	23	${INSTALL_PROGRAM} ${WRKSRC}/cmp3 ${PREFIX}/bin
		24	${INSTALL_PROGRAM} ${WRKSRC}/rnmp3 ${PREFIX}/bin
		25	.if !defined(NOPORTDOCS)
		26	@${MKDIR} ${PREFIX}/share/doc/cmp3
		27	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
		28	${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
		29	.endif
22		30
23	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-35 Link Here

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