Update to 6.1.0

* This version of biew works on NetBSD/amd64 at least.

Changelog:
6.0.1:
It supports NEW Intel's AES, AVX, FMA and AMD's XOP, FMA4, CVT16 instructions sets.

6.0.2:
It contains minor bug-fixes in 64-bit mode. I hope this release will finalize series of changes for 6.0.x branch.

6.0.1:
It contains minor bug-fixes in 64-bit mode.

5.7.3.1:
This release fixes one accidental bug in AMD64 disassembler

5.7.3:
unknown.

5.7.2:
unknown.

5.7.1:
Changes:
* Minor fixes and cleanups.
+ feature request: [ 1782395 ] Make Goto (F5) accept percentages

5.7.0:
Changes:
* Fixes by Daniel Borca <dborca@yahoo.com>:
* unix/vio.c use the correct alternate set for line drawing.
see http://www.in-ulm.de/~mascheck/various/alternate_charset/
* configure: accept linux and Linux from uname. i?86 is really ia32.
* makefile: install xlt and man pages correctly.
* unix/os_dep.c: DATADIR conforming to configure. Fix duplicate biew
name in configuration file
* ia32/_inlines.h: replace xlat with regular table indexing (to be able
to test biew with valgrind).
* linux/keyboard.c: fix 'I/O possible' error; it seems to be appearing
spuriously between __init_vio and the end of __init_keyboard, where
SIGIO is hooked as event handler. I think it's harmless to just or maybe
block SIGIO events until we are finished setting up the keyboard.
+ Assembling through the nasm/yasm. Patch by <mauro.giachero@gmail.com>
+ New opcodes (SSSE3, SSE4.1, SSE4.2, SSE4a) in x86 disassembler.
+ Provide alternative insns hilighting in ix86-32 disassembler.
* Fixed bug of repainting in hexmode when up_arrow key pressed
and filepos == 0.
* Fixed REX handling in x86_64 disassembler
* Fixed CPU information dialog
+ New disassemblers:
+ ARM32 / XScale
+ AIM Power5+ ISA
+ Added support for PE32+ file format.
+ NEW: User defined names aka bookmarks (Ctrl-F10)!!!
* Many other improvements and fixes.

5.6.4:
This is release has goal to fix loopback in biew during file format detection.
Also it has some other changes:
* Fixed bug #1695783 (biew 5.6.3 - Bug in file detection due mp3.c)
* Improved multimedia format support
+ Added initial support for Sis and SisX formats of Symbian OS
* Fixed bug #1696442 (-extraincdir and -extralibdir can only handle one extra lib.)
* Added endian selection in hexmode viewer

5.6.3:
This minor featues enhancement release which adds support for multimedia file formats

9 files changed, 99 insertions, 185 deletions

diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index f72752fd7b6..5219ef4caeb 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -1,38 +1,30 @@
-# $NetBSD: Makefile,v 1.22 2012/10/03 11:43:31 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/06/30 13:39:05 ryoon Exp $
 #
 
-DISTNAME=	biew562
-PKGNAME=	biew-5.6.2
-PKGREVISION=	1
+DISTNAME=	biew-${BIEWVER:S/.//g}-src
+PKGNAME=	biew-${BIEWVER}
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=biew/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=beye/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://biew.sourceforge.net/en/biew.html
+HOMEPAGE=	http://beye.sourceforge.net/en/beye.html
 COMMENT=	Binary viewer/editor
+LICENSE=	gnu-gpl-v2
 
-ONLY_FOR_PLATFORM=	*-*-i386
+BIEWVER=	6.1.0
 
+WRKSRC=		${WRKDIR}/biew-${BIEWVER:S/.//g}
+
+HAS_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 MAKE_FILE=	makefile
-WRKSRC=		${WRKDIR}/biew-562
 
-INSTALLATION_DIRS=	bin
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+
 
 LIBS.SunOS+=	-lrt
 MAKE_ENV+=	OS_LIBS=${LIBS:Q}
 
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/biew
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/biew
-	${INSTALL_PROGRAM} ${WRKSRC}/biew ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${DESTDIR}${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/assembly.skn ${DESTDIR}${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/golded.skn ${DESTDIR}${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/insight.skn ${DESTDIR}${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/standard.skn ${DESTDIR}${PREFIX}/share/biew
-	${INSTALL_DATA} ${WRKSRC}/doc/biew_en.txt ${DESTDIR}${PREFIX}/share/doc/biew
-
 .include "../../devel/libslang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/biew/PLIST b/editors/biew/PLIST
index 40c7460ce80..57befe2ab1f 100644
--- a/editors/biew/PLIST
+++ b/editors/biew/PLIST
@@ -1,8 +1,44 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/30 13:39:05 ryoon Exp $
 bin/biew
+man/man1/biew.1
 share/biew/biew.hlp
-share/biew/assembly.skn
-share/biew/golded.skn
-share/biew/insight.skn
-share/biew/standard.skn
-share/doc/biew/biew_en.txt
+share/biew/skn/assembly.skn
+share/biew/skn/golded.skn
+share/biew/skn/insight.skn
+share/biew/skn/light.skn
+share/biew/skn/standard.skn
+share/biew/syntax/awk.stx
+share/biew/syntax/c.stx
+share/biew/syntax/cpp.stx
+share/biew/syntax/cxx.stx
+share/biew/syntax/diff.stx
+share/biew/syntax/fortran.stx
+share/biew/syntax/html.stx
+share/biew/syntax/java.stx
+share/biew/syntax/makefile.stx
+share/biew/syntax/pascal.stx
+share/biew/syntax/perl.stx
+share/biew/syntax/python.stx
+share/biew/syntax/sh.stx
+share/biew/syntax/sql.stx
+share/biew/syntax/syntax.stx
+share/biew/syntax/template.stx
+share/biew/syntax/xml.stx
+share/biew/xlt/nothing.xlt
+share/biew/xlt/readme
+share/biew/xlt/russian/alt2koi.xlt
+share/biew/xlt/russian/alt2mac.xlt
+share/biew/xlt/russian/alt2win.xlt
+share/biew/xlt/russian/e2a.xlt
+share/biew/xlt/russian/gost872a.xlt
+share/biew/xlt/russian/ibm2alt.xlt
+share/biew/xlt/russian/iso2alt.xlt
+share/biew/xlt/russian/koi02alt.xlt
+share/biew/xlt/russian/koi2alt.xlt
+share/biew/xlt/russian/koi72alt.xlt
+share/biew/xlt/russian/koi82_2a.xlt
+share/biew/xlt/russian/koi8a2a.xlt
+share/biew/xlt/russian/koi8e2a.xlt
+share/biew/xlt/russian/mac2alt.xlt
+share/biew/xlt/russian/mik2alt.xlt
+share/biew/xlt/russian/win2alt.xlt
diff --git a/editors/biew/distinfo b/editors/biew/distinfo
index 2317f1db9d5..d2ade589a48 100644
--- a/editors/biew/distinfo
+++ b/editors/biew/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/06/30 22:22:58 wiz Exp $
+$NetBSD: distinfo,v 1.8 2013/06/30 13:39:05 ryoon Exp $
 
-SHA1 (biew562.tar.bz2) = 44435c0815a59d38c9a6c74d09c0f495e71e23fe
-RMD160 (biew562.tar.bz2) = 413f2c72a70056adbebd5e79d541201d6e3b27cb
-Size (biew562.tar.bz2) = 594367 bytes
-SHA1 (patch-aa) = 6a717b0bd36c39dbdc2e50f4536d28e40e876f88
-SHA1 (patch-ab) = 2020874ed19dff5802998e20b5b8595c8d1786f3
-SHA1 (patch-ac) = 2636b520a7ee316551e4d5f33860327d9cc370ea
-SHA1 (patch-ad) = 91ff707e73c496f7c6b125d80a17bf665901f039
-SHA1 (patch-ae) = 96a8b1a4500612db2984878d2e9f3edc3f86d211
-SHA1 (patch-af) = b583dc266959ed7568d3f23bf21fdc0797683998
+SHA1 (biew-610-src.tar.bz2) = 332b45580cdee134ee42c48bec652fcba96cd99a
+RMD160 (biew-610-src.tar.bz2) = c728c8e165c2e16edcc4c25ddef063379b32049d
+Size (biew-610-src.tar.bz2) = 860517 bytes
+SHA1 (patch-aa) = 01be55a0850bce93bddea0a01de5e79d088ffe1f
diff --git a/editors/biew/patches/patch-aa b/editors/biew/patches/patch-aa
index 889b765c73c..f9828432588 100644
--- a/editors/biew/patches/patch-aa
+++ b/editors/biew/patches/patch-aa
@@ -1,26 +1,43 @@
-$NetBSD: patch-aa,v 1.3 2003/07/22 12:27:08 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2013/06/30 13:39:05 ryoon Exp $
 
---- makefile.orig	Sun Dec 30 18:05:47 2001
+* Install with BSD_INSTALL tools.
+
+--- makefile.orig	2009-09-23 07:17:50.000000000 +0000
 +++ makefile
-@@ -59,18 +59,18 @@ TARGET_OS=unix
- # Try it if you have problems with compilation due to assembler errors.
- # Note that it is not the same as specifying TARGET_PLATFORM=generic.
- #------------------------------------------------------------------------------
--HOST_CFLAGS=
-+HOST_CFLAGS=-I${PREFIX}/include -D__int8_t_defined -DLIBDIR='"${PREFIX}/share"'
- 
- # Please add any host specific linker flags here
- #------------------------------------------------------------------------------
--HOST_LDFLAGS=
-+HOST_LDFLAGS=-L${PREFIX}/lib -Wl,-R${PREFIX}/lib
- 
- ###########################################################################
- # Here comes Unix-specific configuration, see unix.txt for details.
- # Please select screen library, valid values are:
- # vt100, slang, curses (default)
- #--------------------------------------------------------------------------
--TARGET_SCREEN_LIB=curses
-+TARGET_SCREEN_LIB=slang
+@@ -264,23 +264,19 @@ biewlib/sysdep/ia32/qnx/3sto3r.o:       
+ endif
  
- # Please select if you want to use mouse. Valid values are:
- # n(default), y
+ install:
+-ifeq ($(INSTALL),)
+-	@echo "*** 'install' utility was not found and you can't run automatic"
+-	@echo "*** installation. Please download 'fileutils' from ftp://ftp.gnu.org and"
+-	@echo "*** install them to have possibility perform autiomatic installation"
+-	@echo "*** of this project" 
+-	@exit 1
+-endif
+-	$(INSTALL) -D -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
+-	$(INSTALL) -D -c -m 644 doc/biew.1 $(DESTDIR)$(PREFIX)/man/man1/biew.1
+-	$(INSTALL) -D -c -m 644 bin_rc/biew.hlp $(DESTDIR)$(DATADIR)/biew.hlp
+-	mkdir --parents $(DESTDIR)$(DATADIR)/skn
+-	$(INSTALL) -D -c -m 644 bin_rc/skn/*.skn $(DESTDIR)$(DATADIR)/skn
+-	mkdir --parents $(DESTDIR)$(DATADIR)/syntax
+-	$(INSTALL) -D -c -m 644 bin_rc/syntax/*.stx $(DESTDIR)$(DATADIR)/syntax
+-	mkdir --parents $(DESTDIR)$(DATADIR)/xlt/russian
+-	$(INSTALL) -D -c -m 644 bin_rc/xlt/russian/*.xlt $(DESTDIR)$(DATADIR)/xlt/russian
+-	$(INSTALL) -D -c -m 644 bin_rc/xlt/*.xlt bin_rc/xlt/readme $(DESTDIR)$(DATADIR)/xlt
++	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/bin
++	${BSD_INSTALL_PROGRAM} $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_MAN} doc/biew.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1/biew.1
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(DATADIR)
++	${BSD_INSTALL_DATA} bin_rc/biew.hlp $(DESTDIR)$(DATADIR)/biew.hlp
++	mkdir -p $(DESTDIR)$(DATADIR)/skn
++	${BSD_INSTALL_DATA} bin_rc/skn/*.skn $(DESTDIR)$(DATADIR)/skn
++	mkdir -p $(DESTDIR)$(DATADIR)/syntax
++	${BSD_INSTALL_DATA} bin_rc/syntax/*.stx $(DESTDIR)$(DATADIR)/syntax
++	mkdir -p $(DESTDIR)$(DATADIR)/xlt/russian
++	${BSD_INSTALL_DATA} bin_rc/xlt/russian/*.xlt $(DESTDIR)$(DATADIR)/xlt/russian
++	${BSD_INSTALL_DATA} bin_rc/xlt/*.xlt bin_rc/xlt/readme $(DESTDIR)$(DATADIR)/xlt
+ uninstall:
+ 	$(RM) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
+ 	$(RM) $(DESTDIR)$(DATADIR)/skn/*
diff --git a/editors/biew/patches/patch-ab b/editors/biew/patches/patch-ab
deleted file mode 100644
index 08b58d64b89..00000000000
--- a/editors/biew/patches/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/06/30 22:22:58 wiz Exp $
-
---- biewlib/file_ini.c.orig	2004-02-26 15:53:22.000000000 +0000
-+++ biewlib/file_ini.c
-@@ -1295,7 +1295,7 @@ static tBool __NEAR__ __FASTCALL__ __add
-   void __HUGE__ *found;
-   ini_cache __HUGE__ *it;
-   ini_cache ic;
--  (const char *)ic.item = section;
-+  ic.item = section;
-   ic.flags = 0;
-   if(!(found =la_Find((linearArray *)opening->cache,&ic,__full_compare_cache)))
-   {
-@@ -1325,7 +1325,7 @@ static tBool __NEAR__ __FASTCALL__ __add
-   {
-     do_subsect:
-       it = (ini_cache __HUGE__ *)found;
--      (const char *)ic.item = subsection;
-+      ic.item = subsection;
-       if(!(found=la_Find(it->v.leaf,&ic,__full_compare_cache)))
-       {
-         ic.item = PMalloc(strlen(subsection)+1);
-@@ -1354,7 +1354,7 @@ static tBool __NEAR__ __FASTCALL__ __add
-       {
-         do_item:
-         it = (ini_cache __HUGE__ *)found;
--        (const char *)ic.item = item;
-+        ic.item = item;
-         ic.flags = IC_STRING;
-         if(!(found=la_Find(it->v.leaf,&ic,__full_compare_cache)))
-         {
-@@ -1589,15 +1589,15 @@ unsigned __FASTCALL__ iniReadProfileStri
-           ini_cache ic;
-           void __HUGE__ *found,__HUGE__ *foundi,__HUGE__ *foundv;
-           ini_cache __HUGE__ *fi;
--          (const char *)ic.item = section;
-+          ic.item = section;
-           ic.flags = 0;
-           if((found=la_Find(ini->cache,&ic,__full_compare_cache))!=NULL)
-           {
--            (const char *)ic.item=subsection;
-+            ic.item=subsection;
-             fi = (ini_cache __HUGE__ *)found;
-             if((foundi=la_Find(fi->v.leaf,&ic,__full_compare_cache))!=NULL)
-             {
--               (const char *)ic.item = _item;
-+               ic.item = _item;
-                ic.flags = IC_STRING;
-                fi = (ini_cache __HUGE__ *)foundi;
-                if((foundv=la_Find(fi->v.leaf,&ic,__full_compare_cache))!=NULL)
diff --git a/editors/biew/patches/patch-ac b/editors/biew/patches/patch-ac
deleted file mode 100644
index bd988990ace..00000000000
--- a/editors/biew/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/06/30 22:22:58 wiz Exp $
-
---- biewlib/sysdep/ia16/cmn_ix86.c.orig	2003-03-27 06:19:30.000000000 +0000
-+++ biewlib/sysdep/ia16/cmn_ix86.c
-@@ -47,7 +47,7 @@ static unsigned long __NEAR__ __FASTCALL
-   ctrl_arr = c_arr;
-   /* align pointer on 16-byte boundary */
- 
--  if((tUInt32)ctrl_arr & 15) ((tUInt32)ctrl_arr) += 16-((tUInt32)ctrl_arr&15);
-+  if((tUInt32)ctrl_arr & 15) ctrl_arr = ((tUInt32)ctrl_arr) + 16-((tUInt32)ctrl_arr&15);
- 
-   memset(ctrl_arr,0,sizeof(ctrl_arr));
-   if(time_interval)
diff --git a/editors/biew/patches/patch-ad b/editors/biew/patches/patch-ad
deleted file mode 100644
index 018088b28df..00000000000
--- a/editors/biew/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/06/30 22:22:58 wiz Exp $
-
---- biewlib/sysdep/ia32/aclib_template.c.orig	2002-12-13 15:31:20.000000000 +0000
-+++ biewlib/sysdep/ia32/aclib_template.c
-@@ -209,8 +209,8 @@ static void * RENAME(fast_memcpy)(void *
- 		MOVNTQ" %%mm6, 48(%1)\n"
- 		MOVNTQ" %%mm7, 56(%1)\n"
- 		:: "r" (from), "r" (to) : "memory");
--		((const unsigned char *)from)+=64;
--		((unsigned char *)to)+=64;
-+		from = ((const unsigned char *)from)+64;
-+		to = ((unsigned char *)to)+64;
- 	}
- 
- 	// Pure Assembly cuz gcc is a bit unpredictable ;)
-@@ -297,8 +297,8 @@ static void * RENAME(fast_memcpy)(void *
- 		MOVNTQ" %%mm6, 48(%1)\n"
- 		MOVNTQ" %%mm7, 56(%1)\n"
- 		:: "r" (from), "r" (to) : "memory");
--		((const unsigned char *)from)+=64;
--		((unsigned char *)to)+=64;
-+		from = ((const unsigned char *)from)+64;
-+		to = ((unsigned char *)to)+64;
- 	}
- 
- #endif /* Have SSE */
-@@ -393,7 +393,7 @@ static void * RENAME(fast_memset)(void *
- 		MOVNTQ" %%mm0, 112(%0)\n"
- 		MOVNTQ" %%mm0, 120(%0)\n"
- 		:: "r" (to) : "memory");
--		((unsigned char *)to)+=128;
-+		to = ((unsigned char *)to)+128;
- 	}
- #endif /* Have SSE */
- #ifdef HAVE_MMX2
diff --git a/editors/biew/patches/patch-ae b/editors/biew/patches/patch-ae
deleted file mode 100644
index df9a939a292..00000000000
--- a/editors/biew/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/06/30 22:22:58 wiz Exp $
-
---- biewlib/tw_class.c.orig	2001-11-18 17:05:48.000000000 +0000
-+++ biewlib/tw_class.c
-@@ -71,6 +71,6 @@ void __FASTCALL__ twcDestroyClassSet(voi
- TwClass * __FASTCALL__ twcFindClass(const char *name)
- {
-  TwClass key;
-- (const char *)(key.name) = name;
-+ key.name = name;
-  return (TwClass *)la_Find(class_set,&key, comp_class);
- }
diff --git a/editors/biew/patches/patch-af b/editors/biew/patches/patch-af
deleted file mode 100644
index 20f79c074fe..00000000000
--- a/editors/biew/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/06/30 22:22:58 wiz Exp $
-
---- biewlib/twin.c.orig	2003-05-28 16:30:26.000000000 +0000
-+++ biewlib/twin.c
-@@ -1891,9 +1891,9 @@ int __FASTCALL__ twPutS(const char *str)
-        strcpy(__nls,str);
-        __nls_OemToOsdep((unsigned char *)__nls,len);
-      }
--     else (const char *)__nls = str;
-+     else __nls = str;
-   }
--  else (const char *)__nls = str;
-+  else __nls = str;
-   __nls_ptr = __nls;
-   __oem_ptr = str;
-   vidx = active->cur_x + active->cur_y*active->wwidth;