From b9c7d71a3f93e6453a74992c89d88b71e5fe20f4 Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Tue, 19 Apr 2005 08:58:44 +0000
Subject: Avoid excessive Makefile-patch

---
 audio/cdplay/Makefile       |  6 ++++++
 audio/cdplay/files/patch-aa | 26 --------------------------
 2 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 audio/cdplay/files/patch-aa

(limited to 'audio/cdplay')

diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index fdac737975a6..45492cd599ee 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -15,10 +15,16 @@ MASTER_SITE_SUBDIR=	dannyboy
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD-player with text-based user interface
 
+MAKE_ARGS=	CFLAGS="${CFLAGS} -c -ansi"
+
 MAN1=		cdplay.1
 PLIST_FILES=	bin/cdplay
 
 pre-patch:
 	@${GUNZIP_CMD} ${WRKSRC}/cdplay.1.gz
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cdplay ${PREFIX}/bin
+	${INSTALL_MAN}	${WRKSRC}/cdplay.1 ${MAN1PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/audio/cdplay/files/patch-aa b/audio/cdplay/files/patch-aa
deleted file mode 100644
index ef23507527c2..000000000000
--- a/audio/cdplay/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.orig	Fri Nov  7 16:32:07 1997
-+++ Makefile	Fri Aug 21 22:57:43 1998
-@@ -26,11 +26,11 @@
- BIN=cdplay
- CDDEVICE=\"/dev/rcd0c\"
- OPTIMISE=-O2
--CFLAGS=-c -ansi -pedantic -Wall
-+CFLAGS+=-c -ansi -pedantic -Wall
- LFLAGS=-ltermcap
- OFILES=cd.o term.o main.o sound.o
--MANPATH=/usr/local/man/man1/
--BINPATH=/usr/local/bin/
-+MANPATH=${PREFIX}/man/man1/
-+BINPATH=${PREFIX}/bin/
- 
- all: main term cd sound link
- 
-@@ -56,6 +56,6 @@
- 	@rm cdplay
- install:
- 	@echo Installing binary
--	@install -c -o root -g wheel -m 755 cdplay $(BINPATH)
-+	@$(BSD_INSTALL_PROGRAM) cdplay $(BINPATH)
- 	@echo Installing manpage
--	@install -c -o root -g wheel -m 755 cdplay.1.gz $(MANPATH)
-+	@$(BSD_INSTALL_MAN) cdplay.1 $(MANPATH)
-- 
cgit v1.2.3