From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 25 21:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F2BD7DBD for ; Fri, 25 Jan 2013 21:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id D6A75981 for ; Fri, 25 Jan 2013 21:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0PLA1X1074918 for ; Fri, 25 Jan 2013 21:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0PLA174074917; Fri, 25 Jan 2013 21:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jan 2013 21:10:01 GMT Resent-Message-Id: <201301252110.r0PLA174074917@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 367AFC26 for ; Fri, 25 Jan 2013 21:00:37 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166]) by mx1.freebsd.org (Postfix) with ESMTP id 0BDDF915 for ; Fri, 25 Jan 2013 21:00:37 +0000 (UTC) Received: from msa103lp.auone-net.jp (MSA103lp [172.27.12.181]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 992A27D41F3 for ; Sat, 26 Jan 2013 06:00:33 +0900 (JST) Received: from localhost.localdomain (ZT034163.ppp.dion.ne.jp [59.128.34.163]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 1E39047C037 for ; Sat, 26 Jan 2013 06:00:22 +0900 (JST) Message-Id: <20130126054816.de6eef6931f7a87d530fc4ab@yahoo.com> Date: Sat, 26 Jan 2013 05:48:16 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/175570: audio/xcdplayer: Update MASTER_SITES X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2013 21:10:02 -0000 >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@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: