Thu Feb 11 19:02:01 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.13 -r1.14 pkgsrc/misc/chord/Makefile
diff -r1.5 -r1.6 pkgsrc/misc/chord/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/chord/patches/patch-aa
cvs diff -r1.13 -r1.14 pkgsrc/misc/chord/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/chord/Makefile 2006/03/04 21:30:10 1.13
+++ pkgsrc/misc/chord/Makefile 2010/02/11 19:02:01 1.14
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:10 jlam Exp $ 1# $NetBSD: Makefile,v 1.14 2010/02/11 19:02:01 joerg Exp $
2 2
3DISTNAME= chord 3DISTNAME= chord
4PKGNAME= chord-3.6 4PKGNAME= chord-3.6
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_LOCAL} 6MASTER_SITES= ${MASTER_SITE_LOCAL}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Produce PS sheet-music from text input 9COMMENT= Produce PS sheet-music from text input
10 10
11NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL 11PKG_DESTDIR_SUPPORT= user-destdir
 12
 13INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
12 14
13CFLAGS+= -DPAPERSIZE=${PAPERSIZE} 15CFLAGS+= -DPAPERSIZE=${PAPERSIZE}
14 16
15.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/misc/chord/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/chord/distinfo 2005/02/24 11:02:51 1.5
+++ pkgsrc/misc/chord/distinfo 2010/02/11 19:02:01 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2005/02/24 11:02:51 agc Exp $ 1$NetBSD: distinfo,v 1.6 2010/02/11 19:02:01 joerg Exp $
2 2
3SHA1 (chord.tar.gz) = 2d93a43ee153f840786d7218cf49b44c85d19388 3SHA1 (chord.tar.gz) = 2d93a43ee153f840786d7218cf49b44c85d19388
4RMD160 (chord.tar.gz) = a0f01ac2f67f1556e7249848601901a1481fb4a1 4RMD160 (chord.tar.gz) = a0f01ac2f67f1556e7249848601901a1481fb4a1
5Size (chord.tar.gz) = 74809 bytes 5Size (chord.tar.gz) = 74809 bytes
6SHA1 (patch-aa) = 8625a6cf246d265c305faaffd826e984b30fdbc3 6SHA1 (patch-aa) = 68a43070091b8ecdb51d3e7aafbe10fa053f3018
7SHA1 (patch-ab) = d99fade958792cf1b31905d5b685b6cbfd699585 7SHA1 (patch-ab) = d99fade958792cf1b31905d5b685b6cbfd699585
cvs diff -r1.3 -r1.4 pkgsrc/misc/chord/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/chord/patches/patch-aa 2003/09/22 12:29:20 1.3
+++ pkgsrc/misc/chord/patches/patch-aa 2010/02/11 19:02:01 1.4
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1$NetBSD: patch-aa,v 1.3 2003/09/22 12:29:20 wiz Exp $ 1$NetBSD: patch-aa,v 1.4 2010/02/11 19:02:01 joerg Exp $
2 2
3--- Makefile.orig Tue Apr 25 08:04:52 1995 3--- Makefile.orig Tue Apr 25 08:04:52 1995
4+++ Makefile Mon Sep 22 11:18:10 2003 4+++ Makefile Mon Sep 22 11:18:10 2003
5@@ -8,15 +8,15 @@ 5@@ -8,15 +8,15 @@
6 #GETOPT = getopt.o 6 #GETOPT = getopt.o
7  7
8 # Use a ansi or K&R compiler 8 # Use a ansi or K&R compiler
9-CC = cc  9-CC = cc
10-CFLAGS = -D$(PAPERSIZE) -g 10-CFLAGS = -D$(PAPERSIZE) -g
11+#CC = cc  11+#CC = cc
12+#CFLAGS = -D$(PAPERSIZE) -g 12+#CFLAGS = -D$(PAPERSIZE) -g
13  13
14 # where to put the resulting program 14 # where to put the resulting program
15-BINDIR = /usr/local/bin 15-BINDIR = /usr/local/bin
16+BINDIR = ${PREFIX}/bin 16+BINDIR = ${PREFIX}/bin
17  17
18 # where to put the man page 18 # where to put the man page
19-MANDIR = /usr/man 19-MANDIR = /usr/man
20-MANEXT = l 20-MANEXT = l
21+MANDIR = ${PREFIX}/man 21+MANDIR = ${PREFIX}/${PKGMANDIR}
22+MANEXT = 1 22+MANEXT = 1
23  23
24 # You should not have to change anything below this line 24 # You should not have to change anything below this line
25  25
26@@ -46,13 +46,12 @@ 26@@ -46,13 +46,12 @@
27 toc.o : chord.h 27 toc.o : chord.h
28  28
29 install : all 29 install : all
30- cp $(PROGRAMS) $(BINDIR) 30- cp $(PROGRAMS) $(BINDIR)
31- rm -f $(MANDIR)/cat$(MANEXT)/chord.$(MANEXT) 31- rm -f $(MANDIR)/cat$(MANEXT)/chord.$(MANEXT)
32- cp chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT) 32- cp chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
33- chmod 666 $(MANDIR)/man$(MANEXT)/chord.$(MANEXT) 33- chmod 666 $(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
34- Cp a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT) 34- Cp a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
35- chmod 666 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT) 35- chmod 666 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
36-  36-
37+ for prog in $(PROGRAMS); do \ 37+ for prog in $(PROGRAMS); do \
38+ ${BSD_INSTALL_PROGRAM} $$prog $(BINDIR)/$$prog; \ 38+ ${BSD_INSTALL_PROGRAM} $$prog ${DESTDIR}$(BINDIR)/$$prog; \
39+ done 39+ done
40+ ${BSD_INSTALL_MAN} chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT) 40+ ${BSD_INSTALL_MAN} chord.man ${DESTDIR}$(MANDIR)/man$(MANEXT)/chord.$(MANEXT)
41+ ${BSD_INSTALL_MAN} a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT) 41+ ${BSD_INSTALL_MAN} a2crd.man ${DESTDIR}$(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT)
42+ 42+
43 shar : $(SRC) 43 shar : $(SRC)
44 rm -f $(RELNAME).part* 44 rm -f $(RELNAME).part*
45 shar -F -L 60 -o $(RELNAME).part $(SRC) $(INCL) $(SONGS) $(DOCS) 45 shar -F -L 60 -o $(RELNAME).part $(SRC) $(INCL) $(SONGS) $(DOCS)