summaryrefslogtreecommitdiff
path: root/misc/chord/patches/patch-aa
diff options
context:
space:
mode:
authorwiz <wiz>2003-09-22 12:29:19 +0000
committerwiz <wiz>2003-09-22 12:29:19 +0000
commit1f23d906a95fc1dbdd6a989d17b4561fc63d7159 (patch)
tree8dbcf8bb2811d1772fd8249ef7b53ed835c75998 /misc/chord/patches/patch-aa
parent8dbb4f41f34ba8ea592e5e58b29c956c4afac039 (diff)
downloadpkgsrc-1f23d906a95fc1dbdd6a989d17b4561fc63d7159.tar.gz
Fix build on Solaris, from Jonathan Perkin in PR 22886.
Diffstat (limited to 'misc/chord/patches/patch-aa')
-rw-r--r--misc/chord/patches/patch-aa43
1 files changed, 15 insertions, 28 deletions
diff --git a/misc/chord/patches/patch-aa b/misc/chord/patches/patch-aa
index 24f4b12cfd4..dddfd50f93e 100644
--- a/misc/chord/patches/patch-aa
+++ b/misc/chord/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:11 agc Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/22 12:29:20 wiz Exp $
---- ./Makefile.org Tue Apr 25 00:04:52 1995
-+++ ./Makefile Tue Apr 25 00:14:57 1995
-@@ -9,14 +9,14 @@
+--- Makefile.orig Tue Apr 25 08:04:52 1995
++++ Makefile Mon Sep 22 11:18:10 2003
+@@ -8,15 +8,15 @@
+ #GETOPT = getopt.o
# Use a ansi or K&R compiler
- CC = cc
+-CC = cc
-CFLAGS = -D$(PAPERSIZE) -g
-+CFLAGS = -D$(PAPERSIZE) -O2
++#CC = cc
++#CFLAGS = -D$(PAPERSIZE) -g
# where to put the resulting program
-BINDIR = /usr/local/bin
@@ -21,38 +23,23 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:10:11 agc Exp $
# 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 @@
+@@ -46,13 +46,12 @@
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)
+- 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)
++ for prog in $(PROGRAMS); do \
++ ${BSD_INSTALL_PROGRAM} $$prog $(BINDIR)/$$prog; \
++ done
++ ${BSD_INSTALL_MAN} chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
++ ${BSD_INSTALL_MAN} a2crd.man $(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
-
--