Update to mpd-2.0b1.

7 files changed, 92 insertions, 64 deletions

diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index c4ce0661e96e..0f9410829c22 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -1,35 +1,19 @@
 # New ports collection makefile for:	mpd
-# Version required:			1.0b5
-# Date created:				16 May 1997
-# Whom:					Andrey Zakhvatov
+# Version required:			2.0b1
+# Date created:				25 Feb 1999
+# Whom:					Archie Cobbs
 #
-# $Id: Makefile,v 1.9 1998/11/18 11:19:25 asami Exp $
+# $Id: Makefile,v 1.10 1998/11/19 06:24:40 archie Exp $
 #
 
-DISTNAME=	mpd-1.0b5
+DISTNAME=	mpd-2.0b1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.whistle.com/pub/archie/mpd/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	archie@freebsd.org
 
-WRKSRC=		${WRKDIR}/mpd-1.0b5/src
-ALL_TARGET=	depend all
-MAN1=		mpd.1
-
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/mpd ${PREFIX}/sbin/mpd
-	@ ${INSTALL_MAN} ${WRKSRC}/mpd.1 ${PREFIX}/man/man1
-	@ ${MKDIR} ${PREFIX}/etc/mpd
-.for file in mpd.conf mpd.links mpd.script mpd.secret
-	@ ${INSTALL_DATA} ${WRKSRC}/../conf/${file} ${PREFIX}/etc/mpd/${file}.sample
-.endfor
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/mpd
-	@ ${INSTALL_DATA} ${WRKSRC}/../README ${PREFIX}/share/doc/mpd/README
-.for file in CHANGES PROTOS EQL.patch README.code README.commands README.scripts README.server
-	@ ${INSTALL_DATA} ${WRKSRC}/../docs/${file} ${PREFIX}/share/doc/mpd
-.endfor
-.endif
+MTREE_FILE=	files/mpd.mtree
+MAN8=		mpd.8
+MANCOMPRESSED=	yes
 
 .include <bsd.port.mk>
diff --git a/net/mpd/distinfo b/net/mpd/distinfo
index 82e78f810a29..2e64d58d43da 100644
--- a/net/mpd/distinfo
+++ b/net/mpd/distinfo
@@ -1 +1 @@
-MD5 (mpd-1.0b5.tgz) = 306b7422256b0634fc0921364cf8a898
+MD5 (mpd-2.0b1.tar.gz) = 0b85b7f3fd5ca12ba61336b6fd043d2c
diff --git a/net/mpd/files/mpd.mtree b/net/mpd/files/mpd.mtree
new file mode 100644
index 000000000000..d664b87f6ec1
--- /dev/null
+++ b/net/mpd/files/mpd.mtree
@@ -0,0 +1,24 @@
+# $Id: skip.mtree,v 1.1.1.1 1998/01/09 23:23:41 julian 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/files/patch-aa b/net/mpd/files/patch-aa
deleted file mode 100644
index e0c14027fbbd..000000000000
--- a/net/mpd/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile	Wed Sep  9 07:12:26 1998
-+++ /home/andy/tmp/wrk/Makefile	Wed Sep 16 17:26:34 1998
-@@ -15,7 +15,7 @@
- 
- # Default configuration directory
- 
--MPD_CONF_DIR?=	${PREFIX}/etc/ppp
-+MPD_CONF_DIR?=	${PREFIX}/etc/mpd
- 
- # Define supported physical layer types
- 
-@@ -42,7 +42,6 @@
- LDADD+=		-lmd
- DPADD+=		${LIBMD}
- 
--COPTS+=		-O2
- COPTS+=		-Wall -Wmissing-prototypes -Wnested-externs
- COPTS+=		-DPATH_CONF_DIR=\"${MPD_CONF_DIR}\"
- 
diff --git a/net/mpd/pkg-comment b/net/mpd/pkg-comment
index 0c318be019ed..3dcbdc345c36 100644
--- a/net/mpd/pkg-comment
+++ b/net/mpd/pkg-comment
@@ -1 +1 @@
-Multilink PPP daemon
+Multi-link PPP daemon
diff --git a/net/mpd/pkg-descr b/net/mpd/pkg-descr
index f15736488407..9e38c4a3e264 100644
--- a/net/mpd/pkg-descr
+++ b/net/mpd/pkg-descr
@@ -1,11 +1,10 @@
+
 MPD MULTI-LINK PPP DAEMON FOR FREEBSD
 
-Release 1.0b5
+Version 2.0b1
 Written by Archie Cobbs <archie@whistle.com>
 Based on IIJ-PPP by Toshiharu OHNO <tony-o@iij.ad.jp>
 
-Please see the CHANGES file if you are updating from mpd-1.0b3.
-
 * WHAT IS IT?
 
   A user-mode PPP daemon based on iij-ppp which supports multi-link PPP.
@@ -24,6 +23,8 @@ Please see the CHANGES file if you are updating from mpd-1.0b3.
 
 * HOW DO I SET IT UP?
 
+  Complete documentation is included in the "doc" subdirectory.
+
   You will need to create your own versions of the four required
   configuration files in /etc/ppp:
 
@@ -55,13 +56,7 @@ Please see the CHANGES file if you are updating from mpd-1.0b3.
 
   Berkeley style: see ``COPYRIGHT.iij'' and ``COPYRIGHT.whistle''.
 
-* WHERE CAN I READ MORE ABOUT IT?
-
-  In the "docs" directory is a preliminary man page and some other
-  assorted stuff. In the "conf" directory are example configuration
-  files with descriptive comments.
-
 * WHERE CAN I GO FOR HELP?
 
-  Email me any questions <archie@whistle.com> and I'll do my best
-  to answer them.
+  Email questions to the freebsd-net@freebsd.org mailing list.
+
diff --git a/net/mpd/pkg-plist b/net/mpd/pkg-plist
index ef60c29df907..f10f602767f5 100644
--- a/net/mpd/pkg-plist
+++ b/net/mpd/pkg-plist
@@ -1,15 +1,59 @@
 etc/mpd/mpd.conf.sample
 etc/mpd/mpd.links.sample
-etc/mpd/mpd.script.sample
 etc/mpd/mpd.secret.sample
+etc/mpd/mpd.script.sample
 sbin/mpd
 share/doc/mpd/README
-share/doc/mpd/CHANGES
-share/doc/mpd/EQL.patch
-share/doc/mpd/PROTOS
-share/doc/mpd/README.code
-share/doc/mpd/README.commands
-share/doc/mpd/README.scripts
-share/doc/mpd/README.server
+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
+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