From owner-svn-ports-head@FreeBSD.ORG Thu Nov 21 23:12:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C16BD387; Thu, 21 Nov 2013 23:12:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A15872F09; Thu, 21 Nov 2013 23:12:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALNCekj003446; Thu, 21 Nov 2013 23:12:40 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALNCex2003444; Thu, 21 Nov 2013 23:12:40 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311212312.rALNCex2003444@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 21 Nov 2013 23:12:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334539 - head/graphics/lcms2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 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: Thu, 21 Nov 2013 23:12:40 -0000 Author: sunpoet Date: Thu Nov 21 23:12:39 2013 New Revision: 334539 URL: http://svnweb.freebsd.org/changeset/ports/334539 Log: - Convert to new LIB_DEPENDS format - Convert to new options helper - Support STAGEDIR Modified: head/graphics/lcms2/Makefile head/graphics/lcms2/pkg-plist (contents, props changed) Modified: head/graphics/lcms2/Makefile ============================================================================== --- head/graphics/lcms2/Makefile Thu Nov 21 23:12:35 2013 (r334538) +++ head/graphics/lcms2/Makefile Thu Nov 21 23:12:39 2013 (r334539) @@ -13,6 +13,7 @@ COMMENT= Accurate, fast, and small-footp LICENSE= MIT OPTIONS_DEFINE= DOCS JPEGICC TIFFICC +OPTIONS_SUB= yes JPEGICC_DESC= Build color profile applier for JPEG TIFFICC_DESC= Build color profile applier for TIFF @@ -22,34 +23,25 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack lthack USE_LDCONFIG= yes -MAN1= linkicc.1 psicc.1 transicc.1 PLIST_SUB= PORTVERSION=${PORTVERSION} UTILS= linkicc psicc transicc -NO_STAGE= yes +JPEGICC_CONFIGURE_OFF= --without-jpeg +JPEGICC_CONFIGURE_ON= --with-jpeg=${LOCALBASE} +JPEGICC_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +TIFFICC_CONFIGURE_OFF= --without-tiff +TIFFICC_CONFIGURE_ON= --with-tiff=${LOCALBASE} +TIFFICC_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff + .include .if ${PORT_OPTIONS:MJPEGICC} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg -CONFIGURE_ARGS+=--with-jpeg=${LOCALBASE} -MAN1+= jpgicc.1 -PLIST_SUB+= JPEGICC="" UTILS+= jpgicc -.else -CONFIGURE_ARGS+=--without-jpeg -PLIST_SUB+= JPEGICC="@comment " .endif .if ${PORT_OPTIONS:MTIFFICC} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff -CONFIGURE_ARGS= --with-tiff=${LOCALBASE} -MAN1+= tificc.1 -PLIST_SUB+= TIFFICC="" UTILS+= tificc -.else -CONFIGURE_ARGS+=--without-tiff -PLIST_SUB+= TIFFICC="@comment " .endif post-patch: @@ -65,10 +57,10 @@ post-configure: @${REINPLACE_CMD} -E -e '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool post-install: - cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${MANPREFIX}/man/man1/ + cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${STAGEDIR}${PREFIX}/man/man1/ .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}/ .endif regression-test test: build Modified: head/graphics/lcms2/pkg-plist ============================================================================== --- head/graphics/lcms2/pkg-plist Thu Nov 21 23:12:35 2013 (r334538) +++ head/graphics/lcms2/pkg-plist Thu Nov 21 23:12:39 2013 (r334539) @@ -8,6 +8,11 @@ include/lcms2_plugin.h lib/liblcms2.so lib/liblcms2.so.2 libdata/pkgconfig/lcms2.pc +%%JPEGICC%%man/man1/jpgicc.1.gz +man/man1/linkicc.1.gz +man/man1/psicc.1.gz +%%TIFFICC%%man/man1/tificc.1.gz +man/man1/transicc.1.gz %%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% API.pdf %%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% Plugin API.pdf %%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% tutorial.pdf