Upgrade to latest version, and change MASTER_SITES to synack.net.

4 files changed, 39 insertions, 67 deletions

diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index 5adc2711dd5e..99dceba027ab 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -1,28 +1,24 @@
 # New ports collection makefile for:	xinetd
-# Version required:	2.2.1
-# Date created:		28 June 1996
-# Whom:			markm
+# Version required:			2.1.8.6b5
+# Date created:				28 June 1996
+# Whom:					markm
 #
-# $Id: Makefile,v 1.5 1998/07/11 00:37:00 steve Exp $
+# $Id: Makefile,v 1.6 1998/12/06 09:34:31 vanilla Exp $
 #
 
-DISTNAME=	xinetd-2.2.1
+DISTNAME=	xinetd-2.1.8.6b5
 CATEGORIES=	security
-MASTER_SITES=	ftp://coast.cs.purdue.edu/pub/tools/unix/xinetd/
+MASTER_SITES=	http://synack.net/xinetd/
 
 MAINTAINER=	markm@FreeBSD.ORG
 
-MAN1=		xinetd.1
-MAN5=		xinetd.conf.5 xinetd.log.5
+FETCH_BEFORE_ARGS=	-b
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	build
 
-do-build:
-	cd ${WRKSRC} ; ./compile-src -os freebsd2
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xinetd/xinetd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.man ${PREFIX}/man/man1/xinetd.1
-	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.conf.man ${PREFIX}/man/man5/xinetd.conf.5
-	${INSTALL_MAN} ${WRKSRC}/xinetd/xinetd.log.man ${PREFIX}/man/man5/xinetd.log.5
+MAN5=		xinetd.conf.5
+MAN8=		xinetd.8 xinetd.log.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/xinetd.sh ]; then \
@@ -31,5 +27,6 @@ post-install:
 		${ECHO} "[ -x ${PREFIX}/sbin/xinetd ] && ${PREFIX}/sbin/xinetd && echo -n ' xinetd'" >> ${PREFIX}/etc/rc.d/xinetd.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/xinetd.sh; \
 	fi
+	strip ${PREFIX}/sbin/xinetd
 
 .include <bsd.port.mk>
diff --git a/security/xinetd/distinfo b/security/xinetd/distinfo
index cc62eb0d2c25..0e1e8608dc2b 100644
--- a/security/xinetd/distinfo
+++ b/security/xinetd/distinfo
@@ -1 +1 @@
-MD5 (xinetd-2.2.1.tar.gz) = e9385076bef59db0fc865b8718e4cfd9
+MD5 (xinetd-2.1.8.6b5.tar.gz) = 95947195c7ded5361210b2e344dea0f1
diff --git a/security/xinetd/files/patch-aa b/security/xinetd/files/patch-aa
index c336d6ba4e2c..0722a9b574c7 100644
--- a/security/xinetd/files/patch-aa
+++ b/security/xinetd/files/patch-aa
@@ -1,20 +1,11 @@
-*** xinetd/defs.h.orig	Thu Mar 20 11:29:27 1997
---- xinetd/defs.h	Thu Mar 20 11:29:46 1997
-***************
-*** 100,106 ****
-  /*
-   * Used for listen(2)
-   */
-! #define LISTEN_BACKLOG					7
-  
-  /*
-   * When explicit values are given for enum's, that is because the structures 
---- 100,106 ----
-  /*
-   * Used for listen(2)
-   */
-! #define LISTEN_BACKLOG					64
-  
-  /*
-   * When explicit values are given for enum's, that is because the structures
-
+--- xinetd/defs.h.orig	Tue Nov  3 00:05:53 1998
++++ xinetd/defs.h	Tue May 11 00:47:03 1999
+@@ -99,7 +99,7 @@
+ /*
+  * Used for listen(2)
+  */
+-#define LISTEN_BACKLOG					7
++#define LISTEN_BACKLOG					64
+ 
+ /*
+  * When explicit values are given for enum's, that is because the structures 
diff --git a/security/xinetd/files/patch-ab b/security/xinetd/files/patch-ab
index 241e074f180a..0bb5eec09727 100644
--- a/security/xinetd/files/patch-ab
+++ b/security/xinetd/files/patch-ab
@@ -1,32 +1,16 @@
---- compile-src.orig	Thu Oct 16 09:06:46 1997
-+++ compile-src	Thu Oct 16 09:09:32 1997
-@@ -43,7 +43,7 @@
- # The default is optimization.
- #
- cc=
--ccopt=-O
-+ccopt=-O2
- lib_defs=
- xinetd_defs=
+--- Makefile.in.orig	Tue May 11 01:06:13 1999
++++ Makefile.in	Tue May 11 01:06:36 1999
+@@ -39,11 +39,11 @@
+ 		INCLUDEDIR=-I$(LIB_INCLUDEDIR) \
+ 		"DEFS=$(PROG_DEFS)" \
+ 		"CC=$(CC)" \
+-		DEBUG=-O
++		"DEBUG=$(CFLAGS)"
  
-@@ -677,13 +677,13 @@
- case "$want_SB" in
- 	yes) modify_manpages=yes ;;
- 	no)  modify_manpages= ;;
--	*)   echo -n "Convert .B -> .SB in man pages ? (if you are not sure, say no) -->"
--	read x
--	if test "$x" = "y" -o "$x" = "yes"; then
--		modify_manpages=yes
--	else
--		modify_manpages=
--	fi
-+#	*)   echo -n "Convert .B -> .SB in man pages ? (if you are not sure, say no) -->"
-+#	read x
-+#	if test "$x" = "y" -o "$x" = "yes"; then
-+#		modify_manpages=yes
-+#	else
-+#		modify_manpages=
-+#	fi
- esac
+ makelibs:
+ 	for lib in $(MANDATORY_LIBS) ; do \
+-		( cd libs/src/$$lib ; make install LIBDIR=$(LIB_INSTALLDIR) INCLUDEDIR=$(LIB_INCLUDEDIR) MANDIR=$(LIB_MANDIR) "INSTALL=$(INSTALL_CMD)" "DEFS=$(LIB_DEFS)" RANLIB=true "CC=$(CC)" DEBUG=-O ) \
++		( cd libs/src/$$lib ; make install LIBDIR=$(LIB_INSTALLDIR) INCLUDEDIR=$(LIB_INCLUDEDIR) MANDIR=$(LIB_MANDIR) "INSTALL=$(INSTALL_CMD)" "DEFS=$(LIB_DEFS)" RANLIB=true "CC=$(CC)" "DEBUG=$(CFLAGS)" ) \
+ 	; done
  
- if test "$modify_manpages" ; then
+ install: