Update to 2.13. No usable change log in distfile.

6 files changed, 36 insertions, 34 deletions

diff --git a/sysutils/cpmtools/Makefile b/sysutils/cpmtools/Makefile
index 441145a573e..ce4bb8da435 100644
--- a/sysutils/cpmtools/Makefile
+++ b/sysutils/cpmtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/01/27 18:43:52 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/11 18:46:10 shattered Exp $
 #
 
-DISTNAME=		cpmtools-2.5
+DISTNAME=		cpmtools-2.13
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.moria.de/~michael/cpmtools/
 
@@ -13,7 +13,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/cpmtools
+CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/cpmtools
 
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 INSTALLATION_DIRS+=	bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
diff --git a/sysutils/cpmtools/distinfo b/sysutils/cpmtools/distinfo
index 24d7a84a097..0df2e1946d9 100644
--- a/sysutils/cpmtools/distinfo
+++ b/sysutils/cpmtools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2010/01/27 18:43:52 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/10/11 18:46:11 shattered Exp $
 
-SHA1 (cpmtools-2.5.tar.gz) = f563ed2fff83f6e9f7b7dfaf9c93c330d089542e
-RMD160 (cpmtools-2.5.tar.gz) = 36548809b9296023cd89e3b54aa26e51f9431763
-Size (cpmtools-2.5.tar.gz) = 131166 bytes
-SHA1 (patch-aa) = 1bab34c82e5f56391cb4a0822f1afc68bc717132
-SHA1 (patch-ab) = beea1a1a0985506a8d5719d54ec95c2bcf1293de
-SHA1 (patch-ac) = e473ebcc2a9a89089d38340a91efffcbde6dbfac
-SHA1 (patch-ad) = 8d16645203eade5f8d850c936b902970529ca46d
+SHA1 (cpmtools-2.13.tar.gz) = c7efb662a467b0341dc516dee1c36cd284740f8a
+RMD160 (cpmtools-2.13.tar.gz) = ce072d2ff294e7dabbd4cb723a282ab6166d3c08
+Size (cpmtools-2.13.tar.gz) = 170008 bytes
+SHA1 (patch-aa) = c15fa42a3cfbb2477fba4467fee77ba33f966c89
+SHA1 (patch-ab) = aaf72082a55ed08627d44912f461e4a0f9510294
+SHA1 (patch-ac) = c9e2423320f6e3ece5b9a3caf9f8416faf9d8a3c
+SHA1 (patch-ad) = 40d980ed06806e1784994e2bf783f0c159fcd2d4
diff --git a/sysutils/cpmtools/patches/patch-aa b/sysutils/cpmtools/patches/patch-aa
index f9bd9a0748f..ac678b14569 100644
--- a/sysutils/cpmtools/patches/patch-aa
+++ b/sysutils/cpmtools/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2006/12/06 14:58:01 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2012/10/11 18:46:11 shattered Exp $
 
---- cpmfs.c.orig	2006-12-06 14:48:36.000000000 +0000
+--- cpmfs.c.orig	2012-10-07 10:46:25.000000000 +0000
 +++ cpmfs.c
-@@ -8,6 +8,7 @@
- #include "dmalloc.h"
- #endif
+@@ -1,6 +1,7 @@
+ /* #includes */ /*{{{C}}}*//*{{{*/
+ #include "config.h"
  
 +#include <sys/types.h>
  #include <sys/stat.h>
diff --git a/sysutils/cpmtools/patches/patch-ab b/sysutils/cpmtools/patches/patch-ab
index 946a14ac6be..b1ee85696af 100644
--- a/sysutils/cpmtools/patches/patch-ab
+++ b/sysutils/cpmtools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/12/06 14:58:01 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/10/11 18:46:11 shattered Exp $
 
---- config.h.in.orig	2006-12-06 14:49:48.000000000 +0000
+--- config.h.in.orig	2012-10-07 10:46:25.000000000 +0000
 +++ config.h.in
-@@ -10,14 +10,14 @@
+@@ -8,14 +8,14 @@
  #define HAVE_SYS_STAT_H 0
  #define HAVE_MODE_T 0
  
@@ -18,6 +18,6 @@ $NetBSD: patch-ab,v 1.1 2006/12/06 14:58:01 joerg Exp $
 +#include <sys/stat.h>
 +#endif
 +
- #if HAVE_DMALLOC_H
- #include <dmalloc.h>
+ #if HAVE_LIMITS_H
+ #include <limits.h>
  #endif
diff --git a/sysutils/cpmtools/patches/patch-ac b/sysutils/cpmtools/patches/patch-ac
index 31f6abdd996..a47224e678d 100644
--- a/sysutils/cpmtools/patches/patch-ac
+++ b/sysutils/cpmtools/patches/patch-ac
@@ -1,12 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2006/12/06 14:58:01 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2012/10/11 18:46:11 shattered Exp $
 
---- cpmcp.c.orig	2006-12-06 14:53:28.000000000 +0000
+--- cpmcp.c.orig	2012-10-07 10:46:25.000000000 +0000
 +++ cpmcp.c
-@@ -8,6 +8,7 @@
- #include "dmalloc.h"
- #endif
+@@ -1,8 +1,8 @@
+ /* #includes */ /*{{{C}}}*//*{{{*/
+ #include "config.h"
  
-+#include <sys/types.h>
- #include <sys/stat.h>
+-#include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
  #include <ctype.h>
  #include <errno.h>
+ #include <stdio.h>
diff --git a/sysutils/cpmtools/patches/patch-ad b/sysutils/cpmtools/patches/patch-ad
index 43d69cd773c..7478832deb5 100644
--- a/sysutils/cpmtools/patches/patch-ad
+++ b/sysutils/cpmtools/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2010/01/27 18:43:52 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2012/10/11 18:46:11 shattered Exp $
 
---- Makefile.in.orig	2010-01-27 18:41:45.000000000 +0000
+--- Makefile.in.orig	2010-03-30 17:53:11.000000000 +0000
 +++ Makefile.in
-@@ -85,7 +85,7 @@ install:	all
+@@ -88,7 +88,7 @@ install:	all
  		$(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
  		$(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
- 		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
--		$(INSTALL_DATA) diskdefs @datadir@/diskdefs
-+		$(INSTALL_DATA) diskdefs ${DESTDIR}@datadir@/diskdefs
+ 		[ $(FSED_CPM) != '' ] && $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+-		$(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
++		$(INSTALL_DATA) diskdefs ${DESTDIR}@datarootdir@/diskdefs
  		$(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
  		$(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
  		$(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1