6 files changed, 16 insertions, 59 deletions

diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index b6a2009cbbbb..af9993265fd0 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xinetd
-PORTVERSION=	2.3.7
+PORTVERSION=	2.3.8
 PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	http://www.xinetd.org/
@@ -18,16 +18,15 @@ GNU_CONFIGURE=	yes
 ALL_TARGET=	build
 CONFIGURE_ARGS+=	--with-loadavg --with-libwrap
 
-.if defined(WITH_INET6)
-CONFIGURE_ARGS+=	--with-inet6
-.endif
-
 MAN5=		xinetd.conf.5
 MAN8=		xconv.8 xinetd.8 xinetd.log.8
 
 post-patch:
 	${FIND} ${WRKSRC}/libs/src -name Makefile.in | ${XARGS} \
 		${PERL} -pi -e 's!\@INSTALL\@!/bin/cp!; s!-m 640!!'
+	@${SED} 's|%%PREFIX%%|${PREFIX}|g' < ${WRKSRC}/xinetd/xconfig.h \
+		> ${WRKSRC}/xinetd/xconfig.h.new
+	@${MV} ${WRKSRC}/xinetd/xconfig.h.new ${WRKSRC}/xinetd/xconfig.h
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/xinetd.sh ]; then \
diff --git a/security/xinetd/distinfo b/security/xinetd/distinfo
index ed8d561b1dfd..d0c72ce7d582 100644
--- a/security/xinetd/distinfo
+++ b/security/xinetd/distinfo
@@ -1 +1 @@
-MD5 (xinetd-2.3.7.tar.gz) = e9f6849a92ec7d48aa9f771fa2f94491
+MD5 (xinetd-2.3.8.tar.gz) = 70b5270bb717014d38e024c154301547
diff --git a/security/xinetd/files/patch-xinetd::reconfig.c b/security/xinetd/files/patch-xinetd::reconfig.c
deleted file mode 100644
index 66e7faffce0d..000000000000
--- a/security/xinetd/files/patch-xinetd::reconfig.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- xinetd/reconfig.c.orig	Sun Jul 15 04:31:28 2001
-+++ xinetd/reconfig.c	Fri Feb  8 16:05:56 2002
-@@ -14,6 +14,7 @@
- #include <memory.h>
- #include <stdlib.h>
- #include <netinet/in.h>
-+#include <osreldate.h>
- #ifndef NO_RPC
-  #ifdef HAVE_RPC_PMAP_CLNT_H
-   #ifdef __sun
-@@ -22,6 +23,10 @@
-   #endif
-   #include <rpc/types.h>
-   #include <rpc/xdr.h>
-+  #if __FreeBSD_version >= 500029
-+   #include <rpc/auth.h>
-+   #include <rpc/clnt.h>
-+  #endif
-   #include <rpc/pmap_clnt.h>
-  #endif
- #endif
diff --git a/security/xinetd/files/patch-xinetd::sensor.c b/security/xinetd/files/patch-xinetd::sensor.c
deleted file mode 100644
index 16f4bc5f24d7..000000000000
--- a/security/xinetd/files/patch-xinetd::sensor.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- xinetd/sensor.c.orig	Mon Aug 19 11:53:03 2002
-+++ xinetd/sensor.c	Mon Aug 19 11:53:15 2002
-@@ -4,6 +4,7 @@
-  * and conditions for redistribution.
-  */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <time.h>
- 
diff --git a/security/xinetd/files/patch-xinetd::service.c b/security/xinetd/files/patch-xinetd::service.c
deleted file mode 100644
index 1e609a18f585..000000000000
--- a/security/xinetd/files/patch-xinetd::service.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- xinetd/service.c.orig	Mon Aug 13 03:58:57 2001
-+++ xinetd/service.c	Fri Feb  8 16:06:16 2002
-@@ -19,6 +19,7 @@
- #include <time.h>
- #include <errno.h>
- #include <netinet/in.h>
-+#include <osreldate.h>
- #ifndef NO_RPC
-  #ifdef HAVE_RPC_PMAP_CLNT_H
-   #ifdef __sun
-@@ -27,7 +28,10 @@
-   #endif
-   #include <rpc/types.h>
-   #include <rpc/xdr.h>
--  #include <rpc/pmap_clnt.h>
-+  #if __FreeBSD__version >= 500029
-+   #include <rpc/auth.h>
-+   #include <rpc/pmap_clnt.h>
-+  #endif
-  #endif
- #endif
- 
diff --git a/security/xinetd/files/patch-xinetd::xconfig.h b/security/xinetd/files/patch-xinetd::xconfig.h
new file mode 100644
index 000000000000..2f25829c7be8
--- /dev/null
+++ b/security/xinetd/files/patch-xinetd::xconfig.h
@@ -0,0 +1,11 @@
+--- xinetd/xconfig.h.orig	Sun Sep 15 19:23:41 2002
++++ xinetd/xconfig.h	Sun Sep 15 19:23:55 2002
+@@ -29,7 +29,7 @@
+ #endif
+ 
+ 
+-#define DEFAULT_CONFIG_FILE			"/etc/xinetd.conf"
++#define DEFAULT_CONFIG_FILE			"%%PREFIX%%/etc/xinetd.conf"
+ 
+ /*
+  * This is the facility used by xinetd to log syslog messages