Import of pkgsrc-2015Q2

devel/cvsdiff2patch/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:16:50 asau Exp $
+# $NetBSD: Makefile,v 1.5 2015/06/10 11:45:56 richard Exp $
 #
 
 DISTNAME=	cvsdiff2patch-1.0.1
@@ -10,9 +10,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~alfred/sources/cvsdiff2patch/
 COMMENT=	Convert CVS diffs into something that patch(1) understands
 
-NO_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
+USE_FEATURES=	nbcompat # specifically fgetln
+
 INSTALLATION_DIRS+=	bin
 
 do-extract:
@@ -20,7 +21,7 @@ do-extract:
 
 do-build:
 	${RUN} cd ${WRKSRC} && \
-	${LIBTOOL} --mode=link ${CC} -o ${PKGBASE} ${PKGBASE}.c
+	${LIBTOOL} --mode=link ${CC} ${CPPFLAGS} ${LDFLAGS} ${LIBS} -o ${PKGBASE} ${PKGBASE}.c
 
 do-install:
 	${RUN} cd ${WRKSRC} && \

devel/cvsdiff2patch/files/cvsdiff2patch.c

@@ -1,4 +1,4 @@
-/* $NetBSD: cvsdiff2patch.c,v 1.1.1.1 2007/11/29 10:11:13 bjs Exp $ */
+/* $NetBSD: cvsdiff2patch.c,v 1.2 2015/06/10 11:45:56 richard Exp $ */
 
 /*
  * Copyright (c) 2003 Research Engineering Development Inc.
@@ -26,17 +26,25 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: cvsdiff2patch.c,v 1.1.1.1 2007/11/29 10:11:13 bjs Exp $
+ * $Id: cvsdiff2patch.c,v 1.2 2015/06/10 11:45:56 richard Exp $
  */
 
 /*
  * Convert crappy CVS diffs into something that patch(1) understands.
  */
-
+#ifdef HAVE_NBCOMPAT_H
+#include <nbcompat/config.h>	/* needed for the other headers */
+#include <nbcompat/cdefs.h>	/* needed for the other headers */
+#include <nbcompat/stdio.h>
+#include <nbcompat/string.h>
+#include <nbcompat/stdlib.h>
+#include <nbcompat/err.h>
+#else
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <err.h>
+#endif
 
 char *	xstrdup(const char *str);
 int	fileline(const char *line, int ch);