Import of pkgsrc-2015Q1

devel/patch/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2014/01/03 14:55:47 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2015/02/20 07:09:19 tnn Exp $
 
-DISTNAME=	patch-2.7.1
+DISTNAME=	patch-2.7.4
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNU:=patch/}
 EXTRACT_SUFX=	.tar.xz
@@ -10,25 +10,22 @@ HOMEPAGE=	http://www.gnu.org/software/patch/patch.html
 COMMENT=	Patch files using diff output
 LICENSE=	gnu-gpl-v3
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		awk
 
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ENV+=		ac_cv_func_setmode_dos=no	# Fix for Interix (and old bsd?)
 
 INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 do-patch:
-	${MV} ${WRKSRC}/src/pch.c ${WRKSRC}/src/pch.c.orig
-	${AWK} '/#include <pch.h>/{print $$0 "\n#include <sys/param.h>";next;}\
-		/^#if HAVE_SETMODE_DOS/					\
-		{gsub(/^#if HAVE_SETMODE_DOS/,"#if defined(HAVE_SETMODE_DOS) \\&\\& !(defined(BSD) \\&\\& BSD >= 199306) \\&\\& !defined(__INTERIX)");print $$0; next; } \
-		{print $$0;}'						\
-		< ${WRKSRC}/src/pch.c.orig 					\
-		> ${WRKSRC}/src/pch.c
+.for stdhdr in sys/param.h sys/stat.h string.h
+	echo "#ifdef HAVE_${stdhdr:tu:C,[/.],_,g}" >> ${WRKSRC}/config.hin
+	echo "#include <${stdhdr}>" >> ${WRKSRC}/config.hin
+	echo "#endif" >> ${WRKSRC}/config.hin
+.endfor
 
 SYMLINKS	= bin/gpatch ${PKGGNUDIR}bin/patch \
 		man/man1/gpatch.1 ${PKGGNUDIR}${PKGMANDIR}/man1/patch.1

devel/patch/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2014/01/03 14:55:47 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/02/08 09:29:43 mef Exp $
 
-SHA1 (patch-2.7.1.tar.xz) = 433184d0ca43770f28b3de1d5e9da518a7ac7c50
-RMD160 (patch-2.7.1.tar.xz) = cc98b255bde6c322d7435db3ce377c476888359f
-Size (patch-2.7.1.tar.xz) = 675896 bytes
+SHA1 (patch-2.7.4.tar.xz) = b2e29867263095e0f8bfd4b1319124b04102f2b0
+RMD160 (patch-2.7.4.tar.xz) = 4531f6a4f9fbae08b831e3f289946f5d4e2bfb71
+Size (patch-2.7.4.tar.xz) = 714392 bytes