From 3fe23b548e03404f013e0deefc25d97618eec38d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 2 Jun 2015 16:57:49 +0200
Subject: [PATCH] iodine: merge -server subpkg; move to usr/bin.

---
 srcpkgs/iodine-server   |  1 -
 srcpkgs/iodine/template | 16 +++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 120000 srcpkgs/iodine-server

diff --git a/srcpkgs/iodine-server b/srcpkgs/iodine-server
deleted file mode 120000
index acf42dd5a3..0000000000
--- a/srcpkgs/iodine-server
+++ /dev/null
@@ -1 +0,0 @@
-iodine
\ No newline at end of file
diff --git a/srcpkgs/iodine/template b/srcpkgs/iodine/template
index ef141cb713..71c6caeba1 100644
--- a/srcpkgs/iodine/template
+++ b/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
 }