ports/175570: audio/xcdplayer: Update MASTER_SITES
KATO Tsuguru
tkato432 at yahoo.com
Fri Jan 25 21:10:02 UTC 2013
>Number: 175570
>Category: ports
>Synopsis: audio/xcdplayer: Update MASTER_SITES
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 25 21:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES
- Fix build with clang
- Add MAKE_JOBS_SAFE
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/xcdplayer/Makefile audio/xcdplayer/Makefile
--- /usr/ports/audio/xcdplayer/Makefile 2012-11-08 05:46:58.000000000 +0900
+++ audio/xcdplayer/Makefile 2013-01-11 01:46:31.000000000 +0900
@@ -1,22 +1,20 @@
-# New ports collection makefile for: xcdplayer
-# Date created: 30 Sep 1994
-# Whom: swallace
-#
+# Created by: swallace
# $FreeBSD: head/audio/xcdplayer/Makefile 300895 2012-07-14 12:56:14Z beat $
-#
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 at 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 -urN /usr/ports/audio/xcdplayer/files/patch-internals.c audio/xcdplayer/files/patch-internals.c
--- /usr/ports/audio/xcdplayer/files/patch-internals.c 2012-11-08 05:46:58.000000000 +0900
+++ audio/xcdplayer/files/patch-internals.c 2013-01-11 01:51:58.000000000 +0900
@@ -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 @@
}
}
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list