The original "net/mpd" port is obsolete. Update it to make it equivalent

to the "net/mpd-netgraph" port, and then get rid of "net/mpd-netgraph".

11 files changed, 11 insertions, 138 deletions

diff --git a/net/mpd-netgraph/Makefile b/net/mpd-netgraph/Makefile
deleted file mode 100644
index e02a3e3ca9f6..000000000000
--- a/net/mpd-netgraph/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	mpd
-# Date created:				31 Jan 2000
-# Whom:					Archie Cobbs
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mpd
-PORTVERSION=	3.7
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	archie
-
-MAINTAINER=	archie@freebsd.org
-
-MTREE_FILE=	${FILESDIR}/mpd.mtree
-MAN8=		mpd.8
-MANCOMPRESSED=	maybe
-
-.include <bsd.port.mk>
diff --git a/net/mpd-netgraph/distinfo b/net/mpd-netgraph/distinfo
deleted file mode 100644
index fa257e24d7bc..000000000000
--- a/net/mpd-netgraph/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mpd-3.7.tar.gz) = 97cb3ebaeae594d9168300dbfd528876
diff --git a/net/mpd-netgraph/files/mpd.mtree b/net/mpd-netgraph/files/mpd.mtree
deleted file mode 100644
index e7f8d9fc5d89..000000000000
--- a/net/mpd-netgraph/files/mpd.mtree
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD: /tmp/pcvs/ports/net/mpd-netgraph/files/Attic/mpd.mtree,v 1.1 1999-12-09 23:03:10 archie Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    sbin
-    ..
-    etc
-	mpd
-	..
-    ..
-    man
-        cat8            uname=man
-        ..
-        man8
-        ..
-    ..
-    share
-        doc
-	    mpd
-	    ..
-        ..
-    ..
-..
-
diff --git a/net/mpd-netgraph/pkg-comment b/net/mpd-netgraph/pkg-comment
deleted file mode 100644
index 34af82d1d1c2..000000000000
--- a/net/mpd-netgraph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-link PPP daemon based on netgraph(4)
diff --git a/net/mpd-netgraph/pkg-descr b/net/mpd-netgraph/pkg-descr
deleted file mode 100644
index 11ab7ffc6ab8..000000000000
--- a/net/mpd-netgraph/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-Mpd is a netgraph(4) based implementation of the multi-link PPP
-protocol for FreeBSD.  It is designed to be both fast and flexible.
-It handles configuration and negotiation in user land, while routing
-all data packets strictly in the kernel.  It supports several of
-the numerous PPP sub-protocols and extensions, such as:
-
-      Multi-link PPP capability 
-      PAP, CHAP, and MS-CHAP authentication 
-      PPP compression and encryption
-      Point-to-Point Tunnelling Protocol (PPTP)
-
-Mpd also includes many additional features: 
-
-      Dial-on-demand with idle timeout 
-      Multiple active connections running simultaneously 
-      Dynamic demand based link management (also known as ``rubber bandwidth'') 
-      Powerful chat scripting language for asynchronous serial ports 
-      Pre-tested chat scripts for automatic configuration of several
-	common modems and ISDN terminal adapters 
-      Clean device-type independent design 
-      Comprehensive logging 
diff --git a/net/mpd-netgraph/pkg-plist b/net/mpd-netgraph/pkg-plist
deleted file mode 100644
index 027b575080f7..000000000000
--- a/net/mpd-netgraph/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-etc/mpd/mpd.conf.sample
-etc/mpd/mpd.links.sample
-etc/mpd/mpd.secret.sample
-etc/mpd/mpd.script.sample
-sbin/mpd
-share/doc/mpd/README
-share/doc/mpd/mpd.html
-share/doc/mpd/mpd1.html
-share/doc/mpd/mpd10.html
-share/doc/mpd/mpd11.html
-share/doc/mpd/mpd12.html
-share/doc/mpd/mpd13.html
-share/doc/mpd/mpd14.html
-share/doc/mpd/mpd15.html
-share/doc/mpd/mpd16.html
-share/doc/mpd/mpd17.html
-share/doc/mpd/mpd18.html
-share/doc/mpd/mpd19.html
-share/doc/mpd/mpd2.html
-share/doc/mpd/mpd20.html
-share/doc/mpd/mpd21.html
-share/doc/mpd/mpd22.html
-share/doc/mpd/mpd23.html
-share/doc/mpd/mpd24.html
-share/doc/mpd/mpd25.html
-share/doc/mpd/mpd26.html
-share/doc/mpd/mpd27.html
-share/doc/mpd/mpd28.html
-share/doc/mpd/mpd29.html
-share/doc/mpd/mpd3.html
-share/doc/mpd/mpd30.html
-share/doc/mpd/mpd31.html
-share/doc/mpd/mpd32.html
-share/doc/mpd/mpd33.html
-share/doc/mpd/mpd34.html
-share/doc/mpd/mpd35.html
-share/doc/mpd/mpd36.html
-share/doc/mpd/mpd37.html
-share/doc/mpd/mpd38.html
-share/doc/mpd/mpd39.html
-share/doc/mpd/mpd4.html
-share/doc/mpd/mpd40.html
-share/doc/mpd/mpd41.html
-share/doc/mpd/mpd42.html
-share/doc/mpd/mpd43.html
-share/doc/mpd/mpd44.html
-share/doc/mpd/mpd45.html
-share/doc/mpd/mpd46.html
-share/doc/mpd/mpd47.html
-share/doc/mpd/mpd5.html
-share/doc/mpd/mpd6.html
-share/doc/mpd/mpd7.html
-share/doc/mpd/mpd8.html
-share/doc/mpd/mpd9.html
-share/doc/mpd/mpd_toc.html
-@dirrm etc/mpd
-@dirrm share/doc/mpd
diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index a35623ee3a36..0262b19459eb 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	mpd
-PORTVERSION=	2.0.b2
+PORTVERSION=	3.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	archie
-DISTNAME=	mpd-2.0b2
 
 MAINTAINER=	archie@freebsd.org
 
 MTREE_FILE=	${FILESDIR}/mpd.mtree
 MAN8=		mpd.8
-MANCOMPRESSED=	yes
-NO_LATEST_LINK=
+MANCOMPRESSED=	maybe
 
 .include <bsd.port.mk>
diff --git a/net/mpd/distinfo b/net/mpd/distinfo
index 08be7dc3d0ce..fa257e24d7bc 100644
--- a/net/mpd/distinfo
+++ b/net/mpd/distinfo
@@ -1 +1 @@
-MD5 (mpd-2.0b2.tar.gz) = bbe5ad9ac726f5b9113316cf7526c223
+MD5 (mpd-3.7.tar.gz) = 97cb3ebaeae594d9168300dbfd528876
diff --git a/net/mpd/pkg-comment b/net/mpd/pkg-comment
index 3dcbdc345c36..34af82d1d1c2 100644
--- a/net/mpd/pkg-comment
+++ b/net/mpd/pkg-comment
@@ -1 +1 @@
-Multi-link PPP daemon
+Multi-link PPP daemon based on netgraph(4)
diff --git a/net/mpd/pkg-descr b/net/mpd/pkg-descr
index 787a3e428623..11ab7ffc6ab8 100644
--- a/net/mpd/pkg-descr
+++ b/net/mpd/pkg-descr
@@ -1,10 +1,13 @@
-Mpd is a user-mode implementation of the PPP protocol for FreeBSD.
-It supports several of the numerous PPP sub-protocols and extensions,
-such as:
+Mpd is a netgraph(4) based implementation of the multi-link PPP
+protocol for FreeBSD.  It is designed to be both fast and flexible.
+It handles configuration and negotiation in user land, while routing
+all data packets strictly in the kernel.  It supports several of
+the numerous PPP sub-protocols and extensions, such as:
 
       Multi-link PPP capability 
       PAP, CHAP, and MS-CHAP authentication 
-      DES encryption 
+      PPP compression and encryption
+      Point-to-Point Tunnelling Protocol (PPTP)
 
 Mpd also includes many additional features: 
 
@@ -14,7 +17,5 @@ Mpd also includes many additional features:
       Powerful chat scripting language for asynchronous serial ports 
       Pre-tested chat scripts for automatic configuration of several
 	common modems and ISDN terminal adapters 
-      Support for the Netgraph kernel networking system 
-      Support for tunnelling PPP over TCP, and UDP
       Clean device-type independent design 
       Comprehensive logging 
diff --git a/net/mpd/pkg-plist b/net/mpd/pkg-plist
index f10f602767f5..027b575080f7 100644
--- a/net/mpd/pkg-plist
+++ b/net/mpd/pkg-plist
@@ -4,8 +4,6 @@ etc/mpd/mpd.secret.sample
 etc/mpd/mpd.script.sample
 sbin/mpd
 share/doc/mpd/README
-share/doc/mpd/mpd.ascii
-share/doc/mpd/mpd.ps
 share/doc/mpd/mpd.html
 share/doc/mpd/mpd1.html
 share/doc/mpd/mpd10.html