Index: branches/2017Q1/graphics/icoutils/Makefile
===================================================================
--- branches/2017Q1/graphics/icoutils/Makefile	(revision 431910)
+++ branches/2017Q1/graphics/icoutils/Makefile	(revision 431911)
@@ -1,50 +1,33 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	icoutils
-PORTVERSION=	0.31.0
-PORTREVISION=	1
+PORTVERSION=	0.31.1
 CATEGORIES=	graphics
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert/extract images in Microsoft Windows(R) icon/cursor files
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		shebangfix tar:bzip2
+USES=		localbase shebangfix tar:bzip2
 SHEBANG_FILES=	extresso/*.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-PLIST_FILES=	bin/icotool bin/wrestool \
-		man/man1/icotool.1.gz man/man1/wrestool.1.gz
-
 OPTIONS_DEFINE=	RESSCRIPTS
+OPTIONS_SUB=	yes
+
 RESSCRIPTS_DESC=	Additional resource scripts written in Perl
+RESSCRIPTS_RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RESSCRIPTS_USES=	perl5
+RESSCRIPTS_USE=		PERL5=run
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRESSCRIPTS}
-RUN_DEPENDS+=	p5-libwww>=0:www/p5-libwww
-USES+=		perl5
-USE_PERL5=	run
-PLIST_FILES+=	bin/extresso bin/genresscript \
-		man/man1/extresso.1.gz man/man1/genresscript.1.gz
-.endif
-
-post-patch:
+post-patch-RESSCRIPTS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|extresso||' ${WRKSRC}/Makefile.in
-
-post-install:
-.if ${PORT_OPTIONS:MRESSCRIPTS}
-	@(cd ${WRKSRC}/extresso && ${SETENV} ${MAKE_ENV} ${MAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endif
 
 .include <bsd.port.mk>
Index: branches/2017Q1/graphics/icoutils/distinfo
===================================================================
--- branches/2017Q1/graphics/icoutils/distinfo	(revision 431910)
+++ branches/2017Q1/graphics/icoutils/distinfo	(revision 431911)
@@ -1,2 +1,3 @@
-SHA256 (icoutils-0.31.0.tar.bz2) = a895d9d74a418d65d39a667e58ae38be79c9e726711384551d36531696f3af71
-SIZE (icoutils-0.31.0.tar.bz2) = 559836
+TIMESTAMP = 1484794814
+SHA256 (icoutils-0.31.1.tar.bz2) = 26e29d3c78f25d4cdf402501ac0414c51a9a092daebf6c9dee3b837dee693093
+SIZE (icoutils-0.31.1.tar.bz2) = 573484
Index: branches/2017Q1/graphics/icoutils/pkg-plist
===================================================================
--- branches/2017Q1/graphics/icoutils/pkg-plist	(nonexistent)
+++ branches/2017Q1/graphics/icoutils/pkg-plist	(revision 431911)
@@ -0,0 +1,8 @@
+%%RESSCRIPTS%%bin/extresso
+%%RESSCRIPTS%%bin/genresscript
+bin/icotool
+bin/wrestool
+%%RESSCRIPTS%%man/man1/extresso.1.gz
+%%RESSCRIPTS%%man/man1/genresscript.1.gz
+man/man1/icotool.1.gz
+man/man1/wrestool.1.gz

Property changes on: branches/2017Q1/graphics/icoutils/pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 431910)
+++ branches/2017Q1	(revision 431911)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r431838