[pkgsrc/trunk]: pkgsrc/net/tnftp Fix the build on OS X.3.

[lukem <lukem%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbd54219519a
branches:  trunk
changeset: 493763:fbd54219519a
user:      lukem <lukem%pkgsrc.org@localhost>
date:      Sat May 14 06:06:26 2005 +0000

description:
Fix the build on OS X.3.
Bump PKGREVISION.

diffstat:

 net/tnftp/Makefile      |   3 ++-
 net/tnftp/files/tnftp.h |  24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diffs (52 lines):

diff -r 19df05d2b22b -r fbd54219519a net/tnftp/Makefile
--- a/net/tnftp/Makefile        Sat May 14 06:04:44 2005 +0000
+++ b/net/tnftp/Makefile        Sat May 14 06:06:26 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/05/14 05:16:09 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/14 06:06:26 lukem Exp $
 #
 
 DISTNAME=              tnftp-20050514
+PKGREVISION=           1
 SVR4_PKGNAME=          tnftp
 CATEGORIES=            net
 MASTER_SITES=          # empty
diff -r 19df05d2b22b -r fbd54219519a net/tnftp/files/tnftp.h
--- a/net/tnftp/files/tnftp.h   Sat May 14 06:04:44 2005 +0000
+++ b/net/tnftp/files/tnftp.h   Sat May 14 06:06:26 2005 +0000
@@ -42,22 +42,24 @@
 #include <unistd.h>
 
 #if HAVE_POLL
-# if HAVE_POLL_H
-#  include <poll.h>
-# elif HAVE_SYS_POLL_H
-#  include <sys/poll.h>
-# endif
+/* we use poll */
 #elif HAVE_SELECT
-# ifndef POLLIN
-#  define POLLIN 1
-# endif
-# ifndef POLLOUT
-#  define POLLOUT 4
-# endif
 /* we use select */
 #else /* ! HAVE_POLL && ! HAVE_SELECT */
 # error "no poll() or select() found"
 #endif
+
+#if HAVE_POLL_H
+# include <poll.h>
+#elif HAVE_SYS_POLL_H
+# include <sys/poll.h>
+#endif
+#ifndef POLLIN
+# define POLLIN 1
+#endif
+#ifndef POLLOUT
+# define POLLOUT 4
+#endif
 #ifndef INFTIM
 # define INFTIM -1
 #endif