mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

- Fix build with clang

Browse Source 
PR:		179214
Submitted by:	Ports Fury
This commit is contained in:
Martin Wilke 2013-06-04 08:25:12 +00:00
parent 867c6b64ba
commit 233099396b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319833
4 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
audio/xcd/Makefile
View File

@ -5,31 +5,45 @@ PORTNAME= xcd
PORTVERSION= 1.7
PORTREVISION= 3
CATEGORIES= audio tk
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
MASTER_SITES= LOCAL/jmz
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk CD player
USE_TK= yes
WRKSRC= ${WRKDIR}/xcd
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_TK_WRAPPER= yes
MAN1= xcd.1
.if !defined(WITH_CDROM_PLAYER)
WITH_CDROM_PLAYER= acd0
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: acd0"
@${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
@${REINPLACE_CMD} 's|/usr/local/bin/wish8.0|${WISH}|' ${WRKSRC}/xcd.in
@${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
@(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>

11
audio/xcd/files/patch-aa
View File

@ -1,11 +0,0 @@
--- 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)

11
audio/xcd/files/patch-ab
View File

@ -1,11 +0,0 @@
--- Makefile.orig Mon Oct 26 16:14:26 1998
+++ Makefile Sun Sep 8 13:14:02 2002
@@ -8,7 +8,7 @@
< xcd.in > $@
chmod ugo+x xcd
cdplayer: cdplayer.cc
- $(CC) $(CFLAGS) -o $@ cdplayer.cc -lm
+ $(CXX) $(CXXFLAGS) -o $@ cdplayer.cc -lm
install: xcd cdplayer
mkdir -p $(BINDIR)

20
audio/xcd/files/patch-cdplayer.cc Normal file
View File

@ -0,0 +1,20 @@
--- 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;