[Midnightbsd-cvs] mports [18407] trunk/graphics/lcms: fixup build

[laffer1 at midnightbsd.org]

Revision: 18407
          http://svnweb.midnightbsd.org/mports/?rev=18407
Author:   laffer1
Date:     2015-03-28 05:53:25 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
fixup build

Modified Paths:
--------------
    trunk/graphics/lcms/Makefile
    trunk/graphics/lcms/pkg-plist

Modified: trunk/graphics/lcms/Makefile
===================================================================
--- trunk/graphics/lcms/Makefile	2015-03-28 09:51:51 UTC (rev 18406)
+++ trunk/graphics/lcms/Makefile	2015-03-28 09:53:25 UTC (rev 18407)
@@ -3,80 +3,50 @@
 
 PORTNAME=	lcms
 PORTVERSION=	1.19
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.19 \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		http://www.littlecms.com/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Light Color Management System -- a color management library
+
 LICENSE=	mit
 
-USE_GNOME=	gnomehack lthack
+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
+
+CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+INSTALL_TARGET=	install-strip
 LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/lcms-1.19
+USES=		libtool:keepla pathfix
 
-OPTIONS=	TIFFICC "Build color profile applier for tiff" off \
-		JPEGICC "Build color profile applier for JPEG" off
+PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+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
 
-.if defined(WITH_TIFFICC)
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-PLIST_SUB+=	TIFFICC=""
-MAN1+=		tifficc.1
-.else
-CONFIGURE_ARGS=	--without-tiff
-PLIST_SUB+=	TIFFICC="@comment "
-.endif
-
-.if defined(WITH_JPEGICC)
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
-PLIST_SUB+=	JPEGICC=""
-MAN1+=		jpegicc.1
-.else
-CONFIGURE_ARGS=	--without-jpeg
-PLIST_SUB+=	JPEGICC="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|^SUBDIRS =.*$$|SUBDIRS = src include|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|-O3||g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| python samples||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^#ifdef __sgi/ s|__sgi|__unix__|; /^#include "sgidefs.h"/d' ${WRKSRC}/include/icc34.h.in
+	@${REINPLACE_CMD} -e '/^testcms_LDFLAGS = / s|$$| -static|' ${WRKSRC}/testbed/Makefile.in
 
-#
-# Get rid of .la and static library files
-#
-post-configure:
-	@${REINPLACE_CMD} -E -e \
-	    '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
-
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in doc/LCMSAPI.TXT doc/TUTORIAL.TXT tifficc/tifficc.c \
-	jpegicc/jpegicc.c jpegicc/iccjpeg.c samples/wtpt.c samples/icctrans.c
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} doc/LCMSAPI.TXT doc/TUTORIAL.TXT tifficc/tifficc.c \
+		jpegicc/jpegicc.c jpegicc/iccjpeg.c samples/wtpt.c samples/icctrans.c ${STAGEDIR}${DOCSDIR}/
 
-.if defined(WITH_TIFFICC)
-	@(cd ${WRKSRC}/tifficc && ${SETENV} ${MAKE_ENV} ${MAKE} \
-		${MAKE_FLAGS} Makefile all install)
-.endif
+regression-test test: build
+	cd ${WRKSRC}/testbed/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
-.if defined(WITH_JPEGICC)
-	@(cd ${WRKSRC}/jpegicc && ${SETENV} ${MAKE_ENV} ${MAKE} \
-		${MAKE_FLAGS} Makefile all install)
-.endif
-
-post-build test:
-	cd ${WRKSRC}/testbed && ${SETENV} ${MAKE_ENV} ${MAKE} check
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/graphics/lcms/pkg-plist
===================================================================
--- trunk/graphics/lcms/pkg-plist	2015-03-28 09:51:51 UTC (rev 18406)
+++ trunk/graphics/lcms/pkg-plist	2015-03-28 09:53:25 UTC (rev 18407)
@@ -3,14 +3,11 @@
 %%TIFFICC%%bin/tifficc
 include/icc34.h
 include/lcms.h
+lib/liblcms.a
+lib/liblcms.la
 lib/liblcms.so
 lib/liblcms.so.1
+lib/liblcms.so.1.0.19
 libdata/pkgconfig/lcms.pc
-%%PORTDOCS%%%%DOCSDIR%%/LCMSAPI.TXT
-%%PORTDOCS%%%%DOCSDIR%%/TUTORIAL.TXT
-%%PORTDOCS%%%%DOCSDIR%%/iccjpeg.c
-%%PORTDOCS%%%%DOCSDIR%%/icctrans.c
-%%PORTDOCS%%%%DOCSDIR%%/jpegicc.c
-%%PORTDOCS%%%%DOCSDIR%%/tifficc.c
-%%PORTDOCS%%%%DOCSDIR%%/wtpt.c
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%JPEGICC%%man/man1/jpegicc.1.gz
+%%TIFFICC%%man/man1/tifficc.1.gz