Wed Mar 30 09:17:41 2016 UTC ()
Use PKGMANDIR.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/time/globe/distinfo
diff -r1.1 -r1.2 pkgsrc/time/globe/patches/patch-Makefile
cvs diff -r1.6 -r1.7 pkgsrc/time/globe/distinfo (switch to unified diff)

--- pkgsrc/time/globe/distinfo 2015/11/02 23:31:36 1.6
+++ pkgsrc/time/globe/distinfo 2016/03/30 09:17:41 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2015/11/02 23:31:36 agc Exp $ 1$NetBSD: distinfo,v 1.7 2016/03/30 09:17:41 jperkin Exp $
2 2
3SHA1 (globe_14Aug2014.tar.gz) = d9c2657e0080c762f797dc6d2956d9ce91e220b8 3SHA1 (globe_14Aug2014.tar.gz) = d9c2657e0080c762f797dc6d2956d9ce91e220b8
4RMD160 (globe_14Aug2014.tar.gz) = 85f00508aa7625bbe3296ffc4b465c26dd8351a6 4RMD160 (globe_14Aug2014.tar.gz) = 85f00508aa7625bbe3296ffc4b465c26dd8351a6
5SHA512 (globe_14Aug2014.tar.gz) = 4bf472ecbedb1582bc4caa71bdce3dd44914d9263d58277bc9b82184a8621fb2ebba26ad49aee7a29e625816009604b49fc02719c0a3cfe8351b70463b89bf46 5SHA512 (globe_14Aug2014.tar.gz) = 4bf472ecbedb1582bc4caa71bdce3dd44914d9263d58277bc9b82184a8621fb2ebba26ad49aee7a29e625816009604b49fc02719c0a3cfe8351b70463b89bf46
6Size (globe_14Aug2014.tar.gz) = 9956 bytes 6Size (globe_14Aug2014.tar.gz) = 9956 bytes
7SHA1 (patch-Makefile) = 6b977be1e83edf385b350552bd4e798eea634dca 7SHA1 (patch-Makefile) = e1b8fc509e618053e24c552d7dcc5b56b490de91
cvs diff -r1.1 -r1.2 pkgsrc/time/globe/patches/patch-Makefile (switch to unified diff)

--- pkgsrc/time/globe/patches/patch-Makefile 2015/10/05 13:47:35 1.1
+++ pkgsrc/time/globe/patches/patch-Makefile 2016/03/30 09:17:41 1.2
@@ -1,37 +1,39 @@ @@ -1,37 +1,39 @@
1$NetBSD: patch-Makefile,v 1.1 2015/10/05 13:47:35 youri Exp $ 1$NetBSD: patch-Makefile,v 1.2 2016/03/30 09:17:41 jperkin Exp $
2 pkgsrc-ify the new Makefile  2
 3pkgsrc-ify the new Makefile
 4
3--- Makefile.orig 2014-08-11 19:13:12.000000000 +0000 5--- Makefile.orig 2014-08-11 19:13:12.000000000 +0000
4+++ Makefile 6+++ Makefile
5@@ -1,17 +1,15 @@ 7@@ -1,17 +1,15 @@
6 # CONFIGURE: the directory where you want the executables installed. 8 # CONFIGURE: the directory where you want the executables installed.
7-BINDIR = /usr/local/bin 9-BINDIR = /usr/local/bin
8+BINDIR = ${PREFIX}/bin 10+BINDIR = ${PREFIX}/bin
9  11
10 # CONFIGURE: the directory tree where you want the man pages installed. 12 # CONFIGURE: the directory tree where you want the man pages installed.
11-MANDIR = /usr/local/man 13-MANDIR = /usr/local/man
12+MANDIR = ${PREFIX}/man/man1 14+MANDIR = ${PREFIX}/${PKGMANDIR}/man1
13  15
14 # CONFIGURE: your favorite C compiler. 16 # CONFIGURE: your favorite C compiler.
15-CC = cc 17-CC = cc
16  18
17 # CONFIGURE: your favorite C flags. 19 # CONFIGURE: your favorite C flags.
18 CFLAGS = -O -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long 20 CFLAGS = -O -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long
19  21
20 # CONFIGURE: your favorite linker flags. 22 # CONFIGURE: your favorite linker flags.
21-LDFLAGS = -s 23-LDFLAGS = -s
22  24
23 all: globe 25 all: globe
24  26
25@@ -19,10 +17,7 @@ globe: globe.c 27@@ -19,10 +17,7 @@ globe: globe.c
26 $(CC) $(CFLAGS) globe.c $(LDFLAGS) -o globe 28 $(CC) $(CFLAGS) globe.c $(LDFLAGS) -o globe
27  29
28 install: all 30 install: all
29- rm -f $(BINDIR)/globe 31- rm -f $(BINDIR)/globe
30- cp globe $(BINDIR) 32- cp globe $(BINDIR)
31- rm -f $(MANDIR)/man1/globe.1 33- rm -f $(MANDIR)/man1/globe.1
32- cp globe.1 $(MANDIR)/man1 34- cp globe.1 $(MANDIR)/man1
33- 35-
34+ ${BSD_INSTALL_PROGRAM} globe ${DESTDIR}$(BINDIR) 36+ ${BSD_INSTALL_PROGRAM} globe ${DESTDIR}$(BINDIR)
35+ ${BSD_INSTALL_MAN} globe.1 ${DESTDIR}$(MANDIR) 37+ ${BSD_INSTALL_MAN} globe.1 ${DESTDIR}$(MANDIR)
36 clean: 38 clean:
37 rm -f globe a.out core 39 rm -f globe a.out core