Upgrade from version 1.0.2 to 1.0.3 and welcome Thomas Quinot as

the new maintainer of this port.

Submitted by:	Thomas Quinot <thomas@cuivre.fr.eu.org>

8 files changed, 74 insertions, 134 deletions

diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index bcb6186c740..d494f5a8557 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -6,16 +6,33 @@
 #
 
 PORTNAME=	pptpclient
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.pdos.lcs.mit.edu/~cananian/Projects/PPTP/release/ \
-		ftp://ftp.kddlabs.co.jp/pub/inet/vpn/pptp-linux/ \
-		ftp://ftp.iks-jena.de/pub/software/linux/net/
-DISTNAME=	pptp-linux-1.0.2
+MASTER_SITES=	http://www.linuxalpha.compaq.com/pptpclient/files/
+DISTNAME=	pptp-linux-1.0.3
+DISTFILES=	pptp-linux-1.0.3-1.tar.gz
 
-MAINTAINER=	jdp@freebsd.org
+MAINTAINER=	thomas@cuivre.fr.eu.org
 
-post-install:
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgnugetopt.a:${PORTSDIR}/devel/libgnugetopt
+
+MAKE_ARGS=	DEBUG="" \
+		INCLUDE="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lgnugetopt" \
+		pptp
+
+GUNZIP_CMD=		${GZIP_CMD} ${EXTRACT_BEFORE_ARGS}
+
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	@(cd ${WRKDIR} && \
+	${GUNZIP_CMD} ${_DISTDIR}/${DISTFILES} | tar -xf - && \
+	${GUNZIP_CMD} `basename ${DISTFILES} .tar.gz`/${DISTNAME}.tar.gz | \
+	tar -xf -)
+
+do-install:
+	cd ${WRKSRC} ; ${INSTALL_PROGRAM} pptp ${PREFIX}/sbin
 	${MKDIR} ${PREFIX}/share/examples/pptpclient
 	${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/examples/pptpclient
 	${INSTALL_DATA} ${FILESDIR}/ppp.conf ${PREFIX}/share/examples/pptpclient
diff --git a/net/pptpclient/distinfo b/net/pptpclient/distinfo
index ccb9b1b696a..f8dcb764126 100644
--- a/net/pptpclient/distinfo
+++ b/net/pptpclient/distinfo
@@ -1 +1 @@
-MD5 (pptp-linux-1.0.2.tar.gz) = 257835dbb111673dcf80bdf927a1be87
+MD5 (pptp-linux-1.0.3-1.tar.gz) = 3feef84198b14bbe99cdbe17576c13e5
diff --git a/net/pptpclient/files/patch-aa b/net/pptpclient/files/patch-aa
index aebd3ce6146..7aea6b6c64f 100644
--- a/net/pptpclient/files/patch-aa
+++ b/net/pptpclient/files/patch-aa
@@ -1,23 +1,7 @@
---- Makefile.orig	Thu Feb 19 00:42:14 1998
-+++ Makefile	Fri Aug 11 11:40:08 2000
-@@ -1,17 +1,21 @@
- VERSION = 1.0.2
- VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"'
- 
--CC	= gcc -Wall
--DEBUG	= -g
-+CC	= gcc
-+DEBUG	=
- INCLUDE =
--CFLAGS  = -O9 $(VERSION_DEFINE) $(DEBUG) $(INCLUDE)
-+CFLAGS  = -O $(VERSION_DEFINE) $(DEBUG) $(INCLUDE)
- LIBS	=
- LDFLAGS	=
-+RM	= rm -f
-+
-+# This is the directory where pptp gets installed:
-+PPTP_BINDIR	= ${PREFIX}/sbin
- 
+diff -ur dist/pptp-linux-1.0.3/Makefile work/pptp-linux-1.0.3/Makefile
+--- dist/pptp-linux-1.0.3/Makefile	Mon May  7 05:19:34 2001
++++ Makefile	Thu May 10 00:43:58 2001
+@@ -11,12 +11,12 @@
  #################################################################
  # CHANGE THIS LINE to point to the location of your pppd binary.
  
@@ -26,23 +10,10 @@
  #################################################################
  
  PPTP_BIN = pptp
-@@ -24,7 +28,7 @@
- CALLMGR_OBJS = pptp_callmgr.o pptp_ctrl.o dirutil.o util.o vector.o version.o
- CALLMGR_DEPS = pptp_callmgr.h pptp_ctrl.h dirutil.h pptp_msg.h vector.h
- 
--all: $(PPTP_BIN) $(CALLMGR_BIN)
-+all: $(PPTP_BIN)
- 
- $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS)
- 	$(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS)
-@@ -34,6 +38,10 @@
- 
- vector_test: vector_test.o vector.o
- 	$(CC) -o vector_test vector_test.o vector.o
-+
-+install: all
-+	test -d $(PPTP_BINDIR) || mkdir -p $(PPTP_BINDIR)
-+	install -c -s -o root -g wheel -m 755 $(PPTP_BIN) $(PPTP_BINDIR)
+-PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o pty.o \
++PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o \
+             pptp_ctrl.o dirutil.o vector.o \
+             inststr.o util.o version.o
+-PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h pty.h util.h
++PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h util.h
  
- clean:
- 	$(RM) *.o *~
diff --git a/net/pptpclient/files/patch-ab b/net/pptpclient/files/patch-ab
index 5b024aa90ef..06fa6345189 100644
--- a/net/pptpclient/files/patch-ab
+++ b/net/pptpclient/files/patch-ab
@@ -1,18 +1,45 @@
-RCS file: /home/jdp/f5/pptp/cvs/pptp/pptp.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -r1.1.1.1 -r1.3
---- pptp.c	1999/04/28 19:36:57	1.1.1.1
-+++ pptp.c	1999/04/29 17:05:59	1.3
-@@ -18,6 +18,7 @@
+diff -ur dist/pptp-linux-1.0.3/pptp.c work/pptp-linux-1.0.3/pptp.c
+--- dist/pptp-linux-1.0.3/pptp.c	Mon Apr 30 05:42:36 2001
++++ pptp.c	Thu May 10 00:43:02 2001
+@@ -7,7 +7,11 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#ifdef __FreeBSD__
++#include <libutil.h>
++#else
+ #include <pty.h>
++#endif
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/un.h>
+@@ -19,14 +23,15 @@
  #include <signal.h>
  #include <setjmp.h>
  #include <errno.h>
 +#include <fcntl.h>
  #include <sys/wait.h>
++#include <limits.h>
+ #include <getopt.h>
  #include "pptp_callmgr.h"
  #include "pptp_gre.h"
-@@ -235,13 +236,23 @@
+ #include "version.h"
+ #include "inststr.h"
+ #include "util.h"
+-#include "pty.h"
+ 
+ #ifndef PPPD_BINARY
+ #define PPPD_BINARY "pppd"
+@@ -64,7 +69,7 @@
+ int main(int argc, char **argv, char **envp) {
+   struct in_addr inetaddr;
+   int callmgr_sock;
+-  char ttydev[TTYMAX];
++  char ttydev[PATH_MAX];
+   int pty_fd, tty_fd, rc;
+   pid_t parent_pid, child_pid;
+   u_int16_t call_id, peer_call_id;
+@@ -289,13 +294,23 @@
  void launch_pppd(char *ttydev, int argc, char **argv) {
    char *new_argv[argc+4]; /* XXX if not using GCC, hard code a limit here. */
    int i;
diff --git a/net/pptpclient/files/patch-ad b/net/pptpclient/files/patch-ad
index a55ccfd63f3..876fad22a11 100644
--- a/net/pptpclient/files/patch-ad
+++ b/net/pptpclient/files/patch-ad
@@ -1,11 +1,8 @@
-RCS file: /home/jdp/f5/pptp/cvs/pptp/pptp_gre.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- pptp_gre.c	1999/04/28 19:36:57	1.1.1.1
-+++ pptp_gre.c	1999/04/28 19:43:56	1.2
+diff -ur dist/pptp-linux-1.0.3/pptp_gre.c work/pptp-linux-1.0.3/pptp_gre.c
+--- dist/pptp-linux-1.0.3/pptp_gre.c	Mon Apr 30 05:40:40 2001
++++ pptp_gre.c	Thu May 10 00:43:41 2001
 @@ -5,10 +5,10 @@
-  * $Id: pptp_gre.c,v 1.5 1997/12/15 10:11:38 cananian Exp $
+  * $Id: pptp_gre.c,v 1.3 2001/04/30 03:40:40 scott Exp $
   */
  
 +#include <sys/types.h>
@@ -17,12 +14,3 @@ diff -u -r1.1.1.1 -r1.2
  #include <sys/stat.h>
  #include <sys/time.h>
  #include <unistd.h>
-@@ -59,7 +59,7 @@
-   struct sockaddr_in src_addr;
-   int s, n, stat1, stat2;
- 
--  pptp_gre_call_id = call_id;
-+  pptp_gre_call_id = peer_call_id;
-   /* Open IP protocol socket */
-   s = socket(AF_INET, SOCK_RAW, PPTP_PROTO);
-   if (s<0) { warn("socket: %s", strerror(errno)); return; }
diff --git a/net/pptpclient/files/patch-ae b/net/pptpclient/files/patch-ae
deleted file mode 100644
index dfd12056309..00000000000
--- a/net/pptpclient/files/patch-ae
+++ /dev/null
@@ -1,46 +0,0 @@
-RCS file: /home/jdp/f5/pptp/cvs/pptp/pty.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- pty.h	1999/04/28 19:36:57	1.1.1.1
-+++ pty.h	1999/04/28 19:42:34	1.2
-@@ -6,18 +6,32 @@
-  * $Id: pty.h,v 1.2 1997/12/13 08:39:01 cananian Exp $
-  */
- 
--/* Hmm.  PTYs can be anywhere.... */
--
- #ifdef __linux__
--#define PTYDEV	"/dev/ptyxx"
--#define TTYDEV	"/dev/ttyxx"
-+#define PTYCHAR1	"abcdepqrstuvwxyz"
-+#define PTYCHAR2	"0123456789abcdef"
-+#endif
- 
--#define PTYMAX  (strlen(PTYDEV)+1)
--#define TTYMAX  (strlen(TTYDEV)+1)
-+#ifdef __FreeBSD__
-+#define PTYCHAR1	"pqrsPQRS"
-+#define PTYCHAR2	"0123456789abcdefghijklmnopqrstuv"
-+#endif
- 
--#define PTYCHAR1	"abcdepqrstuvwxyz"
-+/* Conservative defaults that will work for most systems. */
-+#ifndef PTYDEV
-+#define PTYDEV	"/dev/ptyxx"
-+#endif
-+#ifndef TTYDEV
-+#define TTYDEV  "/dev/ttyxx"
-+#endif
-+#ifndef PTYCHAR1
-+#define PTYCHAR1        "pqrs"
-+#endif
-+#ifndef PTYCHAR2
- #define PTYCHAR2	"0123456789abcdef"
- #endif
-+
-+#define PTYMAX  (strlen(PTYDEV)+1)
-+#define TTYMAX  (strlen(TTYDEV)+1)
- 
- /* Get pty/tty pair, put filename in ttydev, ptydev (which must be
-  * at least PTYMAX characters long), and return file descriptor of
diff --git a/net/pptpclient/files/patch-af b/net/pptpclient/files/patch-af
deleted file mode 100644
index e47e9966260..00000000000
--- a/net/pptpclient/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- pptp_ctrl.c~	Thu Feb 19 07:42:14 1998
-+++ pptp_ctrl.c	Sun Nov 14 11:12:03 1999
-@@ -513,7 +513,7 @@
- 	  close_reason = PPTP_STOP_PROTOCOL;
- 	  goto pptp_conn_close;
- 	}
--	if (ntoh8(packet->result_code)!=1) { /* some problem with start */
-+	if (ntoh8(packet->result_code)!=1 && ntoh8(packet->result_code)!=0) { /* some problem with start */
- 	  /* if result_code == 5, we might fall back to different version */
- 	  if (conn->callback!=NULL) conn->callback(conn, CONN_OPEN_FAIL);
- 	  close_reason = PPTP_STOP_PROTOCOL;
diff --git a/net/pptpclient/pkg-descr b/net/pptpclient/pkg-descr
index 57a2e42314d..415b809c0a8 100644
--- a/net/pptpclient/pkg-descr
+++ b/net/pptpclient/pkg-descr
@@ -1,9 +1,3 @@
-NOTE: The maintainer of this port strongly recommends the use of
-the "mpd-netgraph" port instead of this port.  The mpd-netgraph
-port is more flexible, and it works much better in every respect.
-If you choose to use this port, the maintainer will be able to
-offer you nothing beyond his sympathy.
-
 This is a port of the "pptp-linux" PPTP client.  It can establish a
 PPP connection with an NT server, tunneled through a PPTP link over
 the Internet.  In effect, it makes the client machine behave as if