Attachment #94019 for bug #132070

View | Details | Raw Unified | Return to bug 132070
Collapse All | Expand All




# $FreeBSD: ports/devel/cvswrap/Makefile,v 1.7 2009/02/11 10:18:41 erwin Exp $
#

PORTNAME=	cvswrap
PORTVERSION=	0.2
CATEGORIES=	devel
MASTER_SITES+=	${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	alfred

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Helper for multiple CVS repositories

GNU_CONFIGURE=	yes

MAN1=		cvswrap.1
MAN5=		cvswrap.conf.5

.include <bsd.port.mk>

# Redefines strndup(3)
.if ${OSVERSION} >= 800058 || (${OSVERSION} >= 701101 && ${OSVERSION} < 800000)
BROKEN=		does not build
.endif

.include <bsd.port.post.mk>




--- cvswrap.c.orig	2009-02-24 15:40:55.000000000 +0100
+++ cvswrap.c	2009-02-24 15:38:24.000000000 +0100
@@ -94,7 +94,12 @@
     char **cvsrootp);
 static void	slashfix(char *);
 static int	strings_have_line(char * const *strings, const char *line);
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100
 static char *	strndup(const char *str, size_t len);
+#endif
+#endif
 static int	timeval_diff(const struct timeval *tv1,
     const struct timeval *tv2);
 static int	writebuf(int fd, const char *buf, size_t len);
@@ -324,6 +329,9 @@
 	return (0);
 }
 
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100
 /*
  * return: a copy of "len" bytes from byte string "str" and NULL terminate.
  */
@@ -340,6 +348,8 @@
 		*(ret + len) = '\0';
 	return (ret);
 }
+#endif
+#endif
 
 /*
  * Wait for child cvs process to exit.

Return to bug 132070

Lines 5-29 Link Here

(-)/usr/ports/devel/cvswrap/Makefile (-11 / +4 lines)
5	# $FreeBSD: ports/devel/cvswrap/Makefile,v 1.7 2009/02/11 10:18:41 erwin Exp $	5	# $FreeBSD: ports/devel/cvswrap/Makefile,v 1.7 2009/02/11 10:18:41 erwin Exp $
6	#	6	#
7		7
8	PORTNAME= cvswrap	8	PORTNAME= cvswrap
9	PORTVERSION= 0.2	9	PORTVERSION= 0.2
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES+= ${MASTER_SITE_LOCAL}	11	MASTER_SITES+= ${MASTER_SITE_LOCAL}
12	MASTER_SITE_SUBDIR= alfred	12	MASTER_SITE_SUBDIR= alfred
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Helper for multiple CVS repositories.	15	COMMENT= Helper for multiple CVS repositories
16		16
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18		18
19	MAN1= cvswrap.1	19	MAN1= cvswrap.1
20	MAN5= cvswrap.conf.5	20	MAN5= cvswrap.conf.5
21		21
22	.include <bsd.port.pre.mk>	22	.include <bsd.port.mk>
23
24	# Redefines strndup(3)
25	.if ${OSVERSION} >= 800058 \|\| (${OSVERSION} >= 701101 && ${OSVERSION} < 800000)
26	BROKEN= does not build
27	.endif
28
29	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/devel/cvswrap/files/patch-cvswrap.c (+34 lines)
	1	--- cvswrap.c.orig 2009-02-24 15:40:55.000000000 +0100
	2	+++ cvswrap.c 2009-02-24 15:38:24.000000000 +0100
	3	@@ -94,7 +94,12 @@
	4	char **cvsrootp);
	5	static void slashfix(char *);
	6	static int strings_have_line(char * const strings, const char line);
	7	+#if defined(__FreeBSD__)
	8	+#include <osreldate.h>
	9	+#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 \|\| __FreeBSD_version <= 701100
	10	static char * strndup(const char *str, size_t len);
	11	+#endif
	12	+#endif
	13	static int timeval_diff(const struct timeval *tv1,
	14	const struct timeval *tv2);
	15	static int writebuf(int fd, const char *buf, size_t len);
	16	@@ -324,6 +329,9 @@
	17	return (0);
	18	}
	19
	20	+#if defined(__FreeBSD__)
	21	+#include <osreldate.h>
	22	+#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 \|\| __FreeBSD_version <= 701100
	23	/*
	24	* return: a copy of "len" bytes from byte string "str" and NULL terminate.
	25	*/
	26	@@ -340,6 +348,8 @@
	27	*(ret + len) = '\0';
	28	return (ret);
	29	}
	30	+#endif
	31	+#endif
	32
	33	/*
	34	* Wait for child cvs process to exit.