svn commit: r350297 - in head/graphics/lcms: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Apr  6 05:46:59 2014
New Revision: 350297
URL: http://svnweb.freebsd.org/changeset/ports/350297
QAT: https://qat.redports.org/buildarchive/r350297/

Log:
  - Enable JPEGICC and TIFFICC by default
  - Use USES=libtool instead of USE_GNOME=lthack
  - Use USES=pathfix instead of USE_GNOME=gnomehack
  - Use PORTDOCS
  - Install static library
  - Strip shared library
  - Use MAKE_CMD
  - Simplify Makefile
  - Bump PORTREVISION for dependency and package change

Deleted:
  head/graphics/lcms/files/
Modified:
  head/graphics/lcms/Makefile
  head/graphics/lcms/pkg-plist

Modified: head/graphics/lcms/Makefile
==============================================================================
--- head/graphics/lcms/Makefile	Sun Apr  6 05:46:54 2014	(r350296)
+++ head/graphics/lcms/Makefile	Sun Apr  6 05:46:59 2014	(r350297)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lcms
 PORTVERSION=	1.19
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
@@ -15,6 +15,7 @@ COMMENT=	Light Color Management System -
 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
@@ -22,8 +23,10 @@ TIFFICC_DESC=	Build color profile applie
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	gnomehack lthack
 USE_LDCONFIG=	yes
+USES=		libtool pathfix
+
+PORTDOCS=	*
 
 JPEGICC_CONFIGURE_OFF=	--without-jpeg
 JPEGICC_CONFIGURE_ON=	--with-jpeg=${LOCALBASE}
@@ -32,31 +35,18 @@ TIFFICC_CONFIGURE_OFF=	--without-tiff
 TIFFICC_CONFIGURE_ON=	--with-tiff=${LOCALBASE}
 TIFFICC_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| python samples||' ${WRKSRC}/Makefile.in
-#	@${REINPLACE_CMD} -e '/^#ifdef __sgi/d; /^#include "sgidefs.h"/d' ${WRKSRC}/include/icc34.h.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
-.if !${PORT_OPTIONS:MJPEGICC}
-	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| jpegicc||' ${WRKSRC}/Makefile.in
-.endif
-.if !${PORT_OPTIONS:MTIFFICC}
-	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| tifficc||' ${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:
-.if ${PORT_OPTIONS:MDOCS}
 	${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}/
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblcms.so.1.0.19
 
 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: head/graphics/lcms/pkg-plist
==============================================================================
--- head/graphics/lcms/pkg-plist	Sun Apr  6 05:46:54 2014	(r350296)
+++ head/graphics/lcms/pkg-plist	Sun Apr  6 05:46:59 2014	(r350297)
@@ -3,16 +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
 %%JPEGICC%%man/man1/jpegicc.1.gz
 %%TIFFICC%%man/man1/tifficc.1.gz
-%%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%%