diff options
Diffstat (limited to 'net/poptop')
-rw-r--r-- | net/poptop/Makefile | 13 | ||||
-rw-r--r-- | net/poptop/distinfo | 8 | ||||
-rw-r--r-- | net/poptop/patches/patch-ab | 25 |
3 files changed, 20 insertions, 26 deletions
diff --git a/net/poptop/Makefile b/net/poptop/Makefile index a2d5e05db71..7b239c21031 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:51:39 grant Exp $ +# $NetBSD: Makefile,v 1.7 2003/09/17 19:37:08 cube Exp $ # -DISTNAME= pptpd-1.0.1 -PKGNAME= ${DISTNAME:S/pptpd/poptop/} +DISTNAME= pptpd-1.1.3-20030409 +PKGNAME= poptop-1.1.3.20030409 +WRKSRC= ${WRKDIR}/poptop CATEGORIES= net -MASTER_SITES= ftp://ftp.snapgear.com/poptop/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poptop/} -MAINTAINER= dbj@NetBSD.org -HOMEPAGE= http://www.snapgear.com/vpn/pptp.html +MAINTAINER= cube@NetBSD.org +HOMEPAGE= http://www.poptop.org/ COMMENT= PPTP server with support for Microsoft VPN clients USE_BUILDLINK2= YES diff --git a/net/poptop/distinfo b/net/poptop/distinfo index 8a3df224421..8ee8c2cc7ed 100644 --- a/net/poptop/distinfo +++ b/net/poptop/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/12/23 17:18:12 kim Exp $ +$NetBSD: distinfo,v 1.4 2003/09/17 19:37:08 cube Exp $ -SHA1 (pptpd-1.0.1.tar.gz) = 844615d46040b5aa724aac049b91dfc6d688dab8 -Size (pptpd-1.0.1.tar.gz) = 111195 bytes +SHA1 (pptpd-1.1.3-20030409.tar.gz) = b4b7e2c5dc17b962fafb2aebff780fdcfa666551 +Size (pptpd-1.1.3-20030409.tar.gz) = 148934 bytes SHA1 (patch-aa) = 11bf3a2c6fb445c90c01389f98b3a339a052b53a -SHA1 (patch-ab) = 811ecf9f54bf5468a0b6a92b49c613f3d5b438c4 +SHA1 (patch-ab) = 878af32d56324ca4001488b3b05eae917011c2a3 SHA1 (patch-ac) = 9414c9d086913d8a322629d87f3ed79ecbd4059f diff --git a/net/poptop/patches/patch-ab b/net/poptop/patches/patch-ab index 1e358191dd9..b2faa95a643 100644 --- a/net/poptop/patches/patch-ab +++ b/net/poptop/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ +$NetBSD: patch-ab,v 1.3 2003/09/17 19:37:12 cube Exp $ ---- configure.orig Sun Sep 24 21:29:23 2000 -+++ configure Sun Dec 23 12:10:15 2001 +--- configure.orig 2003-02-06 17:39:46.000000000 +0100 ++++ configure @@ -21,6 +21,8 @@ - --with-pppd-ip-alloc Let pppd allocate IP (and IPX) addresses " + --with-pppd-ip-alloc Let pppd allocate IP addresses " ac_help="$ac_help --with-pns-mode Option is NOT FUNCTIONAL YET " +ac_help="$ac_help @@ -203,7 +203,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ 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,18 +1155,18 @@ +@@ -1153,12 +1155,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 @@ -218,13 +218,6 @@ $NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ #include "confdefs.h" int main() { - - /* Ultrix mips cc rejects this. */ --typedef int charset[2]; const charset x = {0,0}; -+typedef int charset[2]; const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; @@ -1207,7 +1209,7 @@ ; return 0; } @@ -251,8 +244,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ #include "confdefs.h" int main() { --} int $ac_kw foo() { -+} $ac_kw foo() { + } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -953,7 +945,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ else echo "Have libintl.h but no usable gettext!" 1>&2 exit 1 -@@ -2590,24 +2592,34 @@ +@@ -2590,25 +2592,35 @@ fi @@ -992,7 +984,8 @@ $NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ + fi + fi fi -+ ++ if test "$SLIRP" = "yes"; then if test "$PPPD_IP_ALLOC" = "yes"; then + true |