diff options
| author | dholland <dholland> | 2013-04-14 01:21:17 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-04-14 01:21:17 +0000 |
| commit | 9033a36398eb66b9886b19cf72501d4eb0ff6c8f (patch) | |
| tree | c8a15face6168b811f072f49abd8badca92ef14e /cross/dasm | |
| parent | cb2d7fda4efb86e62edc5c068c7842e329cde67c (diff) | |
| download | pkgsrc-9033a36398eb66b9886b19cf72501d4eb0ff6c8f.tar.gz | |
Fix printf format for LP64 platforms. Add patch comment to patch-aa.
PKGREVISION -> 2.
Diffstat (limited to 'cross/dasm')
| -rw-r--r-- | cross/dasm/Makefile | 4 | ||||
| -rw-r--r-- | cross/dasm/distinfo | 6 | ||||
| -rw-r--r-- | cross/dasm/patches/patch-aa | 4 | ||||
| -rw-r--r-- | cross/dasm/patches/patch-ab | 16 |
4 files changed, 22 insertions, 8 deletions
diff --git a/cross/dasm/Makefile b/cross/dasm/Makefile index 18f098d06fb..60afd44dcf8 100644 --- a/cross/dasm/Makefile +++ b/cross/dasm/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2012/10/03 00:10:29 asau Exp $ +# $NetBSD: Makefile,v 1.9 2013/04/14 01:21:17 dholland Exp $ # DISTNAME= dasm212 PKGNAME= dasm-2.12 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= cross MASTER_SITES= http://members.cox.net/rcolbert/zip/ EXTRACT_SUFX= .zip diff --git a/cross/dasm/distinfo b/cross/dasm/distinfo index 2a7ef5fd0cb..e90e5496a97 100644 --- a/cross/dasm/distinfo +++ b/cross/dasm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2013/04/14 01:15:51 dholland Exp $ +$NetBSD: distinfo,v 1.7 2013/04/14 01:21:17 dholland Exp $ SHA1 (dasm212.zip) = cf14367131bc3490ab75a349d07ee276e114967d RMD160 (dasm212.zip) = dc1af353dae599acf5fedda46f586369e7030c51 Size (dasm212.zip) = 63734 bytes -SHA1 (patch-aa) = 62a65be3eec4c1cd6259c52542b53e79ae0ee904 -SHA1 (patch-ab) = 0a80e4178f9956b8881ec272ed9a4b491c49a9c9 +SHA1 (patch-aa) = f5d4838e914e4cb92401a65ec082cceefd1459fc +SHA1 (patch-ab) = 50b87f7aa07e9243da566b778d7b191a56ee229f diff --git a/cross/dasm/patches/patch-aa b/cross/dasm/patches/patch-aa index 560f5a9afc3..802efc70d4a 100644 --- a/cross/dasm/patches/patch-aa +++ b/cross/dasm/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2013/04/14 01:15:51 dholland Exp $ +$NetBSD: patch-aa,v 1.5 2013/04/14 01:21:17 dholland Exp $ + +"ulong" already exists on some platforms. --- asm.h.orig 1998-02-26 19:54:52.000000000 -0600 +++ asm.h diff --git a/cross/dasm/patches/patch-ab b/cross/dasm/patches/patch-ab index 4ce8490d3c5..48e393cb5ac 100644 --- a/cross/dasm/patches/patch-ab +++ b/cross/dasm/patches/patch-ab @@ -1,6 +1,9 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/11/20 16:24:43 minskim Exp $ +$NetBSD: patch-ab,v 1.2 2013/04/14 01:21:17 dholland Exp $ ---- main.c.orig 1998-03-02 06:28:34.000000000 -0600 +- remove nonportable use of _fmode, whatever that was +- fix printf format for LP64 platforms + +--- main.c.orig 1998-03-02 11:28:34.000000000 +0000 +++ main.c @@ -199,9 +199,7 @@ nextpass: #if OlafDol @@ -12,3 +15,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/11/20 16:24:43 minskim Exp $ Fisclear = 1; CheckSum = 0; if (FI_temp == NULL) { +@@ -568,7 +566,7 @@ cleanup(char *buf) + if (strlist) { + add += strlen(strlist->buf); + if (Xdebug) +- printf("strlist: '%s' %d\n", strlist->buf, strlen(strlist->buf)); ++ printf("strlist: '%s' %zu\n", strlist->buf, strlen(strlist->buf)); + if (str + add + strlen(str) + 1 > buf + MAXLINE) { + if (Xdebug) + printf("str %8ld buf %8ld (add/strlen(str)): %d %ld\n", (unsigned long)str, (unsigned long)buf, add, (long)strlen(str)); |