Thu Apr 21 13:37:23 2016 UTC ()
Use PKGMANDIR.  Fix patch format of patch-ac.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/graphics/xplot/distinfo
diff -r1.8 -r1.9 pkgsrc/graphics/xplot/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/graphics/xplot/patches/patch-ac
cvs diff -r1.10 -r1.11 pkgsrc/graphics/xplot/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/xplot/distinfo 2015/11/03 21:34:36 1.10
+++ pkgsrc/graphics/xplot/distinfo 2016/04/21 13:37:22 1.11
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 21:34:36 agc Exp $ 1$NetBSD: distinfo,v 1.11 2016/04/21 13:37:22 jperkin Exp $
2 2
3SHA1 (xplot-0.90.7.1.tar.gz) = 164074206addaeb971d2fa65069c7c7be654efc5 3SHA1 (xplot-0.90.7.1.tar.gz) = 164074206addaeb971d2fa65069c7c7be654efc5
4RMD160 (xplot-0.90.7.1.tar.gz) = 166915e138ea52e58a67e80cb20d42005fa54621 4RMD160 (xplot-0.90.7.1.tar.gz) = 166915e138ea52e58a67e80cb20d42005fa54621
5SHA512 (xplot-0.90.7.1.tar.gz) = 6b823b24e7c2b1a7fda0062e5f5def7d022b62cc8c3353136841138b5d05f455874cf4539521dbbbdf8b0f55279d829f6e126a7b35579ab4540e31fe41aee933 5SHA512 (xplot-0.90.7.1.tar.gz) = 6b823b24e7c2b1a7fda0062e5f5def7d022b62cc8c3353136841138b5d05f455874cf4539521dbbbdf8b0f55279d829f6e126a7b35579ab4540e31fe41aee933
6Size (xplot-0.90.7.1.tar.gz) = 60166 bytes 6Size (xplot-0.90.7.1.tar.gz) = 60166 bytes
7SHA1 (patch-aa) = 487b2f4b55c4851ec7b0ae8770c5f741187a061d 7SHA1 (patch-aa) = 3e876d17de714cc1fafa71b5513fb67e7c7778cc
8SHA1 (patch-ab) = 97c7b292a1c1f8d9294c69d4cc2eacbbff411d2e 8SHA1 (patch-ab) = 97c7b292a1c1f8d9294c69d4cc2eacbbff411d2e
9SHA1 (patch-ac) = 671b63a8db7c41df4e9f14147988d81ff921aca7 9SHA1 (patch-ac) = 3313ce11016f06488f7d2f7dc04b940e74c27151
10SHA1 (patch-ad) = fd19823030badf91734fde92b45fcaecc06cf0f8 10SHA1 (patch-ad) = fd19823030badf91734fde92b45fcaecc06cf0f8
cvs diff -r1.8 -r1.9 pkgsrc/graphics/xplot/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/xplot/patches/patch-aa 2009/12/11 16:57:12 1.8
+++ pkgsrc/graphics/xplot/patches/patch-aa 2016/04/21 13:37:22 1.9
@@ -1,27 +1,36 @@ @@ -1,27 +1,36 @@
1$NetBSD: patch-aa,v 1.8 2009/12/11 16:57:12 asau Exp $ 1$NetBSD: patch-aa,v 1.9 2016/04/21 13:37:22 jperkin Exp $
2 2
3--- Makefile.in.orig 2000-05-05 01:04:20.000000000 +0400 3--- Makefile.in.orig 2000-05-04 21:04:20.000000000 +0000
4+++ Makefile.in 2009-12-11 19:54:53.000000000 +0300 4+++ Makefile.in
5@@ -62,7 +62,7 @@ 5@@ -50,7 +50,7 @@ prefix = @prefix@
 6 exec_prefix = @exec_prefix@
 7
 8 bindir = $(exec_prefix)/bin
 9-mandir = $(exec_prefix)/man/man1
 10+mandir = $(exec_prefix)/${PKGMANDIR}/man1
 11
 12 CFILES= xplot.c version_string.c coord.c unsigned.c signed.c timeval.c double.c dtime.c
 13 OFILES= xplot.o version_string.o coord.o unsigned.o signed.o timeval.o double.o dtime.o
 14@@ -62,7 +62,7 @@ MANFILES= xplot.1 tcpdump2xplot.1
6 all: ${PROG} 15 all: ${PROG}
7  16
8 ${PROG}: ${OFILES} 17 ${PROG}: ${OFILES}
9- ${CC} ${CFLAGS} -o $@.new ${OFILES} ${LIBS} 18- ${CC} ${CFLAGS} -o $@.new ${OFILES} ${LIBS}
10+ ${CC} ${CFLAGS} -o $@.new ${OFILES} ${LIBS} ${LDFLAGS} 19+ ${CC} ${CFLAGS} -o $@.new ${OFILES} ${LIBS} ${LDFLAGS}
11 -mv -f $@ $@.old 20 -mv -f $@ $@.old
12 mv -f $@.new $@ 21 mv -f $@.new $@
13  22
14@@ -70,11 +70,11 @@ 23@@ -70,11 +70,11 @@ version_string.c: version
15 echo 'char *version_string = "'`cat version`'";' >version_string.c 24 echo 'char *version_string = "'`cat version`'";' >version_string.c
16  25
17 install: all 26 install: all
18- mkdir -p $(bindir) 27- mkdir -p $(bindir)
19- $(INSTALL_PROGRAM) xplot $(bindir)/xplot 28- $(INSTALL_PROGRAM) xplot $(bindir)/xplot
20- $(INSTALL) tcpdump2xplot.pl $(bindir)/tcpdump2xplot 29- $(INSTALL) tcpdump2xplot.pl $(bindir)/tcpdump2xplot
21- mkdir -p $(mandir) 30- mkdir -p $(mandir)
22- $(INSTALL_MAN) $(MANFILES) $(mandir) 31- $(INSTALL_MAN) $(MANFILES) $(mandir)
23+ mkdir -p $(DESTDIR)$(bindir) 32+ mkdir -p $(DESTDIR)$(bindir)
24+ $(INSTALL_PROGRAM) xplot $(DESTDIR)$(bindir)/xplot 33+ $(INSTALL_PROGRAM) xplot $(DESTDIR)$(bindir)/xplot
25+ $(INSTALL) tcpdump2xplot.pl $(DESTDIR)$(bindir)/tcpdump2xplot 34+ $(INSTALL) tcpdump2xplot.pl $(DESTDIR)$(bindir)/tcpdump2xplot
26+ mkdir -p $(DESTDIR)$(mandir) 35+ mkdir -p $(DESTDIR)$(mandir)
27+ $(INSTALL_MAN) $(MANFILES) $(DESTDIR)$(mandir) 36+ $(INSTALL_MAN) $(MANFILES) $(DESTDIR)$(mandir)
cvs diff -r1.3 -r1.4 pkgsrc/graphics/xplot/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/xplot/patches/patch-ac 1999/01/29 20:19:22 1.3
+++ pkgsrc/graphics/xplot/patches/patch-ac 2016/04/21 13:37:22 1.4
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1$NetBSD: patch-ac,v 1.3 1999/01/29 20:19:22 tron Exp $ 1$NetBSD: patch-ac,v 1.4 2016/04/21 13:37:22 jperkin Exp $
2 2
3*** unsigned.c.orig Fri Dec 12 20:16:26 1997 3--- unsigned.c.orig 1998-06-18 17:50:42.000000000 +0000
4--- unsigned.c Fri Dec 12 20:16:52 1997 4+++ unsigned.c
5*************** 5@@ -45,6 +45,10 @@ to preserve same.
6*** 45,50 **** 6 #define LIBC_ATOI_IS_BROKEN
7--- 45,54 ---- 7 #endif
8 #define LIBC_ATOI_IS_BROKEN 8
9 #endif 9+#ifdef __NetBSD__
10  10+#define LIBC_ATOI_IS_BROKEN
11+ #ifdef __NetBSD__ 11+#endif
12+ #define LIBC_ATOI_IS_BROKEN 12+
13+ #endif 13 #ifdef LIBC_ATOI_IS_BROKEN
14+  14 #include <ctype.h>
15 #ifdef LIBC_ATOI_IS_BROKEN 15 #endif
16 #include <ctype.h> 
17 #endif