Thu Oct 11 18:46:11 2012 UTC ()
Update to 2.13.  No usable change log in distfile.


(shattered)
diff -r1.3 -r1.4 pkgsrc/sysutils/cpmtools/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/cpmtools/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/patch-ad

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/cpmtools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/Makefile 2010/01/27 18:43:52 1.3
+++ pkgsrc/sysutils/cpmtools/Makefile 2012/10/11 18:46:10 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.3 2010/01/27 18:43:52 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2012/10/11 18:46:10 shattered Exp $
2# 2#
3 3
4DISTNAME= cpmtools-2.5 4DISTNAME= cpmtools-2.13
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://www.moria.de/~michael/cpmtools/ 6MASTER_SITES= http://www.moria.de/~michael/cpmtools/
7 7
8MAINTAINER= dgriffi@cs.csubak.edu 8MAINTAINER= dgriffi@cs.csubak.edu
9HOMEPAGE= http://www.moria.de/~michael/cpmtools/ 9HOMEPAGE= http://www.moria.de/~michael/cpmtools/
10COMMENT= Similar to mtools, except for CP/M filesystems 10COMMENT= Similar to mtools, except for CP/M filesystems
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15 15
16CONFIGURE_ARGS+= --datadir=${PREFIX}/share/cpmtools 16CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/cpmtools
17 17
18INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} 18INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
19INSTALLATION_DIRS+= bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 19INSTALLATION_DIRS+= bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
20 20
21.include "../../devel/ncurses/buildlink3.mk" 21.include "../../devel/ncurses/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/cpmtools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/distinfo 2010/01/27 18:43:52 1.3
+++ pkgsrc/sysutils/cpmtools/distinfo 2012/10/11 18:46:11 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2010/01/27 18:43:52 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2012/10/11 18:46:11 shattered Exp $
2 2
3SHA1 (cpmtools-2.5.tar.gz) = f563ed2fff83f6e9f7b7dfaf9c93c330d089542e 3SHA1 (cpmtools-2.13.tar.gz) = c7efb662a467b0341dc516dee1c36cd284740f8a
4RMD160 (cpmtools-2.5.tar.gz) = 36548809b9296023cd89e3b54aa26e51f9431763 4RMD160 (cpmtools-2.13.tar.gz) = ce072d2ff294e7dabbd4cb723a282ab6166d3c08
5Size (cpmtools-2.5.tar.gz) = 131166 bytes 5Size (cpmtools-2.13.tar.gz) = 170008 bytes
6SHA1 (patch-aa) = 1bab34c82e5f56391cb4a0822f1afc68bc717132 6SHA1 (patch-aa) = c15fa42a3cfbb2477fba4467fee77ba33f966c89
7SHA1 (patch-ab) = beea1a1a0985506a8d5719d54ec95c2bcf1293de 7SHA1 (patch-ab) = aaf72082a55ed08627d44912f461e4a0f9510294
8SHA1 (patch-ac) = e473ebcc2a9a89089d38340a91efffcbde6dbfac 8SHA1 (patch-ac) = c9e2423320f6e3ece5b9a3caf9f8416faf9d8a3c
9SHA1 (patch-ad) = 8d16645203eade5f8d850c936b902970529ca46d 9SHA1 (patch-ad) = 40d980ed06806e1784994e2bf783f0c159fcd2d4

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/patches/Attic/patch-aa 2006/12/06 14:58:01 1.1
+++ pkgsrc/sysutils/cpmtools/patches/Attic/patch-aa 2012/10/11 18:46:11 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-aa,v 1.1 2006/12/06 14:58:01 joerg Exp $ 1$NetBSD: patch-aa,v 1.2 2012/10/11 18:46:11 shattered Exp $
2 2
3--- cpmfs.c.orig 2006-12-06 14:48:36.000000000 +0000 3--- cpmfs.c.orig 2012-10-07 10:46:25.000000000 +0000
4+++ cpmfs.c 4+++ cpmfs.c
5@@ -8,6 +8,7 @@ 5@@ -1,6 +1,7 @@
6 #include "dmalloc.h" 6 /* #includes */ /*{{{C}}}*//*{{{*/
7 #endif 7 #include "config.h"
8  8
9+#include <sys/types.h> 9+#include <sys/types.h>
10 #include <sys/stat.h> 10 #include <sys/stat.h>
11 #include <assert.h> 11 #include <assert.h>
12 #include <ctype.h> 12 #include <ctype.h>

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/patches/Attic/patch-ab 2006/12/06 14:58:01 1.1
+++ pkgsrc/sysutils/cpmtools/patches/Attic/patch-ab 2012/10/11 18:46:11 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ab,v 1.1 2006/12/06 14:58:01 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2012/10/11 18:46:11 shattered Exp $
2 2
3--- config.h.in.orig 2006-12-06 14:49:48.000000000 +0000 3--- config.h.in.orig 2012-10-07 10:46:25.000000000 +0000
4+++ config.h.in 4+++ config.h.in
5@@ -10,14 +10,14 @@ 5@@ -8,14 +8,14 @@
6 #define HAVE_SYS_STAT_H 0 6 #define HAVE_SYS_STAT_H 0
7 #define HAVE_MODE_T 0 7 #define HAVE_MODE_T 0
8  8
9-#if HAVE_SYS_STAT_H 9-#if HAVE_SYS_STAT_H
10-#include <sys/stat.h> 10-#include <sys/stat.h>
11-#endif 11-#endif
12- 12-
13 #if HAVE_SYS_TYPES_H 13 #if HAVE_SYS_TYPES_H
14 #include <sys/types.h> 14 #include <sys/types.h>
15 #endif 15 #endif
16  16
17+#if HAVE_SYS_STAT_H 17+#if HAVE_SYS_STAT_H
18+#include <sys/stat.h> 18+#include <sys/stat.h>
19+#endif 19+#endif
20+ 20+
21 #if HAVE_DMALLOC_H 21 #if HAVE_LIMITS_H
22 #include <dmalloc.h> 22 #include <limits.h>
23 #endif 23 #endif

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/patches/Attic/patch-ac 2006/12/06 14:58:01 1.1
+++ pkgsrc/sysutils/cpmtools/patches/Attic/patch-ac 2012/10/11 18:46:11 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-ac,v 1.1 2006/12/06 14:58:01 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2012/10/11 18:46:11 shattered Exp $
2 2
3--- cpmcp.c.orig 2006-12-06 14:53:28.000000000 +0000 3--- cpmcp.c.orig 2012-10-07 10:46:25.000000000 +0000
4+++ cpmcp.c 4+++ cpmcp.c
5@@ -8,6 +8,7 @@ 5@@ -1,8 +1,8 @@
6 #include "dmalloc.h" 6 /* #includes */ /*{{{C}}}*//*{{{*/
7 #endif 7 #include "config.h"
8  8
9+#include <sys/types.h> 9-#include <sys/stat.h>
10 #include <sys/stat.h> 10 #include <sys/types.h>
 11+#include <sys/stat.h>
11 #include <ctype.h> 12 #include <ctype.h>
12 #include <errno.h> 13 #include <errno.h>
 14 #include <stdio.h>

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/cpmtools/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/patches/Attic/patch-ad 2010/01/27 18:43:52 1.1
+++ pkgsrc/sysutils/cpmtools/patches/Attic/patch-ad 2012/10/11 18:46:11 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.1 2010/01/27 18:43:52 joerg Exp $ 1$NetBSD: patch-ad,v 1.2 2012/10/11 18:46:11 shattered Exp $
2 2
3--- Makefile.in.orig 2010-01-27 18:41:45.000000000 +0000 3--- Makefile.in.orig 2010-03-30 17:53:11.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -85,7 +85,7 @@ install: all 5@@ -88,7 +88,7 @@ install: all
6 $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm 6 $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
7 $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm 7 $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
8 $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm 8 [ $(FSED_CPM) != '' ] && $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
9- $(INSTALL_DATA) diskdefs @datadir@/diskdefs 9- $(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
10+ $(INSTALL_DATA) diskdefs ${DESTDIR}@datadir@/diskdefs 10+ $(INSTALL_DATA) diskdefs ${DESTDIR}@datarootdir@/diskdefs
11 $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1 11 $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
12 $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1 12 $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
13 $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1 13 $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1