From owner-svn-ports-all@FreeBSD.ORG Thu Nov 21 23:12:38 2013 Return-Path: Delivered-To: svn-ports-all@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 1808F357; Thu, 21 Nov 2013 23:12:36 +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 2DF992F07; Thu, 21 Nov 2013 23:12:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALNCabD003372; Thu, 21 Nov 2013 23:12:36 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALNCZOV003364; Thu, 21 Nov 2013 23:12:35 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311212312.rALNCZOV003364@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 21 Nov 2013 23:12:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334538 - in head/graphics/lcms: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2013 23:12:38 -0000 Author: sunpoet Date: Thu Nov 21 23:12:35 2013 New Revision: 334538 URL: http://svnweb.freebsd.org/changeset/ports/334538 Log: - Add LICENSE - Convert to new LIB_DEPENDS format - Convert to new options helper - Remove unnecessary patch: already replaced by REINPLACE_CMD - Support STAGEDIR Deleted: head/graphics/lcms/files/patch-test-static Modified: head/graphics/lcms/Makefile head/graphics/lcms/pkg-plist (contents, props changed) Modified: head/graphics/lcms/Makefile ============================================================================== --- head/graphics/lcms/Makefile Thu Nov 21 23:12:31 2013 (r334537) +++ head/graphics/lcms/Makefile Thu Nov 21 23:12:35 2013 (r334538) @@ -12,7 +12,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Light Color Management System -- a color management library +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,32 +25,19 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack lthack USE_LDCONFIG= yes -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MJPEGICC} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg -CONFIGURE_ARGS+=--with-jpeg=${LOCALBASE} -MAN1+= jpegicc.1 -PLIST_SUB+= JPEGICC="" -.else -CONFIGURE_ARGS+=--without-jpeg -PLIST_SUB+= JPEGICC="@comment " -.endif +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 -.if ${PORT_OPTIONS:MTIFFICC} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff -CONFIGURE_ARGS+=--with-tiff=${LOCALBASE} -MAN1+= tifficc.1 -PLIST_SUB+= TIFFICC="" -.else -CONFIGURE_ARGS+=--without-tiff -PLIST_SUB+= TIFFICC="@comment " -.endif +.include post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s| python samples||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|^testcms_LDFLAGS = .*$$|& -static|' ${WRKSRC}/testbed/Makefile.in +# @${REINPLACE_CMD} -e '/^#ifdef __sgi/d; /^#include "sgidefs.h"/d' ${WRKSRC}/include/icc34.h.in + @${REINPLACE_CMD} -e '/^testcms_LDFLAGS = / s|$$| -static|' ${WRKSRC}/testbed/Makefile.in .if !${PORT_OPTIONS:MJPEGICC} @${REINPLACE_CMD} -e '/^SUBDIRS = / s| jpegicc||' ${WRKSRC}/Makefile.in .endif @@ -61,9 +51,9 @@ post-configure: post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} doc/LCMSAPI.TXT doc/TUTORIAL.TXT tifficc/tifficc.c \ - jpegicc/jpegicc.c jpegicc/iccjpeg.c samples/wtpt.c samples/icctrans.c ${DOCSDIR}/ + jpegicc/jpegicc.c jpegicc/iccjpeg.c samples/wtpt.c samples/icctrans.c ${STAGEDIR}${DOCSDIR}/ .endif regression-test test: build Modified: head/graphics/lcms/pkg-plist ============================================================================== --- head/graphics/lcms/pkg-plist Thu Nov 21 23:12:31 2013 (r334537) +++ head/graphics/lcms/pkg-plist Thu Nov 21 23:12:35 2013 (r334538) @@ -6,6 +6,8 @@ include/lcms.h lib/liblcms.so lib/liblcms.so.1 libdata/pkgconfig/lcms.pc +%%JPEGICC%%man/man1/jpegicc.1.gz +%%TIFFICC%%man/man1/tifficc.1.gz %%PORTDOCS%%%%DOCSDIR%%/LCMSAPI.TXT %%PORTDOCS%%%%DOCSDIR%%/TUTORIAL.TXT %%PORTDOCS%%%%DOCSDIR%%/iccjpeg.c