Attachment 221068 Details for Bug 252248 – git(1) diff against the ports tree

[patch] git(1) diff against the ports tree

0003-devel-cvs-fix-build.patch (text/plain), 1.93 KB, created by Kyle Evans on 2020-12-29 05:46:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2020-12-29 05:46:41 UTC

Size: 1.93 KB

patch

obsolete

>From bdc4b08ebeb83a35e785ada931246ad2333b205c Mon Sep 17 00:00:00 2001
>From: Kyle Evans <kevans@FreeBSD.org>
>Date: Mon, 28 Dec 2020 23:31:21 -0600
>Subject: [PATCH 03/13] devel/cvs: fix build
>
>Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
>---
> devel/cvs/Makefile                  |  4 ++++
> devel/cvs/files/patch-cvs__Makefile | 15 ++++++++++++---
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
>diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
>index 6ab720d8c6e7..df3d2735b181 100644
>--- a/devel/cvs/Makefile
>+++ b/devel/cvs/Makefile
>@@ -11,6 +11,8 @@ COMMENT?=	Version control system
> 
> LICENSE=	GPLv2+
> 
>+LIB_DEPENDS=	libgnuregex.so.6:devel/libgnuregex
>+
> USES=		cpe shebangfix tar:xz uidfix
> 
> CONFLICTS_INSTALL?=	cvs+ipv6-[12]* cvs-devel-[12]*
>@@ -47,6 +49,8 @@ post-patch:
> .if !${PORT_OPTIONS:MINFO}
> 	@${REINPLACE_CMD} -e "s,doc,,g" ${WRKSRC}/Makefile
> .endif
>+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
>+		${WRKSRC}/cvs/Makefile
> pre-install:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
> 
>diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
>index d2b0c67fbfe3..da17656a5d31 100644
>--- a/devel/cvs/files/patch-cvs__Makefile
>+++ b/devel/cvs/files/patch-cvs__Makefile
>@@ -1,6 +1,15 @@
>---- ../cvs-build/cvs/Makefile.orig	2012-09-06 06:25:43.000000000 +0400
>-+++ ../cvs-build/cvs/Makefile	2014-07-15 12:37:28.000000000 +0400
>-@@ -32,7 +32,7 @@
>+--- ../cvs-build/cvs/Makefile.orig	2012-09-05 21:25:43.000000000 -0500
>++++ ../cvs-build/cvs/Makefile	2020-12-28 22:45:49.371878000 -0600
>+@@ -26,13 +26,15 @@
>+ 
>+ # gnu must be before lib to pick correct regex.h
>+ CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
>+-	 -I/usr/include/gnu \
>++	 -I%%LOCALBASE%%/include/gnu \
>+ 	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
>+ 
>++LDFLAGS+=	-L%%LOCALBASE%%/lib
>++
>  DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
>  LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
>  
>-- 
>2.29.2
>

Actions: View | Diff

Attachments on bug 252248: 221068 | 221218