From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 21 02:10:14 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 029B416A41F for ; Fri, 21 Oct 2005 02:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 630A343D6A for ; Fri, 21 Oct 2005 02:10:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9L2ACVe025574 for ; Fri, 21 Oct 2005 02:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9L2ACxj025573; Fri, 21 Oct 2005 02:10:12 GMT (envelope-from gnats) Resent-Date: Fri, 21 Oct 2005 02:10:12 GMT Resent-Message-Id: <200510210210.j9L2ACxj025573@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Oleg M. Golovanov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D14E016A41F for ; Fri, 21 Oct 2005 02:07:01 +0000 (GMT) (envelope-from olmi@zyx.4net.ru) Received: from zyx.4net.ru (zyx.4net.ru [80.91.194.106]) by mx1.FreeBSD.org (Postfix) with ESMTP id B906543D5A for ; Fri, 21 Oct 2005 02:07:00 +0000 (GMT) (envelope-from olmi@zyx.4net.ru) Received: (from root@localhost) by zyx.4net.ru (8.13.1/8.12.11) id j9L27C56031524; Fri, 21 Oct 2005 10:07:12 +0800 (KRAST) (envelope-from olmi) Message-Id: <200510210207.j9L27C56031524@zyx.4net.ru> Date: Fri, 21 Oct 2005 10:07:12 +0800 (KRAST) From: "Oleg M. Golovanov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/87767: upgrade port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2005 02:10:14 -0000 >Number: 87767 >Category: ports >Synopsis: upgrade port >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 21 02:10:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Oleg M. Golovanov >Release: FreeBSD 4.11-RELEASE i386 >Organization: REN Technologies >Environment: >Description: PoPToP is a PPTP daemon. It is compatible with the Microsoft Windows VPN adapter. >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # poptop # poptop/files # poptop/files/patch-ah # poptop/files/patch-ag # poptop/files/patch-af # poptop/files/patch-ae # poptop/files/pptpd.sh # poptop/files/patch-ad # poptop/files/patch-ac # poptop/files/patch-ab # poptop/files/patch-aa # poptop/Makefile # poptop/distinfo # poptop/pkg-descr # poptop/pkg-plist # echo c - poptop mkdir -p poptop > /dev/null 2>&1 echo c - poptop/files mkdir -p poptop/files > /dev/null 2>&1 echo x - poptop/files/patch-ah sed 's/^X//' >poptop/files/patch-ah << 'END-of-poptop/files/patch-ah' X--- pptpd.conf.5.orig Mon May 24 09:31:24 2004 X+++ pptpd.conf.5 Thu Oct 20 22:33:48 2005 X@@ -5,7 +5,7 @@ X .SH DESCRIPTION X .BR pptpd (8) X reads options from this file, usually X-.IR /etc/pptpd.conf . X+.IR /usr/local/etc/pptpd.conf . X Most options can be overridden by the command line. The local and X remote IP addresses for clients must come from the configuration file X or from END-of-poptop/files/patch-ah echo x - poptop/files/patch-ag sed 's/^X//' >poptop/files/patch-ag << 'END-of-poptop/files/patch-ag' X--- defaults.h.orig Wed Apr 28 11:36:07 2004 X+++ defaults.h Thu Oct 20 22:33:48 2005 X@@ -45,7 +45,7 @@ X #if EMBED X #define PPTPD_CONFIG_FILE_DEFAULT "/etc/config/pptpd.conf" X #else X-#define PPTPD_CONFIG_FILE_DEFAULT "/etc/pptpd.conf" X+#define PPTPD_CONFIG_FILE_DEFAULT "/usr/local/etc/pptpd.conf" X #endif X #define PIDFILE_DEFAULT "/var/run/pptpd.pid" X END-of-poptop/files/patch-ag echo x - poptop/files/patch-af sed 's/^X//' >poptop/files/patch-af << 'END-of-poptop/files/patch-af' X--- pptpd.8.orig Mon May 24 09:39:03 2004 X+++ pptpd.8 Thu Oct 20 22:33:48 2005 X@@ -29,7 +29,7 @@ X specifies the configuration file for X .B pptpd X (default X-.IR /etc/pptpd.conf ) X+.IR /usr/local/etc/pptpd.conf ) X X .TP X .BR -d | --debug END-of-poptop/files/patch-af echo x - poptop/files/patch-ae sed 's/^X//' >poptop/files/patch-ae << 'END-of-poptop/files/patch-ae' X--- Makefile.in.orig Wed Jun 23 10:03:07 2004 X+++ Makefile.in Thu Oct 20 22:33:48 2005 X@@ -14,7 +14,7 @@ X X @SET_MAKE@ X X-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES) X+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES) X X srcdir = @srcdir@ X top_srcdir = @top_srcdir@ X@@ -37,7 +37,7 @@ X PRE_UNINSTALL = : X POST_UNINSTALL = : X EXTRA_PROGRAMS = X-sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT) X+sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) X subdir = . X DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ X $(srcdir)/Makefile.in $(srcdir)/config.h.in \ X@@ -55,9 +55,6 @@ X am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" X sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) X PROGRAMS = $(sbin_PROGRAMS) X-am_bcrelay_OBJECTS = bcrelay.$(OBJEXT) X-bcrelay_OBJECTS = $(am_bcrelay_OBJECTS) X-bcrelay_LDADD = $(LDADD) X am_pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \ X inststr.$(OBJEXT) compat.$(OBJEXT) pptpgre.$(OBJEXT) \ X ppphdlc.$(OBJEXT) X@@ -76,8 +73,8 @@ X $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) X CCLD = $(CC) X LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ X-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES) X-DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES) X+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES) X+DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES) X man5dir = $(mandir)/man5 X man8dir = $(mandir)/man8 X NROFF = nroff X@@ -285,9 +282,6 @@ X X clean-sbinPROGRAMS: X -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) X-bcrelay$(EXEEXT): $(bcrelay_OBJECTS) $(bcrelay_DEPENDENCIES) X- @rm -f bcrelay$(EXEEXT) X- $(LINK) $(bcrelay_LDFLAGS) $(bcrelay_OBJECTS) $(bcrelay_LDADD) $(LIBS) X pptpctrl$(EXEEXT): $(pptpctrl_OBJECTS) $(pptpctrl_DEPENDENCIES) X @rm -f pptpctrl$(EXEEXT) X $(LINK) $(pptpctrl_LDFLAGS) $(pptpctrl_OBJECTS) $(pptpctrl_LDADD) $(LIBS) END-of-poptop/files/patch-ae echo x - poptop/files/pptpd.sh sed 's/^X//' >poptop/files/pptpd.sh << 'END-of-poptop/files/pptpd.sh' X#! /bin/sh X Xcase $1 in Xstart) X [ -x /usr/local/sbin/pptpd ] && /usr/local/sbin/pptpd && echo -n ' pptpd' X ;; Xstop) X killall pptpd && echo -n ' pptpd' X ;; X*) X echo "Usage: `basename $0` {start|stop}" >&2 X exit 64 X ;; Xesac X Xexit 0 END-of-poptop/files/pptpd.sh echo x - poptop/files/patch-ad sed 's/^X//' >poptop/files/patch-ad << 'END-of-poptop/files/patch-ad' X--- Makefile.am.orig Wed Jun 23 09:48:50 2004 X+++ Makefile.am Thu Oct 20 22:33:48 2005 X@@ -32,7 +32,7 @@ X debian/po/templates.pot X X EXTRA_PROGRAMS = X-sbin_PROGRAMS = pptpd pptpctrl bcrelay X+sbin_PROGRAMS = pptpd pptpctrl X X # Header files are only used to determine what to put in a distribution, not X # for dependencies, so just attribute them all to pptpd. END-of-poptop/files/patch-ad echo x - poptop/files/patch-ac sed 's/^X//' >poptop/files/patch-ac << 'END-of-poptop/files/patch-ac' X--- pptpctrl.c.orig Wed Apr 28 11:36:07 2004 X+++ pptpctrl.c Thu Oct 20 22:33:48 2005 X@@ -734,7 +734,7 @@ X X if (pptp_logwtmp) { X pppd_argv[an++] = "plugin"; X- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so"; X+ pppd_argv[an++] = "@@PREFIX@@/lib/pptpd/pptpd-logwtmp.so"; X pppd_argv[an++] = "pptpd-original-ip"; X pppd_argv[an++] = inet_ntoa(inetaddrs[1]); X } END-of-poptop/files/patch-ac echo x - poptop/files/patch-ab sed 's/^X//' >poptop/files/patch-ab << 'END-of-poptop/files/patch-ab' X--- configure.orig Wed Jun 23 07:39:15 2004 X+++ configure Thu Oct 20 22:33:48 2005 X@@ -958,7 +958,7 @@ X else X echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 X fi X- cd "$ac_popdir" X+ cd $ac_popdir X done X fi X X@@ -2301,7 +2301,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -2359,7 +2360,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -2475,7 +2477,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -2529,7 +2532,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -2574,7 +2578,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -2618,7 +2623,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -3107,7 +3113,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -3167,7 +3174,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -3309,7 +3317,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -3625,7 +3634,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -3795,7 +3805,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -3862,7 +3873,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4011,7 +4023,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4160,7 +4173,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4309,7 +4323,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4458,7 +4473,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4606,7 +4622,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4671,7 +4688,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4736,7 +4754,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4801,7 +4820,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4866,7 +4886,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -4971,7 +4992,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5024,7 +5046,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5101,7 +5124,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5174,7 +5198,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5247,7 +5272,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5320,7 +5346,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5393,7 +5420,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5466,7 +5494,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5539,7 +5568,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5612,7 +5642,8 @@ X cat conftest.err >&5 X echo "$as_me:$LINENO: \$? = $ac_status" >&5 X (exit $ac_status); } && X- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' X+ { ac_try='test -z "$ac_c_werror_flag" X+ || test ! -s conftest.err' X { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X (eval $ac_try) 2>&5 X ac_status=$? X@@ -5683,7 +5714,7 @@ X if test "$ac_cv_header_libintl_h" = yes; then X if test "$ac_cv_lib_c_gettext" = no; then X if test "$ac_cv_lib_intl_gettext" = yes; then X- XTRALIBS_MGR = "$XTRALIBS_MGR -lintl" X+ XTRALIBS_MGR="$XTRALIBS_MGR -lintl" X else X echo "Have libintl.h but no usable gettext!" 1>&2 X exit 1 X@@ -6712,6 +6743,11 @@ X *) ac_INSTALL=$ac_top_builddir$INSTALL ;; X esac X X+ if test x"$ac_file" != x-; then X+ { echo "$as_me:$LINENO: creating $ac_file" >&5 X+echo "$as_me: creating $ac_file" >&6;} X+ rm -f "$ac_file" X+ fi X # Let's still pretend it is `configure' which instantiates (i.e., don't X # use $as_me), people would be surprised to read: X # /* config.h. Generated by config.status. */ X@@ -6750,12 +6786,6 @@ X fi;; X esac X done` || { (exit 1); exit 1; } X- X- if test x"$ac_file" != x-; then X- { echo "$as_me:$LINENO: creating $ac_file" >&5 X-echo "$as_me: creating $ac_file" >&6;} X- rm -f "$ac_file" X- fi X _ACEOF X cat >>$CONFIG_STATUS <<_ACEOF X sed "$ac_vpsub END-of-poptop/files/patch-ab echo x - poptop/files/patch-aa sed 's/^X//' >poptop/files/patch-aa << 'END-of-poptop/files/patch-aa' X--- configure.in.orig Wed Jun 23 07:38:43 2004 X+++ configure.in Thu Oct 20 22:33:48 2005 X@@ -112,7 +112,7 @@ X if test "$ac_cv_header_libintl_h" = yes; then X if test "$ac_cv_lib_c_gettext" = no; then X if test "$ac_cv_lib_intl_gettext" = yes; then X- XTRALIBS_MGR = "$XTRALIBS_MGR -lintl" X+ XTRALIBS_MGR="$XTRALIBS_MGR -lintl" X else X echo "Have libintl.h but no usable gettext!" 1>&2 X exit 1 END-of-poptop/files/patch-aa echo x - poptop/Makefile sed 's/^X//' >poptop/Makefile << 'END-of-poptop/Makefile' X# New ports collection makefile for: poptop X# Date created: 20 October 2005 X# Whom: Oleg Golovanov X# X# $FreeBSD: ports/net/poptop/Makefile,v 1.20 2005/10/20 05:08:18 olmi Exp $ X# X XPORTNAME= poptop XPORTVERSION= 1.2.1 XPORTREVISION= 9 XCATEGORIES= net XMASTER_SITES= http://jaist.dl.sourceforge.net/sourceforge/poptop/ \ X http://easynews.dl.sourceforge.net/sourceforge/poptop/ \ X http://nchc.dl.sourceforge.net/sourceforge/poptop/ \ X http://optusnet.dl.sourceforge.net/sourceforge/poptop/ \ X http://mesh.dl.sourceforge.net/sourceforge/poptop/ \ X http://switch.dl.sourceforge.net/sourceforge/poptop/ \ X http://kent.dl.sourceforge.net/sourceforge/poptop/ \ X http://puzzle.dl.sourceforge.net/sourceforge/poptop/ \ X http://cogent.dl.sourceforge.net/sourceforge/poptop/ \ X http://citkit.dl.sourceforge.net/sourceforge/poptop/ \ X http://belnet.dl.sourceforge.net/sourceforge/poptop/ \ X ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR= ${PORTNAME} XDISTNAME= pptpd-${PORTVERSION:S/.b/-b/} X XMAINTAINER= olmi@rentech.ru XCOMMENT= Windows 9x compatible PPTP (VPN) server X X#WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} XWRKSRC= ${WRKDIR}/pptpd-${PORTVERSION} X X X XUSE_GETOPT_LONG= yes XUSE_REINPLACE= yes XUSE_GMAKE= yes XGNU_CONFIGURE= yes XMAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ X AUTOHEADER="${TRUE}" \ X XMAN5= pptpd.conf.5 XMAN8= pptpd.8 pptpctrl.8 X X.if !defined(WITH_KERNPPP) XCONFIGURE_ARGS+= --with-bsdppp X.endif X Xpost-patch: X.for file in bcrelay.c pptpd.c X @${REINPLACE_CMD} -e 's|"out_getopt\.h"||g' ${WRKSRC}/${file} X.endfor X Xpost-install: X ${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf \ X ${PREFIX}/etc/pptpd.conf.sample X ${INSTALL_SCRIPT} ${FILESDIR}/pptpd.sh \ X ${PREFIX}/etc/rc.d/pptpd.sh.sample X X.include END-of-poptop/Makefile echo x - poptop/distinfo sed 's/^X//' >poptop/distinfo << 'END-of-poptop/distinfo' XMD5 (pptpd-1.2.1.tar.gz) = 067e9474998345485ba1e92cc5ff59c6 XSIZE (pptpd-1.2.1.tar.gz) = 180974 END-of-poptop/distinfo echo x - poptop/pkg-descr sed 's/^X//' >poptop/pkg-descr << 'END-of-poptop/pkg-descr' XPoPToP is a PPTP daemon. It is compatible with the Microsoft Windows XVPN adapter. X XWWW: http://www.poptop.org/ END-of-poptop/pkg-descr echo x - poptop/pkg-plist sed 's/^X//' >poptop/pkg-plist << 'END-of-poptop/pkg-plist' Xsbin/pptpd Xsbin/pptpctrl Xetc/pptpd.conf.sample Xetc/rc.d/pptpd.sh.sample END-of-poptop/pkg-plist exit >Release-Note: >Audit-Trail: >Unformatted: >System: FreeBSD zyx.4net.ru 4.11-RELEASE FreeBSD 4.11-RELEASE #1: Mon Jun 20 09:18:55 KRAST 2005 olmi@zyx.4net.ru:/usr/src/sys/compile/ZYX-4NET i386 >Upgrade port: net/poptop