From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 20 08:00:47 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 022E9498;
 Fri, 20 Dec 2013 08:00:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D704318AE;
 Fri, 20 Dec 2013 08:00:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK80kci045024;
 Fri, 20 Dec 2013 08:00:46 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK80kFn045022;
 Fri, 20 Dec 2013 08:00:46 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312200800.rBK80kFn045022@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 20 Dec 2013 08:00:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r336980 - in branches/2014Q1/audio/mcplay: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 08:00:47 -0000

Author: bapt
Date: Fri Dec 20 08:00:46 2013
New Revision: 336980
URL: http://svnweb.freebsd.org/changeset/ports/336980

Log:
  MFH: r336946
  
  - Support CC/CFLAGS properly
  - Update MASTER_SITES
  - Support ncurses
  - Convert to staging
  
  PR:		ports/184826
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  branches/2014Q1/audio/mcplay/Makefile   (contents, props changed)
  branches/2014Q1/audio/mcplay/files/patch-Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/audio/mcplay/Makefile
==============================================================================
--- branches/2014Q1/audio/mcplay/Makefile	Fri Dec 20 07:59:55 2013	(r336979)
+++ branches/2014Q1/audio/mcplay/Makefile	Fri Dec 20 08:00:46 2013	(r336980)
@@ -4,21 +4,29 @@
 PORTNAME=	mcplay
 DISTVERSION=	0.3i
 CATEGORIES=	audio
-MASTER_SITES=	http://www.yahuxo.de/${PORTNAME}/
+MASTER_SITES=	http://www.yahuxo.de/${PORTNAME}/ \
+		http://www.sourcefiles.org/Multimedia/MP3/Front_End/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses based front-end to various audio players
 
 LICENSE=	GPLv2
 
+USES=		ncurses
 USE_GNOME=	glib12
 
-NO_STAGE=	yes
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+
+post-patch:
+.for i in mcplay.c screen.c
+	@${REINPLACE_CMD} -e \
+		's|<sys/termios.h>|<termios.h>|' ${WRKSRC}/${i}
+.endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${FILESDIR} && ${INSTALL_MAN} ${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1)
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/audio/mcplay/files/patch-Makefile
==============================================================================
--- branches/2014Q1/audio/mcplay/files/patch-Makefile	Fri Dec 20 07:59:55 2013	(r336979)
+++ branches/2014Q1/audio/mcplay/files/patch-Makefile	Fri Dec 20 08:00:46 2013	(r336980)
@@ -18,3 +18,30 @@
  BINDIR=$(INSTDIR)/bin
  
  #####################################################################
+@@ -33,7 +33,7 @@
+ PROGNAME=mcplay
+ VERSION=0.3i
+ DISTDIR=$(PROGNAME)-$(VERSION)
+-CC=gcc
++CC?=gcc
+ TARGET=mcplay
+ OBJECTS=mcplay.o \
+         screen.o \
+@@ -48,7 +48,7 @@
+ 
+ DATA=Makefile COPYING
+ 
+-MY_CFLAGS=-Wall -g -I. -DPROGNAME_S=\"$(PROGNAME)\" -DVERSION_S=\"$(VERSION)\" $(LOG_CFLAGS)
++MY_CFLAGS=-Wall -I. -DPROGNAME_S=\"$(PROGNAME)\" -DVERSION_S=\"$(VERSION)\" $(LOG_CFLAGS)
+ MY_LFLAGS=
+ 
+ PLAYER_CFLAGS=$(MPG_CFLAGS) $(OGG_CFLAGS) $(SOX_CFLAGS) $(MID_CFLAGS)
+@@ -60,7 +60,7 @@
+ NCURSES_CFLAGS=
+ NCURSES_LFLAGS=-lncurses
+ 
+-CFLAGS=$(MY_CFLAGS) $(PLAYER_CFLAGS) $(GLIB_CFLAGS) $(NCURSES_CFLAGS) $(LIRC_CFLAGS)
++CFLAGS+=$(MY_CFLAGS) $(PLAYER_CFLAGS) $(GLIB_CFLAGS) $(NCURSES_CFLAGS) $(LIRC_CFLAGS)
+ LFLAGS=$(MY_LFLAGS) $(PLAYER_LFLAGS) $(GLIB_LFLAGS) $(NCURSES_LFLAGS) $(LIRC_LFLAGS)
+ 
+ all: $(TARGET)