- Update ng_car to 0.5 and mpd4 to 4.2.2

- Fix compatibility with FreeBSD 5.x
- Install a kernel module in /boot/modules
- Fix possible races with ldconfig in rc.d script
- Change a maintainer email on @FreeBSD.org one

Submitted by:	mav

8 files changed, 33 insertions, 21 deletions

diff --git a/net/mpd4/Makefile b/net/mpd4/Makefile
index b3c91ba9a8fb..41b9fa8fe217 100644
--- a/net/mpd4/Makefile
+++ b/net/mpd4/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	mpd
-DISTVERSION=	4.2.1
+DISTVERSION=	4.2.2
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
 DIST_SUBDIR=	mpd4
 
-MAINTAINER=	mav@alkar.net
+MAINTAINER=	mav@FreeBSD.org
 COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LIB_DEPENDS=	pdel.0:${PORTSDIR}/devel/libpdel
@@ -23,7 +23,11 @@ LATEST_LINK=    mpd4
 
 .if ${OSVERSION} < 700041
 BUILD_DEPENDS=	/usr/local/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car
+.if exists(${KMODDIR}/ng_car.ko)
 RUN_DEPENDS=	${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car
+.else
+RUN_DEPENDS=	/boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car
+.endif
 .endif
 
 MTREE_FILE=	${FILESDIR}/mpd4.mtree
diff --git a/net/mpd4/distinfo b/net/mpd4/distinfo
index c39554a0fc6f..221a670554a2 100644
--- a/net/mpd4/distinfo
+++ b/net/mpd4/distinfo
@@ -1,3 +1,3 @@
-SIZE (mpd4/mpd-4.2.1.tar.gz) = 436177
-MD5 (mpd4/mpd-4.2.1.tar.gz) = aee761933fb24ba3be24c074a91efed1
-SHA256 (mpd4/mpd-4.2.1.tar.gz) = a77925aa9efbfc361f75362c0744cb3405bc5cca441864420aa636e703a0ac63
+SIZE (mpd4/mpd-4.2.2.tar.gz) = 436214
+MD5 (mpd4/mpd-4.2.2.tar.gz) = 3208393c7127390a1222efe93cb4e3e1
+SHA256 (mpd4/mpd-4.2.2.tar.gz) = a6d6a1c132f0156c5f9e49d90c9f39584d86d4eaf9d530fb12a30e7d3f9b2733
diff --git a/net/mpd4/files/mpd4.sh.in b/net/mpd4/files/mpd4.sh.in
index acc229458c4e..c51ca124c7ab 100644
--- a/net/mpd4/files/mpd4.sh.in
+++ b/net/mpd4/files/mpd4.sh.in
@@ -4,8 +4,9 @@
 #
 
 # PROVIDE: mpd
-# REQUIRE: NETWORKING
-# BEFORE: SERVERS
+# REQUIRE: SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mpd4:
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index b3c91ba9a8fb..41b9fa8fe217 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	mpd
-DISTVERSION=	4.2.1
+DISTVERSION=	4.2.2
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
 DIST_SUBDIR=	mpd4
 
-MAINTAINER=	mav@alkar.net
+MAINTAINER=	mav@FreeBSD.org
 COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LIB_DEPENDS=	pdel.0:${PORTSDIR}/devel/libpdel
@@ -23,7 +23,11 @@ LATEST_LINK=    mpd4
 
 .if ${OSVERSION} < 700041
 BUILD_DEPENDS=	/usr/local/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car
+.if exists(${KMODDIR}/ng_car.ko)
 RUN_DEPENDS=	${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car
+.else
+RUN_DEPENDS=	/boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car
+.endif
 .endif
 
 MTREE_FILE=	${FILESDIR}/mpd4.mtree
diff --git a/net/mpd5/distinfo b/net/mpd5/distinfo
index c39554a0fc6f..221a670554a2 100644
--- a/net/mpd5/distinfo
+++ b/net/mpd5/distinfo
@@ -1,3 +1,3 @@
-SIZE (mpd4/mpd-4.2.1.tar.gz) = 436177
-MD5 (mpd4/mpd-4.2.1.tar.gz) = aee761933fb24ba3be24c074a91efed1
-SHA256 (mpd4/mpd-4.2.1.tar.gz) = a77925aa9efbfc361f75362c0744cb3405bc5cca441864420aa636e703a0ac63
+SIZE (mpd4/mpd-4.2.2.tar.gz) = 436214
+MD5 (mpd4/mpd-4.2.2.tar.gz) = 3208393c7127390a1222efe93cb4e3e1
+SHA256 (mpd4/mpd-4.2.2.tar.gz) = a6d6a1c132f0156c5f9e49d90c9f39584d86d4eaf9d530fb12a30e7d3f9b2733
diff --git a/net/mpd5/files/mpd4.sh.in b/net/mpd5/files/mpd4.sh.in
index acc229458c4e..c51ca124c7ab 100644
--- a/net/mpd5/files/mpd4.sh.in
+++ b/net/mpd5/files/mpd4.sh.in
@@ -4,8 +4,9 @@
 #
 
 # PROVIDE: mpd
-# REQUIRE: NETWORKING
-# BEFORE: SERVERS
+# REQUIRE: SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mpd4:
diff --git a/net/ng_car/Makefile b/net/ng_car/Makefile
index b59667ca3eff..7903f57d7a0b 100644
--- a/net/ng_car/Makefile
+++ b/net/ng_car/Makefile
@@ -6,29 +6,31 @@
 #
 
 PORTNAME=	ng_car
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	net kld
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	mpd
 
-MAINTAINER=	mav@alkar.net
+MAINTAINER=	mav@FreeBSD.org
 COMMENT=	Netgraph committed access rate node
 
 NO_PACKAGE=	Should be in sync with the kernel to work correctly
 
+KMODDIR?=	/boot/modules
 PLIST_SUB=	KMODDIR=${KMODDIR}
+MAKE_ENV+=	KMODDIR="${KMODDIR}"
 
 MAN4=		ng_car.4
 MANCOMPRESSED=	yes
 
 .if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE=	This port requires kernel sources
+IGNORE=	this port requires kernel sources
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 700041
-IGNORE=	"Already exists in base system"
+IGNORE=	already exists in base system
 .endif
 
 post-install:
diff --git a/net/ng_car/distinfo b/net/ng_car/distinfo
index a3a044d73cfb..afd3c40375e6 100644
--- a/net/ng_car/distinfo
+++ b/net/ng_car/distinfo
@@ -1,3 +1,3 @@
-MD5 (ng_car-0.4.tar.gz) = ba46e400015bf0fdc85b722153f37c9a
-SHA256 (ng_car-0.4.tar.gz) = ba8fc8897d6966e0558c5a7d8ab982513d3ff2aaa89f210af62196b6c12a68a1
-SIZE (ng_car-0.4.tar.gz) = 8331
+MD5 (ng_car-0.5.tar.gz) = 3e0fa3d9c190207def9fdb419ec7632d
+SHA256 (ng_car-0.5.tar.gz) = f5fd183314c75a4749334b00415ff54c466ac58abbd0ecb444512d0686309718
+SIZE (ng_car-0.5.tar.gz) = 8288