8 files changed, 13 insertions, 15 deletions
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index 144c0528d..90161bd97 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -9,13 +9,17 @@ PKG_NAME:=		miredo
 PKG_VERSION:=		1.1.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		bf49c1ddc068746760787d0cf76e40de
-MASTER_SITES:=		http://www.remlab.net/files/miredo/
+PKG_DESCR:=		A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
+PKG_SECTION:=		net
+PKG_URL:=		http://www.remlab.net
+PKG_SITES:=		http://www.remlab.net/files/miredo/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-chroot \
diff --git a/package/miredo/files/miredo-server.init b/package/miredo/files/miredo-server.init
index d8282e316..6231573a4 100644
--- a/package/miredo/files/miredo-server.init
+++ b/package/miredo/files/miredo-server.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG miredo-server
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/miredo/ipkg/miredo-server.postinst b/package/miredo/files/miredo-server.postinst
index 00c88c459..00c88c459 100644
--- a/package/miredo/ipkg/miredo-server.postinst
+++ b/package/miredo/files/miredo-server.postinst
diff --git a/package/miredo/ipkg/miredo.conffiles b/package/miredo/files/miredo.conffiles
index f4d3b04af..f4d3b04af 100644
--- a/package/miredo/ipkg/miredo.conffiles
+++ b/package/miredo/files/miredo.conffiles
diff --git a/package/miredo/files/miredo.init b/package/miredo/files/miredo.init
index bb4b3fdcd..d1e846ad7 100644
--- a/package/miredo/files/miredo.init
+++ b/package/miredo/files/miredo.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG miredo
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/miredo/ipkg/miredo.postinst b/package/miredo/files/miredo.postinst
index 37667f8da..37667f8da 100644
--- a/package/miredo/ipkg/miredo.postinst
+++ b/package/miredo/files/miredo.postinst
diff --git a/package/miredo/ipkg/miredo-server.control b/package/miredo/ipkg/miredo-server.control
deleted file mode 100644
index ebbc3cc58..000000000
--- a/package/miredo/ipkg/miredo-server.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: miredo-server
-Priority: optional
-Section: net
-Depends: kmod-ipv6, kmod-tun, libpthread, uclibc++
-Description: A Teredo (IPv6 tunneling over UDP through NAT) server daemon
diff --git a/package/miredo/ipkg/miredo.control b/package/miredo/ipkg/miredo.control
deleted file mode 100644
index 2794f3bde..000000000
--- a/package/miredo/ipkg/miredo.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: miredo
-Priority: optional
-Section: net
-Depends: kmod-ipv6, kmod-tun, libpthread, uclibc++
-Description: A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon