Attachment #221218 for bug #252248

Lines 2-8 Link Here

(-)b/devel/cvs/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= cvs	3	PORTNAME= cvs
4	PORTVERSION= 1.20120905	4	PORTVERSION= 1.20120905
5	PORTREVISION?= 6	5	PORTREVISION?= 7
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= LOCAL/eadler	7	MASTER_SITES= LOCAL/eadler
8		8

Lines 1-8 Link Here

(-)b/devel/cvs/files/patch-cvs__Makefile (-5 / +10 lines)
1	--- ../cvs-build/cvs/Makefile.orig 2012-09-06 06:25:43.000000000 +0400	1	--- ../cvs-build/cvs/Makefile.orig 2012-09-05 19:25:43.000000000 -0700
2	+++ ../cvs-build/cvs/Makefile 2014-07-15 12:37:28.000000000 +0400	2	+++ ../cvs-build/cvs/Makefile 2021-01-02 17:11:22.159883000 -0800
3	@@ -32,7 +32,7 @@	3	@@ -29,10 +29,10 @@
4	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}	4	-I/usr/include/gnu \
5	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz	5	-I${CVSDIR}/lib -I${CVSDIR}/diff -I.
		6
		7	-DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
		8	-LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
		9	+DPADD= ${LIBCVS} ${LIBDIFF} ${LIBMD} ${LIBCRYPT} ${LIBZ}
		10	+LDADD= ${LIBCVS} ${LIBDIFF} -lmd -lcrypt -lz
6		11
7	-.if ${MK_KERBEROS_SUPPORT} != "no"	12	-.if ${MK_KERBEROS_SUPPORT} != "no"
8	+.if defined(KERBEROS_SUPPORT)	13	+.if defined(KERBEROS_SUPPORT)




--- ../cvs-build/lib/Makefile.orig	2012-09-05 19:19:41.000000000 -0700
+++ ../cvs-build/lib/Makefile	2021-01-02 17:10:09.173277000 -0800
@@ -11,9 +11,7 @@
 LIB=		cvs
 INTERNALLIB=
 
-# gnu must be before lib to pick correct regex.h
-CFLAGS+= -I. -I${CVSDIR}/src -I/usr/include/gnu \
-	 -I${CVSDIR}/lib
+CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib
 CFLAGS+= -DHAVE_CONFIG_H
 YFLAGS=
 CLEANFILES+=	config.h
@@ -23,7 +21,7 @@
 CVS_TMPDIR_DFLT?=	/tmp
 
 SRCS=	config.h argmatch.c getdate.y getline.c \
-	getopt.c getopt1.c savecwd.c \
+	getopt.c getopt1.c regex.c savecwd.c \
 	sighandle.c stripslash.c \
 	xgetwd.c yesno.c
 

Return to bug 252248

Added Link Here

(-)b/devel/cvs/files/patch-cvs__lib_Makefile (-1 / +22 lines)
0	-	1	--- ../cvs-build/lib/Makefile.orig 2012-09-05 19:19:41.000000000 -0700
		2	+++ ../cvs-build/lib/Makefile 2021-01-02 17:10:09.173277000 -0800
		3	@@ -11,9 +11,7 @@
		4	LIB= cvs
		5	INTERNALLIB=
		6
		7	-# gnu must be before lib to pick correct regex.h
		8	-CFLAGS+= -I. -I${CVSDIR}/src -I/usr/include/gnu \
		9	- -I${CVSDIR}/lib
		10	+CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib
		11	CFLAGS+= -DHAVE_CONFIG_H
		12	YFLAGS=
		13	CLEANFILES+= config.h
		14	@@ -23,7 +21,7 @@
		15	CVS_TMPDIR_DFLT?= /tmp
		16
		17	SRCS= config.h argmatch.c getdate.y getline.c \
		18	- getopt.c getopt1.c savecwd.c \
		19	+ getopt.c getopt1.c regex.c savecwd.c \
		20	sighandle.c stripslash.c \
		21	xgetwd.c yesno.c
		22