Hello, Here is a diff to update ish-1.11 -> ish-2.01a5.
I tested on i386 and amd64 and found two bugs. #1: Multi-volume format cannot handle on 64bit environment. #2: When decoding, the status display has Y2K problem. So, this diff contains bug-fix patch. patch-crc32_c and patch-mvol_c fixes #1 and patch-decode_c is for #2. ok? -- SASANO Takayoshi <[email protected]> Index: Makefile =================================================================== RCS file: /cvs/ports/converters/ish/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 16 Sep 2007 01:40:27 -0000 1.18 +++ Makefile 26 Dec 2011 12:29:37 -0000 @@ -2,7 +2,8 @@ COMMENT= binary-to-text file converter -DISTNAME= ish-1.11 +DISTNAME= ish201a5 +PKGNAME= ish-2.01a5 CATEGORIES= converters PERMIT_PACKAGE_CDROM= no license @@ -12,13 +13,13 @@ PERMIT_DISTFILES_FTP= no license WANTLIB= c MASTER_SITES= \ - ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \ - ftp://ftp4.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \ - ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/ports-jp/LOCAL_PORTS/ + ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \ + ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/ \ + http://www.unix.gr.jp/jnetcex/soft/ MAKE_FILE= makefile MAKE_FLAGS= CFLAGS="${CFLAGS}" -ALL_TARGET= ish +ALL_TARGET= ish dispish NO_REGRESS= Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/converters/ish/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 15:37:47 -0000 1.3 +++ distinfo 26 Dec 2011 12:29:37 -0000 @@ -1,5 +1,5 @@ -MD5 (ish-1.11.tar.gz) = ByuJT9QBTp8G6mx49qTyUg== -RMD160 (ish-1.11.tar.gz) = s/1n+f9XmoZcJp8Lptt3BgAw/Jc= -SHA1 (ish-1.11.tar.gz) = mcGCxoUhAXlCjUTPGoDZZ2bPPT4= -SHA256 (ish-1.11.tar.gz) = rF7qE6m7f5rbW6UWGIGxWdJ/gJZ7vPDlIZPFwZFrFd8= -SIZE (ish-1.11.tar.gz) = 13029 +MD5 (ish201a5.tar.gz) = rhtix3d9F7bWShwbBW2BFA== +RMD160 (ish201a5.tar.gz) = EY6Cg/sx0Mzf6m59xU+IcSd+8i4= +SHA1 (ish201a5.tar.gz) = I7/ZggOqgni8uQ4c58GQNrUkYsg= +SHA256 (ish201a5.tar.gz) = tigowYxFZL9qk6DCEQYDV8PStfC2d3pSw5nBD02TkG0= +SIZE (ish201a5.tar.gz) = 25803 Index: patches/patch-crc32_c =================================================================== RCS file: patches/patch-crc32_c diff -N patches/patch-crc32_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-crc32_c 26 Dec 2011 12:29:37 -0000 @@ -0,0 +1,10 @@ +--- crc32.c.orig Wed Apr 20 14:23:00 1994 ++++ crc32.c Tue Dec 20 18:56:44 2011 +@@ -78,6 +78,7 @@ unsigned char *arg; + int len; + unsigned long crc; + { ++ crc &= 0xffffffffU; + while(--len >= 0) { + crc = crc >> 8 ^ crctbl[(crc & 0xff) ^ *arg++]; + } Index: patches/patch-decode_c =================================================================== RCS file: patches/patch-decode_c diff -N patches/patch-decode_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-decode_c 26 Dec 2011 12:29:37 -0000 @@ -0,0 +1,13 @@ +--- decode.c.orig Sun Jan 7 19:46:37 1996 ++++ decode.c Mon Dec 26 20:06:50 2011 +@@ -273,8 +273,8 @@ ish_head *head; + tm.tm_min = (p[1]&0x07)<<3; + tm.tm_min += p[0]>>5; + tm.tm_sec = (p[0]&0x1f)<<1; +- fprintf(stderr,"%02d/%02d/%02d %02d:%02d:%02d ", +- tm.tm_year,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec); ++ fprintf(stderr,"%04d/%02d/%02d %02d:%02d:%02d ", ++ tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec); + #ifdef __TURBOC__ + memcpy( &timep[0], head->time, 4); + timep[1] = timep[0]; Index: patches/patch-makefile =================================================================== RCS file: /cvs/ports/converters/ish/patches/patch-makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-makefile --- patches/patch-makefile 26 Oct 2007 20:39:26 -0000 1.1 +++ patches/patch-makefile 26 Dec 2011 12:29:37 -0000 @@ -1,9 +1,11 @@ -$OpenBSD: patch-makefile,v 1.1 2007/10/26 20:39:26 ajacoutot Exp $ ---- makefile.orig Sun Aug 5 13:04:08 1990 -+++ makefile Fri Oct 26 22:35:41 2007 -@@ -1,4 +1,4 @@ --DEST = . +--- makefile.orig Sun Jan 14 10:28:21 1996 ++++ makefile Mon Dec 19 21:46:20 2011 +@@ -45,7 +45,7 @@ + LDFLAGS = -g + + # binaries dir +-DEST = /usr/local/bin +DEST = $(PREFIX)/bin - #CFLAGS = -O -DSysV - CFLAGS = -O - LDFLAGS = -s + + SRCS = crc.c crc32.c decode.c encode.c ish.c jis7.c jis8.c sjis.c njis.c mvol.c mencode.c + OBJS = crc.o crc32.o decode.o encode.o ish.o jis7.o jis8.o sjis.o njis.o mvol.o mencode.o Index: patches/patch-mvol_c =================================================================== RCS file: patches/patch-mvol_c diff -N patches/patch-mvol_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-mvol_c 26 Dec 2011 12:29:37 -0000 @@ -0,0 +1,11 @@ +--- mvol.c.orig Sun Jan 7 19:47:17 1996 ++++ mvol.c Tue Dec 20 20:07:46 2011 +@@ -248,7 +248,7 @@ unsigned char *p; + } + close(id); + close(od); +- crc32 = ~crc32; ++ crc32 = ~crc32 & 0xffffffffU; + crc16 = ~crc16; + if (crc32 == ncrc32 && crc16 == ncrc16) { + /* checksum OK */ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/converters/ish/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 7 Apr 2002 01:54:48 -0000 1.2 +++ pkg/PLIST 26 Dec 2011 12:29:37 -0000 @@ -1,2 +1,3 @@ @comment $OpenBSD: PLIST,v 1.2 2002/04/07 01:54:48 naddy Exp $ bin/ish +bin/dispish
