First public release of the mpd-5.x branch.

The main goal of this branch is to implement new
operation principles based on dynamic on-demand
links/bundles creation.

Repocopied from:	net/mpd4
Repocopied by:		marcus
Submitted by:		maintainer

5 files changed, 21 insertions, 20 deletions

diff --git a/net/Makefile b/net/Makefile
index 0aa74cd60eee..3780109e23fd 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -323,6 +323,7 @@
     SUBDIR += morebalance
     SUBDIR += mpd
     SUBDIR += mpd4
+    SUBDIR += mpd5
     SUBDIR += mpich
     SUBDIR += mpich2
     SUBDIR += mping
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index a132385fcbe5..27d857b176fe 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	mpd
-DISTVERSION=	4.3
+DISTVERSION=	5.0b1
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
-DIST_SUBDIR=	mpd4
+DIST_SUBDIR=	mpd5
 
 MAINTAINER=	mav@FreeBSD.org
 COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LIB_DEPENDS=	pdel.0:${PORTSDIR}/devel/libpdel
 
-LATEST_LINK=	mpd4
+LATEST_LINK=	mpd5
 
 OPTIONS=	NG_CAR "Use ng_car kernel module from port (< 7.0 only)" off\
 		NG_IPACCT "Use ng_ipacct kernel module from port" off
@@ -47,16 +47,16 @@ RUN_DEPENDS+=	/boot/modules/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct
 .endif
 .endif
 
-MTREE_FILE=	${FILESDIR}/mpd4.mtree
-MAN8=		mpd4.8
+MTREE_FILE=	${FILESDIR}/mpd5.mtree
+MAN8=		mpd5.8
 MANCOMPRESSED=	maybe
-USE_RC_SUBR=	mpd4.sh
-HTMLNUM!=	jot 67 1
-CONFSUF=	conf links secret script
-DOCSDIR=	${PREFIX}/share/doc/mpd4
+USE_RC_SUBR=	mpd5.sh
+HTMLNUM!=	jot 65 1
+CONFSUF=	conf secret script
+DOCSDIR=	${PREFIX}/share/doc/mpd5
 PORTDOCS=	${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README	\
 		mpd_toc.html
-PLIST_DIRS=	etc/mpd4
-PLIST_FILES=	${CONFSUF:S/^/etc\/mpd4\/mpd./:S/$/.sample/} sbin/mpd4
+PLIST_DIRS=	etc/mpd5
+PLIST_FILES=	${CONFSUF:S/^/etc\/mpd5\/mpd./:S/$/.sample/} sbin/mpd5
 
 .include <bsd.port.post.mk>
diff --git a/net/mpd5/distinfo b/net/mpd5/distinfo
index 3bff497d04bb..c71f144de225 100644
--- a/net/mpd5/distinfo
+++ b/net/mpd5/distinfo
@@ -1,3 +1,3 @@
-SIZE (mpd4/mpd-4.3.tar.gz) = 442614
-MD5 (mpd4/mpd-4.3.tar.gz) = 6493486df091685b1b647a761e8ec7af
-SHA256 (mpd4/mpd-4.3.tar.gz) = de2993d8a50d89623d3a5f43e303db252b5c953f86ab830aa7e52d44828b0cae
+SIZE (mpd5/mpd-5.0b1.tar.gz) = 444376
+MD5 (mpd5/mpd-5.0b1.tar.gz) = 00966af5013a10a501be998ef4de73bb
+SHA256 (mpd5/mpd-5.0b1.tar.gz) = 9ef2dfea829c014c12faf08c4bc970389b51dcad5fed420b010a51d8c71462af
diff --git a/net/mpd5/files/mpd4.mtree b/net/mpd5/files/mpd5.mtree
index 530d666792dd..a41838ced9ff 100644
--- a/net/mpd5/files/mpd4.mtree
+++ b/net/mpd5/files/mpd5.mtree
@@ -9,7 +9,7 @@
     sbin
     ..
     etc
-	mpd4
+	mpd5
 	..
     ..
     man
@@ -20,7 +20,7 @@
     ..
     share
         doc
-	    mpd4
+	    mpd5
 	    ..
         ..
     ..
diff --git a/net/mpd5/files/mpd4.sh.in b/net/mpd5/files/mpd5.sh.in
index c51ca124c7ab..77caa812689a 100644
--- a/net/mpd5/files/mpd4.sh.in
+++ b/net/mpd5/files/mpd5.sh.in
@@ -9,9 +9,9 @@
 # KEYWORD: shutdown
 
 #
-# Add the following lines to /etc/rc.conf to enable mpd4:
+# Add the following lines to /etc/rc.conf to enable mpd5:
 # mpd_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable mpd4.
+#			Set it to "YES" to enable mpd5.
 # mpd_flags (string):	Set to "-b" by default.
 #			Extra flags passed to start command.
 #
@@ -20,7 +20,7 @@
 
 . %%RC_SUBR%%
 
-name="mpd4"
+name="mpd5"
 rcvar=`set_rcvar mpd`
 
 load_rc_config ${name}
@@ -30,7 +30,7 @@ load_rc_config ${name}
 
 pidfile="/var/run/${name}.pid"
 command="%%PREFIX%%/sbin/${name}"
-required_files="%%PREFIX%%/etc/${name}/mpd.conf %%PREFIX%%/etc/${name}/mpd.links"
+required_files="%%PREFIX%%/etc/${name}/mpd.conf"
 
 case "${mpd_flags}" in
 *-p\ *)