Update to version 1.0 beta 5.

PR:		7947
Submitted by:	maintainer

5 files changed, 69 insertions, 43 deletions

diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index 2719624a5606..a8c6f0d33cbd 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -1,23 +1,23 @@
 # New ports collection makefile for:	mpd
-# Version required:			1.0b4
+# Version required:			1.0b5
 # Date created:				16 May 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.6 1998/01/11 18:02:33 steve Exp $
+# $Id: Makefile,v 1.7 1998/01/15 03:42:31 steve Exp $
 #
 
-DISTNAME=		mpd-1.0b4
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.whistle.com/pub/archie/mpd/
-EXTRACT_SUFX=		.tgz
+DISTNAME=	mpd-1.0b5
+CATEGORIES=	net
+MASTER_SITES=	ftp://ftp.whistle.com/pub/archie/mpd/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		andy@icc.surw.chel.su
+MAINTAINER=	andy@icc.surw.chel.su
 
-OSVERSION!=     sysctl -n kern.osreldate
+OSVERSION!=	sysctl -n kern.osreldate
 
-WRKSRC=			${WRKDIR}/mpd-1.0b4/src
-ALL_TARGET=		depend all
-MAN1=			mpd.1
+WRKSRC=		${WRKDIR}/mpd-1.0b5/src
+ALL_TARGET=	depend all
+MAN1=		mpd.1
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/mpd ${PREFIX}/sbin/mpd
@@ -26,10 +26,12 @@ do-install:
 .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 README.code README.commands README.scripts
+.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
 
 .include <bsd.port.mk>
diff --git a/net/mpd/distinfo b/net/mpd/distinfo
index 0bd40884c46c..82e78f810a29 100644
--- a/net/mpd/distinfo
+++ b/net/mpd/distinfo
@@ -1 +1 @@
-MD5 (mpd-1.0b4.tgz) = 3b09fbfe752cfe87c275e8ee1c67a4c0
+MD5 (mpd-1.0b5.tgz) = 306b7422256b0634fc0921364cf8a898
diff --git a/net/mpd/files/patch-aa b/net/mpd/files/patch-aa
index 2ec003e51012..e0c14027fbbd 100644
--- a/net/mpd/files/patch-aa
+++ b/net/mpd/files/patch-aa
@@ -1,19 +1,19 @@
-*** Makefile	Mon Aug 18 02:12:35 1997
---- /home/andy/tmp/wrk/Makefile	Wed Sep 10 13:06:30 1997
-***************
-*** 15,21 ****
-  
-  # Default configuration directory
-  
-! MPD_CONF_DIR?=	${PREFIX}/etc/ppp
-  
-  # Define supported physical layer types
-  
---- 15,21 ----
-  
-  # Default configuration directory
-  
-! MPD_CONF_DIR?=	${PREFIX}/etc/mpd
-  
-  # Define supported physical layer types
-  
+--- 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-descr b/net/mpd/pkg-descr
index cb43a81bd345..f15736488407 100644
--- a/net/mpd/pkg-descr
+++ b/net/mpd/pkg-descr
@@ -1,12 +1,11 @@
 MPD MULTI-LINK PPP DAEMON FOR FREEBSD
 
-Release 1.0b4
+Release 1.0b5
 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.
@@ -18,27 +17,48 @@ Please see the CHANGES file if you are updating from mpd-1.0b3.
   as compression, have not been tested very much at all. However,
   the core of the daemon is very solid.
 
+* HOW DO I BUILD AND INSTALL IT?
+
+  cd src
+  make depend all install
+
 * HOW DO I SET IT UP?
 
-  Check the "etc/mpd" directory for configuration file examples.
-  There are four configuration files:
+  You will need to create your own versions of the four required
+  configuration files in /etc/ppp:
 
-	mpd.conf.sample		- General configuration
-	mpd.links.sample	- Description of available links
-	mpd.script.sample	- Modem scripts
-	mpd.secret.sample	- Login/password pairs
+    mpd.conf    - General configuration
+    mpd.links   - Description of available links
+    mpd.script  - Modem scripts
+    mpd.secret  - Login/password pairs
 
   If you're familiar with iij-ppp, the configuration method is
   similar: commands are read from a file.
 
+  Check the "conf" subdirectory for configuration file examples.
+
+  Then append the following lines to /etc/syslog.conf and create an
+  empty /var/log/mpd.log file to get proper logging:
+
+    !mpd
+    *.*                        /var/log/mpd.log
+
+  Add a corresponding line to /etc/newsyslog.conf as well to get
+  proper log rotation.
+
+  If you want to start it as a background daemon at boot time,
+  add the appropriate line to /etc/rc.local, e.g.:
+
+    echo -n " mpd" ; /usr/local/bin/mpd -b
+
 * WHAT'S THE COPYRIGHT STATUS?
 
   Berkeley style: see ``COPYRIGHT.iij'' and ``COPYRIGHT.whistle''.
 
 * WHERE CAN I READ MORE ABOUT IT?
 
-  In the "doc/mpd" directory is a preliminary man page and some other
-  assorted stuff. In the "etc/mpd" directory are example configuration
+  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?
diff --git a/net/mpd/pkg-plist b/net/mpd/pkg-plist
index 9be0425c7260..ef60c29df907 100644
--- a/net/mpd/pkg-plist
+++ b/net/mpd/pkg-plist
@@ -1,11 +1,15 @@
-sbin/mpd
 etc/mpd/mpd.conf.sample
 etc/mpd/mpd.links.sample
 etc/mpd/mpd.script.sample
 etc/mpd/mpd.secret.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
+@dirrm etc/mpd
+@dirrm share/doc/mpd