[pkgsrc/trunk]: pkgsrc/misc/chord Fix build on Solaris, from Jonathan Perkin ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd5e5f8a54ad
branches:  trunk
changeset: 461833:fd5e5f8a54ad
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Sep 22 12:29:19 2003 +0000

description:
Fix build on Solaris, from Jonathan Perkin in PR 22886.

diffstat:

 misc/chord/Makefile         |   4 ++--
 misc/chord/distinfo         |   4 ++--
 misc/chord/patches/patch-aa |  43 +++++++++++++++----------------------------
 3 files changed, 19 insertions(+), 32 deletions(-)

diffs (100 lines):

diff -r d31252be7d01 -r fd5e5f8a54ad misc/chord/Makefile
--- a/misc/chord/Makefile       Mon Sep 22 12:27:28 2003 +0000
+++ b/misc/chord/Makefile       Mon Sep 22 12:29:19 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:48:47 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/22 12:29:19 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/04/30 03:18:06 asami Exp
 #
 
@@ -12,6 +12,6 @@
 
 NO_SRC_ON_FTP=         Already in MASTER_SITE_LOCAL
 
-MANCOMPRESSED= yes
+CFLAGS+=       -DPAPERSIZE=${PAPERSIZE}
 
 .include "../../mk/bsd.pkg.mk"
diff -r d31252be7d01 -r fd5e5f8a54ad misc/chord/distinfo
--- a/misc/chord/distinfo       Mon Sep 22 12:27:28 2003 +0000
+++ b/misc/chord/distinfo       Mon Sep 22 12:29:19 2003 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/22 01:16:58 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/09/22 12:29:19 wiz Exp $
 
 SHA1 (chord.tar.gz) = 2d93a43ee153f840786d7218cf49b44c85d19388
 Size (chord.tar.gz) = 74809 bytes
-SHA1 (patch-aa) = 3af8a5e93e0c9c4f3dbf45cdc598daae96531509
+SHA1 (patch-aa) = 8625a6cf246d265c305faaffd826e984b30fdbc3
 SHA1 (patch-ab) = d99fade958792cf1b31905d5b685b6cbfd699585
diff -r d31252be7d01 -r fd5e5f8a54ad misc/chord/patches/patch-aa
--- a/misc/chord/patches/patch-aa       Mon Sep 22 12:27:28 2003 +0000
+++ b/misc/chord/patches/patch-aa       Mon Sep 22 12:29:19 2003 +0000
@@ -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 @@
  
  # 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 
- 
--