6 files changed, 41 insertions, 30 deletions

diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index e33b92408239..aaf62524a28c 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	radvd
-PORTVERSION=	0.7.2
+PORTVERSION=	0.9.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://v6web.litech.org/radvd/dist/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/p4/pl4/}
+MASTER_SITES=	http://www.litech.org/radvd/dist/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	A Linux/BSD IPv6 router advertisement daemon
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_RC_SUBR=	radvd
 
 MAN5=	radvd.conf.5
 MAN8=	radvd.8 radvdump.8
+PORTDOCS=	CHANGES COPYRIGHT INTRO.html README TODO
+PLIST_FILES=	etc/radvd.conf.example sbin/radvd sbin/radvdump
 
 post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/INTRO.html ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/radvd.conf.example ${PREFIX}/etc
-.endif #NOPORTDOCS
-	@${SED} -e "s|/usr/local|${PREFIX}|" ${PKGMESSAGE}
+	@${INSTALL_DATA} ${WRKSRC}/radvd.conf.example ${PREFIX}/etc/
+.ifndef NOPORTDOCS
+	@${INSTALL} -d ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S.^.${WRKSRC}/.} ${DOCSDIR}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/radvd/distinfo b/net/radvd/distinfo
index 361356a4358a..f41fdef704c4 100644
--- a/net/radvd/distinfo
+++ b/net/radvd/distinfo
@@ -1,3 +1,3 @@
-MD5 (radvd-0.7.2.tar.gz) = 26ea468b2323e44cf827ae5f84d18dc8
-SHA256 (radvd-0.7.2.tar.gz) = 66ed3cbb85c77aaf8293e3e5df678dc9ade82253628d2ce8cec570655cf157e9
-SIZE (radvd-0.7.2.tar.gz) = 116442
+MD5 (radvd-0.9.1.tar.gz) = d5d24abd3dddc2b702e621ebf6b9cfdc
+SHA256 (radvd-0.9.1.tar.gz) = d90f95b1af5a853d3cdbc15582ab219bbdd73efc4c7290759bcb895695514e1d
+SIZE (radvd-0.9.1.tar.gz) = 104993
diff --git a/net/radvd/files/radvd.in b/net/radvd/files/radvd.in
new file mode 100644
index 000000000000..f96b27627744
--- /dev/null
+++ b/net/radvd/files/radvd.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# PROVIDE: radvd
+# REQUIRE: NETWORKING
+
+#
+# Add the following line to /etc/rc.conf to enable radvd:
+#
+# radvd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=radvd
+rcvar=`set_rcvar`
+prefix=%%PREFIX%%
+pidfile=/var/run/${name}.pid
+command="${prefix}/sbin/${name}"
+command_args="-p ${pidfile}"
+required_files="${prefix}/etc/${name}.conf"
+
+load_rc_config $name
+: ${radvd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/net/radvd/pkg-descr b/net/radvd/pkg-descr
index 5f1230badb43..f7b52303903c 100644
--- a/net/radvd/pkg-descr
+++ b/net/radvd/pkg-descr
@@ -2,6 +2,6 @@ radvd implements IPv6 router advertisements for Linux and FreeBSD
 as specified in RFC 2461. Support for Mobile IPv6 as well as 6to4
 is included.
 
-WWW: http://v6web.litech.org/radvd/
+WWW: http://www.litech.org/radvd/
 
 - Patrick Li <pat@FreeBSD.org>
diff --git a/net/radvd/pkg-message b/net/radvd/pkg-message
deleted file mode 100644
index 72fb7b6a2431..000000000000
--- a/net/radvd/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-
------------------------------------------------
-Example of the radvd config file is located at:
-
-        (/usr/local/etc/radvd.conf.example)
-
-Also refer to: `man radvd.conf`
------------------------------------------------
-
diff --git a/net/radvd/pkg-plist b/net/radvd/pkg-plist
deleted file mode 100644
index 1cef5ddcf8fd..000000000000
--- a/net/radvd/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/radvd.conf.example
-sbin/radvd
-sbin/radvdump
-share/doc/radvd/INTRO.html
-share/doc/radvd/README
-@dirrm share/doc/radvd