- Update to 2.3

- Use bsd.port.options.mk
- Pet portlint
- Cosmetic change

Changes:	https://github.com/mm2/Little-CMS/blob/master/ChangeLog
		http://littlecms2.blogspot.com/2011/12/littlecms-23-released.html

3 files changed, 25 insertions, 21 deletions

diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index e6b15ac306a8..991ab3305887 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lcms2
-PORTVERSION=	2.2
+PORTVERSION=	2.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lcms/lcms/${PORTVERSION} \
 		http://www.littlecms.com/
@@ -16,36 +16,40 @@ COMMENT=	Accurate, fast, and small-footprint color management engine
 
 LICENSE=	MIT
 
-USE_GNOME=	gnomehack lthack
-GNU_CONFIGURE=	yes
+OPTIONS=	TIFFICC "Build color profile applier for TIFF" off \
+		JPEGICC "Build color profile applier for JPEG" off
+
 CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GNOME=	gnomehack lthack
 USE_LDCONFIG=	yes
 
-OPTIONS=	TIFFICC "Build color profile applier for TIFF" off \
-		JPEGICC "Build color profile applier for JPEG" off
+MAN1=		transicc.1 psicc.1 linkicc.1
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 UTILS=		transicc psicc linkicc
-MAN1=		transicc.1 psicc.1 linkicc.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_TIFFICC)
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 UTILS+=		tificc
 MAN1+=		tificc.1
-PLIST_FILES+=	bin/tificc
+PLIST_SUB+=	TIFFICC=""
 .else
 CONFIGURE_ARGS=	--without-tiff
+PLIST_SUB+=	TIFFICC="@comment "
 .endif
 
 .if defined(WITH_JPEGICC)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 UTILS+=		jpgicc
 MAN1+=		jpgicc.1
-PLIST_FILES+=	bin/jpgicc
+PLIST_SUB+=	JPEGICC=""
 .else
 CONFIGURE_ARGS=	--without-jpeg
+PLIST_SUB+=	JPEGICC="@comment "
 .endif
 
 post-patch:
@@ -60,13 +64,13 @@ post-configure:
 
 post-build:
 .for dir in ${UTILS}
-	@cd ${WRKSRC}/utils/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} \
+	@cd ${WRKSRC}/utils/${dir}/ && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} all
 .endfor
 
 post-install:
 .for dir in ${UTILS}
-	@cd ${WRKSRC}/utils/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} \
+	@cd ${WRKSRC}/utils/${dir}/ && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} install
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/utils/linkicc/linkicc.1 \
@@ -77,9 +81,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
 .endif
 
-test:	build
-	@cd ${WRKSRC}/testbed && ${SETENV} ${MAKE_ENV} ${MAKE} check
-
-regression-test:	test
+regression-test test: build
+	@cd ${WRKSRC}/testbed/ && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/lcms2/distinfo b/graphics/lcms2/distinfo
index 3d6139b250db..9cf18083c6aa 100644
--- a/graphics/lcms2/distinfo
+++ b/graphics/lcms2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lcms2-2.2.tar.gz) = b6f2a1be1a2b7ca54bfab69b32242d383a176637f161eeeaef451bd9fc1195cc
-SIZE (lcms2-2.2.tar.gz) = 4193353
+SHA256 (lcms2-2.3.tar.gz) = 3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4
+SIZE (lcms2-2.3.tar.gz) = 4461644
diff --git a/graphics/lcms2/pkg-plist b/graphics/lcms2/pkg-plist
index d06a1bcaa722..acbaf640bf45 100644
--- a/graphics/lcms2/pkg-plist
+++ b/graphics/lcms2/pkg-plist
@@ -1,12 +1,14 @@
+%%JPEGICC%%bin/jpgicc
 bin/linkicc
 bin/psicc
+%%TIFFICC%%bin/tificc
 bin/transicc
 include/lcms2.h
 include/lcms2_plugin.h
 lib/liblcms2.so
 lib/liblcms2.so.2
 libdata/pkgconfig/lcms2.pc
-%%PORTDOCS%%%%DOCSDIR%%/LittleCMS2.2 API.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LittleCMS2.2 Plugin API.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LittleCMS2.2 tutorial.pdf
+%%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% API.pdf
+%%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% Plugin API.pdf
+%%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% tutorial.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%