- Update to version 1.12

PR:		ports/67083
Submitted by:	Ports Fury

graphics/lcms/Makefile

@@ -6,33 +6,42 @@
 #
 
 PORTNAME=	lcms
-PORTVERSION=	1.09
-PORTREVISION=	1
+PORTVERSION=	1.12
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.littlecms.com/
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Light Color Management System -- a color management library
 
-INSTALLS_SHLIB=	yes
-MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ARGS+=	-j2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
+
+USE_GNOME=	gnometarget lthack
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=	13
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--without-jpeg --without-tiff
+INSTALLS_SHLIB=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^SUBDIRS =.*$$|SUBDIRS = src include|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-O3||g' ${WRKSRC}/src/Makefile.in
 
-.ifndef NOPORTDOCS
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/lcms
-	${CP} -rp ${WRKSRC}/../doc/* ${WRKSRC}/../tifficc/tifficc.c \
-		${WRKSRC}/../jpegicc/jpegicc.c ${WRKSRC}/../jpegicc/iccjpeg.c \
-		${WRKSRC}/../samples/wtpt.c ${WRKSRC}/../samples/icctrans.c \
-		${PREFIX}/share/doc/lcms/
+.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
 
 post-build test:
-	cd ${WRKSRC}/../testbed && \
-		${SETENV} CFLAGS="${CFLAGS} -I../include" ${MAKE} -E CFLAGS test
+	cd ${WRKSRC}/testbed && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
 .include <bsd.port.mk>

graphics/lcms/distinfo

@@ -1,2 +1,2 @@
-MD5 (lcms-1.09.tar.gz) = 8e8e2303351f3c7de335f02196820a4e
-SIZE (lcms-1.09.tar.gz) = 192593
+MD5 (lcms-1.12.tar.gz) = ac377fc055cf50aa8a8505aedb13a125
+SIZE (lcms-1.12.tar.gz) = 567985

graphics/lcms/files/Makefile.bsd

@@ -1,18 +0,0 @@
-LIB=lcms
-SHLIB_MAJOR=	1
-SHLIB_MINOR=	9
-
-SRCS!=	make -V SRCS
-
-NOPROFILE=YES
-
-INCS=	${.CURDIR}/../include/lcms.h ${.CURDIR}/../include/icc34.h
-
-CFLAGS+=	-I${.CURDIR}/../include
-LDADD+=		-lm
-
-INCSDIR=${LOCALBASE}/include
-INCDIR= ${INCSDIR}		# for 4.x bsd.lib.mk
-LIBDIR=	${LOCALBASE}/lib
-
-.include <bsd.lib.mk>

graphics/lcms/files/patch-32bit

@@ -1,8 +1,8 @@
 This  patch  fixes assumptions  made  in  different  parts of  the  code
 regarding the sizeof long and int. The original code appears to use them
 interchangeably, even though it expects them to be 32 bit wide.
---- cmsmtrx.c	Tue Feb 13 12:08:06 2001
-+++ cmsmtrx.c	Wed Sep  5 10:28:02 2001
+--- src/cmsmtrx.c	Tue Feb 13 12:08:06 2001
++++ src/cmsmtrx.c	Wed Sep  5 10:28:02 2001
 @@ -705,6 +705,6 @@
  void VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d)
  {

graphics/lcms/files/patch-config

@@ -1,15 +1,17 @@
---- ../include/lcms.h	Wed Aug  7 15:34:37 2002
-+++ ../include/lcms.h	Wed Nov  6 01:23:21 2002
-@@ -66,5 +73,11 @@
+--- include/lcms.h.orig	Sun Dec 21 00:00:11 2003
++++ include/lcms.h	Sun May 23 12:14:22 2004
+@@ -52,7 +52,13 @@
+ 
  // Uncomment this one if you are using big endian machines (only meaningful
  // when NON_WINDOWS is used)
 -// #define USE_BIG_ENDIAN   1
 +
-+#include <machine/endian.h>
++#include <sys/endian.h>
 +#if BYTE_ORDER == BIG_ENDIAN
-+#	define USE_BIG_ENDIAN   1
++#      define USE_BIG_ENDIAN   1
 +#elif BYTE_ORDER != LITTLE_ENDIAN
-+#	error "Unexpected BYTE_ORDER on this architecture"
++#      error "Unexpected BYTE_ORDER on this architecture"
 +#endif
  
  // Uncomment this one if your compiler/machine does support the
+ // "long long" type This will speedup fixed point math. (USE_C only)

graphics/lcms/files/patch-icc34

@@ -1,13 +1,14 @@
 Try to use the int32 and friends on all Unixes -- not just SGI's Irix.
---- ../include/icc34.h	Tue Feb 13 12:08:06 2001
-+++ ../include/icc34.h	Wed Sep  5 10:08:42 2001
-@@ -144,7 +144,9 @@
-  */
-
+--- 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;
+ typedef __int32_t       icSignature; 
  

graphics/lcms/pkg-plist

@@ -2,12 +2,12 @@ include/icc34.h
 include/lcms.h
 lib/liblcms.a
 lib/liblcms.so
-lib/liblcms.so.1.9
-%%PORTDOCS%%share/doc/lcms/LCMSAPI.TXT
-%%PORTDOCS%%share/doc/lcms/TUTORIAL.TXT
-%%PORTDOCS%%share/doc/lcms/iccjpeg.c
-%%PORTDOCS%%share/doc/lcms/icctrans.c
-%%PORTDOCS%%share/doc/lcms/jpegicc.c
-%%PORTDOCS%%share/doc/lcms/tifficc.c
-%%PORTDOCS%%share/doc/lcms/wtpt.c
-%%PORTDOCS%%@dirrm share/doc/lcms
+lib/liblcms.so.1
+%%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%%