Update to version 1.12.

Package changes:
	The include files moved from $PREFIX/include/lcms to
	$PREFIX/include. Support added to buildlink*.mk to provide
	compatibility symlinks include/lcms/*.h in BUILDLINK_DIR.

No list of changes since the previously packaged version (1.06), I do not
even know if there was any versions in between... Anyway changes
in version 1.12 are (from the homepage):

- Brightness/Contrast/Hue/Saturation/WhitePoint modification across abstract
profile
- License changed to MIT
- pseq tag handling: cmsReadProfileSequenceDescription and cmsSEQ,
cmsPSEQDESC structures
- CRD generation now supports black point compensation, see
cmsGetPostScriptCRDEx
- cmsTakeManufacturer and cmsTakeModel for uncooked info on these tags
- Writing 8 bit profiles is now supported
- Named color profiles support. This turns lcms from a "wide subset" into
a "full implementation" of ICC 3.4, with some ICC 4.0 support.
- PostScript CSA, CRD generation
- Ink-Limiting capabilities for CMYK
- Devicelink profile generation.
- Gray scale virtual profiles
- Linearization virtual device link profiles
- New ICCLINK and ICC2PS utilities
- SWIG wrapper. This enables lcms from Python.
- Floating-point formats are now accepted as well.
- More ICC 4.0 compatibility. Some 4.0 profiles are now are fully understood
(still experimental)
- Profiles can now be saved to memory (thanks to Steven Greaves for providing
the code)
- Char Target data are now handled. Some profiles does store the data
profiler has used. This is all information needed to rebuild the profile
from scratch.
- New low-resolution flag cmsFLAGS_LOWRESPRECALC to save memory.
- User-defined encodings are now supported.
- cmsChangeBuffersFormat() to change the encoding of buffers on runtime
allows reuse of existing transforms.
- Gamma estimation routines cmsEstimateGamma() and cmsEstimateGammaEx()
- multilocalized unicode is now supported. Language and codepage is
selected via cmsSetLanguage() (ICC 4.0 only)
- LUT handling has been enhanced with enumerators. (SAMPLER_INSPECT)
- Improved TIFFICC, JPEGICC and ICCTRANS utilities.
- cmsOpenProfileFromMem() no longer creates temporary files.
- Transforms does accept now a maximum of 8 channels on input and 16 on
output. (last version did accept 6 on input)
- 8 <-> 16 bits per sample are now always computed accurately.
- Some minor bugs fixed

7 files changed, 54 insertions, 105 deletions

diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 67dc3178490..5114ed5e308 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 00:56:37 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/09 12:03:27 seb Exp $
 # FreeBSD: ports/graphics/lcms/Makefile,v 1.2 2000/12/19 15:36:26 sobomax Exp
 
-DISTNAME=	lcms-1.06
+DISTNAME=	lcms-1.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.littlecms.com/ \
 		http://www.abaforum.es/martim/
@@ -15,11 +15,18 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+TEST_TARGET=		check
+
+CONFIGURE_ARGS+=	--without-jpeg
+CONFIGURE_ARGS+=	--without-tiff
+CONFIGURE_ARGS+=	--without-zlib
+
+INSTALLATION_DIRS+=	share/doc/lcms
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lcms
-	cd ${WRKSRC}/doc && ${PAX} -rw . ${PREFIX}/share/doc/lcms
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/lcms
+.for _f_ in LCMSAPI.TXT TUTORIAL.TXT
+	${INSTALL_DATA} ${WRKSRC}/doc/${_f_} ${PREFIX}/share/doc/lcms/${_f_}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/lcms/PLIST b/graphics/lcms/PLIST
index fa0f12a7a7d..73be6982ed0 100644
--- a/graphics/lcms/PLIST
+++ b/graphics/lcms/PLIST
@@ -1,21 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:45 zuntum Exp $
-bin/testcms
-include/lcms/icc34.h
-include/lcms/lcms.h
+@comment $NetBSD: PLIST,v 1.2 2004/02/09 12:03:27 seb Exp $
+bin/icc2ps
+bin/icclink
+bin/icctrans
+bin/wtpt
+include/icc34.h
+include/lcms.h
 lib/liblcms.a
 lib/liblcms.la
 lib/liblcms.so
 lib/liblcms.so.1
-lib/liblcms.so.1.6
-share/doc/lcms/README.simple
-share/doc/lcms/filter.c
-share/doc/lcms/jpgemb.c
-share/doc/lcms/lcmsapi.txt
-share/doc/lcms/neutral.c
-share/doc/lcms/pngchrm.c
-share/doc/lcms/simple.c
-share/doc/lcms/tiffemb.c
-share/doc/lcms/tutorial.txt
-share/doc/lcms/wtpt.c
+lib/liblcms.so.1.12
+share/doc/lcms/LCMSAPI.TXT
+share/doc/lcms/TUTORIAL.TXT
 @dirrm share/doc/lcms
-@dirrm include/lcms
diff --git a/graphics/lcms/buildlink2.mk b/graphics/lcms/buildlink2.mk
index f5125e30b77..6234841ecd5 100644
--- a/graphics/lcms/buildlink2.mk
+++ b/graphics/lcms/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/31 08:00:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/09 12:03:27 seb Exp $
 
 .if !defined(LCMS_BUILDLINK2_MK)
 LCMS_BUILDLINK2_MK=	# defined
@@ -9,13 +9,25 @@ BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.lcms=lcms
 BUILDLINK_PREFIX.lcms_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.lcms=	include/lcms/*
+BUILDLINK_FILES.lcms=	include/icc34.h
+BUILDLINK_FILES.lcms+=	include/lcms.h
 BUILDLINK_FILES.lcms+=	lib/liblcms.*
 
-BUILDLINK_CPPFLAGS.lcms=	-I${BUILDLINK_PREFIX.lcms}/include/lcms
+BUILDLINK_CPPFLAGS.lcms=	-I${BUILDLINK_PREFIX.lcms}/include
 
 BUILDLINK_TARGETS+=	lcms-buildlink
+BUILDLINK_TARGETS+=	buildlink-include-lcms
 
 lcms-buildlink: _BUILDLINK_USE
 
+buildlink-include-lcms: .PHONY
+.for _h_ in lcms.h icc34.h
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if [ ! -f ${BUILDLINK_DIR}/include/lcms/${_h_} ]; then		\
+		${INSTALL_DATA_DIR} ${BUILDLINK_DIR}/include/lcms;	\
+		${ECHO_BUILDLINK_MSG} "Linking lcms/${_h_} to ${_h_} in ${BUILDLINK_DIR}/include"; \
+		${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \
+	fi
+.endfor
+
 .endif	# LCMS_BUILDLINK2_MK
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 0fdf4e29740..fdea4044b10 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 12:03:27 seb Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LCMS_BUILDLINK3_MK:=	${LCMS_BUILDLINK3_MK}+
@@ -11,7 +11,18 @@ BUILDLINK_DEPENDS+=	lcms
 BUILDLINK_PACKAGES+=		lcms
 BUILDLINK_DEPENDS.lcms+=	lcms>=1.06
 BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
-BUILDLINK_INCDIRS.lcms?=	include/lcms
 .endif # LCMS_BUILDLINK3_MK
 
+BUILDLINK_TARGETS+=	buildlink-include-lcms
+
+buildlink-include-lcms: .PHONY
+.for _h_ in lcms.h icc34.h
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if [ ! -f ${BUILDLINK_DIR}/include/lcms/${_h_} ]; then		\
+		${INSTALL_DATA_DIR} ${BUILDLINK_DIR}/include/lcms;	\
+		${ECHO_BUILDLINK_MSG} "Linking lcms/${_h_} to ${_h_} in ${BUILDLINK_DIR}/include"; \
+		${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \
+	fi
+.endfor
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo
index 8ee9f5d35f6..0afffa71262 100644
--- a/graphics/lcms/distinfo
+++ b/graphics/lcms/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/10/08 22:57:37 jschauma Exp $
+$NetBSD: distinfo,v 1.9 2004/02/09 12:03:27 seb Exp $
 
-SHA1 (lcms-1.06.tar.gz) = 3c9e99eb50598a0346c07fb1cacbf6cc4841001b
-Size (lcms-1.06.tar.gz) = 644116 bytes
-SHA1 (patch-aa) = 52102849563445b39eb8e504e9c6001af84bdbd5
-SHA1 (patch-ab) = 532e2e9f2a31e43bd14e26966db64079575e6015
+SHA1 (lcms-1.12.tar.gz) = 91c184378287df26cd8d729b1aae00b49077b9fb
+Size (lcms-1.12.tar.gz) = 567985 bytes
diff --git a/graphics/lcms/patches/patch-aa b/graphics/lcms/patches/patch-aa
deleted file mode 100644
index 1610a06f107..00000000000
--- a/graphics/lcms/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/07 08:22:52 skrll Exp $
-
---- configure	Thu May 18 20:08:40 2000
-+++ configure	Mon Oct 30 09:40:41 2000
-@@ -2259,35 +2259,13 @@
- 
- case "$host" in
--  i?86-pc-*)
-+  i?86-*-*)
-     CFLAGS="$CFLAGS -fomit-frame-pointer"
-     ;;
- esac
- 
--echo $ac_n "checking for __int64 type""... $ac_c" 1>&6
--echo "configure:2268: checking for __int64 type" >&5
--if test "$cross_compiling" = yes; then
--  echo "$ac_t""assuming no" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2273 "configure"
--#include "confdefs.h"
--int main (void) { __int64 i = 0; return (i == 0);}
--EOF
--if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
-+echo "using int64 on BSD" 1>&6
-   cat >> confdefs.h <<\EOF
- #define USE_INT64 1
- EOF
--
--  	echo "$ac_t""ok" 1>&6
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  echo "$ac_t""no" 1>&6
--fi
--rm -fr conftest*
--fi
--
- 
- echo $ac_n "checking for optimization""... $ac_c" 1>&6
diff --git a/graphics/lcms/patches/patch-ab b/graphics/lcms/patches/patch-ab
deleted file mode 100644
index 45315b31d2b..00000000000
--- a/graphics/lcms/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2002/10/08 22:57:38 jschauma Exp $
---- source/cmsmtrx.c.orig	Thu May 18 23:08:13 2000
-+++ source/cmsmtrx.c	Tue May 14 22:38:58 2002
-@@ -31,6 +31,7 @@
- // Vector & Matrix stuff
- 
- #include "lcms.h"
-+#include <sys/types.h>
- 
- 
- void cdecl VEC3init(LPVEC3 r, double x, double y, double z);
-@@ -242,13 +243,18 @@
- // support asm at all. Use with care, since this will slow down
- // all operations
- 
-+#include <sys/param.h>
- Fixed32 FixedMul(Fixed32 a, Fixed32 b)
- {
- 
- // If newest __int64 defined, then use it
- 
- #ifdef USE_INT64
--       __int64 l = (__int64) a * b + 0x8000i64;
-+#if (defined(BSD) && BSD >= 199506) || defined(linux)
-+       u_int64_t l = (u_int64_t) a * b + (u_int64_t)0x8000;
-+#else
-+       uint64_t l = (uint64_t) a * b + (uint64_t)0x8000;
-+#endif
-        return (Fixed32) (l >> 16);
- #else
-        return DOUBLE_TO_FIXED(FIXED_TO_DOUBLE(a) * FIXED_TO_DOUBLE(b));