diff options
author | wiz <wiz> | 2010-03-18 10:05:48 +0000 |
---|---|---|
committer | wiz <wiz> | 2010-03-18 10:05:48 +0000 |
commit | 859e29a8cabeebc4ad79a486516d87826880a113 (patch) | |
tree | 254f5324d1825d749172e30e73430b6d5cbfe833 /devel/m4 | |
parent | c63b3e871680d25fecf0ffd515ef3220a94fd62e (diff) | |
download | pkgsrc-859e29a8cabeebc4ad79a486516d87826880a113.tar.gz |
Remove DragonFly workaround that's no longer necessary.
From Johannes Hofmann in PR 42926.
Diffstat (limited to 'devel/m4')
-rw-r--r-- | devel/m4/Makefile | 7 | ||||
-rw-r--r-- | devel/m4/files/bsd-fflush.c | 72 |
2 files changed, 1 insertions, 78 deletions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 42fb0d2975a..696128a26a0 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2010/02/26 15:31:42 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2010/03/18 10:05:48 wiz Exp $ DISTNAME= m4-1.4.14 CATEGORIES= devel @@ -35,11 +35,6 @@ PLIST.gm4= yes CFLAGS+= -D_LINUX_SOURCE_COMPAT .endif -.if ${OPSYS} == "DragonFly" -post-patch: - ${CP} ${FILESDIR}/bsd-fflush.c ${WRKSRC}/lib/fflush.c -.endif - post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/m4 ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4 diff --git a/devel/m4/files/bsd-fflush.c b/devel/m4/files/bsd-fflush.c deleted file mode 100644 index f0bdf4ea09c..00000000000 --- a/devel/m4/files/bsd-fflush.c +++ /dev/null @@ -1,72 +0,0 @@ -/* $NetBSD: bsd-fflush.c,v 1.1 2007/07/29 14:36:46 joerg Exp $ */ - -/*- - * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. - * All rights reserved. - * - * This code was developed as part of Google's Summer of Code 2007 program. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <errno.h> -#include <stdio.h> -#include <unistd.h> - -#undef fflush - -int -rpl_fflush(FILE *fp) -{ -#if defined(__DragonFly__) - struct __FILE_public *fp_ = (struct __FILE_public *)fp; -#else -#define fp_ fp -#endif - off_t pos; - - /* NULL pointer or writeable stream: use normal fflush. */ - if (fp == NULL || (fp_->_flags & (__SWR | __SRW)) != 0) - return fflush(fp); - - /* Get current position, possibly different from file pointer. */ - pos = ftello(fp); - if (pos == -1) { - errno = EBADF; - return -1; - } - /* Purge buffers. */ - if (fpurge(fp) == EOF) - return -1; - - /* - * Disable seek optimisation. This is forces the following - * fseeko to seek the actual position and not realign - * the file pointer on a block boundary. - */ - fp_->_flags |= __SNPT; - - return fseeko(fp, pos, SEEK_SET); -} |