Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Jan 2017 20:19:30 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r431911 - branches/2017Q1/graphics/icoutils
Message-ID:  <201701192019.v0JKJU1w018155@repo.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
Author: jhale
Date: Thu Jan 19 20:19:29 2017
New Revision: 431911
URL: https://svnweb.freebsd.org/changeset/ports/431911

Log:
  MFH: r431838
  
  - Update to 0.31.1
  - Fix LICENSE
  - Convert to USES=localbase
  - Convert to options helpers
  - Simplify install
  - Use pkg-plist instead of PLIST_FILES
  
  Security:	57facd35-ddf6-11e6-915d-001b3856973b
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2017Q1/graphics/icoutils/pkg-plist
     - copied unchanged from r431838, head/graphics/icoutils/pkg-plist
Modified:
  branches/2017Q1/graphics/icoutils/Makefile
  branches/2017Q1/graphics/icoutils/distinfo
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/graphics/icoutils/Makefile
==============================================================================
--- branches/2017Q1/graphics/icoutils/Makefile	Thu Jan 19 20:09:44 2017	(r431910)
+++ branches/2017Q1/graphics/icoutils/Makefile	Thu Jan 19 20:19:29 2017	(r431911)
@@ -2,49 +2,32 @@
 # $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
-RESSCRIPTS_DESC=	Additional resource scripts written in Perl
+OPTIONS_SUB=	yes
 
-.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
+RESSCRIPTS_DESC=	Additional resource scripts written in Perl
+RESSCRIPTS_RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RESSCRIPTS_USES=	perl5
+RESSCRIPTS_USE=		PERL5=run
 
-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>

Modified: branches/2017Q1/graphics/icoutils/distinfo
==============================================================================
--- branches/2017Q1/graphics/icoutils/distinfo	Thu Jan 19 20:09:44 2017	(r431910)
+++ branches/2017Q1/graphics/icoutils/distinfo	Thu Jan 19 20:19:29 2017	(r431911)
@@ -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

Copied: branches/2017Q1/graphics/icoutils/pkg-plist (from r431838, head/graphics/icoutils/pkg-plist)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/graphics/icoutils/pkg-plist	Thu Jan 19 20:19:29 2017	(r431911, copy of r431838, head/graphics/icoutils/pkg-plist)
@@ -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



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201701192019.v0JKJU1w018155>