4 files changed, 9 insertions, 83 deletions

diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index 42f671f16340..a5e71e29302a 100644
--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@@ -2,45 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	iodine
-PORTVERSION=	0.6.0r1
+PORTVERSION=	0.7.0
 CATEGORIES=	net
 MASTER_SITES=	http://code.kryo.se/iodine/ \
 		http://redundancy.redundancy.org/mirror/
-DISTNAME=	${PORTNAME}-0.6.0-rc1
 
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Tunnel IPv4 data through a DNS server
 
-LICENSE=	BSD
-
-PLIST_FILES=	bin/iodine sbin/iodined man/man8/iodine.8.gz man/man8/iodined.8.gz
-
-PORTDOCS=	CHANGELOG README TODO
-
-MAN8=		iodine.8
-MLINKS=		iodine.8 iodined.8
+LICENSE=	ISCL
 
 USE_RC_SUBR=	iodined
 
+USERS=	_iodined
+GROUPS=	_iodined
+
 .include <bsd.port.pre.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/iodine ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/iodined ${STAGEDIR}${PREFIX}/sbin
-.for m in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/man/${m} ${STAGEDIR}${MANPREFIX}/man/man8
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/iodine.8 ${STAGEDIR}${MANPREFIX}/man/man8
 	${GZIP_CMD} ${STAGEDIR}${MANPREFIX}/man/man8/iodine.8
-	${LN} -s iodine.8.gz ${STAGEDIR}${MANPREFIX}/man/man8/iodined.8.gz
-.if !defined(PORT_OPTIONS:MDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
+.for f in README CHANGELOG TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/iodine/distinfo b/net/iodine/distinfo
index d243020604b5..813743779356 100644
--- a/net/iodine/distinfo
+++ b/net/iodine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (iodine-0.6.0-rc1.tar.gz) = dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60
-SIZE (iodine-0.6.0-rc1.tar.gz) = 89827
+SHA256 (iodine-0.7.0.tar.gz) = ad2b40acf1421316ec15800dcde0f587ab31d7d6f891fa8b9967c4ded93c013e
+SIZE (iodine-0.7.0.tar.gz) = 96181
diff --git a/net/iodine/pkg-deinstall b/net/iodine/pkg-deinstall
deleted file mode 100644
index 7a5a369bcb81..000000000000
--- a/net/iodine/pkg-deinstall
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-DEINSTALL)
-	USER=_iodined
-	GROUP=${USER}
-	PW=/usr/sbin/pw
-
-	if ${PW} groupshow "${GROUP}" 2>/dev/null 1>&2; then
-		if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-			echo "To delete the ${USER} group permanently, use '${PW} groupdel ${GROUP}'."
-		else
-			${PW} groupdel ${USER}
-		fi
-	fi
-
-	if ${PW} usershow "${USER}" 2>/dev/null 1>&2; then
-		if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-			echo "To delete the ${USER} user permanently, use '${PW} userdel ${USER}'."
-		else
-			${PW} userdel ${USER}
-		fi
-	fi
-
-	exit 0
-	;;
-esac
diff --git a/net/iodine/pkg-install b/net/iodine/pkg-install
deleted file mode 100644
index 853b8f374878..000000000000
--- a/net/iodine/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=_iodined
-	GROUP=${USER}
-	UID=353
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/var/empty" -s /sbin/nologin -c "OSPF Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	exit 0
-	;;
-esac