10 files changed, 107 insertions, 0 deletions

diff --git a/net/poptop/Makefile b/net/poptop/Makefile
new file mode 100644
index 000000000000..026a0f8934d2
--- /dev/null
+++ b/net/poptop/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	poptop
+# Version required:	1.0.0
+# Date created:		04 October 1999
+# Whom:			Nick Sayer <nsayer@freebsd.org>
+#
+# $FreeBSD$
+#
+
+DISTNAME=	pptpd-1.0.0
+PKGNAME=	poptop-1.0.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.moretonbay.com/vpn/releases/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	nsayer@freebsd.org
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-bsdppp
+
+MAN5=		pptpd.conf.5
+MAN8=		pptpd.8 pptpctrl.8
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf ${PREFIX}/etc/pptpd.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/pptpd.sh ${PREFIX}/etc/rc.d/pptpd.sh
+
+.include <bsd.port.mk>
diff --git a/net/poptop/distinfo b/net/poptop/distinfo
new file mode 100644
index 000000000000..d763d1bf31bd
--- /dev/null
+++ b/net/poptop/distinfo
@@ -0,0 +1 @@
+MD5 (pptpd-1.0.0.tgz) = cb8964868809381e33a03cd9fcb153a9
diff --git a/net/poptop/files/patch-aa b/net/poptop/files/patch-aa
new file mode 100644
index 000000000000..6ff97a4bedbd
--- /dev/null
+++ b/net/poptop/files/patch-aa
@@ -0,0 +1,11 @@
+--- defaults.h.orig	Wed Sep 22 17:01:28 1999
++++ defaults.h	Tue Oct  5 19:24:12 1999
+@@ -40,7 +40,7 @@
+ #endif
+ 
+ #define PPP_SPEED_DEFAULT		"115200"
+-#define PPTPD_CONFIG_FILE_DEFAULT	"/etc/pptpd.conf"
++#define PPTPD_CONFIG_FILE_DEFAULT	ETCDIR "/pptpd.conf"
+ #define PIDFILE_DEFAULT			"/var/run/pptpd.pid"
+ 
+ /* Location of binaries */
diff --git a/net/poptop/files/patch-ab b/net/poptop/files/patch-ab
new file mode 100644
index 000000000000..77783a145262
--- /dev/null
+++ b/net/poptop/files/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Oct  5 19:26:04 1999
++++ Makefile.in	Tue Oct  5 19:26:21 1999
+@@ -74,7 +74,7 @@
+ AUTOMAKE_OPTIONS = no-dependencies foreign
+ 
+ INCLUDES = -I.
+-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
++CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
+ 
+ man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5
diff --git a/net/poptop/files/patch-ac b/net/poptop/files/patch-ac
new file mode 100644
index 000000000000..f5eafefb8d7d
--- /dev/null
+++ b/net/poptop/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Wed Sep 22 17:01:28 1999
++++ Makefile.am	Tue Oct  5 19:25:56 1999
+@@ -11,7 +11,7 @@
+ ##  warning with -Wmissing-prototypes).
+ ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
+ ##  aren't up to it).
+-CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
++CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)'"
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
+ 
+ man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5
diff --git a/net/poptop/files/patch-ad b/net/poptop/files/patch-ad
new file mode 100644
index 000000000000..0d9b3fb36650
--- /dev/null
+++ b/net/poptop/files/patch-ad
@@ -0,0 +1,35 @@
+--- pptpd.c.orig	Wed Sep 22 17:01:28 1999
++++ pptpd.c	Tue Oct  5 19:32:07 1999
+@@ -77,20 +77,19 @@
+ static void showusage(char *prog)
+ {
+ 	printf("\nPoPToP v%s\n", VERSION);
+-	printf("The PPTP Server for Linux\n");
++	printf("The PPTP Server for FreeBSD\n");
+ 	printf("Usage: pptpd [options], where options are:\n\n");
+ 	printf(" [-c] [--conf file]        Specifies the config file to read default\n");
+-	printf("                           settings from (default is /etc/pptpd.conf).\n");
++	printf("                           settings from (default is " PPTPD_CONFIG_FILE_DEFAULT ").\n");
+ 	printf(" [-d] [--debug]            Turns on debugging (to syslog).\n");
+ 	printf(" [-f] [--fg]               Run in foreground.\n");
+ 	printf(" [-h] [--help]             Displays this help message.\n");
+ 	printf(" [-l] [--listen x.x.x.x]   Specifies IP of local interface to listen to.\n");
+ #if !defined(BSDUSER_PPP)
+ 	printf(" [-o] [--option file]      Specifies the PPP options file to use\n");
+-	printf("                           (default is /etc/ppp/options).\n");
+ #endif
+ 	printf(" [-p] [--pidfile file]     Specifies the file to write the process ID to\n");
+-	printf("                           (default is /var/run/pptpd.pid).\n");
++	printf("                           (default is "PIDFILE_DEFAULT").\n");
+ #if !defined(BSDUSER_PPP)
+ 	printf(" [-s] [--speed baud]       Specifies the baud speed for the PPP daemon\n");
+ 	printf("                           (default is 115200).\n");
+@@ -100,7 +99,7 @@
+ 	printf("\n\nLogs and debugging go to syslog as DAEMON.");
+ 
+ 	printf("\n\nCommand line options will override any default settings and any settings\n");
+-	printf("specified in the config file (default config file: /etc/pptpd.conf).\n\n");
++	printf("specified in the config file.\n\n");
+ }
+ 
+ 
diff --git a/net/poptop/files/pptpd.sh b/net/poptop/files/pptpd.sh
new file mode 100644
index 000000000000..eeb61a0a7a63
--- /dev/null
+++ b/net/poptop/files/pptpd.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+[ -x /usr/local/sbin/pptpd ] && /usr/local/sbin/pptpd && echo -n ' pptpd'
diff --git a/net/poptop/pkg-comment b/net/poptop/pkg-comment
new file mode 100644
index 000000000000..a5e824e863d6
--- /dev/null
+++ b/net/poptop/pkg-comment
@@ -0,0 +1 @@
+A Windows 9x compatible PPTP (VPN) server.
diff --git a/net/poptop/pkg-descr b/net/poptop/pkg-descr
new file mode 100644
index 000000000000..b52a866abf46
--- /dev/null
+++ b/net/poptop/pkg-descr
@@ -0,0 +1,4 @@
+PoPToP is a PPTP daemon. It is compatible with the Microsoft Windows
+VPN adapter.
+
+See http://www.moretonbay.com/vpn/help.html
diff --git a/net/poptop/pkg-plist b/net/poptop/pkg-plist
new file mode 100644
index 000000000000..8cd64f5b55d5
--- /dev/null
+++ b/net/poptop/pkg-plist
@@ -0,0 +1,4 @@
+sbin/pptpd
+sbin/pptpctrl
+etc/pptpd.conf.sample
+etc/rc.d/pptpd.sh