Use buildlink2 to prevent false dependency on gettext-lib. Noticed by cyber@.

Remove now unnecessary post-patch target, delint, whitespaces, better wording
and formatting.

2 files changed, 25 insertions, 25 deletions

diff --git a/net/poptop/DESCR b/net/poptop/DESCR
index 81e7a1975b3..2669353d4c4 100644
--- a/net/poptop/DESCR
+++ b/net/poptop/DESCR
@@ -1,24 +1,24 @@
 PoPToP is the PPTP server solution for Linux (ports exist for Solaris 2.6,
-OpenBSD and FreeBSD and others). To date no real solution existed if you
-wished to include Linux servers in PPTP established VPNs. PoPToP resolves
+OpenBSD and FreeBSD and others).  To date no real solution existed if you
+wished to include Linux servers in PPTP established VPNs.  PoPToP resolves
 that problem by allowing Linux servers to function seamlessly in the PPTP
-VPN environment. This enables administrators to leverage the considerable
-benefits of both Microsoft and Linux. The current pre-release version
-supports Windows 95/98/NT/2000 PPTP clients and PPTP Linux clients. PoPToP
+VPN environment.  This enables administrators to leverage the considerable
+benefits of both Microsoft and Linux.  The current pre-release version
+supports Windows 95/98/NT/2000 PPTP clients and PPTP Linux clients.  PoPToP
 is free GNU software.
 
-The PoPTop pre-release server is not yet fully optimised. It has been
+The PoPTop pre-release server is not yet fully optimised.  It has been
 released early so as to encourage other developers to become involved in
-its development. On release, PoPToP will be fully compliant with IETF PPTP
+its development.  On release, PoPToP will be fully compliant with IETF PPTP
 Internet Draft and it will seamlessly support Windows PPTP clients with the
 full range of encryption and authentication features.
 
 Features for version 1.0.0:
-  . Works with Windows 2000 clients
-  . Available PPPD patch allows Windows compatible encryption and
-     authentication. (MSCHAPv2 and MPPE 40-128 bit RC4 encryption)
-  . Support for multiple clients
-  . Works with Windows 95/98/NT PPTP clients
-  . Works with C. S. Ananian's PPTP Linux clients
-  . PoPToP is, and will remain, totally free under the GNU General Public
-     License
+- Works with Windows 2000 clients
+- Available PPPD patch allows Windows compatible encryption and
+  authentication. (MSCHAPv2 and MPPE 40-128 bit RC4 encryption)
+- Support for multiple clients
+- Works with Windows 95/98/NT PPTP clients
+- Works with C. S. Ananian's PPTP Linux clients
+- PoPToP is, and will remain, totally free under the GNU General
+  Public License
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 4041fb8cb12..2cfb8dc0f28 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.4 2001/12/23 17:18:12 kim Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/18 01:01:20 salo Exp $
+#
 
 DISTNAME=	pptpd-1.0.1
-PKGNAME=	poptop-1.0.1
+PKGNAME=	${DISTNAME:S/pptpd/poptop/}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.snapgear.com/poptop/
 
 MAINTAINER=	dbj@netbsd.org
 HOMEPAGE=	http://www.snapgear.com/vpn/pptp.html
-COMMENT=	PPTP server which can support Microsoft VPN clients
+COMMENT=	PPTP server with support for Microsoft VPN clients
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-libwrap
+USE_BUILDLINK2=	YES
+GNU_CONFIGURE=	YES
+
+CONFIGURE_ARGS+=	--with-libwrap
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(POPTOP_USE_MPPE)
-DEPENDS+=	ppp-mppe-2.3.9:../../net/ppp-mppe
-CONFIGURE_ARGS+= --with-pppd=${PREFIX}/sbin/pppd
+DEPENDS+=		ppp-mppe-2.3.9:../../net/ppp-mppe
+CONFIGURE_ARGS+=	--with-pppd=${PREFIX}/sbin/pppd
 .endif
 
-post-patch:
-	${TOUCH} ${WRKSRC}/config.h.in
-
 .include "../../mk/bsd.pkg.mk"