Attachment #139224 for bug #185434

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




# $FreeBSD: head/sysutils/ioping/Makefile 327772 2013-09-20 23:05:58Z bapt $

PORTNAME=	ioping
PORTVERSION=	0.8
CATEGORIES=	sysutils
MASTER_SITES=	GOOGLE_CODE


# for the benefit of <80000
CFLAGS+=	-lm

NO_STAGE=	yes
do-build:
	cd ${WRKSRC}; \
	${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -DVERSION=${PORTVERSION} ioping.c -o ioping

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/ioping ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/ioping.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)ioping/distinfo (-2 / +2 lines)
1	SHA256 (ioping-0.7.tar.gz) = 234e28eeb256e77756a077604b48d59f206a5288c3da6f207629e783f54b13b0	1	SHA256 (ioping-0.8.tar.gz) = e23fdbd7298e26b63986137d6007e5a72d495da7265b9edea4c12f1b0c55fe48
2	SIZE (ioping-0.7.tar.gz) = 10011	2	SIZE (ioping-0.8.tar.gz) = 10590




--- ioping.c.orig	2014-01-03 10:36:08.000000000 +0400
+++ ioping.c	2014-01-03 10:36:48.000000000 +0400
@@ -247,7 +247,7 @@
 	return FlushFileBuffers(h) ? 0 : -1;
 }
 
-int fdatasync(int fd)
-{
-	return fsync(fd);
-}
-
 void srandom(unsigned int seed)
 {
 	srand(seed);
@@ -178,6 +173,13 @@
 
 #endif /* __MINGW32__ */
 
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__MINGW32__)
+int fdatasync(int fd)
+{
+        return fsync(fd);
+}
+#endif /* (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__MINGW32__) */
+
 #ifndef HAVE_POSIX_MEMALIGN
 /* don't free it */
 int posix_memalign(void **memptr, size_t alignment, size_t size)
@@ -222,7 +224,7 @@
 
 void version(void)
 {

Return to bug 185434

Lines 2-8 Link Here

(-)ioping/Makefile (-4 / +3 lines)
2	# $FreeBSD: head/sysutils/ioping/Makefile 327772 2013-09-20 23:05:58Z bapt $	2	# $FreeBSD: head/sysutils/ioping/Makefile 327772 2013-09-20 23:05:58Z bapt $
3		3
4	PORTNAME= ioping	4	PORTNAME= ioping
5	PORTVERSION= 0.7	5	PORTVERSION= 0.8
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= GOOGLE_CODE	7	MASTER_SITES= GOOGLE_CODE
8		8
Lines 19-31 Link Here
19	# for the benefit of <80000	19	# for the benefit of <80000
20	CFLAGS+= -lm	20	CFLAGS+= -lm
21		21
22	NO_STAGE= yes
23	do-build:	22	do-build:
24	cd ${WRKSRC}; \	23	cd ${WRKSRC}; \
25	${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -DVERSION=${PORTVERSION} ioping.c -o ioping	24	${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -DVERSION=${PORTVERSION} ioping.c -o ioping
26		25
27	do-install:	26	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/ioping ${PREFIX}/bin	27	${INSTALL_PROGRAM} ${WRKSRC}/ioping ${STAGEDIR}${PREFIX}/bin
29	${INSTALL_MAN} ${WRKSRC}/ioping.1 ${MAN1PREFIX}/man/man1	28	${INSTALL_MAN} ${WRKSRC}/ioping.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
30		29
31	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)ioping/files/patch-ioping.c (-29 / +3 lines)
1	--- ioping.c.orig 2013-02-02 21:00:59.000000000 +0400	1	--- ioping.c.orig 2014-01-03 10:36:08.000000000 +0400
2	+++ ioping.c 2013-07-23 15:53:52.000000000 +0400	2	+++ ioping.c 2014-01-03 10:36:48.000000000 +0400
3	@@ -154,11 +154,6 @@	3	@@ -247,7 +247,7 @@
4	return FlushFileBuffers(h) ? 0 : -1;
5	}
6
7	-int fdatasync(int fd)
8	-{
9	- return fsync(fd);
10	-}
11	-
12	void srandom(unsigned int seed)
13	{
14	srand(seed);
15	@@ -178,6 +173,13 @@
16
17	#endif /* __MINGW32__ */
18
19	+#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__MINGW32__)
20	+int fdatasync(int fd)
21	+{
22	+ return fsync(fd);
23	+}
24	+#endif /* (__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__MINGW32__) */
25	+
26	#ifndef HAVE_POSIX_MEMALIGN
27	/* don't free it */
28	int posix_memalign(void **memptr, size_t alignment, size_t size)
29	@@ -222,7 +224,7 @@
30		4
31	void version(void)	5	void version(void)
32	{	6	{