- remove a patch to zap contents of a file which is already not being

built due to a Makefile patch. From Brad, ok stsp@ (maintainer).

- don't use a header which is only needed because of the unused file,
from/commit req'd by stsp@.

shouldn't affect the package, but bumped for safety.

net/pptp/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2010/07/12 22:07:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/14 11:04:15 sthen Exp $
 # $NetBSD: Makefile,v 1.1.1.1 2000/04/10 01:14:01 jtk Exp $
 
 COMMENT=	PPTP client package for Microsoft VPN servers
 
 DISTNAME=	pptp-1.7.2
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=pptpclient/}
 

net/pptp/patches/patch-Makefile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.7 2009/03/08 21:57:24 stsp Exp $
---- Makefile.orig	Wed May 14 07:33:55 2008
-+++ Makefile	Fri Mar  6 15:45:41 2009
+$OpenBSD: patch-Makefile,v 1.8 2010/07/14 11:04:15 sthen Exp $
+--- Makefile.orig	Wed May 14 08:33:55 2008
++++ Makefile	Tue Jul 13 23:52:52 2010
 @@ -4,19 +4,19 @@ RELEASE=
  
  #################################################################
@@ -24,7 +24,7 @@ $OpenBSD: patch-Makefile,v 1.7 2009/03/08 21:57:24 stsp Exp $
  LIBS	= -lutil
  # Solaris 10
  # LIBS	= -lnsl -lsocket -lresolv
-@@ -29,7 +29,7 @@ PPTP_BIN = pptp
+@@ -29,11 +29,11 @@ PPTP_BIN = pptp
  PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o \
              pptp_ctrl.o dirutil.o vector.o \
  	    inststr.o util.o version.o test.o \
@@ -33,3 +33,8 @@ $OpenBSD: patch-Makefile,v 1.7 2009/03/08 21:57:24 stsp Exp $
  	    pptp_compat.o
  
  PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h util.h test.h \
+-	    pptp_quirks.h orckit_quirks.h config.h pqueue.h routing.h
++	    pptp_quirks.h orckit_quirks.h config.h pqueue.h
+ 
+ all: config.h $(PPTP_BIN) pptpsetup.8
+ 

net/pptp/patches/patch-pptp_callmgr_c

@@ -1,7 +1,15 @@
-$OpenBSD: patch-pptp_callmgr_c,v 1.1 2009/03/08 21:57:24 stsp Exp $
---- pptp_callmgr.c.orig	Fri Mar  6 15:44:54 2009
-+++ pptp_callmgr.c	Fri Mar  6 15:45:00 2009
-@@ -120,8 +120,6 @@ int callmgr_main(int argc, char **argv, char **envp)
+$OpenBSD: patch-pptp_callmgr_c,v 1.2 2010/07/14 11:04:15 sthen Exp $
+--- pptp_callmgr.c.orig	Wed May 14 08:33:55 2008
++++ pptp_callmgr.c	Tue Jul 13 23:52:46 2010
+@@ -25,7 +25,6 @@
+ #include "dirutil.h"
+ #include "vector.h"
+ #include "util.h"
+-#include "routing.h"
+ 
+ extern struct in_addr localbind; /* from pptp.c */
+ 
+@@ -120,8 +119,6 @@ int callmgr_main(int argc, char **argv, char **envp)
      phonenr = argc == 3 ? argv[2] : NULL;
      if (inet_aton(argv[1], &inetaddr) == 0)
          fatal("Invalid IP address: %s", argv[1]);

net/pptp/patches/patch-routing_c

@@ -1,83 +0,0 @@
-$OpenBSD: patch-routing_c,v 1.1 2009/03/08 21:57:24 stsp Exp $
---- routing.c.orig	Fri Mar  6 15:31:31 2009
-+++ routing.c	Fri Mar  6 15:43:43 2009
-@@ -1,79 +0,0 @@
--/*
--    routing.c, manipulating routing table for PPTP Client
--    Copyright (C) 2006  James Cameron <quozl@us.netrek.org>
--
--    This program is free software; you can redistribute it and/or modify
--    it under the terms of the GNU General Public License as published by
--    the Free Software Foundation; either version 2 of the License, or
--    (at your option) any later version.
--
--    This program is distributed in the hope that it will be useful,
--    but WITHOUT ANY WARRANTY; without even the implied warranty of
--    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--    GNU General Public License for more details.
--
--    You should have received a copy of the GNU General Public License
--    along with this program; if not, write to the Free Software
--    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--
--*/
--
--#include <sys/types.h>
--#include <unistd.h>
--#include <stdio.h>
--#include <string.h>
--#include "routing.h"
--
--/* route to the server */
--char *route;
--
--/*
--
--Design discussion.
--
--The primary task of this module is to add a host route to the PPTP
--server so that the kernel continues to deliver PPTP control and data
--connection packets to the server despite the new PPP interface that is
--created.  The flag --no-host-route is to disable this (not yet implemented).
--
--A secondary task may be to implement all-to-tunnel routing if the
--appropriate flag is specified on the command line.  The flag
----route-all is to implement this (not yet implemented).
--
--Caveat.
--
--It is not possible from the "ip route" command to determine if a host
--route already exists, so it isn't practical to put the routing table
--back exactly as it was.
--
--We have a choice of either leaving our route lying around, or
--destroying a route that the user had pre-arranged.  Both are
--unfortunate.  The flag --remove-host-route is to remove the route
--regardless (not yet implemented).
--
--*/
--
--void routing_init(char *ip) {
--  char buf[256];
--  snprintf(buf, 255, "/bin/ip route get %s", ip);
--  FILE *p = popen(buf, "r");
--  fgets(buf, 255, p);
--  /* TODO: check for failure of fgets */
--  route = strdup(buf);
--  pclose(p);
--  /* TODO: check for failure of command */
--}
--
--void routing_start() {
--  char buf[256];
--  snprintf(buf, 255, "/bin/ip route replace %s", route);
--  FILE *p = popen(buf, "r");
--  pclose(p);
--}
--
--void routing_end() {
--  char buf[256];
--  snprintf(buf, 255, "/bin/ip route delete %s", route);
--  FILE *p = popen(buf, "r");
--  pclose(p);
--}