Attachment #134529 for bug #179214

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




PORTVERSION=	1.7
PORTREVISION=	3
CATEGORIES=	audio tk
MASTER_SITES=	LOCAL/jmz
MASTER_SITE_SUBDIR=	jmz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Tcl/Tk CD player

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_TK_WRAPPER=	yes

MAN1=		xcd.1

.if !defined(WITH_CDROM_PLAYER)
WITH_CDROM_PLAYER=	cd0
.endif

pre-extract:
	@${ECHO_CMD} ""
	@${ECHO_CMD} "You can define WITH_CDROM_PLAYER to set the default CD/DVD player"
	@${ECHO_CMD} "Default: cd0"
	@${ECHO_CMD} ""
	@${ECHO_CMD} "Use the CDPLAYER environment variable to override it."
	@${ECHO_CMD} ""

post-patch:
	@${REINPLACE_CMD} 's|cd0c|${WITH_CDROM_PLAYER}|' ${WRKSRC}/cdplayer.cc
	@(cd ${WRKSRC} && ${SED} -e \
		's|/usr/local/bin/wish8.0|${WISH}| ; \
		 s|CDPLAYER|${PREFIX}/lib/xcd/cdplayer| ; \
		 s|BITMAPDIR|${PREFIX}/lib/xcd|' \
		< xcd.in > xcd)

do-build:
	(cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o cdplayer cdplayer.cc)

do-install:
	(cd ${WRKSRC} && ${INSTALL_SCRIPT} xcd ${PREFIX}/bin)
	(cd ${WRKSRC} && ${INSTALL_MAN} xcd.1 ${MANPREFIX}/man/man1)
	@${MKDIR} ${PREFIX}/lib/xcd
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} cdplayer ${PREFIX}/lib/xcd)
	(cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} *.xbm ${PREFIX}/lib/xcd)

.include <bsd.port.mk>

Lines 1-11 Link Here

(-)audio/xcd/files/patch-aa (-11 lines)
1	--- cdplayer.cc.orig Sat Nov 27 16:20:49 1999
2	+++ cdplayer.cc Sat Nov 27 16:24:02 1999
3	@@ -29,7 +29,7 @@
4	public:
5	button (char *s) {state=0; strcpy (name, s);}
6	~button () {}
7	- set (int i) {
8	+ void set (int i) {
9	if (state != i) {
10	state = i;
11	if (state == 0)

Lines 1-11 Link Here

(-)audio/xcd/files/patch-ab (-11 lines)
1	--- Makefile.orig Mon Oct 26 16:14:26 1998
2	+++ Makefile Sun Sep 8 13:14:02 2002
3	@@ -8,7 +8,7 @@
4	< xcd.in > $@
5	chmod ugo+x xcd
6	cdplayer: cdplayer.cc
7	- $(CC) $(CFLAGS) -o $@ cdplayer.cc -lm
8	+ $(CXX) $(CXXFLAGS) -o $@ cdplayer.cc -lm
9
10	install: xcd cdplayer
11	mkdir -p $(BINDIR)




--- cdplayer.cc.orig	Sat Nov 27 16:20:49 1999
+++ cdplayer.cc	Sat Nov 27 16:24:02 1999
@@ -29,7 +29,7 @@
 public:
     button (char *s) {state=0; strcpy (name, s);}
     ~button () {}
-    set (int i) {
+    void set (int i) {
 	if (state != i) {
 	    state = i;
 	    if (state == 0)
@@ -90,7 +90,7 @@
 #define S(t) toc_buffer[t].addr.msf.second
 #define F(t) toc_buffer[t].addr.msf.frame
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
     char dev[20], line[50];
     int i;

Return to bug 179214

Lines 5-35 Link Here

(-)audio/xcd/Makefile (-8 / +22 lines)
5	PORTVERSION= 1.7	5	PORTVERSION= 1.7
6	PORTREVISION= 3	6	PORTREVISION= 3
7	CATEGORIES= audio tk	7	CATEGORIES= audio tk
8	MASTER_SITES= ${MASTER_SITE_LOCAL}	8	MASTER_SITES= LOCAL/jmz
9	MASTER_SITE_SUBDIR= jmz
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Tcl/Tk CD player	11	COMMENT= Tcl/Tk CD player
13		12
14	USE_TK= yes	13	WRKSRC= ${WRKDIR}/${PORTNAME}
15	WRKSRC= ${WRKDIR}/xcd	14
		15	USE_TK_WRAPPER= yes
		16
16	MAN1= xcd.1	17	MAN1= xcd.1
17		18
18	.if !defined(WITH_CDROM_PLAYER)	19	.if !defined(WITH_CDROM_PLAYER)
19	WITH_CDROM_PLAYER= acd0	20	WITH_CDROM_PLAYER= cd0
20	.endif	21	.endif
21		22
22	pre-extract:	23	pre-extract:
23	@${ECHO_CMD} ""	24	@${ECHO_CMD} ""
24	@${ECHO_CMD} "You can define WITH_CDROM_PLAYER to set the default CD/DVD player"	25	@${ECHO_CMD} "You can define WITH_CDROM_PLAYER to set the default CD/DVD player"
25	@${ECHO_CMD} "Default: acd0"	26	@${ECHO_CMD} "Default: cd0"
26	@${ECHO_CMD} ""	27	@${ECHO_CMD} ""
27	@${ECHO_CMD} "Use the CDPLAYER environment variable to override it."	28	@${ECHO_CMD} "Use the CDPLAYER environment variable to override it."
28	@${ECHO_CMD} ""	29	@${ECHO_CMD} ""
29		30
30	post-patch:	31	post-patch:
31	@${REINPLACE_CMD} 's\|cd0c\|${WITH_CDROM_PLAYER}\|' ${WRKSRC}/cdplayer.cc	32	@${REINPLACE_CMD} 's\|cd0c\|${WITH_CDROM_PLAYER}\|' ${WRKSRC}/cdplayer.cc
32	@${REINPLACE_CMD} 's\|/usr/local/bin/wish8.0\|${WISH}\|' ${WRKSRC}/xcd.in	33	@(cd ${WRKSRC} && ${SED} -e \
33	@${REINPLACE_CMD} 's\|/usr/local\|${PREFIX}\|' ${WRKSRC}/Makefile	34	's\|/usr/local/bin/wish8.0\|${WISH}\| ; \
		35	s\|CDPLAYER\|${PREFIX}/lib/xcd/cdplayer\| ; \
		36	s\|BITMAPDIR\|${PREFIX}/lib/xcd\|' \
		37	< xcd.in > xcd)
		38
		39	do-build:
		40	(cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o cdplayer cdplayer.cc)
		41
		42	do-install:
		43	(cd ${WRKSRC} && ${INSTALL_SCRIPT} xcd ${PREFIX}/bin)
		44	(cd ${WRKSRC} && ${INSTALL_MAN} xcd.1 ${MANPREFIX}/man/man1)
		45	@${MKDIR} ${PREFIX}/lib/xcd
		46	(cd ${WRKSRC} && ${INSTALL_PROGRAM} cdplayer ${PREFIX}/lib/xcd)
		47	(cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} *.xbm ${PREFIX}/lib/xcd)
34		48
35	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/xcd/files/patch-cdplayer.cc (+20 lines)
	1	--- cdplayer.cc.orig Sat Nov 27 16:20:49 1999
	2	+++ cdplayer.cc Sat Nov 27 16:24:02 1999
	3	@@ -29,7 +29,7 @@
	4	public:
	5	button (char *s) {state=0; strcpy (name, s);}
	6	~button () {}
	7	- set (int i) {
	8	+ void set (int i) {
	9	if (state != i) {
	10	state = i;
	11	if (state == 0)
	12	@@ -90,7 +90,7 @@
	13	#define S(t) toc_buffer[t].addr.msf.second
	14	#define F(t) toc_buffer[t].addr.msf.frame
	15
	16	-main (int argc, char **argv)
	17	+int main (int argc, char **argv)
	18	{
	19	char dev[20], line[50];
	20	int i;