summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2011-12-21 08:36:01 +0000
committerdholland <dholland>2011-12-21 08:36:01 +0000
commit14632ea38ca25805b34d061c910b99e438799611 (patch)
treedb69383a287c752aeb3b41aa3d2bd117db2ed739
parent42c3b2eddfb6793abb3c7457de0136c011fc3009 (diff)
downloadpkgsrc-14632ea38ca25805b34d061c910b99e438799611.tar.gz
Patch glitch in makefile causing parallel build failure.
-rw-r--r--misc/chord/distinfo4
-rw-r--r--misc/chord/patches/patch-aa31
2 files changed, 28 insertions, 7 deletions
diff --git a/misc/chord/distinfo b/misc/chord/distinfo
index 817a98d854a..7718aa34b1a 100644
--- a/misc/chord/distinfo
+++ b/misc/chord/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/02/11 19:02:01 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/12/21 08:36:01 dholland Exp $
SHA1 (chord.tar.gz) = 2d93a43ee153f840786d7218cf49b44c85d19388
RMD160 (chord.tar.gz) = a0f01ac2f67f1556e7249848601901a1481fb4a1
Size (chord.tar.gz) = 74809 bytes
-SHA1 (patch-aa) = 68a43070091b8ecdb51d3e7aafbe10fa053f3018
+SHA1 (patch-aa) = 81b38beb41687d49c1b531524db899d6cf856e86
SHA1 (patch-ab) = d99fade958792cf1b31905d5b685b6cbfd699585
diff --git a/misc/chord/patches/patch-aa b/misc/chord/patches/patch-aa
index 5ccc0723bcd..384550a78f4 100644
--- a/misc/chord/patches/patch-aa
+++ b/misc/chord/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2010/02/11 19:02:01 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2011/12/21 08:36:01 dholland Exp $
---- Makefile.orig Tue Apr 25 08:04:52 1995
-+++ Makefile Mon Sep 22 11:18:10 2003
-@@ -8,15 +8,15 @@
+- configure for pkgsrc
+- fix deps of a2crd
+
+--- Makefile.orig 1995-04-25 07:04:52.000000000 +0000
++++ Makefile
+@@ -8,15 +8,15 @@ PAPERSIZE = US
#GETOPT = getopt.o
# Use a ansi or K&R compiler
@@ -23,7 +26,19 @@ $NetBSD: patch-aa,v 1.4 2010/02/11 19:02:01 joerg Exp $
# You should not have to change anything below this line
-@@ -46,13 +46,12 @@
+@@ -35,9 +35,9 @@ all: $(PROGRAMS)
+ chord : $(OBJ) Makefile
+ $(CC) $(CFLAGS) -o $@ $(OBJ)
+
+-a2crd: a2crd.o Makefile
++a2crd: a2crd.o common.o Makefile
+ $(CC) $(CFLAGS) -o $@ a2crd.o common.o
+-
++
+ chord.o : chord.h
+ common.o : chord.h
+ grid.o : chord.h
+@@ -46,13 +46,12 @@ getopt.o : getopt.h
toc.o : chord.h
install : all
@@ -43,3 +58,9 @@ $NetBSD: patch-aa,v 1.4 2010/02/11 19:02:01 joerg Exp $
shar : $(SRC)
rm -f $(RELNAME).part*
shar -F -L 60 -o $(RELNAME).part $(SRC) $(INCL) $(SONGS) $(DOCS)
+@@ -67,5 +66,3 @@ lint : $(SRC)
+
+ clean:
+ rm -f core *.o chord
+-
+-