From owner-svn-ports-all@FreeBSD.ORG Sun Oct 7 15:09:51 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE02A106564A; Sun, 7 Oct 2012 15:09:51 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9F4378FC0A; Sun, 7 Oct 2012 15:09:51 +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 q97F9pgV020772; Sun, 7 Oct 2012 15:09:51 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97F9p9Z020769; Sun, 7 Oct 2012 15:09:51 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201210071509.q97F9p9Z020769@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 7 Oct 2012 15:09:51 +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: r305489 - head/graphics/lcms2 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 07 Oct 2012 15:09:51 -0000 Author: sunpoet Date: Sun Oct 7 15:09:51 2012 New Revision: 305489 URL: http://svn.freebsd.org/changeset/ports/305489 Log: - Update to 2.4 - Convert to new options framework - Fix CONFIGURE_ARGS - Cleanup Makefile - Cosmetic change Changes: https://github.com/mm2/Little-CMS/blob/master/ChangeLog Modified: head/graphics/lcms2/Makefile (contents, props changed) head/graphics/lcms2/distinfo (contents, props changed) Modified: head/graphics/lcms2/Makefile ============================================================================== --- head/graphics/lcms2/Makefile Sun Oct 7 15:08:52 2012 (r305488) +++ head/graphics/lcms2/Makefile Sun Oct 7 15:09:51 2012 (r305489) @@ -1,12 +1,8 @@ -# New ports collection makefile for: Little CMS (v2) -# Date created: 12/04/2010 -# Whom: Stanislav Sedov -# +# Created by: Stanislav Sedov # $FreeBSD$ -# PORTNAME= lcms2 -PORTVERSION= 2.3 +PORTVERSION= 2.4 CATEGORIES= graphics MASTER_SITES= SF/lcms/lcms/${PORTVERSION} \ http://www.littlecms.com/ @@ -16,8 +12,9 @@ COMMENT= Accurate, fast, and small-footp LICENSE= MIT -OPTIONS= TIFFICC "Build color profile applier for TIFF" off \ - JPEGICC "Build color profile applier for JPEG" off +OPTIONS_DEFINE= DOCS JPEGICC TIFFICC +JPEGICC_DESC= Build color profile applier for JPEG +TIFFICC_DESC= Build color profile applier for TIFF CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes @@ -25,63 +22,55 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack lthack USE_LDCONFIG= yes -MAN1= transicc.1 psicc.1 linkicc.1 +MAN1= linkicc.1 psicc.1 transicc.1 PLIST_SUB= PORTVERSION=${PORTVERSION} -UTILS= transicc psicc linkicc +UTILS= linkicc psicc transicc .include -.if defined(WITH_TIFFICC) -LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff -UTILS+= tificc -MAN1+= tificc.1 -PLIST_SUB+= TIFFICC="" +.if ${PORT_OPTIONS:MJPEGICC} +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +CONFIGURE_ARGS+=--with-jpeg=${LOCALBASE} +MAN1+= jpegicc.1 +PLIST_SUB+= JPEGICC="" +UTILS+= jpgicc .else -CONFIGURE_ARGS= --without-tiff -PLIST_SUB+= TIFFICC="@comment " +CONFIGURE_ARGS+=--without-jpeg +PLIST_SUB+= JPEGICC="@comment " .endif -.if defined(WITH_JPEGICC) -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -UTILS+= jpgicc -MAN1+= jpgicc.1 -PLIST_SUB+= JPEGICC="" +.if ${PORT_OPTIONS:MTIFFICC} +LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff +CONFIGURE_ARGS= --with-tiff=${LOCALBASE} +MAN1+= tifficc.1 +PLIST_SUB+= TIFFICC="" +UTILS+= tificc .else -CONFIGURE_ARGS= --without-jpeg -PLIST_SUB+= JPEGICC="@comment " +CONFIGURE_ARGS+=--without-tiff +PLIST_SUB+= TIFFICC="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|^SUBDIRS =.*$$|SUBDIRS = src include|' \ - ${WRKSRC}/Makefile.in +.if empty(PORT_OPTIONS:MJPEGICC) + @${REINPLACE_CMD} -e '/^SUBDIRS = / s| utils/jpgicc||' ${WRKSRC}/Makefile.in +.endif +.if empty(PORT_OPTIONS:MTIFFICC) + @${REINPLACE_CMD} -e '/^SUBDIRS = / s| utils/tificc||' ${WRKSRC}/Makefile.in +.endif post-configure: # Get rid of .la and static library files - @${REINPLACE_CMD} -E -e \ - '/Install the pseudo-library/,/staticlibs=/s,^,#,' \ - ${WRKSRC}/libtool - -post-build: -.for dir in ${UTILS} - @cd ${WRKSRC}/utils/${dir}/ && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} all -.endfor + @${REINPLACE_CMD} -E -e '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool post-install: -.for dir in ${UTILS} - @cd ${WRKSRC}/utils/${dir}/ && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} install -.endfor - ${INSTALL_MAN} ${WRKSRC}/utils/linkicc/linkicc.1 \ - ${WRKSRC}/utils/psicc/psicc.1 \ - ${WRKSRC}/utils/transicc/transicc.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR} + cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${MANPREFIX}/man/man1/ +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}/ .endif regression-test test: build - @cd ${WRKSRC}/testbed/ && ${SETENV} ${MAKE_ENV} ${MAKE} check + cd ${WRKSRC}/testbed/ && ${SETENV} ${MAKE_ENV} ${MAKE} check .include Modified: head/graphics/lcms2/distinfo ============================================================================== --- head/graphics/lcms2/distinfo Sun Oct 7 15:08:52 2012 (r305488) +++ head/graphics/lcms2/distinfo Sun Oct 7 15:09:51 2012 (r305489) @@ -1,2 +1,2 @@ -SHA256 (lcms2-2.3.tar.gz) = 3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4 -SIZE (lcms2-2.3.tar.gz) = 4461644 +SHA256 (lcms2-2.4.tar.gz) = 2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8 +SIZE (lcms2-2.4.tar.gz) = 4293291