Make it compile either on 3.4-STABLE, 4.0-STABLE or 5.0-CURRENT

and unmark as BROKEN.

Remove a redundant entry from CATEGORIES. (security net => security)

PR:		ports/18707
Submitted by:	MAINTAINER

security/oidentd/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	oidentd
 PORTVERSION=	1.6.4
-CATEGORIES=	security net
+CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/ojnk/ \
 		http://www.numb.org/~odin/stuff/
 
@@ -17,10 +17,4 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN8=		oidentd.8
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400010
-BROKEN=		"outdated sys/file.h"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

security/oidentd/files/patch-aa

@@ -1,14 +1,14 @@
 --- src/freebsd.c.orig	Tue Jan 18 02:37:19 2000
-+++ src/freebsd.c	Wed Mar 29 09:39:27 2000
-@@ -22,9 +22,9 @@
++++ src/freebsd.c	Sun May 21 03:50:57 2000
+@@ -22,8 +22,10 @@
  #include <sys/queue.h>
  #include <sys/uio.h>
  #include <sys/socketvar.h>
 -#define KERNEL
-+#define _KERNEL
++#define KERNEL /* FreeBSD 3.4 */
++#define _KERNEL /* FreeBSD 4.0 */
  #include <sys/file.h>
--#undef KERNEL
 +#undef _KERNEL
+ #undef KERNEL
  #include <sys/user.h>
  #include <sys/filedesc.h>
- #include <sys/proc.h>

security/oidentd/pkg-descr

@@ -1,6 +1,6 @@
 from the README:
 
-Oidentd is an ident (RFC 1413-compliant) daemon which runs on
+Oidentd is an RFC 1413-compliant ident daemon which runs on
 GNU/Linux, FreeBSD and OpenBSD.  Oidentd supports most features of
 pidentd as well as a number of features absent in pidentd.  Most
 notably, oidentd allows users, given the proper permission, to
@@ -9,13 +9,11 @@ successful lookup is completed.  Oidentd also allows for pseudo-random
 strings (either a prefix, such as "user," followed by a number
 between 0 and 99999, or 10 pseudo-random characters of the set
 0-9A-Za-z) to be returned upon the completion of a successful lookup
-instead of a username or a UID.  Oidentd supports IP masqueraded
-connections and supports fowarding ident requests for IP masqeraded
-connections to the machines from which the connections originate.
-For information on how to setup support for masqueraded connections,
-see the "INSTALL" file. NOTE: Currently, only Linux supports the
--P -f and -m options.  In other words, the IP masquerading support
-only exists on Linux right now.
+instead of a username or a UID.  The IP masquerading support only
+exists on Linux right now.
+
+FreeBSD's inetd has a built-in ident service which can also generate
+bogus responses.
 
 WWW: http://ojnk.sourceforge.net/