From 30ec49f1f3f22e24a6e9785b7782d25afe59c98e Mon Sep 17 00:00:00 2001 From: Danilo Egea Gondolfo Date: Sat, 7 Dec 2013 18:38:36 +0000 Subject: [PATCH] - Fix build (remove BROKEN). Use CXX as compiler instead of CC. - Add stage support --- audio/xcd/Makefile | 7 +------ audio/xcd/files/patch-Makefile | 36 ++++++++++++++++++++++++++++++++-- audio/xcd/pkg-plist | 1 + 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile index 31b44f077017..2e577a5c58ab 100644 --- a/audio/xcd/Makefile +++ b/audio/xcd/Makefile @@ -12,12 +12,7 @@ COMMENT= Tcl/Tk CD player WRKSRC= ${WRKDIR}/${PORTNAME} -BROKEN= Does not build - -USES+= tk -NO_STAGE= yes - -MAN1= xcd.1 +USES= tk WITH_CDROM_PLAYER?= cd0 diff --git a/audio/xcd/files/patch-Makefile b/audio/xcd/files/patch-Makefile index 1b82d41ace8e..4ac12910accf 100644 --- a/audio/xcd/files/patch-Makefile +++ b/audio/xcd/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 1998-10-27 01:14:26.000000000 +0100 -+++ Makefile 2013-09-23 14:57:00.000000000 +0200 +--- ./Makefile.orig 1998-10-26 22:14:26.000000000 -0200 ++++ ./Makefile 2013-12-07 16:02:51.000000000 -0200 @@ -1,6 +1,6 @@ -BINDIR = /usr/local/bin -CDDIR = /usr/local/lib/xcd @@ -10,3 +10,35 @@ all: cdplayer xcd xcd: xcd.in +@@ -8,20 +8,20 @@ + < xcd.in > $@ + chmod ugo+x xcd + cdplayer: cdplayer.cc +- $(CC) $(CFLAGS) -o $@ cdplayer.cc -lm ++ $(CXX) $(CFLAGS) -o $@ cdplayer.cc -lm + + install: xcd cdplayer +- mkdir -p $(BINDIR) +- mkdir -p $(MANDIR) +- mkdir -p $(CDDIR) +- install -c -s cdplayer $(CDDIR) +- install -c xcd $(BINDIR) +- install -c xcd.1 $(MANDIR) ++ mkdir -p ${DESTDIR}$(BINDIR) ++ mkdir -p ${DESTDIR}$(MANDIR) ++ mkdir -p ${DESTDIR}$(CDDIR) ++ install -c -s cdplayer ${DESTDIR}$(CDDIR) ++ install -c xcd ${DESTDIR}$(BINDIR) ++ install -c xcd.1 ${DESTDIR}$(MANDIR) + for f in bitmaps/*.xbm ; do \ +- install -c $$f $(CDDIR); \ ++ install -c $$f ${DESTDIR}$(CDDIR); \ + done + + install.prog: xcd cdplayer +- mkdir -p $(BINDIR) +- install -c -s cdplayer $(CDDIR) +- install -c xcd $(BINDIR) ++ mkdir -p ${DESTDIR}$(BINDIR) ++ install -c -s cdplayer ${DESTDIR}$(CDDIR) ++ install -c xcd ${DESTDIR}$(BINDIR) diff --git a/audio/xcd/pkg-plist b/audio/xcd/pkg-plist index efe673c18797..b765481ac331 100644 --- a/audio/xcd/pkg-plist +++ b/audio/xcd/pkg-plist @@ -1,4 +1,5 @@ bin/xcd +man/man1/xcd.1.gz lib/xcd/cdplayer lib/xcd/eject.xbm lib/xcd/eject_s.xbm