diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2013-02-04 14:31:17 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2013-02-04 14:31:17 +0000 |
| commit | 881dc0799f2b5e96056748cd7e5179c22779417e (patch) | |
| tree | ba70052d233cf555d613e3c524dae5b13ccbb061 | |
| parent | 5eee5a30c71c8d68f07ea563c9af100c04e1a19a (diff) | |
| download | ports-881dc0799f2b5e96056748cd7e5179c22779417e.tar.gz ports-881dc0799f2b5e96056748cd7e5179c22779417e.zip | |
- Update MASTER_SITES
- Fix build with clang
- Add MAKE_JOBS_SAFE
PR: 175570
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=311622
| -rw-r--r-- | audio/xcdplayer/Makefile | 12 | ||||
| -rw-r--r-- | audio/xcdplayer/files/patch-internals.c | 18 |
2 files changed, 23 insertions, 7 deletions
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile index d949fc4823a7..3ac42f45b2da 100644 --- a/audio/xcdplayer/Makefile +++ b/audio/xcdplayer/Makefile @@ -1,22 +1,20 @@ -# New ports collection makefile for: xcdplayer -# Date created: 30 Sep 1994 -# Whom: swallace -# +# Created by: swallace # $FreeBSD$ -# PORTNAME= xcdplayer PORTVERSION= 2.2 PORTREVISION= 3 CATEGORIES= audio -MASTER_SITES= ftp://ftp.x.org/R5contrib/ +MASTER_SITES= XCONTRIB/../R5contrib EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= CD player for X -USE_IMAKE= yes USE_XORG= xbitmaps xaw +USE_IMAKE= yes +MAKE_JOBS_SAFE= yes + MAN1= xcdplayer.1 PLIST_FILES= bin/xcdplayer lib/X11/app-defaults/XCdplayer diff --git a/audio/xcdplayer/files/patch-internals.c b/audio/xcdplayer/files/patch-internals.c index 8cc4f70e914b..618a26fc496c 100644 --- a/audio/xcdplayer/files/patch-internals.c +++ b/audio/xcdplayer/files/patch-internals.c @@ -26,6 +26,24 @@ int cdrom_get_curtime() { +@@ -46,7 +50,7 @@ + + if (cdrom_open() == -1) { + debug_printf(1, "cdrom_get_curtime: error from cdrom_open\n"); +- return; ++ return 0; + } + + switch (cdrom_status()) { +@@ -54,7 +58,7 @@ + case CDROM_PLAYING: + if (cdrom_get_curmsf(&curmsf) == -1) { + debug_printf(1, "get_curtime: error reading location\n"); +- return; ++ return 0; + } + + if (((curtrack = cdrom_get_curtrack()) == -1) || @@ -76,6 +80,7 @@ } } |