[Midnightbsd-cvs] mports [17912] trunk/graphics/lcms2: lcms 2.6

[laffer1 at midnightbsd.org]

Revision: 17912
          http://svnweb.midnightbsd.org/mports/?rev=17912
Author:   laffer1
Date:     2014-12-21 13:03:53 -0500 (Sun, 21 Dec 2014)
Log Message:
-----------
lcms 2.6

Modified Paths:
--------------
    trunk/graphics/lcms2/Makefile
    trunk/graphics/lcms2/distinfo
    trunk/graphics/lcms2/pkg-plist

Modified: trunk/graphics/lcms2/Makefile
===================================================================
--- trunk/graphics/lcms2/Makefile	2014-12-21 17:44:26 UTC (rev 17911)
+++ trunk/graphics/lcms2/Makefile	2014-12-21 18:03:53 UTC (rev 17912)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	lcms2
-PORTVERSION=	2.4
+PORTVERSION=	2.6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lcms/lcms/${PORTVERSION} \
 		http://www.littlecms.com/
@@ -8,9 +8,12 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 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
 
@@ -17,58 +20,25 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	gnomehack lthack
 USE_LDCONFIG=	yes
+USES=		libtool:keepla pathfix
 
-MAN1=		linkicc.1 psicc.1 transicc.1
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PORTDOCS=	*
 
-UTILS=		linkicc psicc transicc
+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
 
-.include <bsd.mport.options.mk>
-
-.if ${PORT_OPTIONS:MJPEGICC}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--with-jpeg=${LOCALBASE}
-MAN1+=		jpgicc.1
-PLIST_SUB+=	JPEGICC=""
-UTILS+=		jpgicc
-.else
-CONFIGURE_ARGS+=--without-jpeg
-PLIST_SUB+=	JPEGICC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTIFFICC}
-LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
-CONFIGURE_ARGS=	--with-tiff=${LOCALBASE}
-MAN1+=		tificc.1
-PLIST_SUB+=	TIFFICC=""
-UTILS+=		tificc
-.else
-CONFIGURE_ARGS+=--without-tiff
-PLIST_SUB+=	TIFFICC="@comment "
-.endif
-
-post-patch:
-.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-install:
-	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
+	cd ${WRKSRC}/utils/ && ${INSTALL_MAN} linkicc/linkicc.1 psicc/psicc.1 transicc/transicc.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}/
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblcms2.so.2
 
 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>

Modified: trunk/graphics/lcms2/distinfo
===================================================================
--- trunk/graphics/lcms2/distinfo	2014-12-21 17:44:26 UTC (rev 17911)
+++ trunk/graphics/lcms2/distinfo	2014-12-21 18:03:53 UTC (rev 17912)
@@ -1,2 +1,2 @@
-SHA256 (lcms2-2.4.tar.gz) = 2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8
-SIZE (lcms2-2.4.tar.gz) = 4293291
+SHA256 (lcms2-2.6.tar.gz) = 5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1
+SIZE (lcms2-2.6.tar.gz) = 4583389

Modified: trunk/graphics/lcms2/pkg-plist
===================================================================
--- trunk/graphics/lcms2/pkg-plist	2014-12-21 17:44:26 UTC (rev 17911)
+++ trunk/graphics/lcms2/pkg-plist	2014-12-21 18:03:53 UTC (rev 17912)
@@ -5,10 +5,13 @@
 bin/transicc
 include/lcms2.h
 include/lcms2_plugin.h
+lib/liblcms2.a
+lib/liblcms2.la
 lib/liblcms2.so
 lib/liblcms2.so.2
 libdata/pkgconfig/lcms2.pc
-%%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% API.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% Plugin API.pdf
-%%PORTDOCS%%%%DOCSDIR%%/LittleCMS%%PORTVERSION%% tutorial.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%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