2 files changed, 37 insertions, 48 deletions

diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index 991ab3305887..bc74f68b67e2 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	Little CMS (v2)
-# Date created:				12/04/2010
-# Whom:					Stanislav Sedov <stas@FreeBSD.org>
-#
+# Created by: Stanislav Sedov <stas@FreeBSD.org>
 # $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-footprint color management engine
 
 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 <bsd.port.options.mk>
 
-.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 <bsd.port.mk>
diff --git a/graphics/lcms2/distinfo b/graphics/lcms2/distinfo
index 9cf18083c6aa..4a3f8c9b713e 100644
--- a/graphics/lcms2/distinfo
+++ b/graphics/lcms2/distinfo
@@ -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