From owner-svn-ports-head@FreeBSD.ORG Mon Oct 8 16:17:23 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 122711065670; Mon, 8 Oct 2012 16:17:23 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F00408FC12; Mon, 8 Oct 2012 16:17:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q98GHMWv032274; Mon, 8 Oct 2012 16:17:22 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q98GHMea032270; Mon, 8 Oct 2012 16:17:22 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201210081617.q98GHMea032270@svn.freebsd.org> From: Boris Samorodov Date: Mon, 8 Oct 2012 16:17:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305543 - in head/graphics/icoutils: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2012 16:17:23 -0000 Author: bsam Date: Mon Oct 8 16:17:22 2012 New Revision: 305543 URL: http://svn.freebsd.org/changeset/ports/305543 Log: OPTIONify the port. Add an option RESSCRIPTS for PERL resource scripts and switch it off by default. This reduces default dependencies from 22 to 3. The port is useful to get PNG icons from a Windows *.ico files while building ports (as a BUILD dependency). Resource scripts are not used there. Bump PORTREVISION. Added: head/graphics/icoutils/files/ head/graphics/icoutils/files/extra-patch-Makefile.in (contents, props changed) head/graphics/icoutils/files/extra-patch-configure.ac (contents, props changed) Modified: head/graphics/icoutils/Makefile Modified: head/graphics/icoutils/Makefile ============================================================================== --- head/graphics/icoutils/Makefile Mon Oct 8 16:13:55 2012 (r305542) +++ head/graphics/icoutils/Makefile Mon Oct 8 16:17:22 2012 (r305543) @@ -3,6 +3,7 @@ PORTNAME= icoutils PORTVERSION= 0.30.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SAVANNAH @@ -12,23 +13,36 @@ COMMENT= Convert/extract images in Micro LICENSE= GPLv3 LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww USE_BZIP2= yes -USE_PERL5_RUN= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls MAKE_JOBS_SAFE= yes -MAN1= extresso.1 genresscript.1 icotool.1 wrestool.1 -PLIST_FILES= bin/extresso \ - bin/genresscript \ - bin/icotool \ +MAN1= icotool.1 wrestool.1 +PLIST_FILES= bin/icotool \ bin/wrestool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +OPTIONS_DEFINE= RESSCRIPTS +RESSCRIPTS_DESC= PERL resource scripts + +.include + +.if ${PORT_OPTIONS:MRESSCRIPTS} +RUN_DEPENDS+= p5-libwww>=0:${PORTSDIR}/www/p5-libwww +USE_PERL5_RUN= yes +MAN1+= extresso.1 genresscript.1 +PLIST_FILES+= bin/extresso \ + bin/genresscript +.else +post-patch: +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in \ + ${FILESDIR}/extra-patch-configure.ac +.endif + .include .if ${ARCH} == "sparc64" Added: head/graphics/icoutils/files/extra-patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/icoutils/files/extra-patch-Makefile.in Mon Oct 8 16:17:22 2012 (r305543) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2012-10-08 14:19:17.000000000 +0400 ++++ Makefile.in 2012-10-08 14:19:35.000000000 +0400 +@@ -604,7 +604,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = po lib common icotool wrestool extresso ++SUBDIRS = po lib common icotool wrestool + EXTRA_DIST = \ + data/icons/icon-linux_penguin-20x20-16c.png \ + data/icons/icon-linux_penguin-16x16-16c.png \ Added: head/graphics/icoutils/files/extra-patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/icoutils/files/extra-patch-configure.ac Mon Oct 8 16:17:22 2012 (r305543) @@ -0,0 +1,13 @@ +--- configure.ac.orig 2012-10-08 13:47:35.000000000 +0400 ++++ configure.ac 2012-10-08 13:47:59.000000000 +0400 +@@ -69,9 +69,5 @@ AC_CONFIG_FILES([Makefile + po/Makefile.in + lib/Makefile + common/Makefile +- icotool/Makefile +- wrestool/Makefile +- extresso/Makefile]) +-AC_CONFIG_FILES([extresso/extresso], [chmod +x extresso/extresso]) +-AC_CONFIG_FILES([extresso/genresscript], [chmod +x extresso/genresscript]) ++ icotool/Makefile) + AC_OUTPUT