- 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

3 files changed, 11 insertions, 40 deletions

diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 3746df933f2a..1aee776aa3d7 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -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 -- a color management library
 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 applier for TIFF
 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>
diff --git a/graphics/lcms/files/patch-icc34 b/graphics/lcms/files/patch-icc34
deleted file mode 100644
index 6d7a4aa9b2e5..000000000000
--- a/graphics/lcms/files/patch-icc34
+++ /dev/null
@@ -1,14 +0,0 @@
-Try to use the int32 and friends on all Unixes -- not just SGI's Irix.
---- include/icc34.h.in.orig	Tue Jul 22 06:10:02 2003
-+++ include/icc34.h.in	Sun May 23 11:45:09 2004
-@@ -191,8 +191,10 @@
- typedef icUInt32Number   icU16Fixed16Number;
- 
- #else
-+#ifdef __unix__
- #ifdef __sgi
- #include "sgidefs.h"
-+#endif
- 
- typedef __int32_t       icSignature; 
- 
diff --git a/graphics/lcms/pkg-plist b/graphics/lcms/pkg-plist
index f5cd43eb5f1c..c32971a6ee7e 100644
--- a/graphics/lcms/pkg-plist
+++ b/graphics/lcms/pkg-plist
@@ -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%%