Import of pkgsrc-2016Q3

editors/elvis/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/06/06 12:54:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/12/29 04:22:50 dholland Exp $
 
 # This section contains variables that might be overridden.
 PKGNAME?=	${PKGNAME_BASE}
@@ -22,9 +22,9 @@ LICENSE=	artistic
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--verbose
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--docdir=${PREFIX:Q}/share/doc/elvis
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/elvis
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR?=	elvis
 CONF_FILES=		${PREFIX}/share/elvis/elvis.rc \

editors/elvis/distinfo

@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.10 2013/10/20 18:15:32 joerg Exp $
+$NetBSD: distinfo,v 1.12 2015/12/29 04:22:33 dholland Exp $
 
 SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477
 RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805
+SHA512 (elvis-2.2_0.tar.gz) = 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
 Size (elvis-2.2_0.tar.gz) = 1439293 bytes
-SHA1 (patch-ab) = 9bc99e5f13926e5c2d8570c88526249e5a449203
-SHA1 (patch-ac) = a866461c14dd7518f2ee5790a366a5eb7ffbee3c
-SHA1 (patch-ad) = 702b08ec1182c3673721de62690a3a7c32983b8a
-SHA1 (patch-ae) = 2a8eb92b44fa932fcc51e7af999f1363dd53ff74
-SHA1 (patch-ref.c) = 9a15b4a11e65f47a86aa46c16861630195139fe5
+SHA1 (patch-ab) = 86cf5029a50c0bc353070bc0feacf8c2b13a6511
+SHA1 (patch-ac) = 11f8bea5683ee4d5dcfb618278aa7c381ebb4d9d
+SHA1 (patch-ad) = c0491fdc5da090f3aef956af4d2888014b3aee58
+SHA1 (patch-ae) = 6abf29e010d624fa074181c178878ff6c7fb580d
+SHA1 (patch-ref.c) = 324c6bd068bfaf44b278868f8e41895a0f91fe43

editors/elvis/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/12/19 15:27:47 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2015/12/29 04:22:50 dholland Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.elvis
 PKG_SUPPORTED_OPTIONS=		x11
@@ -6,15 +6,15 @@ PKG_SUPPORTED_OPTIONS=		x11
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mx11)
-BUILDLINK_DEPMETHOD.libXt?=	build
+BUILDLINK_DEPMETHOD.libXt=	build
 .  include "../../x11/libXft/buildlink3.mk"
 .  include "../../graphics/freetype2/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
 .  include "../../x11/libXt/buildlink3.mk"
 CONFIGURE_ARGS+=		--with-x
 CONFIGURE_ARGS+=		--with-xft
-CONFIGURE_ARGS+=		--x-includes=${X11BASE:Q}/include
-CONFIGURE_ARGS+=		--x-libraries=${X11BASE:Q}/lib
+CONFIGURE_ARGS+=		--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=		--x-libraries=${X11BASE}/lib
 USE_TOOLS+=			pkg-config
 .else
 CONFIGURE_ARGS+=		--without-x

editors/elvis/patches/patch-ab

@@ -1,4 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2013/10/20 18:15:32 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2015/12/29 04:22:33 dholland Exp $
+
+ - Support passing sysconfdir as a configure option.
+ - Honor COMPILER_RPATH_FLAG.
+ - Use pkgconfig to find freetype.
 
 --- configure.orig	2003-10-20 22:32:25.000000000 -0400
 +++ configure

editors/elvis/patches/patch-ac

@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2008/04/22 16:23:57 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2015/12/29 04:22:33 dholland Exp $
+
+Configure for pkgsrc.
 
 --- Makefile.in.orig	2003-10-20 22:32:25.000000000 -0400
 +++ Makefile.in

editors/elvis/patches/patch-ad

@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2005/11/07 20:13:44 tv Exp $
+$NetBSD: patch-ad,v 1.2 2015/12/29 04:22:33 dholland Exp $
+
+Don't sync on Interix. (XXX: shouldn't sync the whole system even not
+on Interix. How about using fsync?)
 
 --- osunix/osblock.c.orig	2003-10-20 22:32:26.000000000 -0400
 +++ osunix/osblock.c

editors/elvis/patches/patch-ae

@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2006/06/26 10:21:55 rillig Exp $
+$NetBSD: patch-ae,v 1.2 2015/12/29 04:22:33 dholland Exp $
+
+Fix symbol name conflict with freetype.
 
 --- guix11/xdialog.h.orig	2006-06-26 12:17:12.000000000 +0200
 +++ guix11/xdialog.h	2006-06-26 12:19:24.000000000 +0200

editors/elvis/patches/patch-ref.c

@@ -1,4 +1,6 @@
-$NetBSD: patch-ref.c,v 1.1 2009/10/03 10:14:18 ahoka Exp $
+$NetBSD: patch-ref.c,v 1.2 2015/12/29 04:22:33 dholland Exp $
+
+Fix symbol name conflict with posix getline().
 
 --- ref.c.orig	2003-10-21 04:32:25.000000000 +0200
 +++ ref.c