Cleanup:

- Don't patch install-target if the diff is bigger than a do-install
- Drop two-line plist

3 files changed, 10 insertions, 59 deletions

diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index 8af3ca17e457..9fe9fe228970 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -15,7 +15,16 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce PS sheet-music from text input
 
+CFLAGS+=	-DPAPERSIZE=US
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+
+PLIST_FILES=	bin/chord bin/a2crd
 MAN1=		a2crd.1 chord.1
-MANCOMPRESSED=	yes
+
+do-install:
+.	for m in ${MAN1:R}
+	@${INSTALL_MAN} ${WRKSRC}/${m}.man ${MANPREFIX}/man/man1/${m}.1
+.	endfor
+	@cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:T} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/misc/chord/files/patch-aa b/misc/chord/files/patch-aa
deleted file mode 100644
index f808c5cb9ef5..000000000000
--- a/misc/chord/files/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./Makefile.org	Tue Apr 25 00:04:52 1995
-+++ ./Makefile	Tue Apr 25 00:14:57 1995
-@@ -9,14 +9,14 @@
- 
- # Use a ansi or K&R compiler
- CC = cc 
--CFLAGS = -D$(PAPERSIZE) -g
-+CFLAGS = -D$(PAPERSIZE) -O2
- 
- # where to put the resulting program
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
- 
- # where to put the man page
--MANDIR = /usr/man
--MANEXT = l
-+MANDIR = ${PREFIX}/man
-+MANEXT = 1
- 
- # You should not have to change anything below this line
- 
-@@ -37,7 +37,7 @@
- 
- a2crd: a2crd.o Makefile
- 	$(CC) $(CFLAGS) -o $@ a2crd.o common.o
--	
-+
- chord.o    : chord.h
- common.o   : chord.h
- grid.o     : chord.h
-@@ -46,13 +46,14 @@
- toc.o	   : chord.h
- 
- install : all
--	cp $(PROGRAMS) $(BINDIR)
--	rm -f $(MANDIR)/cat$(MANEXT)/chord.$(MANEXT)
-+	install -c -s $(PROGRAMS) $(BINDIR)
- 	cp chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
--	chmod 666 $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
--	Cp a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
--	chmod 666 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
--	
-+	chmod 444 $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
-+	gzip -9nf $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
-+	cp a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
-+	chmod 444 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
-+	gzip -9nf $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
-+
- shar : $(SRC)
- 	rm -f $(RELNAME).part*
- 	shar -F -L 60 -o $(RELNAME).part $(SRC) $(INCL) $(SONGS) $(DOCS)
-@@ -68,4 +69,3 @@
- clean:
- 	rm -f core *.o chord 
- 
--	
diff --git a/misc/chord/pkg-plist b/misc/chord/pkg-plist
deleted file mode 100644
index acb236f3d7b3..000000000000
--- a/misc/chord/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/chord
-bin/a2crd