Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2015/01/26 07:49:53 mef Exp $
+# $NetBSD: Makefile,v 1.139 2015/05/23 02:13:28 mef Exp $
 #

 COMMENT=	Archivers
@@ -32,6 +32,7 @@ SUBDIR+=	ha
 SUBDIR+=	heirloom-tar
 SUBDIR+=	hpack
 SUBDIR+=	hs-zlib
+SUBDIR+=	innoextract
 SUBDIR+=	jamjar
 SUBDIR+=	lbrate
 SUBDIR+=	lcab
@@ -63,6 +64,7 @@ SUBDIR+=	p5-Archive-Any-Lite
 SUBDIR+=	p5-Archive-Extract
 SUBDIR+=	p5-Archive-Peek
 SUBDIR+=	p5-Archive-Tar
+SUBDIR+=	p5-Archive-Tar-Wrapper
 SUBDIR+=	p5-Archive-Zip
 SUBDIR+=	p5-Compress-Bzip2
 SUBDIR+=	p5-Compress-LZMA-Simple
@@ -103,6 +105,7 @@ SUBDIR+=	unzip
 SUBDIR+=	unzoo
 SUBDIR+=	upx
 SUBDIR+=	xbin
+SUBDIR+=	xfce4-thunar-archive
 SUBDIR+=	xmill
 SUBDIR+=	xpk
 SUBDIR+=	xz
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2015/02/26 16:05:11 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/05/10 18:50:47 bsiegert Exp $

 DISTNAME=	arj-3.10.22
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=arj/}

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://arj.sourceforge.net/
 COMMENT=	Open-source ARJ archiver
+LICENSE=       gnu-gpl-v2

 MAKE_JOBS_SAFE=		no

--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,14 +1,21 @@
-$NetBSD: distinfo,v 1.16 2014/05/11 20:56:16 rodent Exp $
+$NetBSD: distinfo,v 1.22 2015/05/10 18:50:47 bsiegert Exp $

 SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
 RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
 Size (arj-3.10.22.tar.gz) = 431467 bytes
-SHA1 (patch-aa) = 02a45f1365121b63020f3714cea142f9571d8f72
-SHA1 (patch-ab) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
-SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
-SHA1 (patch-ad) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
-SHA1 (patch-ae) = 5bc829e43a4d45354905f061905e2810408847f1
-SHA1 (patch-af) = cbde8eccfa95e934714591974786fe94d7b4f19f
-SHA1 (patch-ag) = 898539d86abd3747b60d9f95a5a797f709f6360d
+SHA1 (patch-arj__user.c) = 011e5deaa24c696b212beadad7d386ccb3c7112d
+SHA1 (patch-arjdata.c) = 4e4c142b97feee0673b14ea6f454f3d9de45f584
+SHA1 (patch-arjdisp.c) = d843d4dd1006ea30e8bb3a2acddbc2f0ac221abd
+SHA1 (patch-arjsfx.c) = c9e2314d0933cdc12f8e01ca16bc9222ac4e10b9
+SHA1 (patch-decode.c) = 15c31c3bf1303370691b701a98bad88ae1b0967b
+SHA1 (patch-environ.c) = e306005a88825b2bfd5b3bb35b18710d26a4c885
 SHA1 (patch-exe__sear.c) = 6d8db5a2cdb8f2452b96cf4d09687ae9d45d3e17
-SHA1 (patch-integr.c) = 67ae3fc4149a7b71a185bf45d2a457a109bcef9b
+SHA1 (patch-fardata.c) = b76ac5a168b9a8e288a610dce093280d31520af6
+SHA1 (patch-gnu_config.h.in) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
+SHA1 (patch-gnu_configure.in) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
+SHA1 (patch-gnu_makefile.in) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
+SHA1 (patch-integr.c) = fade32219b21ac3382028bf23ee4171d8d095b5f
+SHA1 (patch-msgbind.c) = fa395b0b8b74f4b430a870254a1aa1554f2bb8e7
+SHA1 (patch-register.c) = 8d81e663b499a45f7faa52b16a6cee47394cd09c
+SHA1 (patch-resource_resource.txt) = ea7044dc8a6e4fed213f00f8db9f6c1ab5df6f72
+SHA1 (patch-uxspec.c) = 24a22fa2822704e620b38df12b76ef88fe908863
--- a/archivers/arj/patches/patch-aa
+++ b/archivers/arj/patches/patch-aa
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2014/05/11 20:56:16 rodent Exp $
-
-Add support for various OSes.
-
--- environ.c.orig	2004-06-18 16:19:36.000000000 +0000
-+++ environ.c
-@@ -58,10 +58,10 @@
-   #include <sys/ioctl.h>
-   #include <sys/statfs.h>
-   #include <sys/statvfs.h>
- #elif defined(__FreeBSD__)||defined(__NetBSD__)
-+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OpenBSD__)
-   #include <sys/param.h>
-   #include <sys/mount.h>
- #elif defined(__QNXNTO__)
-+ #elif defined(__QNXNTO__)||defined(__INTERIX)
-   #include <sys/statvfs.h>
-  #else
-   #include <sys/statfs.h>
-@@ -2286,7 +2286,7 @@ unsigned long file_getfree(char *name)
-   else
-    return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
-  #elif TARGET==UNIX
-  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
-+  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)||(defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
-    struct statvfs vfs;
- 
-    if(statvfs(name, &vfs)==-1)
-@@ -3005,7 +3005,7 @@ void get_exe_name(char *dest, char *arg)
-     they are missing altogether, the corresponding code will gracefully
-     terminate. */
-  #if SFX_LEVEL==ARJ
-  strcpy(dest, "/usr/local/bin/arj");
-+  strcpy(dest, "@PREFIX@/bin/arj");
-  #elif SFX_LEVEL==ARJSFXV
-   strcpy(dest, "./arjsfxv");
-  #elif SFX_LEVEL==ARJSFX
-@@ -3013,7 +3013,7 @@ void get_exe_name(char *dest, char *arg)
-  #elif SFX_LEVEL==ARJSFXJR
-   strcpy(dest, "./arjsfxjr");
-  #elif defined(REARJ)
-  strcpy(dest, "/usr/local/bin/rearj");
-+  strcpy(dest, "@PREFIX@/bin/rearj");
-  #else
-   dest[0]='\0';
-  #endif
-@@ -3802,7 +3802,9 @@ int reset_drive(char *name)
-  #elif TARGET==WIN32
-   return(0);
-  #elif TARGET==UNIX
-+  #ifndef __INTERIX
-   sync();
-+  #endif
-   return(0);
-  #endif
- }
--- a/archivers/arj/patches/patch-ab
+++ b/archivers/arj/patches/patch-ab
@@ -1,98 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2014/05/11 20:56:16 rodent Exp $
-
--- gnu/configure.in.orig	2005-06-21 18:27:20.000000000 +0000
-+++ gnu/configure.in
-@@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
- AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
- 
- dnl Configuration parameters
-AC_CONFIG_HEADER([../c_defs.h:config.h.in])
-+AC_CONFIG_HEADER([c_defs.h:config.h.in])
- 
- dnl Checks for the canonical system name
- AC_CANONICAL_HOST
- 
- dnl Checks for programs.
- AC_PROG_CC
-+AC_DEFUN(AC_PROG_LD_GNU,
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  ac_cv_prog_gnu_ld=yes
-+else
-+  ac_cv_prog_gnu_ld=no
-+fi])
-+])
-+AC_PROG_LD_GNU
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -35,7 +45,8 @@ AC_FUNC_MEMCMP
- AC_FUNC_SETVBUF_REVERSED
- AC_TYPE_SIGNAL
- AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
-+AC_CHECK_FUNCS([getcwd lchown min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
-+AC_SEARCH_LIBS([dlsym], [dl])
- 
- dnl Platform-specific tuning
- PROG_EXT=
-@@ -45,22 +56,27 @@ REQUIRES_DEF=
- OS_ID="UNIX"
- OS_DEF="-D_UNIX"
- DLL_CFLAGS="-fPIC"
-+LD_STRIP="-s "
- 
- case $host_os in
- linux*)
- 	AC_DEFINE(ELF_EXECUTABLES, 1, [Define if executables use ELF format])
-         DYN_LIBS="-ldl"
-        LD_STRIP="gnu/stripgcc.lnk"
-+        LD_STRIP="-s gnu/stripgcc.lnk"
- 	;;
- k*bsd*)
- 	AC_DEFINE(ELF_EXECUTABLES)
- 	DYN_LIBS="-ldl"
-	LD_STRIP="gnu/stripgcc.lnk"
-+	LD_STRIP="-s gnu/stripgcc.lnk"
- 	;;
- *bsd*)
- 	AC_DEFINE(ELF_EXECUTABLES)
-         DLL_FLAGS="-shared -export-dynamic"
-        LD_STRIP="gnu/stripgcc.lnk"
-+        LD_STRIP="-s gnu/stripgcc.lnk"
-+	;;
-+darwin*)
-+	DLL_FLAGS="-bundle"
-+	LD_STRIP=""
- 	;;
- interix3*)
- 	# not ELF
-@@ -71,14 +87,16 @@ interix3*)
- 	AC_DEFINE(ELF_EXECUTABLES)
-         DLL_FLAGS="-shared -fPIC"
-         DLL_CFLAGS="-shared -fPIC"
-        LD_STRIP="gnu/stripgcc.lnk"
-+        LD_STRIP="-s gnu/stripgcc.lnk"
- 	;;
- *solaris*)
- 	AC_DEFINE(ELF_EXECUTABLES)
-         CFLAGS="-DSUNOS -D_UNIX"
-         DLL_FLAGS="-shared -fPIC"
-         DLL_CFLAGS="-shared -fPIC"
-        LD_STRIP="gnu/stripgcc.lnk"
-+	if test X"$ac_cv_prog_gnu_ld" = X"yes"; then
-+        LD_STRIP="-s gnu/stripgcc.lnk"
-+	fi
- 	;;
- os2*)
- 	PROG_EXT=".exe"
-@@ -125,7 +143,7 @@ dnl Initial setup
- 
- test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
- AC_SUBST(CONFIG_SHELL)
-
-+AC_OUTPUT(makefile.gnu:makefile.in)
- AC_MSG_CHECKING([if dynamic C library may be used])
- AC_ARG_ENABLE(libc,
- [  --disable-libc          Disable linking with dynamic C library],
--- a/archivers/arj/patches/patch-ac
+++ b/archivers/arj/patches/patch-ac
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2008/06/21 20:24:08 joerg Exp $
-
--- gnu/makefile.in.orig	2004-04-17 11:28:06.000000000 +0000
-+++ gnu/makefile.in
-@@ -53,7 +53,7 @@ DEBUG_SM = d
- ALL_CFLAGS += -g -DDEBUG
- else
- DEBUG_SM = r
-ADD_LDFLAGS = -s @LD_STRIP@
-+ADD_LDFLAGS = @LD_STRIP@
- endif
- 
- ALL_CFLAGS += $(CFLAGS)
-@@ -166,7 +166,7 @@ MAKE_KEY=$(TOOLS_DIR)/make_key$x
- endif
- 
- all:	prepare timestamp
-	$(MAKE) do-all
-+	$(MAKE) -f makefile.gnu do-all
- 
- do-all:	\
- 	$(ARJ_DIR)/arj$x \
-@@ -351,8 +351,10 @@ $(ARJ_DIR)/arj$x: $(ARJ_OBJS) \
- 	$(TOOLS_DIR)/join $(ARJ_DIR)/arj$x $(SFXSTUB_DIR)/sfxstub$x
- 	rm -f $(BASEDIR)/help.arj
- 	$(ARJ_DIR)/arj$x a $(BASEDIR)/help.arj -+ -t1f -2e -e -jm -jh65535 -jt $(RES_DIR)/$(LOCALE)/arj?.txt
-	$(TOOLS_DIR)/join $(ARJ_DIR)/arj$x $(BASEDIR)/help.arj
-	$(TOOLS_DIR)/postproc $@
-+	cp $(ARJ_DIR)/arj$x $(ARJ_DIR)/arj$x-tmp
-+	$(TOOLS_DIR)/join $(ARJ_DIR)/arj$x-tmp $(BASEDIR)/help.arj
-+	$(TOOLS_DIR)/postproc $(ARJ_DIR)/arj$x-tmp
-+	mv -f $(ARJ_DIR)/arj$x-tmp $(ARJ_DIR)/arj$x
- 
- $(BASEDIR)/fmsg_arj.c $(BASEDIR)/imsg_arj.c $(BASEDIR)/nmsg_arj.c: $(TOOLS_DIR)/msgbind$x $(RESFILE)
- 	$(TOOLS_DIR)/msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)
--- a/archivers/arj/patches/patch-ad
+++ b/archivers/arj/patches/patch-ad
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2014/05/11 20:56:16 rodent Exp $
-
--- gnu/config.h.in.orig	2004-04-17 10:33:38.000000000 +0000
-+++ gnu/config.h.in
-@@ -4,6 +4,7 @@
- #undef LIBC
- #undef NP_SFX
- #undef ELF_EXECUTABLES
-+#undef HAVE_LCHOWN
- #undef HAVE_MKDTEMP
- #undef HAVE_FCLOSEALL
- #undef HAVE_SETPRIORITY
--- a/archivers/arj/patches/patch-ae
+++ b/archivers/arj/patches/patch-ae
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2014/05/11 20:56:16 rodent Exp $
-
--- uxspec.c.orig	2004-04-17 11:39:42.000000000 +0000
-+++ uxspec.c
-@@ -13,6 +13,11 @@
-  #include <unistd.h>
- #endif
- 
-+#include "c_defs.h"
-+#ifndef HAVE_LCHOWN
-+#define lchown chown
-+#endif
-+
- DEBUGHDR(__FILE__)                      /* Debug information block */
- 
- /* UXSPECIAL block types */
--- a/archivers/arj/patches/patch-af
+++ b/archivers/arj/patches/patch-af
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2014/05/11 20:56:16 rodent Exp $
-
--- fardata.c.orig	2004-04-17 11:39:42.000000000 +0000
-+++ fardata.c
-@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
- 
- /* Length-limited strlen() */
- 
-static int strnlen(const char FAR *s, int count)
-+static int _strnlen(const char FAR *s, int count)
- {
-  const char FAR *sc;
- 
-@@ -569,7 +569,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
-     if(!s)
-      s="(null)";
- #endif
-    len=strnlen(s, precision);
-+    len=_strnlen(s, precision);
-     if(!(flags&LEFT))
-     {
-      while(len<field_width--)
-@@ -655,7 +655,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
-     num=va_arg(args, unsigned long);
-    else if(qualifier=='h')
-    {
-#ifdef __linux__
-+#if TARGET==UNIX
-     if (flags&SIGN)
-      num=va_arg(args, int);             /* num=va_arg(args, short);      */
-     else
--- a/archivers/arj/patches/patch-ag
+++ b/archivers/arj/patches/patch-ag
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2014/05/11 20:56:16 rodent Exp $
-
--- arjdata.c.orig	2004-04-17 11:44:46.000000000 +0000
-+++ arjdata.c
-@@ -64,6 +64,8 @@ static char *resources[][2]=
-   #elif TARGET==UNIX
-    #if defined(linux)
-     "Linux"
-+   #elif defined(__DragonFly__)
-+    "DragonFly"
-    #elif defined(__FreeBSD__)
-     "FreeBSD"
-    #elif defined(SUNOS)
-@@ -91,6 +93,8 @@ static char *resources[][2]=
-   "PLATFORM_APPENDIX",
-   #if defined(linux)
-    "/Linux",
-+  #elif defined(__DragonFly__)
-+   "/DragonFly", 
-   #elif defined(__FreeBSD__)
-    "/FreeBSD",
-   #elif defined(SUNOS)
--- a/archivers/arj/patches/patch-arj__user.c
+++ b/archivers/arj/patches/patch-arj__user.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-arj__user.c,v 1.1 2015/04/12 16:09:27 tnn Exp $
+
+Add patch from Debian (security_format.patch) to fix unsafe format string usage.
+
+--- arj_user.c.orig	2004-06-18 16:19:36.000000000 +0000
+++ arj_user.c
+@@ -2303,7 +2303,7 @@ void process_archive()
+   timestamp_to_str(timetext, &ftime_stamp);
+   msg_cprintf(H_HL|H_NFMT, M_ARCHIVE_CREATED, timetext);
+   if(show_ansi_comments)
+-   printf(cmt_ptr);
+   fputs(cmt_ptr, stdout);
+   else
+    display_comment(cmt_ptr);
+   /* The sfx_setup() occurs here */
--- a/archivers/arj/patches/patch-arjdata.c
+++ b/archivers/arj/patches/patch-arjdata.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-arjdata.c,v 1.1 2015/04/12 15:45:00 tnn Exp $
+
+Add DragonFly support.
+
+--- arjdata.c.orig	2004-04-17 11:44:46.000000000 +0000
+++ arjdata.c
+@@ -64,6 +64,8 @@ static char *resources[][2]=
+   #elif TARGET==UNIX
+    #if defined(linux)
+     "Linux"
+   #elif defined(__DragonFly__)
+    "DragonFly"
+    #elif defined(__FreeBSD__)
+     "FreeBSD"
+    #elif defined(SUNOS)
+@@ -91,6 +93,8 @@ static char *resources[][2]=
+   "PLATFORM_APPENDIX",
+   #if defined(linux)
+    "/Linux",
+  #elif defined(__DragonFly__)
+   "/DragonFly", 
+   #elif defined(__FreeBSD__)
+    "/FreeBSD",
+   #elif defined(SUNOS)
--- a/archivers/arj/patches/patch-arjdisp.c
+++ b/archivers/arj/patches/patch-arjdisp.c
@@ -0,0 +1,137 @@
+$NetBSD: patch-arjdisp.c,v 1.1 2015/04/12 16:09:27 tnn Exp $
+
+Add patch from Debian (security_format.patch) to fix unsafe format string usage.
+
+--- arjdisp.c.orig	2003-06-22 11:12:28.000000000 +0000
+++ arjdisp.c
+@@ -20,8 +20,6 @@ static long bytes;
+ static long compsize;
+ static char cmd_verb;
+ static char msg_lf[]="\n";
+-char strform[]="%s";                    /* Export it for scrnio.c, too
+-                                           (a byte saved is a byte gained) */
+ 
+ /* Pseudographical controls */
+ 
+@@ -54,19 +52,19 @@ static void show_init_scrn()
+  textcolor(7);
+  clrscr();
+  gotoxy(2, 2);
+- scrprintf(win_top);
+ fputs(win_top, stdout);
+  for(i=3; i<24; i++)
+  {
+-  gotoxy(2, i); scrprintf(win_border);
+-  gotoxy(79, i); scrprintf(win_border);
+  gotoxy(2, i); fputs(win_border, stdout);
+  gotoxy(79, i); fputs(win_border, stdout);
+  }
+- gotoxy(2, 24); scrprintf(win_bottom);
+ gotoxy(2, 24); fputs(win_bottom, stdout);
+  gotoxy(10, 5);
+- scrprintf(M_ARJDISP_COPYRIGHT);
+ fputs(M_ARJDISP_COPYRIGHT, stdout);
+  gotoxy(10, 6);
+- scrprintf(M_ARJDISP_DISTRIBUTION);
+ fputs(M_ARJDISP_DISTRIBUTION, stdout);
+  gotoxy(10, 7);
+- scrprintf(M_ARJDISP_LICENSE);
+ fputs(M_ARJDISP_LICENSE, stdout);
+  gotoxy(16, 10);
+  scrprintf(M_PROCESSING_ARCHIVE, archive_name);
+  t=strtok(M_ARJDISP_INFO, msg_lf);
+@@ -74,11 +72,11 @@ static void show_init_scrn()
+  while(t!=NULL&&i<=23)
+  {
+   gotoxy(10, i++);
+-  scrprintf(strform, t);
+  scrprintf("%s", t);
+   t=strtok(NULL, msg_lf);
+  }
+  gotoxy(16, 20);
+- scrprintf(M_PRESS_ANY_KEY);
+ fputs(M_PRESS_ANY_KEY, stdout);
+  uni_getch();
+  gotoxy(1, 24);
+ }
+@@ -96,19 +94,19 @@ static void show_proc_scrn()
+  {
+   clrscr();
+   gotoxy(2, 2);
+-  scrprintf(win_top);
+  fputs(win_top, stdout);
+   for(i=3; i<24; i++)
+   {
+-   gotoxy(2, i); scrprintf(win_border);
+-   gotoxy(79, i); scrprintf(win_border);
+   gotoxy(2, i); fputs(win_border, stdout);
+   gotoxy(79, i); fputs(win_border, stdout);
+   }
+-  gotoxy(2, 24); scrprintf(win_bottom);
+  gotoxy(2, 24); fputs(win_bottom, stdout);
+   gotoxy(10, 5);
+-  scrprintf(M_ARJDISP_COPYRIGHT);
+  fputs(M_ARJDISP_COPYRIGHT, stdout);
+   gotoxy(10, 6);
+-  scrprintf(M_ARJDISP_DISTRIBUTION);
+  fputs(M_ARJDISP_DISTRIBUTION, stdout);
+   gotoxy(10, 7);
+-  scrprintf(M_ARJDISP_LICENSE);
+  fputs(M_ARJDISP_LICENSE, stdout);
+   gotoxy(16, 10);
+   scrprintf(M_PROCESSING_ARCHIVE, archive_name);
+   gotoxy(16, 12);
+@@ -132,13 +130,13 @@ static void show_proc_scrn()
+     break;
+   }
+   gotoxy(15, 14);
+-  scrprintf(ind_top);
+  fputs(ind_top, stdout);
+   gotoxy(15, 15);
+-  scrprintf(ind_middle);
+  fputs(ind_middle, stdout);
+   gotoxy(15, 16);
+-  scrprintf(ind_bottom);
+  fputs(ind_bottom, stdout);
+   gotoxy(16, 18);
+-  scrprintf(M_ARJDISP_CTR_START);
+  fputs(M_ARJDISP_CTR_START, stdout);
+  }
+  else
+  {
+@@ -146,7 +144,7 @@ static void show_proc_scrn()
+   gotoxy(16, 15);
+   memset(progress, indo, i);
+   progress[i]='\0';
+-  scrprintf(progress);
+  fputs(progress, stdout);
+   gotoxy(16, 18);
+   scrprintf(M_ARJDISP_CTR, calc_percentage(bytes, uncompsize)/10);
+  }
+@@ -165,19 +163,19 @@ static void show_ending_scrn()
+  textcolor(7);
+  clrscr();
+  gotoxy(2, 2);
+- scrprintf(win_top);
+ fputs(win_top, stdout);
+  for(i=3; i<24; i++)
+  {
+-  gotoxy(2, i); scrprintf(win_border);
+-  gotoxy(79, i); scrprintf(win_border);
+  gotoxy(2, i); fputs(win_border, stdout);
+  gotoxy(79, i); fputs(win_border, stdout);
+  }
+- gotoxy(2, 24); scrprintf(win_bottom);
+ gotoxy(2, 24); fputs(win_bottom, stdout);
+  gotoxy(10, 5);
+- scrprintf(M_ARJDISP_COPYRIGHT);
+ fputs(M_ARJDISP_COPYRIGHT, stdout);
+  gotoxy(10, 6);
+- scrprintf(M_ARJDISP_DISTRIBUTION);
+ fputs(M_ARJDISP_DISTRIBUTION, stdout);
+  gotoxy(10, 7);
+- scrprintf(M_ARJDISP_LICENSE);
+ fputs(M_ARJDISP_LICENSE, stdout);
+  gotoxy(16, 10);
+  scrprintf(M_FINISHED_PROCESSING, archive_name);
+  gotoxy(1, 24);
--- a/archivers/arj/patches/patch-arjsfx.c
+++ b/archivers/arj/patches/patch-arjsfx.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-arjsfx.c,v 1.1 2015/04/12 16:09:27 tnn Exp $
+
+Add patch from Debian (security_format.patch) to fix unsafe format string usage.
+
+--- arjsfx.c.orig	2005-06-21 19:53:14.000000000 +0000
+++ arjsfx.c
+@@ -214,7 +214,7 @@ static void final_cleanup(void)
+   freopen(dev_con, m_w, stdout);
+  #if SFX_LEVEL>=ARJSFXV
+   if(ferror(stdout))
+-   msg_fprintf(stderr, M_DISK_FULL);
+   msg_fprintf(stderr, "Can't write file. Disk full?");
+   if(debug_enabled&&strchr(debug_opt, 't')!=NULL)
+   {
+    ticks=get_ticks()-ticks;
--- a/archivers/arj/patches/patch-decode.c
+++ b/archivers/arj/patches/patch-decode.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-decode.c,v 1.1 2015/04/12 15:54:02 tnn Exp $
+
+Fix CVE-2015-2782. Via Debian security-afl.patch.
+
+--- decode.c.orig	2003-04-12 16:15:58.000000000 +0000
+++ decode.c
+@@ -255,7 +255,7 @@ void read_pt_len(int nn, int nbit, int i
+    if(i==i_special)
+    {
+     c=getbits(2);
+-    while(--c>=0)
+    while(--c>=0&&i<nn)
+      pt_len[i++]=0;
+    }
+   }
+@@ -314,10 +314,10 @@ void read_c_len()
+      c=getbits(CBIT);
+      c+=20;
+     }
+-    while(--c>=0)
+    while(--c>=0&&i<NC)
+      c_len[i++]=0;
+    }
+-   else
+   else if (i<NC)
+     c_len[i++]=(unsigned char)(c-2);
+   }
+   while(i<NC)
--- a/archivers/arj/patches/patch-environ.c
+++ b/archivers/arj/patches/patch-environ.c
@@ -0,0 +1,74 @@
+$NetBSD: patch-environ.c,v 1.2 2015/04/12 15:54:02 tnn Exp $
+
+Add support for various OSes.
+Fix CVE-2015-0557. Via Debian security-traversal-dir.patch.
+
+--- environ.c.orig	2015-04-12 15:49:08.000000000 +0000
+++ environ.c
+@@ -58,10 +58,10 @@
+   #include <sys/ioctl.h>
+   #include <sys/statfs.h>
+   #include <sys/statvfs.h>
+- #elif defined(__FreeBSD__)||defined(__NetBSD__)
+ #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OpenBSD__)
+   #include <sys/param.h>
+   #include <sys/mount.h>
+- #elif defined(__QNXNTO__)
+ #elif defined(__QNXNTO__)||defined(__INTERIX)
+   #include <sys/statvfs.h>
+  #else
+   #include <sys/statfs.h>
+@@ -1087,6 +1087,8 @@ static char *validate_path(char *name)
+   if(action!=VALIDATE_DRIVESPEC)
+   {
+ #endif
+   while (name[0]!='\0'&&
+          (name[0]=='.'||name[0]==PATHSEP_DEFAULT||name[0]==PATHSEP_UNIX)) {
+    if(name[0]=='.')
+    {
+     if(name[1]=='.'&&(name[2]==PATHSEP_DEFAULT||name[2]==PATHSEP_UNIX))
+@@ -1096,6 +1098,7 @@ static char *validate_path(char *name)
+    }
+    if(name[0]==PATHSEP_DEFAULT||name[0]==PATHSEP_UNIX)
+     name++;                             /* "\\" - revert to root */
+   }
+ #if SFX_LEVEL>=ARJSFXV
+   }
+  }
+@@ -2286,7 +2289,7 @@ unsigned long file_getfree(char *name)
+   else
+    return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
+  #elif TARGET==UNIX
+-  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
+  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)||(defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
+    struct statvfs vfs;
+ 
+    if(statvfs(name, &vfs)==-1)
+@@ -3005,7 +3008,7 @@ void get_exe_name(char *dest, char *arg)
+     they are missing altogether, the corresponding code will gracefully
+     terminate. */
+  #if SFX_LEVEL==ARJ
+-  strcpy(dest, "/usr/local/bin/arj");
+  strcpy(dest, "@PREFIX@/bin/arj");
+  #elif SFX_LEVEL==ARJSFXV
+   strcpy(dest, "./arjsfxv");
+  #elif SFX_LEVEL==ARJSFX
+@@ -3013,7 +3016,7 @@ void get_exe_name(char *dest, char *arg)
+  #elif SFX_LEVEL==ARJSFXJR
+   strcpy(dest, "./arjsfxjr");
+  #elif defined(REARJ)
+-  strcpy(dest, "/usr/local/bin/rearj");
+  strcpy(dest, "@PREFIX@/bin/rearj");
+  #else
+   dest[0]='\0';
+  #endif
+@@ -3802,7 +3805,9 @@ int reset_drive(char *name)
+  #elif TARGET==WIN32
+   return(0);
+  #elif TARGET==UNIX
+  #ifndef __INTERIX
+   sync();
+  #endif
+   return(0);
+  #endif
+ }
--- a/archivers/arj/patches/patch-fardata.c
+++ b/archivers/arj/patches/patch-fardata.c
@@ -0,0 +1,72 @@
+$NetBSD: patch-fardata.c,v 1.2 2015/04/12 16:09:27 tnn Exp $
+
+Rename strnlen -> _strnlen to avoid conflict in systems having strnlen.
+Add patch from Debian (security_format.patch) to fix unsafe format string usage.
+
+--- fardata.c.orig	2015-04-12 15:57:39.000000000 +0000
+++ fardata.c
+@@ -52,7 +52,7 @@ int error_proc(FMSG *errmsg, ...)
+   /* Check if the message could have a standard error code */
+   if(errno!=0&&is_std_error(errmsg))
+   {
+-   msg_cprintf(0, lf);
+   msg_cprintf(0, "\n");
+    error_report();
+   }
+  #endif
+@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
+ 
+ /* Length-limited strlen() */
+ 
+-static int strnlen(const char FAR *s, int count)
+static int _strnlen(const char FAR *s, int count)
+ {
+  const char FAR *sc;
+ 
+@@ -377,10 +377,10 @@ static void flush_cbuf(int ccode, char *
+     {
+      #if SFX_LEVEL>=ARJSFXV
+       fprintf(new_stdout, strform, n_text);
+-      fprintf(new_stdout, lf);
+      fprintf(new_stdout, "\n");
+      #else
+       printf(strform, n_text);
+-      printf(lf);
+      printf("\n");
+      #endif
+     }
+     else
+@@ -391,13 +391,13 @@ static void flush_cbuf(int ccode, char *
+      #ifdef NEED_CRLF
+       scr_out("\r");
+      #endif
+-     scr_out(lf);
+     scr_out("\n");
+     }
+     if(!no_colors)
+      textcolor(color_table[ccode&H_COLORMASK].color);
+    #else
+     printf(strform, n_text);
+-    printf(lf);
+    printf("\n");
+    #endif
+    n_text=t_text+1;
+    #if SFX_LEVEL>=ARJ
+@@ -569,7 +569,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
+     if(!s)
+      s="(null)";
+ #endif
+-    len=strnlen(s, precision);
+    len=_strnlen(s, precision);
+     if(!(flags&LEFT))
+     {
+      while(len<field_width--)
+@@ -655,7 +655,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
+     num=va_arg(args, unsigned long);
+    else if(qualifier=='h')
+    {
+-#ifdef __linux__
+#if TARGET==UNIX
+     if (flags&SIGN)
+      num=va_arg(args, int);             /* num=va_arg(args, short);      */
+     else
--- a/archivers/arj/patches/patch-gnu_config.h.in
+++ b/archivers/arj/patches/patch-gnu_config.h.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-gnu_config.h.in,v 1.1 2015/04/12 15:45:00 tnn Exp $
+
+--- gnu/config.h.in.orig	2004-04-17 10:33:38.000000000 +0000
+++ gnu/config.h.in
+@@ -4,6 +4,7 @@
+ #undef LIBC
+ #undef NP_SFX
+ #undef ELF_EXECUTABLES
+#undef HAVE_LCHOWN
+ #undef HAVE_MKDTEMP
+ #undef HAVE_FCLOSEALL
+ #undef HAVE_SETPRIORITY
--- a/archivers/arj/patches/patch-gnu_configure.in
+++ b/archivers/arj/patches/patch-gnu_configure.in
@@ -0,0 +1,98 @@
+$NetBSD: patch-gnu_configure.in,v 1.1 2015/04/12 15:45:00 tnn Exp $
+
+--- gnu/configure.in.orig	2005-06-21 18:27:20.000000000 +0000
+++ gnu/configure.in
+@@ -12,13 +12,23 @@ dnl Installation script (let it be, temp
+ AC_PROG_INSTALL([e:/os2apps/autoconf/install-sh])
+ 
+ dnl Configuration parameters
+-AC_CONFIG_HEADER([../c_defs.h:config.h.in])
+AC_CONFIG_HEADER([c_defs.h:config.h.in])
+ 
+ dnl Checks for the canonical system name
+ AC_CANONICAL_HOST
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  ac_cv_prog_gnu_ld=yes
+else
+  ac_cv_prog_gnu_ld=no
+fi])
+])
+AC_PROG_LD_GNU
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -35,7 +45,8 @@ AC_FUNC_MEMCMP
+ AC_FUNC_SETVBUF_REVERSED
+ AC_TYPE_SIGNAL
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS([getcwd min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
+AC_CHECK_FUNCS([getcwd lchown min max mkdir mkdtemp rmdir fcloseall strcasecmp setpriority strdup strerror strstr strupr strlwr strtol strtoul])
+AC_SEARCH_LIBS([dlsym], [dl])
+ 
+ dnl Platform-specific tuning
+ PROG_EXT=
+@@ -45,22 +56,27 @@ REQUIRES_DEF=
+ OS_ID="UNIX"
+ OS_DEF="-D_UNIX"
+ DLL_CFLAGS="-fPIC"
+LD_STRIP="-s "
+ 
+ case $host_os in
+ linux*)
+ 	AC_DEFINE(ELF_EXECUTABLES, 1, [Define if executables use ELF format])
+         DYN_LIBS="-ldl"
+-        LD_STRIP="gnu/stripgcc.lnk"
+        LD_STRIP="-s gnu/stripgcc.lnk"
+ 	;;
+ k*bsd*)
+ 	AC_DEFINE(ELF_EXECUTABLES)
+ 	DYN_LIBS="-ldl"
+-	LD_STRIP="gnu/stripgcc.lnk"
+	LD_STRIP="-s gnu/stripgcc.lnk"
+ 	;;
+ *bsd*)
+ 	AC_DEFINE(ELF_EXECUTABLES)
+         DLL_FLAGS="-shared -export-dynamic"
+-        LD_STRIP="gnu/stripgcc.lnk"
+        LD_STRIP="-s gnu/stripgcc.lnk"
+	;;
+darwin*)
+	DLL_FLAGS="-bundle"
+	LD_STRIP=""
+ 	;;
+ interix3*)
+ 	# not ELF
+@@ -71,14 +87,16 @@ interix3*)
+ 	AC_DEFINE(ELF_EXECUTABLES)
+         DLL_FLAGS="-shared -fPIC"
+         DLL_CFLAGS="-shared -fPIC"
+-        LD_STRIP="gnu/stripgcc.lnk"
+        LD_STRIP="-s gnu/stripgcc.lnk"
+ 	;;
+ *solaris*)
+ 	AC_DEFINE(ELF_EXECUTABLES)
+         CFLAGS="-DSUNOS -D_UNIX"
+         DLL_FLAGS="-shared -fPIC"
+         DLL_CFLAGS="-shared -fPIC"
+-        LD_STRIP="gnu/stripgcc.lnk"
+	if test X"$ac_cv_prog_gnu_ld" = X"yes"; then
+        LD_STRIP="-s gnu/stripgcc.lnk"
+	fi
+ 	;;
+ os2*)
+ 	PROG_EXT=".exe"
+@@ -125,7 +143,7 @@ dnl Initial setup
+ 
+ test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
+ AC_SUBST(CONFIG_SHELL)
+-
+AC_OUTPUT(makefile.gnu:makefile.in)
+ AC_MSG_CHECKING([if dynamic C library may be used])
+ AC_ARG_ENABLE(libc,
+ [  --disable-libc          Disable linking with dynamic C library],
--- a/archivers/arj/patches/patch-gnu_makefile.in
+++ b/archivers/arj/patches/patch-gnu_makefile.in
@@ -0,0 +1,35 @@
+$NetBSD: patch-gnu_makefile.in,v 1.1 2015/04/12 15:45:00 tnn Exp $
+
+--- gnu/makefile.in.orig	2004-04-17 11:28:06.000000000 +0000
+++ gnu/makefile.in
+@@ -53,7 +53,7 @@ DEBUG_SM = d
+ ALL_CFLAGS += -g -DDEBUG
+ else
+ DEBUG_SM = r
+-ADD_LDFLAGS = -s @LD_STRIP@
+ADD_LDFLAGS = @LD_STRIP@
+ endif
+ 
+ ALL_CFLAGS += $(CFLAGS)
+@@ -166,7 +166,7 @@ MAKE_KEY=$(TOOLS_DIR)/make_key$x
+ endif
+ 
+ all:	prepare timestamp
+-	$(MAKE) do-all
+	$(MAKE) -f makefile.gnu do-all
+ 
+ do-all:	\
+ 	$(ARJ_DIR)/arj$x \
+@@ -351,8 +351,10 @@ $(ARJ_DIR)/arj$x: $(ARJ_OBJS) \
+ 	$(TOOLS_DIR)/join $(ARJ_DIR)/arj$x $(SFXSTUB_DIR)/sfxstub$x
+ 	rm -f $(BASEDIR)/help.arj
+ 	$(ARJ_DIR)/arj$x a $(BASEDIR)/help.arj -+ -t1f -2e -e -jm -jh65535 -jt $(RES_DIR)/$(LOCALE)/arj?.txt
+-	$(TOOLS_DIR)/join $(ARJ_DIR)/arj$x $(BASEDIR)/help.arj
+-	$(TOOLS_DIR)/postproc $@
+	cp $(ARJ_DIR)/arj$x $(ARJ_DIR)/arj$x-tmp
+	$(TOOLS_DIR)/join $(ARJ_DIR)/arj$x-tmp $(BASEDIR)/help.arj
+	$(TOOLS_DIR)/postproc $(ARJ_DIR)/arj$x-tmp
+	mv -f $(ARJ_DIR)/arj$x-tmp $(ARJ_DIR)/arj$x
+ 
+ $(BASEDIR)/fmsg_arj.c $(BASEDIR)/imsg_arj.c $(BASEDIR)/nmsg_arj.c: $(TOOLS_DIR)/msgbind$x $(RESFILE)
+ 	$(TOOLS_DIR)/msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)
--- a/archivers/arj/patches/patch-integr.c
+++ b/archivers/arj/patches/patch-integr.c
@@ -1,4 +1,7 @@
-$NetBSD: patch-integr.c,v 1.2 2014/05/11 20:56:16 rodent Exp $
+$NetBSD: patch-integr.c,v 1.3 2015/04/12 15:45:00 tnn Exp $
+
+Make guard variable used by the integrity check non-static, so
+that it won't get dropped as unused.

 --- integr.c.orig	2005-06-21 18:27:18.000000000 +0000
 +++ integr.c
--- a/archivers/arj/patches/patch-msgbind.c
+++ b/archivers/arj/patches/patch-msgbind.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-msgbind.c,v 1.1 2015/05/10 18:50:47 bsiegert Exp $
+
+Fix overlap string copy
+
+--- msgbind.c.orig     2015-04-25 16:26:29.000000000 +0000
+++ msgbind.c
+@@ -578,7 +578,7 @@ int main(int argc, char **argv)
+    }
+    strcat(pool[tpool].data, msgname);
+    strcat(pool[tpool].data, ", ");
+-   strcpy(msg_buffer, msg_buffer+1);
+   memmove(msg_buffer, msg_buffer+1, strlen(msg_buffer));
+    buf_len=strlen(msg_buffer);
+    msg_buffer[--buf_len]='\0';
+    patch_string(msg_buffer);
--- a/archivers/arj/patches/patch-register.c
+++ b/archivers/arj/patches/patch-register.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-register.c,v 1.1 2015/04/12 16:09:27 tnn Exp $
+
+Add patch from Debian (security_format.patch) to fix unsafe format string usage.
+
+--- register.c.orig	2004-04-21 07:04:10.000000000 +0000
+++ register.c
+@@ -205,7 +205,7 @@ int main(int argc, char **argv)
+  char reg_source[200];
+  int i;
+ 
+- printf(M_REGISTER_BANNER);
+ fputs(M_REGISTER_BANNER, stdout);
+  integrity_pattern[0]--;
+  build_crc32_table();
+  if(argc!=2)
--- a/archivers/arj/patches/patch-resource_resource.txt
+++ b/archivers/arj/patches/patch-resource_resource.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-resource_resource.txt,v 1.1 2015/04/18 12:39:05 rodent Exp $
+
+Fix build on SunOS.
+
+--- resource/resource.txt.orig	2005-06-23 13:21:56.000000000 +0000
+++ resource/resource.txt
+@@ -334,7 +334,7 @@
+  */
+ 
+ {NULL}     {M_CMD_TABLE}            {MSG_ARJ}                            {*}                     {}  {*}                  {F} {"ABCDEFGIJKLMNOPQRSTUVWXYZ"}
+-{NULL}     {M_SW_TABLE}             {MSG_ARJ}                            {*}                     {}  {*}                  {F} {"JHABCDEFGIKLMNOPQRSTUVWXYZ?!$+#&*@@2_"}
+{NULL}     {M_SW_TABLE}             {MSG_ARJ}                            {*}                     {}  {*}                  {F} {"JHABCDEFGIKLMNOPQRSTUVWXYZ?!$+#&*@2_"}
+ {NULL}     {M_SW_PARAMS}            {MSG_ARJ}                            {*}                     {}  {*}                  {F} {"001502130600400100313000000000102000"}
+ {NULL}     {M_JSW_TABLE}            {MSG_ARJ}                            {*}                     {}  {*}                  {F} {"JABCDEFGHIKLMNOPQRSTUVWXYZ#$"}
+ {NULL}     {M_JSW_PARAMS}           {MSG_ARJ}                            {*}                     {}  {*}                  {F} {"0130111100001010020301000040"}
--- a/archivers/arj/patches/patch-uxspec.c
+++ b/archivers/arj/patches/patch-uxspec.c
@@ -0,0 +1,75 @@
+$NetBSD: patch-uxspec.c,v 1.3 2015/04/12 15:56:08 tnn Exp $
+
+Fix build on systems without lchown.
+Fix CVE-2015-0556. Via Debian security-traversal-symlink.patch.
+
+--- uxspec.c.orig	2004-04-17 11:39:42.000000000 +0000
+++ uxspec.c
+@@ -120,6 +120,58 @@ int query_uxspecial(char FAR **dest, cha
+ }
+ #endif
+ 
+#if TARGET==UNIX
+static int is_link_traversal(const char *name)
+{
+  enum {
+    STATE_NONE,
+    STATE_DOTS,
+    STATE_NAME,
+  } state = STATE_NONE;
+  int ndir = 0;
+  int dots = 0;
+
+  while(*name) {
+    int c = *name++;
+
+    if (c == '/')
+    {
+      if ((state == STATE_DOTS) && (dots == 2))
+        ndir--;
+      if (ndir < 0)
+        return 1;
+      if ((state == STATE_DOTS && dots == 1) && ndir == 0)
+        return 1;
+      if (state == STATE_NONE && ndir == 0)
+        return 1;
+      if ((state == STATE_DOTS) && (dots > 2))
+        ndir++;
+      state = STATE_NONE;
+      dots = 0;
+    }
+    else if (c == '.')
+    {
+      if (state == STATE_NONE)
+        state = STATE_DOTS;
+      dots++;
+    }
+    else
+    {
+      if (state == STATE_NONE)
+        ndir++;
+      state = STATE_NAME;
+    }
+  }
+
+  if ((state == STATE_DOTS) && (dots == 2))
+    ndir--;
+  if ((state == STATE_DOTS) && (dots > 2))
+    ndir++;
+
+  return ndir < 0;
+}
+#endif
+
+ /* Restores the UNIX special file data */
+ 
+ int set_uxspecial(char FAR *storage, char *name)
+@@ -156,6 +208,8 @@ int set_uxspecial(char FAR *storage, cha
+      l=sizeof(tmp_name)-1;
+     far_memmove((char FAR *)tmp_name, dptr, l);
+     tmp_name[l]='\0';
+    if (is_link_traversal(tmp_name))
+      return(UXSPEC_RC_ERROR);
+     rc=(id==UXSB_HLNK)?link(tmp_name, name):symlink(tmp_name, name);
+     if(!rc)
+      return(0);
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2015/01/21 09:12:41 obache Exp $
+# $NetBSD: Makefile,v 1.33 2015/04/25 14:20:17 tnn Exp $

 DISTNAME=	ark-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	archivers
 COMMENT=	Manages various archive formats within the KDE environment

--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.132 2014/05/29 23:35:13 wiz Exp $
+# $NetBSD: Makefile,v 1.134 2015/06/12 10:48:21 wiz Exp $
 #

 DISTNAME=	file-roller-2.32.2
-PKGREVISION=	21
+PKGREVISION=	23
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.32/}
 EXTRACT_SUFX=	.tar.bz2
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2014/10/09 14:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2015/04/07 22:08:36 hiramatsu Exp $

-DISTNAME=	sharutils-4.13.5
+DISTNAME=	sharutils-4.15
 PKGNAME=	g${DISTNAME}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=sharutils/}
@@ -19,7 +19,6 @@ INSTALL_TARGET=		install install-man
 INFO_FILES=		yes
 USE_TOOLS+=		makeinfo msgfmt sh:run

-CONFIGURE_ARGS+=	--disable-uucode
 CONFIGURE_ENV+=		SH=${TOOLS_SH}

 CONFIGURE_ARGS+=	--program-prefix=g
--- a/archivers/gsharutils/PLIST
+++ b/archivers/gsharutils/PLIST
@@ -1,13 +1,19 @@
-@comment $NetBSD: PLIST,v 1.11 2013/07/21 09:03:19 shattered Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/04/07 22:08:36 hiramatsu Exp $
 bin/gshar
 bin/gunshar
+bin/guudecode
+bin/guuencode
 gnu/bin/shar
 gnu/bin/unshar
 gnu/man/man1/shar.1
 gnu/man/man1/unshar.1
 info/sharutils.info
+lib/charset.alias
 man/man1/gshar.1
 man/man1/gunshar.1
+man/man1/guudecode.1
+man/man1/guuencode.1
+man/man5/guuencode.5
 share/locale/bg/LC_MESSAGES/sharutils.mo
 share/locale/ca/LC_MESSAGES/sharutils.mo
 share/locale/cs/LC_MESSAGES/sharutils.mo
@@ -27,6 +33,7 @@ share/locale/it/LC_MESSAGES/sharutils.mo
 share/locale/ja/LC_MESSAGES/sharutils.mo
 share/locale/nl/LC_MESSAGES/sharutils.mo
 share/locale/pl/LC_MESSAGES/sharutils.mo
+share/locale/pt_BR/LC_MESSAGES/sharutils.mo
 share/locale/ru/LC_MESSAGES/sharutils.mo
 share/locale/sr/LC_MESSAGES/sharutils.mo
 share/locale/sv/LC_MESSAGES/sharutils.mo
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.19 2014/09/13 10:53:04 shattered Exp $
+$NetBSD: distinfo,v 1.22 2015/06/08 23:13:52 joerg Exp $

-SHA1 (sharutils-4.13.5.tar.gz) = 60868635dff4c36f6ccc7be89b53a591938fa3b2
-RMD160 (sharutils-4.13.5.tar.gz) = 9f59fca8d3ec5e98ba61b7a330fa90a1d02f997d
-Size (sharutils-4.13.5.tar.gz) = 2045022 bytes
+SHA1 (sharutils-4.15.tar.gz) = a073d1912e537a53cabab210ca869adfd907f6f6
+RMD160 (sharutils-4.15.tar.gz) = fd8b1ebe41b1df398eef53513e2e5b5b53e8bbac
+Size (sharutils-4.15.tar.gz) = 2196398 bytes
+SHA1 (patch-lib_fseeko.c) = 9308258bebbabc60a0203fd3baa054758ce60b02
+SHA1 (patch-libopts_libopts.c) = da5b86c5ba4dfdae5108476e46c1ed5e47a4254e
+SHA1 (patch-src_shar-opts.c) = eabc6a22adb102fc88b42c4479ee4030435d07dd
+SHA1 (patch-src_unshar-opts.c) = 7c34db513400d5f818be396a6bdbd2ff8d8bb77b
+SHA1 (patch-src_uudecode-opts.c) = d560a91b977d3c02627be22073b1dc1810a9b3cb
+SHA1 (patch-src_uuencode-opts.c) = 0906d8b3d9ac10d529b2a35aadce1fb09d3c60b7
--- a/archivers/gsharutils/patches/patch-lib_fseeko.c
+++ b/archivers/gsharutils/patches/patch-lib_fseeko.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_fseeko.c,v 1.1 2015/04/07 22:08:36 hiramatsu Exp $
+
+Definition of FILE struct is changed on NetBSD 6.
+
+--- lib/fseeko.c.orig	2015-04-05 22:42:44.000000000 +0900
+++ lib/fseeko.c	2015-04-05 22:42:52.000000000 +0900
+@@ -125,7 +125,7 @@
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+-# if defined __CYGWIN__
+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else
--- a/archivers/gsharutils/patches/patch-libopts_libopts.c
+++ b/archivers/gsharutils/patches/patch-libopts_libopts.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-libopts_libopts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- libopts/libopts.c.orig	2015-06-08 20:10:35.000000000 +0000
+++ libopts/libopts.c
+@@ -1,3 +1,9 @@
+#include "config.h"
+#if ENABLE_NLS
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
+#endif
+ #define  AUTOOPTS_INTERNAL 1
+ #include "autoopts/project.h"
+ #define  LOCAL static
--- a/archivers/gsharutils/patches/patch-src_shar-opts.c
+++ b/archivers/gsharutils/patches/patch-src_shar-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_shar-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/shar-opts.c.orig	2015-06-08 20:10:51.000000000 +0000
+++ src/shar-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include "config.h"
+#if ENABLE_NLS
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
+#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
--- a/archivers/gsharutils/patches/patch-src_unshar-opts.c
+++ b/archivers/gsharutils/patches/patch-src_unshar-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_unshar-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/unshar-opts.c.orig	2015-06-08 20:11:05.000000000 +0000
+++ src/unshar-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include "config.h"
+#if ENABLE_NLS
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
+#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
--- a/archivers/gsharutils/patches/patch-src_uudecode-opts.c
+++ b/archivers/gsharutils/patches/patch-src_uudecode-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_uudecode-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/uudecode-opts.c.orig	2015-06-08 20:12:04.000000000 +0000
+++ src/uudecode-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include "config.h"
+#if ENABLE_NLS
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
+#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
--- a/archivers/gsharutils/patches/patch-src_uuencode-opts.c
+++ b/archivers/gsharutils/patches/patch-src_uuencode-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_uuencode-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/uuencode-opts.c.orig	2015-06-08 20:12:11.000000000 +0000
+++ src/uuencode-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include "config.h"
+#if ENABLE_NLS
+#ifdef HAVE_DCGETTEXT
+# include <gettext.h>
+#endif
+#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2015/01/26 12:30:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.90 2015/05/03 14:32:11 sevan Exp $
 #
 # Please run 'make files/gtar.1' when updating version of this package
 # to regenerate the man page. converters/help2man is needed.
@@ -12,7 +12,6 @@ LICENSE=	gnu-gpl-v3

 CONFLICTS=	gcpio-[0-9]*

-USE_FEATURES=		snprintf
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
@@ -42,7 +41,7 @@ PLIST_VARS+=		gtar rmt
 TEST_TARGET=		check

 # don't include rmt if gtar won't build it
-.if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin" && ${OS_VARIANT} != "SCOOSR5"
+.if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin" && ${OS_VARIANT} != "SCOOSR5" && ${OPSYS} != "AIX"
 PLIST.rmt=		yes
 .endif

@@ -55,6 +54,11 @@ CONFIGURE_ENV+=		gt_cv_func_gnugettext3_libintl=yes
 CPPFLAGS+=		-Dstrtoimax=strtoll -Dstrtoumax=strtoull
 .endif

+.if ${OPSYS} == "AIX"
+#bug 20453 in bug-gzip list, passed onto gnulib
+CONFIGURE_ENV+= ac_cv_header_wctype_h=no
+.endif
+
 SYMLINKS=		bin/gtar ${PKGGNUDIR}bin/tar \
 			${PKGMANDIR}/man1/gtar.1 ${PKGGNUDIR}${PKGMANDIR}/man1/tar.1

--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/10/09 14:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2015/05/09 23:00:39 sevan Exp $

 DISTNAME=	gzip-1.6
 CATEGORIES=	archivers
@@ -19,4 +19,11 @@ MAKE_FLAGS+=	manlinks=so
 INFO_FILES=	yes
 CHECK_PERMS=	no	# can't depend on checkperms; it's distfile is gzipped

+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "AIX"
+#bug 20453 in bug-gzip list, passed onto gnulib
+CONFIGURE_ENV+=	ac_cv_header_wctype_h=no
+.endif
+
 .include "../../mk/bsd.pkg.mk"
--- a/archivers/innoextract/DESCR
+++ b/archivers/innoextract/DESCR
@@ -0,0 +1,5 @@
+Inno Setup is a tool to create installers for Microsoft Windows
+applications. innoextract allows to extract such installers under
+non-windows systems without running the actual installer using
+Wine. innoextract currently supports installers created by Inno
+Setup 1.2.10 to 5.5.5.
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.2 2015/04/17 15:52:58 adam Exp $
+
+DISTNAME=	innoextract-1.4
+PKGREVISION=	1
+CATEGORIES=	archivers
+MASTER_SITES=	http://constexpr.org/innoextract/files/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://constexpr.org/innoextract/
+COMMENT=	Tool to unpack installers created by Inno Setup
+LICENSE=	zlib
+
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_ARGS+=	-DUSE_CXX11=OFF
+
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/archivers/innoextract/PLIST
+++ b/archivers/innoextract/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/03 09:40:54 wiz Exp $
+bin/innoextract
+man/man1/innoextract.1
--- a/archivers/innoextract/distinfo
+++ b/archivers/innoextract/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2015/04/03 09:40:54 wiz Exp $
+
+SHA1 (innoextract-1.4.tar.gz) = 3fd3ac98c802c72a1f4ae5f6e6a5dca35747ff98
+RMD160 (innoextract-1.4.tar.gz) = 5f9cd26d508ee8f28cedaa619df4108f5f761a9c
+Size (innoextract-1.4.tar.gz) = 151230 bytes
+SHA1 (patch-CMakeLists.txt) = ebc9db4211bf01ebab6881ea23e3e5c32321a7aa
+SHA1 (patch-cmake_VersionString.cmake) = db368ea50042a73b78770c0b43d3480398fdff1c
--- a/archivers/innoextract/patches/patch-CMakeLists.txt
+++ b/archivers/innoextract/patches/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/03 09:40:54 wiz Exp $
+
+Fix use of CMAKE_MODULE_PATH
+
+--- CMakeLists.txt.orig	2013-05-22 21:50:31.000000000 +0200
+++ CMakeLists.txt	2013-05-22 21:52:02.000000000 +0200
+@@ -45,7 +45,9 @@
+ 
+ include(CheckSymbolExists)
+ 
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
+# For custom cmake modules
+set(CMAKE_CUSTOM_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH "${CMAKE_CUSTOM_MODULE_PATH}")
+ include(BuildType)
+ include(CompileCheck)
+ include(CXX11Check)
--- a/archivers/innoextract/patches/patch-cmake_VersionString.cmake
+++ b/archivers/innoextract/patches/patch-cmake_VersionString.cmake
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_VersionString.cmake,v 1.1 2015/04/03 09:40:54 wiz Exp $
+
+Fix use of CMAKE_MODULE_PATH
+
+--- cmake/VersionString.cmake.orig	2013-05-22 21:52:30.000000000 +0200
+++ cmake/VersionString.cmake	2013-05-22 21:53:26.000000000 +0200
+@@ -47,7 +47,7 @@
+ 	set(mode "variable")
+ 	
+ 	set(args)
+-	set(dependencies "${CMAKE_MODULE_PATH}/VersionScript.cmake")
+	set(dependencies "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake")
+ 	
+ 	foreach(arg IN LISTS VERSION_SOURCES)
+ 		
+@@ -90,7 +90,7 @@
+ 			"-DVERSION_SOURCES=${args}"
+ 			"-DGIT_DIR=${abs_git_dir}"
+ 			${defines}
+-			-P "${CMAKE_MODULE_PATH}/VersionScript.cmake"
+			-P "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake"
+ 		MAIN_DEPENDENCY
+ 			"${abs_src}"
+ 		DEPENDS
--- a/archivers/libarchive/Makefile.common
+++ b/archivers/libarchive/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2015/02/08 00:14:33 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/05/14 14:54:55 sevan Exp $
 # used by archivers/bsdtar/Makefile
 # used by archivers/libarchive/Makefile

 DISTNAME=	libarchive-3.1.2
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.libarchive.org/downloads/
 DISTFILES=	# empty
--- a/archivers/libarchive/files/libarchive/archive_read.c
+++ b/archivers/libarchive/files/libarchive/archive_read.c
@@ -1394,6 +1394,8 @@ __archive_read_filter_consume(struct archive_read_filter * filter,
 {
 	int64_t skipped;

+	if (request < 0)
+		return ARCHIVE_FATAL;
 	if (request == 0)
 		return 0;

--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2015/03/26 09:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:48:21 wiz Exp $

-DISTNAME=		libzip-0.11.2
+DISTNAME=		libzip-1.0.1
 PKGREVISION=		1
 CATEGORIES=		archivers devel
 MASTER_SITES=		http://www.nih.at/libzip/
@@ -15,6 +15,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libzip.pc.in
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		perl:build

 TEST_TARGET=		check

--- a/archivers/libzip/PLIST
+++ b/archivers/libzip/PLIST
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2013/12/31 11:07:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/05/03 12:11:42 wiz Exp $
 bin/zipcmp
 bin/zipmerge
-bin/ziptorrent
 include/zip.h
 lib/libzip.la
 lib/libzip/include/zipconf.h
 lib/pkgconfig/libzip.pc
 man/man1/zipcmp.1
 man/man1/zipmerge.1
-man/man1/ziptorrent.1
+man/man3/ZIP_SOURCE_GET_ARGS.3
 man/man3/libzip.3
 man/man3/zip_add.3
 man/man3/zip_add_dir.3
@@ -17,8 +16,17 @@ man/man3/zip_delete.3
 man/man3/zip_dir_add.3
 man/man3/zip_discard.3
 man/man3/zip_error_clear.3
+man/man3/zip_error_code_system.3
+man/man3/zip_error_code_zip.3
+man/man3/zip_error_fini.3
 man/man3/zip_error_get.3
 man/man3/zip_error_get_sys_type.3
+man/man3/zip_error_init.3
+man/man3/zip_error_init_with_code.3
+man/man3/zip_error_set.3
+man/man3/zip_error_strerror.3
+man/man3/zip_error_system_type.3
+man/man3/zip_error_to_data.3
 man/man3/zip_error_to_str.3
 man/man3/zip_errors.3
 man/man3/zip_fclose.3
@@ -34,11 +42,13 @@ man/man3/zip_file_extra_field_set.3
 man/man3/zip_file_extra_fields_count.3
 man/man3/zip_file_extra_fields_count_by_id.3
 man/man3/zip_file_get_comment.3
+man/man3/zip_file_get_error.3
 man/man3/zip_file_get_external_attributes.3
 man/man3/zip_file_rename.3
 man/man3/zip_file_replace.3
 man/man3/zip_file_set_comment.3
 man/man3/zip_file_set_external_attributes.3
+man/man3/zip_file_set_mtime.3
 man/man3/zip_file_strerror.3
 man/man3/zip_fopen.3
 man/man3/zip_fopen_encrypted.3
@@ -47,12 +57,14 @@ man/man3/zip_fopen_index_encrypted.3
 man/man3/zip_fread.3
 man/man3/zip_get_archive_comment.3
 man/man3/zip_get_archive_flag.3
+man/man3/zip_get_error.3
 man/man3/zip_get_file_comment.3
 man/man3/zip_get_name.3
 man/man3/zip_get_num_entries.3
 man/man3/zip_get_num_files.3
 man/man3/zip_name_locate.3
 man/man3/zip_open.3
+man/man3/zip_open_from_source.3
 man/man3/zip_rename.3
 man/man3/zip_replace.3
 man/man3/zip_set_archive_comment.3
@@ -60,11 +72,36 @@ man/man3/zip_set_archive_flag.3
 man/man3/zip_set_default_password.3
 man/man3/zip_set_file_comment.3
 man/man3/zip_set_file_compression.3
+man/man3/zip_source.3
+man/man3/zip_source_begin_write.3
 man/man3/zip_source_buffer.3
+man/man3/zip_source_close.3
+man/man3/zip_source_commit_write.3
+man/man3/zip_source_error.3
 man/man3/zip_source_file.3
 man/man3/zip_source_filep.3
 man/man3/zip_source_free.3
 man/man3/zip_source_function.3
+man/man3/zip_source_function_create.3
+man/man3/zip_source_is_deleted.3
+man/man3/zip_source_keep.3
+man/man3/zip_source_make_command_bitmap.3
+man/man3/zip_source_open.3
+man/man3/zip_source_read.3
+man/man3/zip_source_rollback_write.3
+man/man3/zip_source_seek.3
+man/man3/zip_source_seek_compute_offset.3
+man/man3/zip_source_seek_write.3
+man/man3/zip_source_stat.3
+man/man3/zip_source_tell.3
+man/man3/zip_source_tell_write.3
+man/man3/zip_source_win32a.3
+man/man3/zip_source_win32a_create.3
+man/man3/zip_source_win32handle.3
+man/man3/zip_source_win32handle_create.3
+man/man3/zip_source_win32w.3
+man/man3/zip_source_win32w_create.3
+man/man3/zip_source_write.3
 man/man3/zip_source_zip.3
 man/man3/zip_stat.3
 man/man3/zip_stat_index.3
--- a/archivers/libzip/buildlink3.mk
+++ b/archivers/libzip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2013/04/01 16:03:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2015/05/04 21:10:40 wiz Exp $

 BUILDLINK_TREE+=	libzip

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libzip
 LIBZIP_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.libzip+=	libzip>=0.7.1
-BUILDLINK_ABI_DEPENDS.libzip+=	libzip>=0.11
+BUILDLINK_ABI_DEPENDS.libzip+=	libzip>=1.0
 BUILDLINK_PKGSRCDIR.libzip?=	../../archivers/libzip

 BUILDLINK_INCDIRS.libzip=	include lib/libzip/include
--- a/archivers/libzip/distinfo
+++ b/archivers/libzip/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2015/03/26 09:30:01 wiz Exp $
+$NetBSD: distinfo,v 1.17 2015/05/04 21:10:40 wiz Exp $

-SHA1 (libzip-0.11.2.tar.xz) = da86a7b4bb2b7ab7c8c5fb773f8a48a5adc7a405
-RMD160 (libzip-0.11.2.tar.xz) = 4f94874c2f1d06c8c3020f22f17c9ef6da388051
-Size (libzip-0.11.2.tar.xz) = 413352 bytes
-SHA1 (patch-lib_zip__dirent.c) = e6d63693b29a3818943ed39ccd5353c146a2a7fc
+SHA1 (libzip-1.0.1.tar.xz) = c342263fc31311c81c242cb69418303fda41cea7
+RMD160 (libzip-1.0.1.tar.xz) = fc7b4aa1f43bf11c83e7b9a2a3b7ad53ca98b7c5
+Size (libzip-1.0.1.tar.xz) = 450308 bytes
--- a/archivers/libzip/patches/patch-lib_zip__dirent.c
+++ b/archivers/libzip/patches/patch-lib_zip__dirent.c
@@ -1,28 +0,0 @@
-$NetBSD: patch-lib_zip__dirent.c,v 1.1 2015/03/26 09:30:01 wiz Exp $
-
-Based on:
-# HG changeset patch
-# User Thomas Klausner <tk@giga.or.at>
-# Date 1426937322 -3600
-#      Sat Mar 21 12:28:42 2015 +0100
-# Node ID 9f11d54f692edc152afef04178cdf16f906a21b4
-# Parent  fa78ab51417f2fbf19586195dc3662497a5d790d
-Avoid integer overflow. Addresses CVE-2015-2331.
-
-Fixed similarly to patch used in PHP copy of libzip:
-https://github.com/php/php-src/commit/ef8fc4b53d92fbfcd8ef1abbd6f2f5fe2c4a11e5
-
-Thanks to Emmanuel Law <emmanuel.law@gmail.com> for the notification
-about the bug.
-
--- lib/zip_dirent.c.orig	2013-11-28 16:57:10.000000000 +0000
-+++ lib/zip_dirent.c
-@@ -110,7 +110,7 @@ _zip_cdir_new(zip_uint64_t nentry, struc
- 
-     if (nentry == 0)
- 	cd->entry = NULL;
-    else if ((cd->entry=(struct zip_entry *)malloc(sizeof(*(cd->entry))*(size_t)nentry)) == NULL) {
-+    else if ((nentry > SIZE_MAX/sizeof(*(cd->entry))) || (cd->entry=(struct zip_entry *)malloc(sizeof(*(cd->entry))*(size_t)nentry)) == NULL) {
- 	_zip_error_set(error, ZIP_ER_MEMORY, 0);
- 	free(cd);
- 	return NULL;
--- a/archivers/lrzip/Makefile
+++ b/archivers/lrzip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/01/09 15:34:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/08 14:58:09 wiedi Exp $

-DISTNAME=	lrzip-0.616
-PKGREVISION=	1
+DISTNAME=	lrzip-0.621
 CATEGORIES=	archivers
 MASTER_SITES=	http://ck.kolivas.org/apps/lrzip/
 EXTRACT_SUFX=	.tar.bz2
--- a/archivers/lrzip/PLIST
+++ b/archivers/lrzip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/10/21 11:29:05 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/08 14:58:09 wiedi Exp $
 bin/lrunzip
 bin/lrzcat
 bin/lrzip
@@ -17,11 +17,11 @@ share/doc/lrzip/AUTHORS
 share/doc/lrzip/BUGS
 share/doc/lrzip/COPYING
 share/doc/lrzip/ChangeLog
-share/doc/lrzip/README
 share/doc/lrzip/README-NOT-BACKWARD-COMPATIBLE
 share/doc/lrzip/README.Assembler
 share/doc/lrzip/README.benchmarks
 share/doc/lrzip/README.lzo_compresses.test.txt
+share/doc/lrzip/README.md
 share/doc/lrzip/TODO
 share/doc/lrzip/WHATS-NEW
 share/doc/lrzip/lrzip.conf.example
--- a/archivers/lrzip/distinfo
+++ b/archivers/lrzip/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2013/11/08 21:14:01 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/06/08 14:58:09 wiedi Exp $

-SHA1 (lrzip-0.616.tar.bz2) = 374a021ff087ee93b2d5894fd16aa3aef26dfa8f
-RMD160 (lrzip-0.616.tar.bz2) = 6cc2a3f6fd13bfbaba93ae61bf0597383e0d98cd
-Size (lrzip-0.616.tar.bz2) = 493886 bytes
+SHA1 (lrzip-0.621.tar.bz2) = 9c33f6458d39443dbf71b5c66820d4d653daf3c0
+RMD160 (lrzip-0.621.tar.bz2) = 91e04e6969e661ceb5b1259e125722b0cc7fc913
+Size (lrzip-0.621.tar.bz2) = 503286 bytes
 SHA1 (patch-liblrzip.c) = 64092c1b186ced54ba57aba21eb4c9180c82e3ed
 SHA1 (patch-lrzip.h) = 42c3f7eccbd93e1bad5bb91941c1e69a2ff261cd
-SHA1 (patch-lrzip__private.h) = b56cc367a9c2038ccc3448ec2d8c7e07c7e3b44c
+SHA1 (patch-lrzip__private.h) = 17eb75f2a497a47d575cfbe075953311097024cc
+SHA1 (patch-rzip.c) = 787e891b25db11bd7f7a6ee52869224f646ecec8
--- a/archivers/lrzip/patches/patch-lrzip__private.h
+++ b/archivers/lrzip/patches/patch-lrzip__private.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-lrzip__private.h,v 1.1 2013/11/08 21:14:02 joerg Exp $
+$NetBSD: patch-lrzip__private.h,v 1.2 2015/06/08 14:58:09 wiedi Exp $

--- lrzip_private.h.orig	2013-11-08 20:52:44.000000000 +0000
+--- lrzip_private.h.orig	2015-03-10 09:25:42.000000000 +0000
 +++ lrzip_private.h
-@@ -139,7 +139,7 @@ extern int errno;
+@@ -140,7 +140,7 @@ extern int errno;
 #define unlikely(x)	__builtin_expect(!!(x), 0)
 #define __maybe_unused	__attribute__((unused))
 
--- a/archivers/lrzip/patches/patch-rzip.c
+++ b/archivers/lrzip/patches/patch-rzip.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-rzip.c,v 1.1 2015/06/08 14:58:09 wiedi Exp $
+
+Use same platform check as in lrzip_private.h file. The fake_mremap is required
+on all platforms that are not linux.
+
+--- rzip.c.orig	2015-03-10 10:13:22.000000000 +0000
+++ rzip.c
+@@ -772,7 +772,7 @@ static inline void init_hash_indexes(str
+ 		st->hash_index[i] = ((random() << 16) ^ random());
+ }
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if !defined(__linux)
+ # define mremap fake_mremap
+ 
+ static inline void *fake_mremap(void *old_address, size_t old_size, size_t new_size, int flags __UNUSED__)
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $

-DISTNAME=	lz4-r127
+DISTNAME=	lz4-r130
 PKGNAME=	${DISTNAME:S/-r/-/}
 CATEGORIES=	archivers
-MASTER_SITES=	-https://github.com/Cyan4973/lz4/archive/${DISTNAME:S/lz4-//}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Cyan4973/}

 MAINTAINER=	filip@joyent.com
 HOMEPAGE=	http://code.google.com/p/lz4/
 COMMENT=	Extremely Fast Compression algorithm
 LICENSE=	2-clause-bsd

+GITHUB_TAG=	r${PKGVERSION_NOREV}
+
 USE_LANGUAGES=	c c99
 USE_TOOLS+=	gmake pkg-config

--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/06/09 12:04:19 fhajny Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
+bin/unlz4
 include/lz4.h
 include/lz4frame.h
 include/lz4hc.h
 lib/liblz4.a
 lib/liblz4.so
 lib/liblz4.so.1
-lib/liblz4.so.1.5.0
+lib/liblz4.so.1.7.0
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
 man/man1/lz4cat.1
+man/man1/unlz4.1
--- a/archivers/lz4/buildlink3.mk
+++ b/archivers/lz4/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/03/23 22:24:11 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/06/09 12:04:19 fhajny Exp $

 BUILDLINK_TREE+=	lz4

 .if !defined(LZ4_BUILDLINK3_MK)
 LZ4_BUILDLINK3_MK:=

-BUILDLINK_ABI_DEPENDS.lz4+=	lz4>=126
-BUILDLINK_API_DEPENDS.lz4+=	lz4>=126
+BUILDLINK_ABI_DEPENDS.lz4+=	lz4>=130
+BUILDLINK_API_DEPENDS.lz4+=	lz4>=130
 BUILDLINK_PKGSRCDIR.lz4?=	../../archivers/lz4
 .endif # LZ4_BUILDLINK3_MK

--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2015/06/09 12:04:19 fhajny Exp $

-SHA1 (lz4-r127.tar.gz) = 1aa7d4bb62eb79f88b33f86f9890dc9f96797af5
-RMD160 (lz4-r127.tar.gz) = 1f68ce2228d4d0c19c8ca72c7d2d08c45049e963
-Size (lz4-r127.tar.gz) = 139066 bytes
-SHA1 (patch-Makefile) = 93fd35f5d79431f9ebe3ba1344fd1d7e94a55075
-SHA1 (patch-lib_Makefile) = 7a30b62b8a1507e2c62503e73413a795717e089a
-SHA1 (patch-programs_Makefile) = 4f852a496b1acebfebce36f426c394702c5680d0
-SHA1 (patch-programs_frametest.c) = 0d25ab96df4b615a3e04abed116b6ec16de400df
-SHA1 (patch-programs_fuzzer.c) = 02598b7836b73467ce98d9de6bcf9eadc3fa14ce
+SHA1 (lz4-r130.tar.gz) = 5e1167e578639cb75e4103933dbf68e193a4d4c4
+RMD160 (lz4-r130.tar.gz) = c02f1852e17fea7f88f23cca5ca36a694b857d98
+Size (lz4-r130.tar.gz) = 129154 bytes
+SHA1 (patch-Makefile) = c6e5cd7c375aea8d37704f307bd6488f80a208bf
+SHA1 (patch-lib_Makefile) = 30caae8b487ceedb378c7d4c264cacbfaf3df3e9
+SHA1 (patch-programs_Makefile) = 9211e3718b52834fe461dc57ca486113659bbf8d
--- a/archivers/lz4/patches/patch-Makefile
+++ b/archivers/lz4/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $

 Make portable, use pkgsrc install scripts.
--- Makefile.orig	2014-12-19 08:51:32.000000000 +0000
+--- Makefile.orig	2015-05-26 01:13:50.000000000 +0000
 +++ Makefile
-@@ -86,10 +86,6 @@ clean:
+@@ -75,10 +75,6 @@ clean:
 	@echo Cleaning completed
 
 
@@ -14,7 +14,7 @@ Make portable, use pkgsrc install scripts.
 install:
 	@cd $(LZ4DIR); $(MAKE) -e install
 	@cd $(PRGDIR); $(MAKE) -e install
-@@ -133,4 +129,3 @@ streaming-examples:
+@@ -123,4 +119,3 @@ streaming-examples:
 prg-travis:
 	@cd $(PRGDIR); $(MAKE) -e test-travis
 
--- a/archivers/lz4/patches/patch-lib_Makefile
+++ b/archivers/lz4/patches/patch-lib_Makefile
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_Makefile,v 1.1 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: patch-lib_Makefile,v 1.2 2015/06/09 12:04:19 fhajny Exp $

 Make portable, use pkgsrc install scripts.
--- lib/Makefile.orig	2014-12-19 08:51:32.000000000 +0000
+--- lib/Makefile.orig	2015-05-26 01:13:50.000000000 +0000
 +++ lib/Makefile
-@@ -33,9 +33,9 @@
+@@ -32,9 +32,9 @@
 
 # Version numbers
- VERSION ?= 126
+ VERSION ?= 129
 -LIBVER_MAJOR=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
 -LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
 -LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
@@ -16,7 +16,7 @@ Make portable, use pkgsrc install scripts.
 LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
 
 DESTDIR?=
-@@ -80,28 +80,24 @@ clean:
+@@ -79,28 +79,24 @@ clean:
 	@echo Cleaning library completed
 
 
@@ -59,8 +59,8 @@ Make portable, use pkgsrc install scripts.
 
 uninstall:
@@ -113,5 +109,3 @@ uninstall:
- 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4.h
 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
+ 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
 	@echo lz4 libraries successfully uninstalled
 -
 -endif
--- a/archivers/lz4/patches/patch-programs_Makefile
+++ b/archivers/lz4/patches/patch-programs_Makefile
@@ -1,18 +1,18 @@
-$NetBSD: patch-programs_Makefile,v 1.4 2015/03/23 22:24:11 fhajny Exp $
+$NetBSD: patch-programs_Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $

 Make portable, use pkgsrc install scripts.
--- programs/Makefile.orig	2014-12-19 08:51:32.000000000 +0000
+--- programs/Makefile.orig	2015-05-26 01:13:50.000000000 +0000
 +++ programs/Makefile
-@@ -40,7 +40,7 @@ CFLAGS += -std=c99 -Wall -Wextra -Wundef
- FLAGS   = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+@@ -43,7 +43,7 @@ CFLAGS += -std=c99 -Wall -Wextra -Wundef
+ FLAGS  := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 
- BINDIR=$(PREFIX)/bin
-MANDIR=$(PREFIX)/share/man/man1
-+MANDIR=$(PREFIX)/$(PKGMANDIR)/man1
- LZ4DIR=../lib
+ BINDIR := $(PREFIX)/bin
+-MANDIR := $(PREFIX)/share/man/man1
+MANDIR := $(PREFIX)/$(PKGMANDIR)/man1
+ LZ4DIR := ../lib
 
- TEST_FILES = COPYING
-@@ -106,20 +106,16 @@ clean:
+ 
+@@ -112,19 +112,15 @@ clean:
 	@echo Cleaning completed
 
 
@@ -23,23 +23,20 @@ Make portable, use pkgsrc install scripts.
 install: lz4 lz4c
 	@echo Installing binaries
 -	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
-	@install -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT)
+-	@install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4
 +	$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
-+	$(BSD_INSTALL_PROGRAM) -m 755 lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4$(EXT)
- 	@ln -sf lz4$(EXT) $(DESTDIR)$(BINDIR)/lz4cat
-	@install -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
-+	$(BSD_INSTALL_PROGRAM) -m 755 lz4c$(EXT) $(DESTDIR)$(BINDIR)/lz4c$(EXT)
+	$(BSD_INSTALL_PROGRAM) -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4
+ 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/lz4cat
+ 	@ln -sf lz4 $(DESTDIR)$(BINDIR)/unlz4
+-	@install -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c
+	$(BSD_INSTALL_PROGRAM) -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c
 	@echo Installing man pages
 -	@install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
-	@install -m 644 lz4c.1 $(DESTDIR)$(MANDIR)/lz4c.1
-	@install -m 644 lz4cat.1 $(DESTDIR)$(MANDIR)/lz4cat.1
 +	$(BSD_INSTALL_MAN) -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1
-+	$(BSD_INSTALL_MAN) -m 644 lz4c.1 $(DESTDIR)$(MANDIR)/lz4c.1
-+	$(BSD_INSTALL_MAN) -m 644 lz4cat.1 $(DESTDIR)$(MANDIR)/lz4cat.1
- 	@echo lz4 installation completed
- 
- uninstall:
-@@ -203,4 +199,3 @@ test-mem: lz4 datagen fuzzer frametest
+ 	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4c.1
+ 	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/lz4cat.1
+ 	@ln -sf lz4.1 $(DESTDIR)$(MANDIR)/unlz4.1
+@@ -308,4 +304,3 @@ test-mem: lz4 datagen fuzzer frametest f
 test-mem32: lz4c32 datagen
 # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
 
--- a/archivers/lz4/patches/patch-programs_frametest.c
+++ b/archivers/lz4/patches/patch-programs_frametest.c
@@ -1,29 +0,0 @@
-$NetBSD: patch-programs_frametest.c,v 1.3 2015/03/23 22:24:11 fhajny Exp $
-
-Make portable.
--- programs/frametest.c.orig	2014-12-19 08:51:32.000000000 +0000
-+++ programs/frametest.c
-@@ -42,7 +42,7 @@
- **************************************/
- #include <stdlib.h>     // free
- #include <stdio.h>      // fgets, sscanf
-#include <sys/timeb.h>  // timeb
-+#include <sys/time.h>  // timeb
- #include <string.h>     // strcmp
- #include "lz4frame_static.h"
- #include "xxhash.h"     // XXH64
-@@ -113,11 +113,9 @@ static U32 pause = 0;
- *********************************************************/
- static U32 FUZ_GetMilliStart(void)
- {
-    struct timeb tb;
-    U32 nCount;
-    ftime( &tb );
-    nCount = (U32) (((tb.time & 0xFFFFF) * 1000) +  tb.millitm);
-    return nCount;
-+    struct timeval tv;
-+    gettimeofday(&tv, NULL);
-+    return (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
- }
- 
- 
--- a/archivers/lz4/patches/patch-programs_fuzzer.c
+++ b/archivers/lz4/patches/patch-programs_fuzzer.c
@@ -1,68 +0,0 @@
-$NetBSD: patch-programs_fuzzer.c,v 1.4 2015/03/23 22:24:11 fhajny Exp $
-
-Add portable code for ftime for NetBSD.
-
-Based on https://code.google.com/p/lz4/source/detail?r=81.
--- programs/fuzzer.c.orig	2014-12-19 08:51:32.000000000 +0000
-+++ programs/fuzzer.c
-@@ -32,6 +32,7 @@
- #  pragma warning(disable : 4127)    /* disable: C4127: conditional expression is constant */
- #  pragma warning(disable : 4146)    /* disable: C4146: minus unsigned expression */
- #  pragma warning(disable : 4310)    /* disable: C4310: constant char value > 127 */
-+#  define BMK_LEGACY_TIMER 1
- #endif
- 
- 
-@@ -40,12 +41,17 @@
- **************************************/
- #include <stdlib.h>
- #include <stdio.h>      /* fgets, sscanf */
-#include <sys/timeb.h>  /* timeb */
- #include <string.h>     /* strcmp */
- #include "lz4.h"
- #include "lz4hc.h"
- #include "xxhash.h"
- 
-+// Use ftime() if gettimeofday() is not available on your target
-+#if defined(BMK_LEGACY_TIMER)
-+#  include <sys/timeb.h>   // timeb, ftime
-+#else
-+#  include <sys/time.h>    // gettimeofday
-+#endif
- 
- /**************************************
- * Basic Types
-@@ -100,8 +106,11 @@ static U32 g_time = 0;
- /*********************************************************
-   Fuzzer functions
- *********************************************************/
-+#if defined(BMK_LEGACY_TIMER)
-+
- static U32 FUZ_GetMilliStart(void)
- {
-+    // Based on Legacy ftime()
-     struct timeb tb;
-     U32 nCount;
-     ftime( &tb );
-@@ -109,6 +118,21 @@ static U32 FUZ_GetMilliStart(void)
-     return nCount;
- }
- 
-+#else
-+
-+static int FUZ_GetMilliStart()
-+{
-+  // Based on newer gettimeofday()
-+  // Use GetMilliSpan to correct for rollover
-+  struct timeval tv;
-+  int nCount;
-+  gettimeofday(&tv, NULL);
-+  nCount = (int) (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
-+  return nCount;
-+}
-+
-+#endif
-+
- static U32 FUZ_GetMilliSpan(U32 nTimeStart)
- {
-     U32 nCurrent = FUZ_GetMilliStart();
--- a/archivers/p5-Archive-Any-Lite/Makefile
+++ b/archivers/p5-Archive-Any-Lite/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2014/11/24 11:55:29 mef Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/12 10:48:21 wiz Exp $

 DISTNAME=	Archive-Any-Lite-0.10
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Any/Makefile
+++ b/archivers/p5-Archive-Any/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2015/03/08 01:04:58 mef Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/12 10:48:21 wiz Exp $

 DISTNAME=	Archive-Any-0.0942
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Extract/Makefile
+++ b/archivers/p5-Archive-Extract/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2015/01/26 07:48:36 mef Exp $
+# $NetBSD: Makefile,v 1.2 2015/06/12 10:48:21 wiz Exp $

 DISTNAME=	Archive-Extract-0.74
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Peek/Makefile
+++ b/archivers/p5-Archive-Peek/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/10/09 14:05:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/12 10:48:21 wiz Exp $

 DISTNAME=	Archive-Peek-0.35
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Tar-Wrapper/DESCR
+++ b/archivers/p5-Archive-Tar-Wrapper/DESCR
@@ -0,0 +1,11 @@
+Archive::Tar::Wrapper is an API wrapper around the 'tar' command line
+utility. It never stores anything in memory, but works on temporary
+directory structures on disk instead. It provides a mapping between the
+logical paths in the tarball and the 'real' files in the temporary
+directory on disk.
+
+It differs from Archive::Tar in two ways:
+  - Archive::Tar::Wrapper doesn't hold anything in memory. Everything is
+    stored on disk.
+  - Archive::Tar::Wrapper is 100% compliant with the platform's tar
+    utility, because it uses it internally.
--- a/archivers/p5-Archive-Tar-Wrapper/Makefile
+++ b/archivers/p5-Archive-Tar-Wrapper/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.3 2015/06/12 10:48:21 wiz Exp $
+
+DISTNAME=	Archive-Tar-Wrapper-0.22
+PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
+CATEGORIES=	archivers
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/~mschilli/Archive-Tar-Wrapper/
+COMMENT=	API wrapper around the 'tar' utility
+LICENSE=	${PERL5_LICENSE}
+
+PERL5_PACKLIST=	auto/Archive/Tar/Wrapper/.packlist
+USE_LANGUAGES=	# none
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/archivers/p5-Archive-Tar-Wrapper/distinfo
+++ b/archivers/p5-Archive-Tar-Wrapper/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.2 2015/05/24 07:33:59 mef Exp $
+
+SHA1 (Archive-Tar-Wrapper-0.22.tar.gz) = 287fbd4290d6950cc92143a850e3616cf9275378
+RMD160 (Archive-Tar-Wrapper-0.22.tar.gz) = 9c716770c0d96de6f55c96f6e001c2d7678f9a77
+Size (Archive-Tar-Wrapper-0.22.tar.gz) = 16230 bytes
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2014/12/31 14:40:17 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2015/06/12 10:48:21 wiz Exp $

 DISTNAME=	Archive-Tar-2.04
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2015/03/08 01:08:00 mef Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/12 10:48:21 wiz Exp $

-DISTNAME=	Archive-Zip-1.45
+DISTNAME=	Archive-Zip-1.46
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Zip/distinfo
+++ b/archivers/p5-Archive-Zip/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2015/03/08 01:08:00 mef Exp $
+$NetBSD: distinfo,v 1.18 2015/04/05 04:44:09 mef Exp $

-SHA1 (Archive-Zip-1.45.tar.gz) = 8f4ac8523b50f62368f0c3213629233c45211b10
-RMD160 (Archive-Zip-1.45.tar.gz) = f50eadd341e6398796e5ad29ed915101e09a9eba
-Size (Archive-Zip-1.45.tar.gz) = 186378 bytes
+SHA1 (Archive-Zip-1.46.tar.gz) = bb552467b0ded28efbeaff82cfe9a3eaafaaf5f3
+RMD160 (Archive-Zip-1.46.tar.gz) = 387f23de6c25ca351a9f8539eb1b57e65f3306b2
+Size (Archive-Zip-1.46.tar.gz) = 186426 bytes
--- a/archivers/p5-Compress-Bzip2/Makefile
+++ b/archivers/p5-Compress-Bzip2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2015/03/08 01:09:43 mef Exp $
+# $NetBSD: Makefile,v 1.27 2015/06/12 10:48:22 wiz Exp $

 DISTNAME=	Compress-Bzip2-2.22
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Compress/}

--- a/archivers/p5-Compress-LZMA-Simple/Makefile
+++ b/archivers/p5-Compress-LZMA-Simple/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2015/03/15 16:56:49 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/12 10:48:22 wiz Exp $

 DISTNAME=	Compress-LZMA-Simple-0.2
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Compress/}

--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2014/12/01 12:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2015/06/02 14:53:10 adam Exp $

-DISTNAME=	p7zip_9.20.1_src_all
-PKGNAME=	p7zip-9.20.1
-PKGREVISION=	2
+DISTNAME=	p7zip_9.38.1_src_all
+PKGNAME=	p7zip-9.38.1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +20,7 @@ PTHREAD_OPTS+=		require
 PLIST_VARS=		dll

 # compiles, but does not recognize any archives as supported
-DYNAMIC_7Z=		YES
+DYNAMIC_7Z?=		NO
 .if !empty(DYNAMIC_7Z:MYES)
 BUILD_TARGET=		all2
 PLIST.dll=		yes
@@ -48,7 +47,7 @@ SUBST_SED.lib+=		-e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib/\","
 SUBST_STAGE.lib=	post-patch

 .include "../../mk/dlopen.buildlink3.mk"
-BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}

 .include "../../mk/endian.mk"

@@ -71,11 +70,11 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/commands/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip/commands
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/switches/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip/switches
 	${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/10/04 21:51:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/06/02 14:53:10 adam Exp $
 bin/7z
 bin/7za
 ${PLIST.dll}lib/7z.so
@@ -13,8 +13,10 @@ share/doc/p7zip/commands/bench.htm
 share/doc/p7zip/commands/delete.htm
 share/doc/p7zip/commands/extract.htm
 share/doc/p7zip/commands/extract_full.htm
+share/doc/p7zip/commands/hash.htm
 share/doc/p7zip/commands/index.htm
 share/doc/p7zip/commands/list.htm
+share/doc/p7zip/commands/rename.htm
 share/doc/p7zip/commands/style.css
 share/doc/p7zip/commands/test.htm
 share/doc/p7zip/commands/update.htm
@@ -35,10 +37,17 @@ share/doc/p7zip/switches/output_dir.htm
 share/doc/p7zip/switches/overwrite.htm
 share/doc/p7zip/switches/password.htm
 share/doc/p7zip/switches/recurse.htm
+share/doc/p7zip/switches/sa.htm
+share/doc/p7zip/switches/scrc.htm
+share/doc/p7zip/switches/sdel.htm
 share/doc/p7zip/switches/sfx.htm
+share/doc/p7zip/switches/sni.htm
+share/doc/p7zip/switches/sns.htm
+share/doc/p7zip/switches/spf.htm
 share/doc/p7zip/switches/ssc.htm
 share/doc/p7zip/switches/stdin.htm
 share/doc/p7zip/switches/stdout.htm
+share/doc/p7zip/switches/stl.htm
 share/doc/p7zip/switches/stop_switch.htm
 share/doc/p7zip/switches/style.css
 share/doc/p7zip/switches/type.htm
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2014/12/01 12:43:07 wiz Exp $
+$NetBSD: distinfo,v 1.43 2015/06/02 14:53:10 adam Exp $

-SHA1 (p7zip_9.20.1_src_all.tar.bz2) = 1cd567e043ee054bf08244ce15f32cb3258306b7
-RMD160 (p7zip_9.20.1_src_all.tar.bz2) = c3ff2dd12459282b46d9a68ab4af7800ff46039f
-Size (p7zip_9.20.1_src_all.tar.bz2) = 3835235 bytes
-SHA1 (patch-CPP_Windows_DLL.cpp) = 212140b873058eb838a1eb97befebb90512cd7e4
-SHA1 (patch-aa) = 6031e4a571c890b6620627989d056ba606c2e0ca
-SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79
-SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce
+SHA1 (p7zip_9.38.1_src_all.tar.bz2) = 6b1eccf272d8b141a94758f80727ae633568ba69
+RMD160 (p7zip_9.38.1_src_all.tar.bz2) = df76939ed67f3835fe4f8e92f2fec1ab4e4328c6
+Size (p7zip_9.38.1_src_all.tar.bz2) = 3917925 bytes
+SHA1 (patch-CPP_Windows_DLL.cpp) = 12fb3f3cf4d32b8848f741dde6bcb0e56a9c6745
+SHA1 (patch-aa) = 91917c8cfc9638444a32924570067a4298c82105
+SHA1 (patch-ab) = c680fb037b9ef5e19e4c8dc71dd710598277a61b
+SHA1 (patch-ac) = 245f93d2a250b0e2f17e7828a82787ac05652800
--- a/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
+++ b/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.1 2014/12/01 12:43:07 wiz Exp $
+$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.2 2015/06/02 14:53:10 adam Exp $

 Adapt for pkgsrc on OS X.

--- CPP/Windows/DLL.cpp.orig	2010-02-28 12:44:52.000000000 +0000
+--- CPP/Windows/DLL.cpp.orig	2011-07-09 16:25:31.000000000 +0000
 +++ CPP/Windows/DLL.cpp
@@ -2,7 +2,7 @@
 
@@ -13,7 +13,7 @@ Adapt for pkgsrc on OS X.
 #include <mach-o/dyld.h>
 #elif ENV_BEOS
 #include <kernel/image.h>
-@@ -39,7 +39,7 @@ TRACEN((printf("CLibrary::Free(%p)\n",(v
+@@ -34,7 +34,7 @@ TRACEN((printf("CLibrary::Free(this=%p,%
   if (_module == 0)
     return true;
 
@@ -22,7 +22,7 @@ Adapt for pkgsrc on OS X.
   int ret = NSUnLinkModule ((NSModule)_module, 0);
 #elif ENV_BEOS
   int ret = unload_add_on((image_id)_module);
-@@ -57,7 +57,7 @@ static FARPROC local_GetProcAddress(HMOD
+@@ -52,7 +52,7 @@ static FARPROC local_GetProcAddress(HMOD
   void *ptr = 0;
   TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
   if (module) {
@@ -31,16 +31,16 @@ Adapt for pkgsrc on OS X.
     char name[MAX_PATHNAME_LEN];
     snprintf(name,sizeof(name),"_%s",lpProcName);
     name[sizeof(name)-1] = 0;
-@@ -115,7 +115,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
+@@ -103,7 +103,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
 
-   TRACEN((printf("CLibrary::Load(%ls) => %s\n",lpLibFileName,name)))
+   TRACEN((printf("CLibrary::Load(this=%p,%ls) => %s\n",(void *)this,lpLibFileName,name)))
 
 -#ifdef __APPLE_CC__
 +#if defined(USE_APPLE_BUNDLE)
   NSObjectFileImage image;
   NSObjectFileImageReturnCode nsret;
 
-@@ -173,7 +173,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
+@@ -161,7 +161,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
     if (fctTest) fctTest();
 
   } else {
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2014/04/26 01:16:54 dsainty Exp $
+$NetBSD: patch-aa,v 1.20 2015/06/02 14:53:10 adam Exp $

--- makefile.machine.orig	2010-05-30 08:33:48.000000000 +0000
+--- makefile.machine.orig	2015-02-25 20:12:06.000000000 +0000
 +++ makefile.machine
-@@ -2,20 +2,20 @@
+@@ -2,20 +2,18 @@
 # makefile for Linux (x86, PPC, alpha ...)
 #
 
@@ -16,12 +16,10 @@ $NetBSD: patch-aa,v 1.19 2014/04/26 01:16:54 dsainty Exp $
 	-D_7ZIP_LARGE_PAGES \
 	$(LOCAL_FLAGS)
 
-CXX=g++ $(ALLFLAGS)
-CC=gcc $(ALLFLAGS)
+-CXX=g++
+-CC=gcc
 -CC_SHARED=-fPIC
 -LINK_SHARED=-fPIC -shared
-+CXX+=$(ALLFLAGS)
-+CC+=$(ALLFLAGS)
 +CC_SHARED=
 +LINK_SHARED=-shared
 
--- a/archivers/p7zip/patches/patch-ab
+++ b/archivers/p7zip/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2011/03/14 12:36:43 adam Exp $
+$NetBSD: patch-ab,v 1.12 2015/06/02 14:53:10 adam Exp $

 --- CPP/Windows/FileFind.cpp.orig	2009-06-03 19:40:16.000000000 +0200
 +++ CPP/Windows/FileFind.cpp
-@@ -311,7 +311,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar
+@@ -350,7 +350,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar
   }
 
   TRACEN((printf("CFindFile::FindFirst : closedir-2(dirp=%p)\n",_dirp)))
--- a/archivers/p7zip/patches/patch-ac
+++ b/archivers/p7zip/patches/patch-ac
@@ -1,19 +1,21 @@
-$NetBSD: patch-ac,v 1.7 2010/06/16 08:30:09 adam Exp $
+$NetBSD: patch-ac,v 1.8 2015/06/02 14:53:10 adam Exp $

--- makefile.glb.orig	2009-07-03 20:44:21.000000000 +0000
+--- makefile.glb.orig	2015-02-19 14:56:02.000000000 +0000
 +++ makefile.glb
-@@ -1,12 +1,12 @@
+@@ -1,14 +1,14 @@
 
 RM=rm -f
+ 
 -CFLAGS=-c -I. \
 +CFLAGS+=-c -I. \
 -I../../../../C \
 -I../../../myWindows \
 -I../../../include_windows \
- -I../../..
+ -I../../.. \
+ $(ALLFLAGS) $(ALLFLAGS_C)
 
 -CXXFLAGS=-c -I. \
 +CXXFLAGS+=-c -I. \
 -I../../../myWindows \
 -I../../../ \
- -I../../../include_windows
+ -I../../../include_windows \
--- a/archivers/par2/Makefile
+++ b/archivers/par2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2015/03/09 12:14:44 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2015/05/04 10:10:23 adam Exp $

-DISTNAME=		par2-0.6.11
+DISTNAME=	par2-0.6.12
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=BlackIkeEagle/}
 GITHUB_PROJECT=	par2cmdline
--- a/archivers/par2/distinfo
+++ b/archivers/par2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2015/03/07 14:25:48 tnn Exp $
+$NetBSD: distinfo,v 1.12 2015/05/04 10:10:23 adam Exp $

-SHA1 (par2-0.6.11.tar.gz) = 2fd97247b3b7f2c6b6a640416d493764417dfb56
-RMD160 (par2-0.6.11.tar.gz) = 00f80008f9ab3c692b1aea93f642bef7bc1c9ae9
-Size (par2-0.6.11.tar.gz) = 2703989 bytes
+SHA1 (par2-0.6.12.tar.gz) = cee3b0642ffc9ddd73690f20c9e451563d2d9da4
+RMD160 (par2-0.6.12.tar.gz) = 7e90113884a09fc90979a06405d0f69778f4f447
+Size (par2-0.6.12.tar.gz) = 3536512 bytes
 SHA1 (patch-diskfile.cpp) = c2319215a6438322edeb28c4413a0a26dcade2d5
--- a/archivers/ruby-libarchive/Makefile
+++ b/archivers/ruby-libarchive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/01/17 20:00:53 adam Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/19 13:08:49 ryoon Exp $

 DISTNAME=	libarchive-0.1.2
 CATEGORIES=	archivers
@@ -10,6 +10,9 @@ LICENSE=	modified-bsd

 USE_TOOLS+=	gmake

+# Fix Ruby 2.2 build.
+CHECK_WRKREF_SKIP+=	lib/ruby/gems/2.2.0/doc/libarchive-0.1.2/ri/ext/*.ri
+
 .include "../../lang/ruby/gem.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/archivers/ruby-xz/Makefile
+++ b/archivers/ruby-xz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/03/01 12:58:16 taca Exp $
+# $NetBSD: Makefile,v 1.11 2015/05/31 15:21:44 taca Exp $

 DISTNAME=	ruby-xz-0.2.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -13,8 +13,6 @@ DEPENDS+=	xz-[0-9]*:../../archivers/xz
 DEPENDS+=	${RUBY_PKGPREFIX}-ffi-[0-9]*:../../devel/ruby-ffi
 DEPENDS+=	${RUBY_PKGPREFIX}-io-like-[0-9]*:../../devel/ruby-io-like

-RUBY_VERSION_SUPPORTED= 193 200 21
-
 EVAL_PREFIX+=	XZ_PREFIX=xz

 SUBST_CLASSES+=		path
--- a/archivers/ruby-zip/Makefile
+++ b/archivers/ruby-zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/02/03 13:37:45 taca Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 22:57:42 taca Exp $

 DISTNAME=	rubyzip-1.1.7
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby//}
@@ -9,8 +9,6 @@ HOMEPAGE=	https://github.com/aussiegeek/rubyzip
 COMMENT=	Ruby module for reading and writing zip files
 LICENSE=	ruby-license

-RUBY_VERSION_SUPPORTED=	200 193 21
-
 pre-configure:
 	${CHMOD} -R -x ${WRKSRC}/Rakefile ${WRKSRC}/lib/zip/*.rb

--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2015/02/11 12:35:42 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2015/06/05 12:22:28 sevan Exp $

 DISTNAME=	unzip60
 PKGNAME=	unzip-6.0
@@ -32,7 +32,8 @@ CPPFLAGS+=	-DBSD
     ${OPSYS} == "OpenBSD"  || \
     ${OPSYS} == "Cygwin"  || \
    (${OPSYS} == "Darwin" && !empty(OS_VERSION:M[01234678].*))) || \
-     ${OS_VARIANT} == "SCOOSR5"
+     ${OS_VARIANT} == "SCOOSR5" || \
+     ${OPSYS} == "Bitrig"
 CPPFLAGS+=	-DNO_LCHMOD
 .endif
 CPPFLAGS+=	-DUNIX -Dunix -DUSE_UNSHRINK -I.
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/05/29 23:35:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/06/12 10:48:22 wiz Exp $

 DISTNAME=	upx-3.91-src
 PKGNAME=	${DISTNAME:S/-src//1}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=upx/}
 EXTRACT_SUFX=	.tar.bz2
--- a/archivers/xfce4-thunar-archive/DESCR
+++ b/archivers/xfce4-thunar-archive/DESCR
@@ -0,0 +1,5 @@
+The thunar-archive-plugin is a plugin for the Thunar File Manager, which
+adds archive operations to the file context menus. Using this plugin you
+will be able to extract and create archive files from within Thunar using
+an external archive handler. So far, xarchiver, file-roller and ark are
+supported.
--- a/archivers/xfce4-thunar-archive/Makefile
+++ b/archivers/xfce4-thunar-archive/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.2 2015/04/25 14:20:17 tnn Exp $
+#
+
+PKGREVISION= 1
+.include "../../meta-pkgs/xfce4/Makefile.common"
+
+DISTNAME=	thunar-archive-plugin-0.3.1
+PKGNAME=	xfce4-${DISTNAME}
+CATEGORIES=	archivers
+MASTER_SITES=	http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.3/
+
+MAINTAINER=	gls@NetBSD.org
+HOMEPAGE=	http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
+COMMENT=	Thunar archive plugin
+
+DEPENDS=	file-roller-[0-9]*:../../archivers/file-roller
+
+.include "../../sysutils/xfce4-thunar/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/archivers/xfce4-thunar-archive/PLIST
+++ b/archivers/xfce4-thunar-archive/PLIST
@@ -0,0 +1,53 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:37 jperkin Exp $
+lib/thunarx-2/thunar-archive-plugin.la
+libexec/thunar-archive-plugin/ark.tap
+libexec/thunar-archive-plugin/file-roller.tap
+libexec/thunar-archive-plugin/gnome-file-roller.tap
+share/icons/hicolor/16x16/apps/tap-create.png
+share/icons/hicolor/16x16/apps/tap-extract-to.png
+share/icons/hicolor/16x16/apps/tap-extract.png
+share/locale/ar/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ast/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/be/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/bg/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ca/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/cs/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/da/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/de/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/el/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/en_GB/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/eo/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/es/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/eu/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/fi/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/fr/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/gl/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/hr/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/hu/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/id/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/it/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ja/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/kk/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ko/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/lt/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/lv/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/nb/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/nl/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/pa/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/pl/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/pt/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ro/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ru/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sk/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sl/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sq/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sr/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sv/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/tr/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ug/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/uk/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ur/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/zh_CN/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/thunar-archive-plugin.mo
--- a/archivers/xfce4-thunar-archive/distinfo
+++ b/archivers/xfce4-thunar-archive/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/04/21 08:56:37 jperkin Exp $
+
+SHA1 (thunar-archive-plugin-0.3.1.tar.bz2) = 56d4c075eb570167caabdb5e4da8119fed4c16cb
+RMD160 (thunar-archive-plugin-0.3.1.tar.bz2) = 42b1e3be7a193aea9221cd3898a5cd88a6999717
+Size (thunar-archive-plugin-0.3.1.tar.bz2) = 329005 bytes
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.519 2015/02/19 00:21:55 wiz Exp $
+# $NetBSD: Makefile,v 1.523 2015/04/24 06:37:34 jnemeth Exp $
 #

 COMMENT=	Audio tools
@@ -260,6 +260,7 @@ SUBDIR+=	libopenspc
 SUBDIR+=	libopus
 SUBDIR+=	libreplaygain
 SUBDIR+=	libsamplerate
+SUBDIR+=	libsbsms
 SUBDIR+=	libshout
 SUBDIR+=	libsidplay
 SUBDIR+=	libsidplay2
@@ -276,9 +277,11 @@ SUBDIR+=	libvorbis
 SUBDIR+=	libwildmidi
 SUBDIR+=	libxmp
 SUBDIR+=	libxspf
+SUBDIR+=	lilv
 SUBDIR+=	liteamp
 SUBDIR+=	liveice
 SUBDIR+=	lmms
+SUBDIR+=	lv2
 SUBDIR+=	mac
 SUBDIR+=	mad
 SUBDIR+=	mad123
--- a/audio/SDL2_mixer/Makefile
+++ b/audio/SDL2_mixer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2015/02/09 08:43:13 snj Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/25 14:20:17 tnn Exp $

 DISTNAME=	SDL2_mixer-2.0.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/

--- a/audio/SDL2_mixer/buildlink3.mk
+++ b/audio/SDL2_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/02/09 08:43:13 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/04/25 14:20:17 tnn Exp $

 BUILDLINK_TREE+=	SDL2_mixer

@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	SDL2_mixer
 SDL2_MIXER_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0
-BUILDLINK_ABI_DEPENDS.SDL2_mixer?=	SDL2_mixer>=2.0.0nb1
-BUILDLINK_PKGSRCDIR.SDL2_mixer?=	../../devel/SDL2_mixer
+BUILDLINK_ABI_DEPENDS.SDL2_mixer?=	SDL2_mixer>=2.0.0nb2
+BUILDLINK_PKGSRCDIR.SDL2_mixer?=	../../audio/SDL2_mixer

 .include "../../devel/SDL2/buildlink3.mk"
 .endif	# SDL2_MIXER_BUILDLINK3_MK
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2014/10/09 14:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2015/04/25 14:20:17 tnn Exp $

 DISTNAME=	SDL_mixer-1.2.12
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/

--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/10/31 00:16:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2015/04/25 14:20:17 tnn Exp $

 BUILDLINK_TREE+=	SDL_mixer

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	SDL_mixer
 SDL_MIXER_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
-BUILDLINK_ABI_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.6nb5
+BUILDLINK_ABI_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.12nb6
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL

--- a/Show More
+++ b/Show More