iodine: merge -server subpkg; move to usr/bin.

srcpkgs/iodine-server

@@ -1 +0,0 @@
-iodine

srcpkgs/iodine/template

@@ -1,7 +1,8 @@
 # Template file for 'iodine'
 pkgname=iodine
 version=0.7.0
-revision=2
+revision=3
+replaces="iodine-server>=0"
 homepage="http://code.kryo.se/iodine/"
 distfiles="http://code.kryo.se/${pkgname}/${pkgname}-${version}.tar.gz"
 makedepends="zlib-devel"
@@ -9,13 +10,10 @@ short_desc="iodine lets you tunnel IPv4 data through a DNS server"
 maintainer="Enno Boland <eb@s01.de>"
 license="MIT"
 checksum=ad2b40acf1421316ec15800dcde0f587ab31d7d6f891fa8b9967c4ded93c013e
-build_style=gnu-makefile
-make_install_args="prefix=/usr"
 
-iodine-server_package() {
-	short_desc+=" - development files"
-	depends+=" iodine>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/sbin/iodined
-	}
+do_build() {
+	make CC=$CC ${makejobs}
+}
+do_install() {
+	make prefix=/usr DESTDIR=${DESTDIR} sbindir=/usr/bin install
 }