A PPTP server which can support Microsoft VPN clients.

8 files changed, 1084 insertions, 0 deletions

diff --git a/net/poptop/Makefile b/net/poptop/Makefile
new file mode 100644
index 00000000000..dd6b52c113a
--- /dev/null
+++ b/net/poptop/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+
+DISTNAME=	pptpd-1.0.0
+PKGNAME=	poptop-1.0.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.moretonbay.com/vpn/releases/
+EXTRACT_SUFX=   .tgz
+
+MAINTAINER=	dbj@netbsd.org
+HOMEPAGE=	http://www.moretonbay.com/vpn/pptp.html
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= --with-libwrap
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(POPTOP_USE_MPPE)
+RUN_DEPENDS+=	${PREFIX}/sbin/pppd:../ppp-mppe
+CONFIGURE_ARGS+= --with-pppd=${PREFIX}/sbin/pppd
+.endif
+
+post-patch:
+	${TOUCH} ${WRKSRC}/config.h.in
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/poptop/files/md5 b/net/poptop/files/md5
new file mode 100644
index 00000000000..00ec029c4b1
--- /dev/null
+++ b/net/poptop/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+
+MD5 (pptpd-1.0.0.tgz) = cb8964868809381e33a03cd9fcb153a9
diff --git a/net/poptop/patches/patch-aa b/net/poptop/patches/patch-aa
new file mode 100644
index 00000000000..4cd493ac7e3
--- /dev/null
+++ b/net/poptop/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+
+--- configure.in.orig	Sat Sep 25 20:13:57 1999
++++ configure.in	Sat Sep 25 20:46:27 1999
+@@ -144,15 +144,18 @@
+ 	[ AC_DEFINE(PNS_MODE)
+ 	  PNS_MODE = yes ])
+ 
+-if test "$BSDUSER_PPP" = "yes"; then
+-  AC_DEFINE(PPP_BINARY, "/usr/sbin/ppp")
+-else
+-  if test "$SLIRP" = "yes"; then
+-    AC_DEFINE(PPP_BINARY, "/bin/slirp")
+-  else
+-    AC_DEFINE(PPP_BINARY, "/usr/sbin/pppd")
+-  fi
+-fi
++AC_ARG_WITH(pppd,
++	[  --with-pppd=[ARG]       Path to pppd binary.],
++	[ AC_DEFINE_UNQUOTED(PPP_BINARY,"$withval")],
++	[ if test "$BSDUSER_PPP" = "yes"; then
++	    AC_DEFINE(PPP_BINARY, "/usr/sbin/ppp")
++	  else
++	    if test "$SLIRP" = "yes"; then
++	      AC_DEFINE(PPP_BINARY, "/bin/slirp")
++	    else
++	      AC_DEFINE(PPP_BINARY, "/usr/sbin/pppd")
++	    fi
++	  fi])
+ 
+ if test "$SLIRP" = "yes"; then
+   if test "$PPPD_IP_ALLOC" = "yes"; then
diff --git a/net/poptop/patches/patch-ab b/net/poptop/patches/patch-ab
new file mode 100644
index 00000000000..a69af822e5c
--- /dev/null
+++ b/net/poptop/patches/patch-ab
@@ -0,0 +1,981 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+
+--- configure.orig	Sat Sep 25 20:10:12 1999
++++ configure	Sat Sep 25 20:46:41 1999
+@@ -21,6 +21,8 @@
+   --with-pppd-ip-alloc    Let pppd allocate IP (and IPX) addresses "
+ ac_help="$ac_help
+   --with-pns-mode         Option is NOT FUNCTIONAL YET "
++ac_help="$ac_help
++  --with-pppd=[ARG]       Path to pppd binary."
+ 
+ # Initialize some variables set by options.
+ # The variables have the same names as the options, with
+@@ -566,7 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:570: checking for a BSD compatible install" >&5
++echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -619,7 +621,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+-echo "configure:623: checking whether build environment is sane" >&5
++echo "configure:625: checking whether build environment is sane" >&5
+ # Just in case
+ sleep 1
+ echo timestamp > conftestfile
+@@ -676,7 +678,7 @@
+ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:680: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:682: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -722,7 +724,7 @@
+ 
+ missing_dir=`cd $ac_aux_dir && pwd`
+ echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+-echo "configure:726: checking for working aclocal" >&5
++echo "configure:728: checking for working aclocal" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -735,7 +737,7 @@
+ fi
+ 
+ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+-echo "configure:739: checking for working autoconf" >&5
++echo "configure:741: checking for working autoconf" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -748,7 +750,7 @@
+ fi
+ 
+ echo $ac_n "checking for working automake""... $ac_c" 1>&6
+-echo "configure:752: checking for working automake" >&5
++echo "configure:754: checking for working automake" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -761,7 +763,7 @@
+ fi
+ 
+ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+-echo "configure:765: checking for working autoheader" >&5
++echo "configure:767: checking for working autoheader" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -774,7 +776,7 @@
+ fi
+ 
+ echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+-echo "configure:778: checking for working makeinfo" >&5
++echo "configure:780: checking for working makeinfo" >&5
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+@@ -790,7 +792,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:794: checking for $ac_word" >&5
++echo "configure:796: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -820,7 +822,7 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:824: checking for $ac_word" >&5
++echo "configure:826: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -871,7 +873,7 @@
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:875: checking for $ac_word" >&5
++echo "configure:877: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -903,7 +905,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:909: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -914,12 +916,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 918 "configure"
++#line 920 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -945,12 +947,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:951: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:954: checking whether we are using GNU C" >&5
++echo "configure:956: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -959,7 +961,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -978,7 +980,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:982: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:984: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1012,7 +1014,7 @@
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1016: checking for $ac_word" >&5
++echo "configure:1018: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1051,7 +1053,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:1055: checking for a BSD compatible install" >&5
++echo "configure:1057: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1104,7 +1106,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:1108: checking whether ln -s works" >&5
++echo "configure:1110: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1125,7 +1127,7 @@
+ fi
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:1129: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:1131: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1153,12 +1155,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1157: checking for working const" >&5
++echo "configure:1159: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1162 "configure"
++#line 1164 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1207,7 +1209,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -1228,21 +1230,21 @@
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:1232: checking for inline" >&5
++echo "configure:1234: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 1239 "configure"
++#line 1241 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -1269,12 +1271,12 @@
+ 
+ 
+ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+-echo "configure:1273: checking for Cygwin environment" >&5
++echo "configure:1275: checking for Cygwin environment" >&5
+ if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1278 "configure"
++#line 1280 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1285,7 +1287,7 @@
+ return __CYGWIN__;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cygwin=yes
+ else
+@@ -1302,19 +1304,19 @@
+ CYGWIN=
+ test "$ac_cv_cygwin" = yes && CYGWIN=yes
+ echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+-echo "configure:1306: checking for mingw32 environment" >&5
++echo "configure:1308: checking for mingw32 environment" >&5
+ if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1311 "configure"
++#line 1313 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return __MINGW32__;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_mingw32=yes
+ else
+@@ -1333,7 +1335,7 @@
+ 
+ 
+ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+-echo "configure:1337: checking for executable suffix" >&5
++echo "configure:1339: checking for executable suffix" >&5
+ if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1343,7 +1345,7 @@
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_exeext=
+-  if { (eval echo configure:1347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++  if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj) ;;
+@@ -1364,13 +1366,13 @@
+ ac_exeext=$EXEEXT
+ 
+ echo $ac_n "checking for object suffix""... $ac_c" 1>&6
+-echo "configure:1368: checking for object suffix" >&5
++echo "configure:1370: checking for object suffix" >&5
+ if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   rm -f conftest*
+ echo 'int i = 1;' > conftest.$ac_ext
+-if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   for ac_file in conftest.*; do
+     case $ac_file in
+     *.c) ;;
+@@ -1390,7 +1392,7 @@
+ # Pull the hash mark out of the macro call to avoid m4 problems.
+ ac_msg="whether #! works in shell scripts"
+ echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
+-echo "configure:1394: checking $ac_msg" >&5
++echo "configure:1396: checking $ac_msg" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1414,12 +1416,12 @@
+ for ac_func in setsid daemon setproctitle getservbyname strlcpy fork memmove strerror
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:1418: checking for $ac_func" >&5
++echo "configure:1420: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1423 "configure"
++#line 1425 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1442,7 +1444,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -1468,7 +1470,7 @@
+ 
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1472: checking how to run the C preprocessor" >&5
++echo "configure:1474: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1483,13 +1485,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1487 "configure"
++#line 1489 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1500,13 +1502,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1504 "configure"
++#line 1506 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1517,13 +1519,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1521 "configure"
++#line 1523 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1551,17 +1553,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1555: checking for $ac_hdr" >&5
++echo "configure:1557: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1560 "configure"
++#line 1562 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1591,17 +1593,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1595: checking for $ac_hdr" >&5
++echo "configure:1597: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1600 "configure"
++#line 1602 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1631,17 +1633,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1635: checking for $ac_hdr" >&5
++echo "configure:1637: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1640 "configure"
++#line 1642 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1671,17 +1673,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1675: checking for $ac_hdr" >&5
++echo "configure:1677: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1680 "configure"
++#line 1682 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1711,17 +1713,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1715: checking for $ac_hdr" >&5
++echo "configure:1717: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1720 "configure"
++#line 1722 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1749,12 +1751,12 @@
+ 
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1753: checking for ANSI C header files" >&5
++echo "configure:1755: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1758 "configure"
++#line 1760 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1762,7 +1764,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1779,7 +1781,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1783 "configure"
++#line 1785 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1797,7 +1799,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1801 "configure"
++#line 1803 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1818,7 +1820,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1822 "configure"
++#line 1824 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1829,7 +1831,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1853,12 +1855,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:1857: checking for size_t" >&5
++echo "configure:1859: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1862 "configure"
++#line 1864 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1886,12 +1888,12 @@
+ fi
+ 
+ echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+-echo "configure:1890: checking for ssize_t" >&5
++echo "configure:1892: checking for ssize_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1895 "configure"
++#line 1897 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1919,12 +1921,12 @@
+ fi
+ 
+ echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
+-echo "configure:1923: checking for u_int8_t" >&5
++echo "configure:1925: checking for u_int8_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_u_int8_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1928 "configure"
++#line 1930 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1952,12 +1954,12 @@
+ fi
+ 
+ echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
+-echo "configure:1956: checking for u_int16_t" >&5
++echo "configure:1958: checking for u_int16_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1961 "configure"
++#line 1963 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1985,12 +1987,12 @@
+ fi
+ 
+ echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
+-echo "configure:1989: checking for u_int32_t" >&5
++echo "configure:1991: checking for u_int32_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1994 "configure"
++#line 1996 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2019,13 +2021,13 @@
+ 
+ 
+ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+-echo "configure:2023: checking for socklen_t" >&5
++echo "configure:2025: checking for socklen_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+   cat > conftest.$ac_ext <<EOF
+-#line 2029 "configure"
++#line 2031 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -2061,17 +2063,17 @@
+   
+  XYZZY_LIBS="$LIBS"
+  echo $ac_n "checking for libwrap alone""... $ac_c" 1>&6
+-echo "configure:2065: checking for libwrap alone" >&5
++echo "configure:2067: checking for libwrap alone" >&5
+  LIBS="$XYZZY_LIBS -lwrap"
+  cat > conftest.$ac_ext <<EOF
+-#line 2068 "configure"
++#line 2070 "configure"
+ #include "confdefs.h"
+  int allow_severity, deny_severity; 
+ int main() {
+  hosts_access(); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "$ac_t""yes" 1>&6
+ 	       cat >> confdefs.h <<\EOF
+@@ -2087,16 +2089,16 @@
+    echo "$ac_t""no" 1>&6
+    LIBS="$XYZZY_LIBS -lwrap -lnsl"
+    echo $ac_n "checking for libwrap with libnsl""... $ac_c" 1>&6
+-echo "configure:2091: checking for libwrap with libnsl" >&5
++echo "configure:2093: checking for libwrap with libnsl" >&5
+    cat > conftest.$ac_ext <<EOF
+-#line 2093 "configure"
++#line 2095 "configure"
+ #include "confdefs.h"
+  int allow_severity, deny_severity; 
+ int main() {
+  hosts_access(); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "$ac_t""yes" 1>&6
+ 	         cat >> confdefs.h <<\EOF
+@@ -2122,7 +2124,7 @@
+ 
+ XYZZY_LIBS="$LIBS"
+ echo $ac_n "checking for accept in -lc""... $ac_c" 1>&6
+-echo "configure:2126: checking for accept in -lc" >&5
++echo "configure:2128: checking for accept in -lc" >&5
+ ac_lib_var=`echo c'_'accept | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2130,7 +2132,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2134 "configure"
++#line 2136 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2141,7 +2143,7 @@
+ accept()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2169,7 +2171,7 @@
+ fi
+ 
+ echo $ac_n "checking for gethostbyname in -lc""... $ac_c" 1>&6
+-echo "configure:2173: checking for gethostbyname in -lc" >&5
++echo "configure:2175: checking for gethostbyname in -lc" >&5
+ ac_lib_var=`echo c'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2177,7 +2179,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2181 "configure"
++#line 2183 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2188,7 +2190,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2216,7 +2218,7 @@
+ fi
+ 
+ echo $ac_n "checking for openpty in -lc""... $ac_c" 1>&6
+-echo "configure:2220: checking for openpty in -lc" >&5
++echo "configure:2222: checking for openpty in -lc" >&5
+ ac_lib_var=`echo c'_'openpty | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2224,7 +2226,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2228 "configure"
++#line 2230 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2235,7 +2237,7 @@
+ openpty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2263,7 +2265,7 @@
+ fi
+ 
+ echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
+-echo "configure:2267: checking for gettext in -lc" >&5
++echo "configure:2269: checking for gettext in -lc" >&5
+ ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2271,7 +2273,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2275 "configure"
++#line 2277 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2282,7 +2284,7 @@
+ gettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2310,7 +2312,7 @@
+ fi
+ 
+ echo $ac_n "checking for accept in -lsocket""... $ac_c" 1>&6
+-echo "configure:2314: checking for accept in -lsocket" >&5
++echo "configure:2316: checking for accept in -lsocket" >&5
+ ac_lib_var=`echo socket'_'accept | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2318,7 +2320,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2322 "configure"
++#line 2324 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2329,7 +2331,7 @@
+ accept()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2357,7 +2359,7 @@
+ fi
+ 
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:2361: checking for gethostbyname in -lnsl" >&5
++echo "configure:2363: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2365,7 +2367,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2369 "configure"
++#line 2371 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2376,7 +2378,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2404,7 +2406,7 @@
+ fi
+ 
+ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
+-echo "configure:2408: checking for openpty in -lutil" >&5
++echo "configure:2410: checking for openpty in -lutil" >&5
+ ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2412,7 +2414,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lutil  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2416 "configure"
++#line 2418 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2423,7 +2425,7 @@
+ openpty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2451,7 +2453,7 @@
+ fi
+ 
+ echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
+-echo "configure:2455: checking for gettext in -lintl" >&5
++echo "configure:2457: checking for gettext in -lintl" >&5
+ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2459,7 +2461,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2463 "configure"
++#line 2465 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2470,7 +2472,7 @@
+ gettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2590,24 +2592,34 @@
+ fi
+ 
+ 
+-if test "$BSDUSER_PPP" = "yes"; then
+-  cat >> confdefs.h <<\EOF
+-#define PPP_BINARY "/usr/sbin/ppp"
++# Check whether --with-pppd or --without-pppd was given.
++if test "${with_pppd+set}" = set; then
++  withval="$with_pppd"
++   cat >> confdefs.h <<EOF
++#define PPP_BINARY "$withval"
+ EOF
+ 
+ else
+-  if test "$SLIRP" = "yes"; then
+-    cat >> confdefs.h <<\EOF
++   if test "$BSDUSER_PPP" = "yes"; then
++	    cat >> confdefs.h <<\EOF
++#define PPP_BINARY "/usr/sbin/ppp"
++EOF
++
++	  else
++	    if test "$SLIRP" = "yes"; then
++	      cat >> confdefs.h <<\EOF
+ #define PPP_BINARY "/bin/slirp"
+ EOF
+ 
+-  else
+-    cat >> confdefs.h <<\EOF
++	    else
++	      cat >> confdefs.h <<\EOF
+ #define PPP_BINARY "/usr/sbin/pppd"
+ EOF
+ 
+-  fi
++	    fi
++	  fi
+ fi
++
+ 
+ if test "$SLIRP" = "yes"; then
+   if test "$PPPD_IP_ALLOC" = "yes"; then
diff --git a/net/poptop/patches/patch-ac b/net/poptop/patches/patch-ac
new file mode 100644
index 00000000000..fe1fdd327c4
--- /dev/null
+++ b/net/poptop/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+
+--- pptpctrl.c.orig	Wed Sep 22 20:01:28 1999
++++ pptpctrl.c	Sat Sep 25 21:27:35 1999
+@@ -33,6 +33,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #ifdef HAVE_OPENPTY
++#include <util.h>
+ #ifdef HAVE_PTY_H
+ #include <pty.h>
+ #endif
diff --git a/net/poptop/pkg/COMMENT b/net/poptop/pkg/COMMENT
new file mode 100644
index 00000000000..aa58a76088c
--- /dev/null
+++ b/net/poptop/pkg/COMMENT
@@ -0,0 +1 @@
+A PPTP server which can support Microsoft VPN clients.
diff --git a/net/poptop/pkg/DESCR b/net/poptop/pkg/DESCR
new file mode 100644
index 00000000000..2b19ae33dc9
--- /dev/null
+++ b/net/poptop/pkg/DESCR
@@ -0,0 +1,24 @@
+PoPToP is the PPTP server solution for Linux (ports exist for Solaris 2.6,
+OpenBSD and FreeBSD and others). To date no real solution existed if you
+wished to include Linux servers in PPTP established VPNs. PoPToP resolves
+that problem by allowing Linux servers to function seamlessly in the PPTP
+VPN environment. This enables administrators to leverage the considerable
+benefits of both Microsoft and Linux. The current pre-release version
+supports Windows 95/98/NT/2000 PPTP clients and PPTP Linux clients. PoPToP
+is free GNU software.
+
+The PoPTop pre-release server is not yet fully optimised. It has been
+released early so as to encourage other developers to become involved in
+its development. On release, PoPToP will be fully compliant with IETF PPTP
+Internet Draft and it will seamlessly support Windows PPTP clients with the
+full range of encryption and authentication features.
+
+Features for version 1.0.0:
+  . Works with Windows 2000 clients 
+  . Available PPPD patch allows Windows compatible encryption and
+     authentication. (MSCHAPv2 and MPPE 40-128 bit RC4 encryption) 
+  . Support for multiple clients 
+  . Works with Windows 95/98/NT PPTP clients 
+  . Works with C. S. Ananian's PPTP Linux clients 
+  . PoPToP is, and will remain, totally free under the GNU General Public
+     License
diff --git a/net/poptop/pkg/PLIST b/net/poptop/pkg/PLIST
new file mode 100644
index 00000000000..6f1b62ef1a2
--- /dev/null
+++ b/net/poptop/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+sbin/pptpd
+sbin/pptpctrl
+man/man8/pptpd.8
+man/man8/pptpctrl.8
+man/man5/pptpd.conf.5