- Update to 2.6

- Enable JPEGICC and TIFFICC by default
- Use USES=libtool instead of USE_GNOME=lthack
- Use PORTDOCS
- Install static library
- Strip shared library
- Use MAKE_CMD
- Remove unnecessary PLIST_SUB
- Simplify Makefile

Changes:	https://github.com/mm2/Little-CMS/blob/master/ChangeLog

3 files changed, 11 insertions, 37 deletions

diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile
index 463c0660f029..b5b3242e38ca 100644
--- a/graphics/lcms2/Makefile
+++ b/graphics/lcms2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lcms2
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lcms/lcms/${PORTVERSION} \
 		http://www.littlecms.com/
@@ -13,6 +13,7 @@ COMMENT=	Accurate, fast, and small-footprint color management engine
 LICENSE=	MIT
 
 OPTIONS_DEFINE=	DOCS JPEGICC TIFFICC
+OPTIONS_DEFAULT=JPEGICC TIFFICC
 OPTIONS_SUB=	yes
 JPEGICC_DESC=	Build color profile applier for JPEG
 TIFFICC_DESC=	Build color profile applier for TIFF
@@ -20,13 +21,10 @@ TIFFICC_DESC=	Build color profile applier for TIFF
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	lthack
 USE_LDCONFIG=	yes
-USES=		pathfix
+USES=		libtool pathfix
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-UTILS=		linkicc psicc transicc
+PORTDOCS=	*
 
 JPEGICC_CONFIGURE_OFF=	--without-jpeg
 JPEGICC_CONFIGURE_ON=	--with-jpeg=${LOCALBASE}
@@ -35,36 +33,13 @@ TIFFICC_CONFIGURE_OFF=	--without-tiff
 TIFFICC_CONFIGURE_ON=	--with-tiff=${LOCALBASE}
 TIFFICC_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJPEGICC}
-UTILS+=		jpgicc
-.endif
-
-.if ${PORT_OPTIONS:MTIFFICC}
-UTILS+=		tificc
-.endif
-
-post-patch:
-.if !${PORT_OPTIONS:MJPEGICC}
-	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| utils/jpgicc||' ${WRKSRC}/Makefile.in
-.endif
-.if !${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-install:
 	cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${STAGEDIR}${PREFIX}/man/man1/
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}/
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblcms2.so.2.0.6
 
 regression-test test: build
-	cd ${WRKSRC}/testbed/ && ${SETENV} ${MAKE_ENV} ${MAKE} check
+	cd ${WRKSRC}/testbed/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
diff --git a/graphics/lcms2/distinfo b/graphics/lcms2/distinfo
index 01037421edfc..ab74f8ceb84e 100644
--- a/graphics/lcms2/distinfo
+++ b/graphics/lcms2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lcms2-2.5.tar.gz) = 6727772b44470a2111dba53b9ce4c952b87e7d1b72a31c5ebdf44ba6eb0aa72b
-SIZE (lcms2-2.5.tar.gz) = 7000396
+SHA256 (lcms2-2.6.tar.gz) = 5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1
+SIZE (lcms2-2.6.tar.gz) = 4583389
diff --git a/graphics/lcms2/pkg-plist b/graphics/lcms2/pkg-plist
index 4927e442bf47..2ef3ddf55537 100644
--- a/graphics/lcms2/pkg-plist
+++ b/graphics/lcms2/pkg-plist
@@ -5,15 +5,14 @@ bin/psicc
 bin/transicc
 include/lcms2.h
 include/lcms2_plugin.h
+lib/liblcms2.a
+lib/liblcms2.la
 lib/liblcms2.so
 lib/liblcms2.so.2
+lib/liblcms2.so.2.0.6
 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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%