From 4c6f5567d89e90a86a9f9f03b69d33aeb7b48648 Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Thu, 19 Dec 2013 19:00:39 +0000 Subject: [PATCH] - Support CC/CFLAGS properly - Update MASTER_SITES - Support ncurses - Convert to staging PR: ports/184826 Submitted by: KATO Tsuguru --- audio/mcplay/Makefile | 20 ++++++++++++++------ audio/mcplay/files/patch-Makefile | 27 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/audio/mcplay/Makefile b/audio/mcplay/Makefile index a66e546a4d16..5d72665e15d9 100644 --- a/audio/mcplay/Makefile +++ b/audio/mcplay/Makefile @@ -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|||' ${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 diff --git a/audio/mcplay/files/patch-Makefile b/audio/mcplay/files/patch-Makefile index 953ccfe62e24..dadec7782965 100644 --- a/audio/mcplay/files/patch-Makefile +++ b/audio/mcplay/files/patch-Makefile @@ -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)