From 630505b840293d32c628e77070ca52328516d970 Mon Sep 17 00:00:00 2001 From: kim Date: Sun, 23 Dec 2001 17:18:12 +0000 Subject: Upgrade to poptop-1.0.1 since the old distribution was no longer available, you get an HTML page instead. Fixed a syntax error in configure.in that caused compilation to fail (even with the old version) due to gettext(3) not found (-lintl was dropped). --- net/poptop/Makefile | 11 +++++------ net/poptop/distinfo | 10 +++++----- net/poptop/patches/patch-aa | 15 ++++++++++++--- net/poptop/patches/patch-ab | 27 ++++++++++++++++++++++----- 4 files changed, 44 insertions(+), 19 deletions(-) (limited to 'net/poptop') diff --git a/net/poptop/Makefile b/net/poptop/Makefile index cfa87dae9d1..4041fb8cb12 100644 --- a/net/poptop/Makefile +++ b/net/poptop/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:27 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/12/23 17:18:12 kim Exp $ -DISTNAME= pptpd-1.0.0 -PKGNAME= poptop-1.0.0 +DISTNAME= pptpd-1.0.1 +PKGNAME= poptop-1.0.1 CATEGORIES= net -MASTER_SITES= http://www.moretonbay.com/vpn/releases/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ftp://ftp.snapgear.com/poptop/ MAINTAINER= dbj@netbsd.org -HOMEPAGE= http://www.moretonbay.com/vpn/pptp.html +HOMEPAGE= http://www.snapgear.com/vpn/pptp.html COMMENT= PPTP server which can support Microsoft VPN clients GNU_CONFIGURE= yes diff --git a/net/poptop/distinfo b/net/poptop/distinfo index 6af7297e117..8a3df224421 100644 --- a/net/poptop/distinfo +++ b/net/poptop/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:30 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/12/23 17:18:12 kim Exp $ -SHA1 (pptpd-1.0.0.tgz) = 0b181520e46f152a638a75b5f745f318461eb3b3 -Size (pptpd-1.0.0.tgz) = 110188 bytes -SHA1 (patch-aa) = e5856706083f87227cbd88a975ec53badeec8d89 -SHA1 (patch-ab) = ccc0e7d5f4b84ed6d80ef7eee067f017d6ca418a +SHA1 (pptpd-1.0.1.tar.gz) = 844615d46040b5aa724aac049b91dfc6d688dab8 +Size (pptpd-1.0.1.tar.gz) = 111195 bytes +SHA1 (patch-aa) = 11bf3a2c6fb445c90c01389f98b3a339a052b53a +SHA1 (patch-ab) = 811ecf9f54bf5468a0b6a92b49c613f3d5b438c4 SHA1 (patch-ac) = 9414c9d086913d8a322629d87f3ed79ecbd4059f diff --git a/net/poptop/patches/patch-aa b/net/poptop/patches/patch-aa index 4cd493ac7e3..5752cf4edb9 100644 --- a/net/poptop/patches/patch-aa +++ b/net/poptop/patches/patch-aa @@ -1,7 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $ +$NetBSD: patch-aa,v 1.2 2001/12/23 17:18:12 kim Exp $ ---- configure.in.orig Sat Sep 25 20:13:57 1999 -+++ configure.in Sat Sep 25 20:46:27 1999 +--- configure.in.orig Sun Sep 24 21:29:23 2000 ++++ configure.in Sun Dec 23 12:09:28 2001 +@@ -112,7 +112,7 @@ + if test "$ac_cv_header_libintl_h" = yes; then + if test "$ac_cv_lib_c_gettext" = no; then + if test "$ac_cv_lib_intl_gettext" = yes; then +- XTRALIBS_MGR = "$XTRALIBS_MGR -lintl" ++ XTRALIBS_MGR="$XTRALIBS_MGR -lintl" + else + echo "Have libintl.h but no usable gettext!" 1>&2 + exit 1 @@ -144,15 +144,18 @@ [ AC_DEFINE(PNS_MODE) PNS_MODE = yes ]) diff --git a/net/poptop/patches/patch-ab b/net/poptop/patches/patch-ab index a69af822e5c..1e358191dd9 100644 --- a/net/poptop/patches/patch-ab +++ b/net/poptop/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $ +$NetBSD: patch-ab,v 1.2 2001/12/23 17:18:12 kim Exp $ ---- configure.orig Sat Sep 25 20:10:12 1999 -+++ configure Sat Sep 25 20:46:41 1999 +--- configure.orig Sun Sep 24 21:29:23 2000 ++++ configure Sun Dec 23 12:10:15 2001 @@ -21,6 +21,8 @@ --with-pppd-ip-alloc Let pppd allocate IP (and IPX) addresses " ac_help="$ac_help @@ -203,7 +203,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:32:23 dbj 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,12 +1155,12 @@ +@@ -1153,18 +1155,18 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 @@ -218,6 +218,13 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:32:23 dbj 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; } @@ -244,7 +251,8 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $ #include "confdefs.h" int main() { - } $ac_kw foo() { +-} int $ac_kw foo() { ++} $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -936,6 +944,15 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $ rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else +@@ -2534,7 +2536,7 @@ + if test "$ac_cv_header_libintl_h" = yes; then + if test "$ac_cv_lib_c_gettext" = no; then + if test "$ac_cv_lib_intl_gettext" = yes; then +- XTRALIBS_MGR = "$XTRALIBS_MGR -lintl" ++ XTRALIBS_MGR="$XTRALIBS_MGR -lintl" + else + echo "Have libintl.h but no usable gettext!" 1>&2 + exit 1 @@ -2590,24 +2592,34 @@ fi -- cgit v1.2.3