Date: Sun, 23 May 2004 22:00:18 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67083: Update port: graphics/lcms to 1.12 Message-ID: <20040523220018.21d270b3.tkato@prontomail.com> Resent-Message-ID: <200405231310.i4NDAMoV094496@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67083
>Category: ports
>Synopsis: Update port: graphics/lcms to 1.12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 23 06:10:22 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p8 i386
>Organization:
>Environment:
>Description:
- Update to version 1.12
Remove file:
files/Makefile.bsd
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/lcms/Makefile graphics/lcms/Makefile
--- /usr/ports/graphics/lcms/Makefile Fri Feb 6 10:11:50 2004
+++ graphics/lcms/Makefile Sun May 23 12:29:47 2004
@@ -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
+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
-MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ARGS+= -j2
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
-.ifndef NOPORTDOCS
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|^SUBDIRS =.*$$|SUBDIRS = src include|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|-O3||g' ${WRKSRC}/src/Makefile.in
+
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>
diff -urN /usr/ports/graphics/lcms/distinfo graphics/lcms/distinfo
--- /usr/ports/graphics/lcms/distinfo Thu Jan 29 20:26:29 2004
+++ graphics/lcms/distinfo Sun May 23 11:41:38 2004
@@ -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
diff -urN /usr/ports/graphics/lcms/files/Makefile.bsd graphics/lcms/files/Makefile.bsd
--- /usr/ports/graphics/lcms/files/Makefile.bsd Fri Feb 6 19:03:18 2004
+++ graphics/lcms/files/Makefile.bsd Thu Jan 1 09:00:00 1970
@@ -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>
diff -urN /usr/ports/graphics/lcms/files/patch-32bit graphics/lcms/files/patch-32bit
--- /usr/ports/graphics/lcms/files/patch-32bit Sat Jan 5 19:53:21 2002
+++ graphics/lcms/files/patch-32bit Sun May 23 11:48:58 2004
@@ -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)
{
diff -urN /usr/ports/graphics/lcms/files/patch-config graphics/lcms/files/patch-config
--- /usr/ports/graphics/lcms/files/patch-config Wed Nov 6 21:44:10 2002
+++ graphics/lcms/files/patch-config Sun May 23 12:14:34 2004
@@ -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)
diff -urN /usr/ports/graphics/lcms/files/patch-icc34 graphics/lcms/files/patch-icc34
--- /usr/ports/graphics/lcms/files/patch-icc34 Sat Jan 5 19:53:21 2002
+++ graphics/lcms/files/patch-icc34 Sun May 23 11:49:40 2004
@@ -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;
diff -urN /usr/ports/graphics/lcms/pkg-plist graphics/lcms/pkg-plist
--- /usr/ports/graphics/lcms/pkg-plist Fri Nov 8 21:24:17 2002
+++ graphics/lcms/pkg-plist Sun May 23 12:02:52 2004
@@ -2,12 +2,12 @@
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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040523220018.21d270b3.tkato>