Attachment #221068 for bug #252248

Lines 11-16 COMMENT?= Version control system Link Here

(-)b/devel/cvs/Makefile (+4 lines)
11		11
12	LICENSE= GPLv2+	12	LICENSE= GPLv2+
13		13
		14	LIB_DEPENDS= libgnuregex.so.6:devel/libgnuregex
		15
14	USES= cpe shebangfix tar:xz uidfix	16	USES= cpe shebangfix tar:xz uidfix
15		17
16	CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]*	18	CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]*
Lines 47-52 post-patch: Link Here
47	.if !${PORT_OPTIONS:MINFO}	49	.if !${PORT_OPTIONS:MINFO}
48	@${REINPLACE_CMD} -e "s,doc,,g" ${WRKSRC}/Makefile	50	@${REINPLACE_CMD} -e "s,doc,,g" ${WRKSRC}/Makefile
49	.endif	51	.endif
		52	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		53	${WRKSRC}/cvs/Makefile
50	pre-install:	54	pre-install:
51	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib	55	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
52		56




--- ../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
 
- 

Return to bug 252248

Lines 1-6 Link Here

(-)b/devel/cvs/files/patch-cvs__Makefile (-4 / +12 lines)
1	--- ../cvs-build/cvs/Makefile.orig 2012-09-06 06:25:43.000000000 +0400	1	--- ../cvs-build/cvs/Makefile.orig 2012-09-05 21:25:43.000000000 -0500
2	+++ ../cvs-build/cvs/Makefile 2014-07-15 12:37:28.000000000 +0400	2	+++ ../cvs-build/cvs/Makefile 2020-12-28 22:45:49.371878000 -0600
3	@@ -32,7 +32,7 @@	3	@@ -26,13 +26,15 @@
		4
		5	# gnu must be before lib to pick correct regex.h
		6	CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
		7	- -I/usr/include/gnu \
		8	+ -I%%LOCALBASE%%/include/gnu \
		9	-I${CVSDIR}/lib -I${CVSDIR}/diff -I.
		10
		11	+LDFLAGS+= -L%%LOCALBASE%%/lib
		12	+
4	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}	13	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
5	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz	14	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
6		15
7	-