Update to 1.2.3

PR:		ports/88260
Submitted by:	Serge Maslov <serge@maslov.biz>
Approved by:	Oleg M. Golovanov <olmi@rentech.ru> (maintainer, timeout 26 days)

15 files changed, 142 insertions, 487 deletions

diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index aedce37f323c..65ad4baa44b2 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -6,35 +6,22 @@
 #
 
 PORTNAME=	poptop
-PORTVERSION=	1.2.1
-PORTREVISION=	0
+PORTVERSION=	1.2.3
 CATEGORIES=	net
-MASTER_SITES=	http://jaist.dl.sourceforge.net/sourceforge/poptop/ \
-		http://easynews.dl.sourceforge.net/sourceforge/poptop/ \
-		http://nchc.dl.sourceforge.net/sourceforge/poptop/ \
-		http://optusnet.dl.sourceforge.net/sourceforge/poptop/ \
-		http://mesh.dl.sourceforge.net/sourceforge/poptop/ \
-		http://switch.dl.sourceforge.net/sourceforge/poptop/ \
-		http://kent.dl.sourceforge.net/sourceforge/poptop/ \
-		http://puzzle.dl.sourceforge.net/sourceforge/poptop/ \
-		http://cogent.dl.sourceforge.net/sourceforge/poptop/ \
-		http://citkit.dl.sourceforge.net/sourceforge/poptop/ \
-		http://belnet.dl.sourceforge.net/sourceforge/poptop/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	pptpd-${PORTVERSION:S/.b/-b/}
 
 MAINTAINER=	olmi@rentech.ru
 COMMENT=	Windows 9x compatible PPTP (VPN) server
 
-WRKSRC=			${WRKDIR}/pptpd-${PORTVERSION}
-
-USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}" \
+		AUTOHEADER="${TRUE}"
+
+USE_RC_SUBR=	pptpd.sh
 
 MAN5=		pptpd.conf.5
 MAN8=		pptpd.8 pptpctrl.8
@@ -43,16 +30,19 @@ MAN8=		pptpd.8 pptpctrl.8
 CONFIGURE_ARGS+=	--with-bsdppp
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+USE_GETOPT_LONG=	yes
+.endif
+
 post-patch:
-.for file in bcrelay.c pptpd.c
-	@${REINPLACE_CMD} -e 's|"out_getopt\.h"|<getopt.h>|g' ${WRKSRC}/${file}
-.endfor
-	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/pptpd.8 ${WRKSRC}/pptpd.conf.5
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pptpctrl.c
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pptpd.8
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pptpd.conf.5
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf \
 		${PREFIX}/etc/pptpd.conf.sample
-	${INSTALL_SCRIPT} ${FILESDIR}/pptpd.sh \
-		${PREFIX}/etc/rc.d/pptpd.sh.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/poptop/distinfo b/net/poptop/distinfo
index 0fed4ac650f8..0d165eae298a 100644
--- a/net/poptop/distinfo
+++ b/net/poptop/distinfo
@@ -1,2 +1,2 @@
-MD5 (pptpd-1.2.1.tar.gz) = 067e9474998345485ba1e92cc5ff59c6
-SIZE (pptpd-1.2.1.tar.gz) = 180974
+MD5 (pptpd-1.2.3.tar.gz) = a521e40ca304b0c125cc25f9b9d03324
+SIZE (pptpd-1.2.3.tar.gz) = 185721
diff --git a/net/poptop/files/patch-Makefile.in b/net/poptop/files/patch-Makefile.in
new file mode 100644
index 000000000000..e525c837efbf
--- /dev/null
+++ b/net/poptop/files/patch-Makefile.in
@@ -0,0 +1,39 @@
+--- Makefile.in.orig	Wed Aug  3 14:47:42 2005
++++ Makefile.in	Fri Oct 21 12:40:13 2005
+@@ -14,7 +14,7 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
++SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+@@ -37,7 +37,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ EXTRA_PROGRAMS =
+-sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT)
++sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT)
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+@@ -77,8 +74,8 @@
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
+-DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
++SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
++DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
+ man5dir = $(mandir)/man5
+ man8dir = $(mandir)/man8
+ NROFF = nroff
+@@ -178,6 +175,7 @@
+ # We have our own, simpler dependencies stuff in 'reconf'
+ AUTOMAKE_OPTIONS = no-dependencies foreign
+ INCLUDES = -I.
++CFLAGS= @CFLAGS@ -fno-builtin -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
+ man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5
diff --git a/net/poptop/files/patch-aa b/net/poptop/files/patch-aa
deleted file mode 100644
index 2f298eec81e3..000000000000
--- a/net/poptop/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Wed Jun 23 07:38:43 2004
-+++ configure.in	Thu Oct 20 22:33:48 2005
-@@ -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
diff --git a/net/poptop/files/patch-ab b/net/poptop/files/patch-ab
deleted file mode 100644
index 74bbf2fcfa66..000000000000
--- a/net/poptop/files/patch-ab
+++ /dev/null
@@ -1,355 +0,0 @@
---- configure.orig	Wed Jun 23 07:39:15 2004
-+++ configure	Thu Oct 20 22:33:48 2005
-@@ -958,7 +958,7 @@
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -2301,7 +2301,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2359,7 +2360,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2475,7 +2477,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2529,7 +2532,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2574,7 +2578,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2618,7 +2623,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3107,7 +3113,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3167,7 +3174,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3309,7 +3317,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3625,7 +3634,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3795,7 +3805,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3862,7 +3873,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4011,7 +4023,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4160,7 +4173,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4309,7 +4323,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4458,7 +4473,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4606,7 +4622,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4671,7 +4688,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4736,7 +4754,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4801,7 +4820,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4866,7 +4886,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4971,7 +4992,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5024,7 +5046,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5101,7 +5124,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5174,7 +5198,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5247,7 +5272,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5320,7 +5346,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5393,7 +5420,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5466,7 +5494,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5539,7 +5568,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5612,7 +5642,8 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5683,7 +5714,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
-@@ -6712,6 +6743,11 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -6750,12 +6786,6 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
diff --git a/net/poptop/files/patch-ad b/net/poptop/files/patch-ad
deleted file mode 100644
index d39d99969a96..000000000000
--- a/net/poptop/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Wed Jun 23 09:48:50 2004
-+++ Makefile.am	Thu Oct 20 22:33:48 2005
-@@ -32,7 +32,7 @@
- debian/po/templates.pot
- 
- EXTRA_PROGRAMS = 
--sbin_PROGRAMS = pptpd pptpctrl bcrelay
-+sbin_PROGRAMS = pptpd pptpctrl
- 
- # Header files are only used to determine what to put in a distribution, not
- # for dependencies, so just attribute them all to pptpd.
diff --git a/net/poptop/files/patch-ae b/net/poptop/files/patch-ae
deleted file mode 100644
index 67c7324707cc..000000000000
--- a/net/poptop/files/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
---- Makefile.in.orig	Wed Jun 23 10:03:07 2004
-+++ Makefile.in	Thu Oct 20 22:33:48 2005
-@@ -14,7 +14,7 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
-+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
- 
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -37,7 +37,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- EXTRA_PROGRAMS =
--sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT)
-+sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT)
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-@@ -55,9 +55,6 @@
- am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(sbin_PROGRAMS)
--am_bcrelay_OBJECTS = bcrelay.$(OBJEXT)
--bcrelay_OBJECTS = $(am_bcrelay_OBJECTS)
--bcrelay_LDADD = $(LDADD)
- am_pptpctrl_OBJECTS = pptpctrl.$(OBJEXT) ctrlpacket.$(OBJEXT) \
- 	inststr.$(OBJEXT) compat.$(OBJEXT) pptpgre.$(OBJEXT) \
- 	ppphdlc.$(OBJEXT)
-@@ -76,8 +73,8 @@
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
--DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
-+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
-+DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
- man5dir = $(mandir)/man5
- man8dir = $(mandir)/man8
- NROFF = nroff
-@@ -285,9 +282,6 @@
- 
- clean-sbinPROGRAMS:
- 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
--bcrelay$(EXEEXT): $(bcrelay_OBJECTS) $(bcrelay_DEPENDENCIES) 
--	@rm -f bcrelay$(EXEEXT)
--	$(LINK) $(bcrelay_LDFLAGS) $(bcrelay_OBJECTS) $(bcrelay_LDADD) $(LIBS)
- pptpctrl$(EXEEXT): $(pptpctrl_OBJECTS) $(pptpctrl_DEPENDENCIES) 
- 	@rm -f pptpctrl$(EXEEXT)
- 	$(LINK) $(pptpctrl_LDFLAGS) $(pptpctrl_OBJECTS) $(pptpctrl_LDADD) $(LIBS)
diff --git a/net/poptop/files/patch-compat.c b/net/poptop/files/patch-compat.c
new file mode 100644
index 000000000000..73fc2e52d0cf
--- /dev/null
+++ b/net/poptop/files/patch-compat.c
@@ -0,0 +1,18 @@
+--- compat.c.orig	Wed Jan  5 17:01:51 2005
++++ compat.c	Mon Oct 31 09:55:12 2005
+@@ -110,6 +110,7 @@
+ #define __USE_BSD 1
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ void my_setproctitle(int argc, char **argv, const char *format, ...) {
+        char proctitle[64];
+@@ -126,7 +127,6 @@
+ }
+ 
+ /* signal to pipe delivery implementation */
+-#include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+ 
diff --git a/net/poptop/files/patch-defaults.h b/net/poptop/files/patch-defaults.h
index a1a0e7aab929..cec44ad6f0c8 100644
--- a/net/poptop/files/patch-defaults.h
+++ b/net/poptop/files/patch-defaults.h
@@ -1,11 +1,17 @@
---- defaults.h.orig	Wed Apr 28 11:36:07 2004
-+++ defaults.h	Thu Oct 20 22:33:48 2005
-@@ -45,7 +45,7 @@
+--- defaults.h.orig	Thu Mar  7 19:09:42 2002
++++ defaults.h	Sun Sep  8 10:19:58 2002
+@@ -40,10 +40,14 @@
+ #endif
+ 
+ #define PPP_SPEED_DEFAULT		"115200"
++#ifdef __FreeBSD__
++#define PPTPD_CONFIG_FILE_DEFAULT	ETCDIR "/pptpd.conf"
++#else
  #if EMBED
  #define PPTPD_CONFIG_FILE_DEFAULT	"/etc/config/pptpd.conf"
  #else
--#define PPTPD_CONFIG_FILE_DEFAULT	"/etc/pptpd.conf"
-+#define PPTPD_CONFIG_FILE_DEFAULT	"/usr/local/etc/pptpd.conf"
+ #define PPTPD_CONFIG_FILE_DEFAULT	"/etc/pptpd.conf"
++#endif
  #endif
  #define PIDFILE_DEFAULT			"/var/run/pptpd.pid"
  
diff --git a/net/poptop/files/patch-pptpctrl.c b/net/poptop/files/patch-pptpctrl.c
index b344db4d88da..6bc94d49668e 100644
--- a/net/poptop/files/patch-pptpctrl.c
+++ b/net/poptop/files/patch-pptpctrl.c
@@ -1,11 +1,11 @@
---- pptpctrl.c.orig	Wed Apr 28 11:36:07 2004
-+++ pptpctrl.c	Thu Oct 20 22:33:48 2005
-@@ -734,7 +734,7 @@
+--- pptpctrl.c.orig	Fri Oct 21 16:23:58 2005
++++ pptpctrl.c	Fri Oct 21 16:24:28 2005
+@@ -770,7 +770,7 @@
  
          if (pptp_logwtmp) {
                   pppd_argv[an++] = "plugin";
 -                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
-+                 pppd_argv[an++] = "@@PREFIX@@/lib/pptpd/pptpd-logwtmp.so";
++                 pppd_argv[an++] = "%%PREFIX%%/lib/pptpd/pptpd-logwtmp.so";
                   pppd_argv[an++] = "pptpd-original-ip";
                   pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
          }
diff --git a/net/poptop/files/patch-pptpd.8 b/net/poptop/files/patch-pptpd.8
index 5cb54a362f29..4c5d1bdd9d6b 100644
--- a/net/poptop/files/patch-pptpd.8
+++ b/net/poptop/files/patch-pptpd.8
@@ -1,5 +1,5 @@
---- pptpd.8.orig	Mon May 24 13:39:03 2004
-+++ pptpd.8	Mon Oct 24 11:53:31 2005
+--- pptpd.8.orig	Mon May 24 16:39:03 2004
++++ pptpd.8	Fri Oct 28 17:55:37 2005
 @@ -29,7 +29,7 @@
  specifies the configuration file for
  .B pptpd
diff --git a/net/poptop/files/patch-pptpd.c b/net/poptop/files/patch-pptpd.c
new file mode 100644
index 000000000000..0f8c68cb25d3
--- /dev/null
+++ b/net/poptop/files/patch-pptpd.c
@@ -0,0 +1,19 @@
+--- pptpd.c.orig	Fri Oct 21 12:10:41 2005
++++ pptpd.c	Fri Oct 21 12:12:30 2005
+@@ -109,13 +109,13 @@
+ 	printf("                           (default is /etc/ppp/options).\n");
+ #endif
+ 	printf(" [-p] [--pidfile file]     Specifies the file to write the process ID to\n");
+-	printf("                           (default is /var/run/pptpd.pid).\n");
++	printf("                           (default is %s).\n",PIDFILE_DEFAULT);
+ #if !defined(BSDUSER_PPP)
+ 	printf(" [-s] [--speed baud]       Specifies the baud speed for the PPP daemon\n");
+-	printf("                           (default is 115200).\n");
++	printf("                           (default is %s).\n",PPP_SPEED_DEFAULT);
+ #endif
+ 	printf(" [-t] [--stimeout seconds] Specifies the timeout for the first packet. This is a DOS protection\n");
+-	printf("                           (default is 10).\n");
++	printf("                           (default is %s).\n",STIMEOUT_DEFAULT);
+ 	printf(" [-v] [--version]          Displays the pptpd version number.\n");
+ 	printf(" [-w] [--logwtmp]          Update wtmp as users login.\n");
+ 
diff --git a/net/poptop/files/pptpd.sh b/net/poptop/files/pptpd.sh
deleted file mode 100644
index f2e9d47f2bb7..000000000000
--- a/net/poptop/files/pptpd.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-case $1 in
-start)
-	[ -x /usr/local/sbin/pptpd ] && /usr/local/sbin/pptpd && echo -n ' pptpd'
-	;;
-stop)
-	killall pptpd && echo -n ' pptpd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/net/poptop/files/pptpd.sh.in b/net/poptop/files/pptpd.sh.in
new file mode 100644
index 000000000000..faad7bf0f6dd
--- /dev/null
+++ b/net/poptop/files/pptpd.sh.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: pptpd
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable pptpd:
+#
+# pptpd_enable="YES"
+#
+
+pptpd_enable=${pptpd_enable-"NO"}
+pptpd_flags=${pptpd_flags-""}
+
+. %%RC_SUBR%%
+
+name=pptpd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+sig_stop=-KILL
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/net/poptop/pkg-plist b/net/poptop/pkg-plist
index 05b090a0e2e7..8e9e8b623c1d 100644
--- a/net/poptop/pkg-plist
+++ b/net/poptop/pkg-plist
@@ -1,6 +1,6 @@
-etc/pptpd.conf.sample
-etc/rc.d/pptpd.sh.sample
-lib/pptpd/pptpd-logwtmp.so
-sbin/pptpctrl
+@unexec %D/etc/rc.d/pptpd.sh stop > /dev/null 2>&1 || true
 sbin/pptpd
-@dirrm lib/pptpd
+sbin/pptpctrl
+lib/pptpd/pptpd-logwtmp.so
+etc/pptpd.conf.sample
+@unexec rmdir %D/lib/pptpd 2> /dev/null || true