diff -ruN --exclude=CVS /usr/ports/irc/ii/Makefile ./Makefile
--- /usr/ports/irc/ii/Makefile	2012-11-17 06:58:28.000000000 +0100
+++ ./Makefile	2013-01-21 20:30:58.000000000 +0100
@@ -1,41 +1,35 @@
-# New ports collection makefile for: ii
-# Date created: 	July 13, 2008
-# Whom:				Julien Laffaye <kimelto@gmail.com>
-#
-# $FreeBSD: ports/irc/ii/Makefile,v 1.8 2012/11/17 05:58:28 svnexp Exp $
-#
+# Created by: Julien Laffaye <kimelto@gmail.com>
+# $FreeBSD: head/irc/ii/Makefile 300896 2012-07-14 13:54:48Z beat $
 
 PORTNAME=	ii
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	irc
 MASTER_SITES=	http://dl.suckless.org/tools/ \
-		http://laffaye.free.fr/distfiles/
+		LOCAL/sbz
 
-MAINTAINER=	jlaffaye@FreeBSD.org
-COMMENT=	A minimalist FIFO and filesystem-based IRC client
+MAINTAINER=	sbz@FreeBSD.org
+COMMENT=	Minimalist FIFO and filesystem-based IRC client
 
 LICENSE=	MIT
 
-MAN1=		ii.1
-PLIST_FILES=	bin/ii
-PORTDOCS=	CHANGES README FAQ
+MAN1=		${PORTNAME}.1
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	CHANGES FAQ README
 PORTEXAMPLES=	query.sh
 MAKE_ARGS=	-E CC
 
+.include <bsd.port.options.mk>
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ii ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/ii.1 ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${ECHO_MSG} "installing additional examples to ${EXAMPLESDIR}"
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/query.sh ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/irc/ii/distinfo ./distinfo
--- /usr/ports/irc/ii/distinfo	2011-03-11 19:27:23.000000000 +0100
+++ ./distinfo	2013-01-21 20:02:46.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (ii-1.6.tar.gz) = 794fa639b253b4b332fa80e76cde782d9dae021dfaf35a207334c553d962cc29
-SIZE (ii-1.6.tar.gz) = 9970
+SHA256 (ii-1.7.tar.gz) = 3a72ac6606d5560b625c062c71f135820e2214fed098e6d624fc40632dc7cc9c
+SIZE (ii-1.7.tar.gz) = 10174
diff -ruN --exclude=CVS /usr/ports/irc/ii/pkg-descr ./pkg-descr
--- /usr/ports/irc/ii/pkg-descr	2010-08-31 09:38:47.000000000 +0200
+++ ./pkg-descr	2013-01-21 20:30:25.000000000 +0100
@@ -6,4 +6,4 @@
 are related in and out files created. This allows IRC communication from
 command line and adheres to the Unix philosophy.
 
-WWW:	http://tools.suckless.org/ii/
+WWW: http://tools.suckless.org/ii/