# HG changeset patch # User Stefan Teleman # Date 1302536106 25200 # Node ID 187aa0541610fe1bf88df079033ec2db02b36116 # Parent 69315e61a221a3790a9393cb3516b92d974bf93b 7031766 LCMS needs to move to Userland 7033229 CURL should move to Userland 7007881 Curl not configured to find certs in /etc/certs/CA diff -r 69315e61a221 -r 187aa0541610 components/curl/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/Makefile Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,216 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME = curl +COMPONENT_VERSION= 7.21.2 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_PROJECT_URL= http://curl.haxx.se/ +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:af8182165d7a0d16b97e2c2936ed92f3ba5c868c +COMPONENT_ARCHIVE_URL= http://curl.haxx.se/download/$(COMPONENT_ARCHIVE) + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk + +PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig +PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig + +PATCH_LEVEL = 0 + +LIBNAME = $(COMPONENT_NAME) +LINTOUT = lint.out + +GSSAPI_LIBDIR_32 = /usr/lib +GSSAPI_LIBDIR_64 = /usr/lib/$(MACH64) + +# Enable C99 mode +studio_C99MODE = $(studio_C99_ENABLE) + +# And we want -Xc too +CFLAGS += $(CC_BITS) -Xc -xnorunpath $(XPG6MODE) +CFLAGS += $(CPP_POSIX) $(CPP_LARGEFILES) +CPPFLAGS += $(CPP_POSIX) $(CPP_LARGEFILES) -D__EXTENSIONS__=1 -DNDEBUG +LDFLAGS += -lpthread -lc -lm -lgss -lsocket -lresolv -lnsl -lgen + +CONFIGURE_ENV += CPP="$(CC) $(CPPFLAGS) $(CFLAGS) -E" +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" +CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ENV += CCLD="$(CC) $(CFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" +CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_$(BITS))" + +CONFIGURE_OPTIONS += --localstatedir=/var --enable-shared --disable-static +CONFIGURE_OPTIONS += --enable-http --enable-ftp +CONFIGURE_OPTIONS += --enable-file --enable-dict +CONFIGURE_OPTIONS += --enable-manual --disable-libgcc +CONFIGURE_OPTIONS += --enable-rtsp --enable-proxy +CONFIGURE_OPTIONS += --enable-telnet --enable-tftp --enable-pop3 +CONFIGURE_OPTIONS += --enable-imap --enable-smtp +CONFIGURE_OPTIONS += --enable-ipv6 --enable-nonblocking +CONFIGURE_OPTIONS += --enable-thread --enable-verbose +CONFIGURE_OPTIONS += --disable-sspi --enable-crypto-auth +CONFIGURE_OPTIONS += --enable-cookies --disable-hidden-symbols +CONFIGURE_OPTIONS += --disable-soname-bump +CONFIGURE_OPTIONS += --enable-ldap --with-random=/dev/urandom +CONFIGURE_OPTIONS += --with-ssl --with-ldap-lib=ldap +CONFIGURE_OPTIONS += --with-lber-lib=sldap +CONFIGURE_OPTIONS += --with-gssapi-includes=/usr/include/gssapi +CONFIGURE_OPTIONS += --with-gssapi-libs=$(GSSAPI_LIBDIR_$(BITS)) +CONFIGURE_OPTIONS += --with-gssapi=/usr --without-ca-bundle +CONFIGURE_OPTIONS += --with-ca-path=/etc/openssl/certs +CONFIGURE_OPTIONS += --with-zlib=/usr --with-libidn=/usr +CONFIGURE_OPTIONS += --with-pic +CONFIGURE_OPTIONS += "curl_disallow_getifaddrs=yes" + +PKG_PROTO_DIRS += $(COMPONENT_SRC) + +COMPONENT_POST_BUILD_ACTION = \ + ( cd $(@D) ; \ + $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \ + -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \ + -I$(COMPONENT_DIR)/$(COMPONENT_SRC) \ + $(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1) + +COMPONENT_POST_INSTALL_ACTION = \ + ( $(CP) $(COMPONENT_DIR)/llib-l$(LIBNAME) $(PROTOUSRLIBDIR)/ ; \ + cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \ + $(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)) ) + +PROTOUSRBINDIR64 = $(PROTOUSRBINDIR)/$(MACH64) +PROTOUSRSHAREDOCDIR1 = $(PROTOUSRSHAREDIR)/doc/curl/html +PROTOUSRSHAREDOCDIR2 = $(PROTOUSRSHAREDIR)/doc/libcurl/html + +build: $(BUILD_32_and_64) + +HTMLDOCLIST1 = curl.html curl-config.html index.html +HTMLDOCLIST2 = curl_easy_cleanup.html curl_easy_duphandle.html \ + curl_easy_escape.html curl_easy_getinfo.html \ + curl_easy_init.html curl_easy_pause.html \ + curl_easy_perform.html curl_easy_recv.html \ + curl_easy_reset.html curl_easy_send.html \ + curl_easy_setopt.html curl_easy_strerror.html \ + curl_easy_unescape.html curl_escape.html \ + curl_formadd.html curl_formfree.html \ + curl_formget.html curl_free.html \ + curl_getdate.html curl_getenv.html \ + curl_global_cleanup.html curl_global_init.html \ + curl_global_init_mem.html curl_mprintf.html \ + curl_multi_add_handle.html curl_multi_assign.html \ + curl_multi_cleanup.html curl_multi_fdset.html \ + curl_multi_info_read.html curl_multi_init.html \ + curl_multi_perform.html curl_multi_remove_handle.html \ + curl_multi_setopt.html curl_multi_socket.html \ + curl_multi_socket_action.html curl_multi_strerror.html \ + curl_multi_timeout.html curl_share_cleanup.html \ + curl_share_init.html curl_share_setopt.html \ + curl_share_strerror.html curl_slist_append.html \ + curl_slist_free_all.html curl_strequal.html \ + curl_unescape.html curl_version.html \ + curl_version_info.html index.html \ + libcurl-easy.html libcurl-errors.html \ + libcurl-multi.html libcurl-share.html \ + libcurl-tutorial.html libcurl.html + +MAN1LIST = curl-config.1 curl.1 +MAN3LIST = curl_easy_cleanup.3 curl_easy_duphandle.3 \ + curl_easy_escape.3 curl_easy_getinfo.3 \ + curl_easy_init.3 curl_easy_pause.3 \ + curl_easy_perform.3 curl_easy_recv.3 \ + curl_easy_reset.3 curl_easy_send.3 \ + curl_easy_setopt.3 curl_easy_strerror.3 \ + curl_easy_unescape.3 curl_escape.3 \ + curl_formadd.3 curl_formfree.3 \ + curl_formget.3 curl_free.3 \ + curl_getdate.3 curl_getenv.3 \ + curl_global_cleanup.3 curl_global_init.3 \ + curl_global_init_mem.3 curl_mprintf.3 \ + curl_multi_add_handle.3 curl_multi_assign.3 \ + curl_multi_cleanup.3 curl_multi_fdset.3 \ + curl_multi_info_read.3 curl_multi_init.3 \ + curl_multi_perform.3 curl_multi_remove_handle.3 \ + curl_multi_setopt.3 curl_multi_socket.3 \ + curl_multi_socket_action.3 curl_multi_strerror.3 \ + curl_multi_timeout.3 curl_share_cleanup.3 \ + curl_share_init.3 curl_share_setopt.3 \ + curl_share_strerror.3 curl_slist_append.3 \ + curl_slist_free_all.3 curl_strequal.3 \ + curl_unescape.3 curl_version.3 \ + curl_version_info.3 libcurl-easy.3 \ + libcurl-errors.3 libcurl-multi.3 \ + libcurl-share.3 libcurl-tutorial.3 libcurl.3 + +GSED = /usr/gnu/bin/sed + +include ../../make-rules/shared-targets.mk + +install: $(INSTALL_32_and_64) + $(MKDIR) $(PROTOUSRSHAREDOCDIR1) ; \ + list1='$(HTMLDOCLIST1)' ; for f in $$list1; do \ + $(INSTALL) -m 0644 $(COMPONENT_DIR)/$(COMPONENT_SRC)/docs/$$f \ + $(PROTOUSRSHAREDOCDIR1)/ ; \ + done + $(MKDIR) $(PROTOUSRSHAREDOCDIR2) ; \ + list2='$(HTMLDOCLIST2)' ; for f in $$list2; do \ + $(INSTALL) -m 0644 \ + $(COMPONENT_DIR)/$(COMPONENT_SRC)/docs/libcurl/$$f \ + $(PROTOUSRSHAREDOCDIR2)/ ; \ + done + $(MKDIR) $(PROTOUSRSHAREMAN1DIR) ; \ + list3='$(MAN1LIST)'; for f in $$list3; do \ + $(GSED) -f oracleman-stability \ + $(PROTOUSRSHAREMAN1DIR)/$$f > \ + $(PROTOUSRSHAREMAN1DIR)/$$f.sed 2>&1 ; \ + $(CP) -fp $(PROTOUSRSHAREMAN1DIR)/$$f.sed \ + $(PROTOUSRSHAREMAN1DIR)/$$f ; \ + $(RM) -f $(PROTOUSRSHAREMAN1DIR)/$$f.sed ; \ + done + $(MKDIR) $(PROTOUSRSHAREMAN3DIR) ; \ + list4='$(MAN3LIST)'; for f in $$list4; do \ + $(GSED) -f oracleman-stability \ + $(PROTOUSRSHAREMAN3DIR)/$$f > \ + $(PROTOUSRSHAREMAN3DIR)/$$f.sed 2>&1 ; \ + $(CP) -fp $(PROTOUSRSHAREMAN3DIR)/$$f.sed \ + $(PROTOUSRSHAREMAN3DIR)/$$f ; \ + $(RM) -f $(PROTOUSRSHAREMAN3DIR)/$$f.sed ; \ + done + $(RM) $(PROTOUSRBINDIR)/curl-config ; \ + $(INSTALL) -m 0755 $(COMPONENT_DIR)/Solaris/curl-config \ + $(PROTOUSRBINDIR)/ + $(RM) $(PROTOUSRBINDIR64)/curl-config + $(GSED) -e "s#MACH64#$(MACH64)#g" \ + $(COMPONENT_DIR)/Solaris/curl-config-64 > \ + $(COMPONENT_DIR)/curl-config + $(INSTALL) -m 0755 \ + $(COMPONENT_DIR)/curl-config $(PROTOUSRBINDIR64)/ + $(RM) $(COMPONENT_DIR)/curl-config + +test: $(BUILD_32_and_64) + @cd $(BUILD_DIR_32); $(GMAKE) check + @cd $(BUILD_DIR_64); $(GMAKE) check + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk + diff -r 69315e61a221 -r 187aa0541610 components/curl/Solaris/curl-config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/Solaris/curl-config Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,157 @@ +#! /bin/sh +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2001 - 2010, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +# Modified to conform to Solaris standards. +# +########################################################################### + +prefix=/usr +exec_prefix=${prefix} +includedir=${prefix}/include/curl + +usage() +{ + cat <, et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +# Modified to conform to Solaris standards. +# +# ident "@(#)curl-config-64 1.8 10/10/18 SMI" +# +########################################################################### + +prefix=/usr +exec_prefix=${prefix} +includedir=${prefix}/include + +usage() +{ + cat <. + +All rights reserved. + +Permission to use, copy, modify, and distribute this software for +any purpose with or without fee is hereby granted, provided that the +above copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + diff -r 69315e61a221 -r 187aa0541610 components/curl/curl.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/curl.p5m Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,185 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# +set name=pkg.fmri value=pkg:/web/curl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="The CURL Network Utility and Library" +set name=pkg.description value="A command-line tool and library for transforming data with URL syntax" +set name=info.classification value="org.opensolaris.category.2008:System/Libraries" +set name=info.upstream_url value="http://curl.haxx.se/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/bin +dir path=usr/bin/$(MACH64) +dir path=usr/include +dir path=usr/include/curl +dir path=usr/lib +dir path=usr/lib/$(MACH64) +dir path=usr/lib/pkgconfig +dir path=usr/lib/$(MACH64)/pkgconfig +dir path=usr/share +dir path=usr/share/doc +dir path=usr/share/doc/curl +dir path=usr/share/doc/curl/html +dir path=usr/share/doc/libcurl +dir path=usr/share/doc/libcurl/html +dir path=usr/share/man +dir path=usr/share/man/man1 +dir path=usr/share/man/man3 +# +file path=usr/bin/curl +file path=usr/bin/curl-config +file path=usr/bin/$(MACH64)/curl-config +file path=usr/include/curl/curlbuild.h +file path=usr/include/curl/curl.h +file path=usr/include/curl/curlrules.h +file path=usr/include/curl/curlver.h +file path=usr/include/curl/easy.h +file path=usr/include/curl/mprintf.h +file path=usr/include/curl/multi.h +file path=usr/include/curl/stdcheaders.h +file path=usr/include/curl/typecheck-gcc.h +file path=usr/include/curl/types.h +file path=usr/lib/libcurl.so.3.0.0 +file path=usr/lib/$(MACH64)/libcurl.so.3.0.0 +file path=usr/lib/llib-lcurl +file path=usr/lib/llib-lcurl.ln +file path=usr/lib/$(MACH64)/llib-lcurl.ln +file path=usr/lib/pkgconfig/libcurl.pc +file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc +file path=usr/share/doc/curl/html/index.html +file path=usr/share/doc/curl/html/curl.html +file path=usr/share/doc/curl/html/curl-config.html +file path=usr/share/doc/libcurl/html/curl_easy_cleanup.html +file path=usr/share/doc/libcurl/html/curl_easy_duphandle.html +file path=usr/share/doc/libcurl/html/curl_easy_escape.html +file path=usr/share/doc/libcurl/html/curl_easy_getinfo.html +file path=usr/share/doc/libcurl/html/curl_easy_init.html +file path=usr/share/doc/libcurl/html/curl_easy_perform.html +file path=usr/share/doc/libcurl/html/curl_easy_reset.html +file path=usr/share/doc/libcurl/html/curl_easy_setopt.html +file path=usr/share/doc/libcurl/html/curl_easy_strerror.html +file path=usr/share/doc/libcurl/html/curl_easy_unescape.html +file path=usr/share/doc/libcurl/html/curl_escape.html +file path=usr/share/doc/libcurl/html/curl_formadd.html +file path=usr/share/doc/libcurl/html/curl_formfree.html +file path=usr/share/doc/libcurl/html/curl_formget.html +file path=usr/share/doc/libcurl/html/curl_free.html +file path=usr/share/doc/libcurl/html/curl_getdate.html +file path=usr/share/doc/libcurl/html/curl_getenv.html +file path=usr/share/doc/libcurl/html/curl_global_cleanup.html +file path=usr/share/doc/libcurl/html/curl_global_init.html +file path=usr/share/doc/libcurl/html/curl_global_init_mem.html +file path=usr/share/doc/libcurl/html/curl_mprintf.html +file path=usr/share/doc/libcurl/html/curl_multi_add_handle.html +file path=usr/share/doc/libcurl/html/curl_multi_assign.html +file path=usr/share/doc/libcurl/html/curl_multi_cleanup.html +file path=usr/share/doc/libcurl/html/curl_multi_fdset.html +file path=usr/share/doc/libcurl/html/curl_multi_info_read.html +file path=usr/share/doc/libcurl/html/curl_multi_init.html +file path=usr/share/doc/libcurl/html/curl_multi_perform.html +file path=usr/share/doc/libcurl/html/curl_multi_remove_handle.html +file path=usr/share/doc/libcurl/html/curl_multi_setopt.html +file path=usr/share/doc/libcurl/html/curl_multi_socket.html +file path=usr/share/doc/libcurl/html/curl_multi_strerror.html +file path=usr/share/doc/libcurl/html/curl_multi_timeout.html +file path=usr/share/doc/libcurl/html/curl_share_cleanup.html +file path=usr/share/doc/libcurl/html/curl_share_init.html +file path=usr/share/doc/libcurl/html/curl_share_setopt.html +file path=usr/share/doc/libcurl/html/curl_share_strerror.html +file path=usr/share/doc/libcurl/html/curl_slist_append.html +file path=usr/share/doc/libcurl/html/curl_slist_free_all.html +file path=usr/share/doc/libcurl/html/curl_strequal.html +file path=usr/share/doc/libcurl/html/curl_unescape.html +file path=usr/share/doc/libcurl/html/curl_version.html +file path=usr/share/doc/libcurl/html/curl_version_info.html +file path=usr/share/doc/libcurl/html/index.html +file path=usr/share/doc/libcurl/html/libcurl-easy.html +file path=usr/share/doc/libcurl/html/libcurl-errors.html +file path=usr/share/doc/libcurl/html/libcurl-multi.html +file path=usr/share/doc/libcurl/html/libcurl-share.html +file path=usr/share/doc/libcurl/html/libcurl-tutorial.html +file path=usr/share/doc/libcurl/html/libcurl.html +file path=usr/share/man/man1/curl.1 +file path=usr/share/man/man1/curl-config.1 +file path=usr/share/man/man3/curl_easy_cleanup.3 +file path=usr/share/man/man3/curl_easy_duphandle.3 +file path=usr/share/man/man3/curl_easy_escape.3 +file path=usr/share/man/man3/curl_easy_getinfo.3 +file path=usr/share/man/man3/curl_easy_init.3 +file path=usr/share/man/man3/curl_easy_perform.3 +file path=usr/share/man/man3/curl_easy_reset.3 +file path=usr/share/man/man3/curl_easy_setopt.3 +file path=usr/share/man/man3/curl_easy_strerror.3 +file path=usr/share/man/man3/curl_easy_unescape.3 +file path=usr/share/man/man3/curl_escape.3 +file path=usr/share/man/man3/curl_formadd.3 +file path=usr/share/man/man3/curl_formfree.3 +file path=usr/share/man/man3/curl_formget.3 +file path=usr/share/man/man3/curl_free.3 +file path=usr/share/man/man3/curl_getdate.3 +file path=usr/share/man/man3/curl_getenv.3 +file path=usr/share/man/man3/curl_global_cleanup.3 +file path=usr/share/man/man3/curl_global_init.3 +file path=usr/share/man/man3/curl_global_init_mem.3 +file path=usr/share/man/man3/curl_mprintf.3 +file path=usr/share/man/man3/curl_multi_add_handle.3 +file path=usr/share/man/man3/curl_multi_assign.3 +file path=usr/share/man/man3/curl_multi_cleanup.3 +file path=usr/share/man/man3/curl_multi_fdset.3 +file path=usr/share/man/man3/curl_multi_info_read.3 +file path=usr/share/man/man3/curl_multi_init.3 +file path=usr/share/man/man3/curl_multi_perform.3 +file path=usr/share/man/man3/curl_multi_remove_handle.3 +file path=usr/share/man/man3/curl_multi_setopt.3 +file path=usr/share/man/man3/curl_multi_socket.3 +file path=usr/share/man/man3/curl_multi_strerror.3 +file path=usr/share/man/man3/curl_multi_timeout.3 +file path=usr/share/man/man3/curl_share_cleanup.3 +file path=usr/share/man/man3/curl_share_init.3 +file path=usr/share/man/man3/curl_share_setopt.3 +file path=usr/share/man/man3/curl_share_strerror.3 +file path=usr/share/man/man3/curl_slist_append.3 +file path=usr/share/man/man3/curl_slist_free_all.3 +file path=usr/share/man/man3/curl_strequal.3 +file path=usr/share/man/man3/curl_unescape.3 +file path=usr/share/man/man3/curl_version.3 +file path=usr/share/man/man3/curl_version_info.3 +file path=usr/share/man/man3/libcurl-easy.3 +file path=usr/share/man/man3/libcurl-errors.3 +file path=usr/share/man/man3/libcurl-multi.3 +file path=usr/share/man/man3/libcurl-share.3 +file path=usr/share/man/man3/libcurl-tutorial.3 +file path=usr/share/man/man3/libcurl.3 +# +link path=usr/lib/libcurl.so.3 target=libcurl.so.3.0.0 +link path=usr/lib/libcurl.so target=libcurl.so.3.0.0 +link path=usr/lib/$(MACH64)/libcurl.so.3 target=libcurl.so.3.0.0 +link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.3.0.0 +# +license curl.license license="CURL" +# +legacy pkg=SUNWcurl \ + desc="CURL - The C-URL Wrappers Library (7.21.2)" \ + name="The C-URL Wrappers Library" + diff -r 69315e61a221 -r 187aa0541610 components/curl/llib-lcurl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/llib-lcurl Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,36 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + */ + +/* LINTLIBRARY */ +/* PROTOLIB1 */ + +/* + * This little dance is necessary to avoid ftello/fseeko + * complaints vs libc. We don't use them but we do #include + * stdio.h and as we are large file aware they get defined + * differently than libc. + */ +#include + diff -r 69315e61a221 -r 187aa0541610 components/curl/oracleman-stability --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/oracleman-stability Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,27 @@ +1i\ +'\\" t\ +\.\\"\ +\.\\" Modified for Solaris to to add the Solaris stability classification,\ +\.\\" and to add a note about source availability.\ +\.\\"\ +$a\ +\.\\" Begin Sun update\ +.SH ATTRIBUTES\ +See\ +.BR attributes (5)\ +for descriptions of the following attributes:\ +.sp\ +.TS\ +box;\ +cbp-1 | cbp-1\ +l | l .\ +ATTRIBUTE TYPE ATTRIBUTE VALUE\ +=\ +Availability web/curl \ +=\ +Interface Stability Uncommitted \ +.TE \ +.PP\ +.SH NOTES\ +Source for C-URL is available on http://opensolaris.org.\ +\.\\" End Sun update diff -r 69315e61a221 -r 187aa0541610 components/curl/patches/000-configure.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/patches/000-configure.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,246 @@ +--- configure 2010-10-01 13:49:17.000000000 -0700 ++++ configure 2010-10-18 08:18:56.838791104 -0700 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/ksh93 + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.67 for curl -. + # +@@ -274,7 +274,7 @@ + fi + fi + fi +-SHELL=${CONFIG_SHELL-/bin/sh} ++SHELL=${CONFIG_SHELL-/bin/ksh93} + export SHELL + # Unset more variables known to interfere with behavior of common tools. + CLICOLOR_FORCE= GREP_OPTIONS= +@@ -565,7 +565,7 @@ + + + # Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} ++SHELL=${CONFIG_SHELL-/bin/ksh93} + + case X$lt_ECHO in + X*--fallback-echo) +@@ -649,7 +649,7 @@ + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/ksh93} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL +@@ -691,7 +691,7 @@ + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/ksh93}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo +@@ -2001,6 +2001,13 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 ++#include ++#include ++#include ++#include ++#include ++#include ++#include + int main (void) + { + static int test_array [1 - 2 * !(($2) >= 0)]; +@@ -2041,6 +2048,13 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 ++#include ++#include ++#include ++#include ++#include ++#include ++#include + int main (void) + { + static int test_array [1 - 2 * !(($2) < 0)]; +@@ -2056,6 +2070,13 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 ++#include ++#include ++#include ++#include ++#include ++#include ++#include + int main (void) + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +@@ -2089,6 +2110,13 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 ++#include ++#include ++#include ++#include ++#include ++#include ++#include + int main (void) + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +@@ -2113,10 +2141,15 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 +-static long int longval () { return $2; } +-static unsigned long int ulongval () { return $2; } + #include + #include ++#include ++#include ++#include ++#include ++#include ++static long int longval () { return $2; } ++static unsigned long int ulongval () { return $2; } + int main (void) + { + +@@ -2797,7 +2830,7 @@ + + + +-ac_config_headers="$ac_config_headers lib/curl_config.h src/curl_config.h include/curl/curlbuild.h" ++ac_config_headers="$ac_config_headers lib/curl_config.h src/curl_config.h" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +@@ -3263,12 +3296,6 @@ + fi + + +- +- +-if test -f ${srcdir}/include/curl/curlbuild.h; then +- rm -f ${srcdir}/include/curl/curlbuild.h +-fi +- + VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h` + am__api_version="1.9" + ac_aux_dir= +@@ -3538,7 +3565,7 @@ + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh ++SHELL = /bin/ksh93 + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +@@ -4734,7 +4761,7 @@ + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. ++ # Solaris 8's {/usr,}/bin/ksh93. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +@@ -8029,7 +8056,7 @@ + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/ksh93}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +@@ -9261,8 +9288,8 @@ + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" ++ if ${LD-ld} -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld}" + fi + ;; + esac +@@ -13653,7 +13680,7 @@ + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh ++SHELL = /bin/ksh93 + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +@@ -19176,15 +19203,15 @@ + LIBS="$LIBS $gss_libs" + elif test "$GSSAPI_ROOT" != "yes"; then + LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" +- LIBS="$LIBS -lgssapi" ++ LIBS="$LIBS -lgss" + else +- LIBS="$LIBS -lgssapi" ++ LIBS="$LIBS -lgss" + fi + ;; + esac + else + LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" +- LIBS="$LIBS -lgssapi" ++ LIBS="$LIBS -lgss" + fi + else + CPPFLAGS="$save_CPPFLAGS" +@@ -19210,7 +19237,7 @@ + if test x$cross_compiling != xyes; then + PKGTEST="yes" + fi +- PREFIX_OPENSSL=/usr/local/ssl ++ PREFIX_OPENSSL="/usr" + LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" + ;; + off) +@@ -22731,20 +22758,13 @@ + + + +-curl_preprocess_callconv="\ +-/* preprocess start */ +-#ifdef HAVE_WINDOWS_H +-# define FUNCALLCONV __stdcall +-#else +-# define FUNCALLCONV +-#endif +-/* preprocess end */" ++curl_preprocess_callconv="" + + + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5 + $as_echo_n "checking for curl_socklen_t data type... " >&6; } +- curl_typeof_curl_socklen_t="unknown" ++ curl_typeof_curl_socklen_t="socklen_t" + for arg1 in int SOCKET; do + for arg2 in 'struct sockaddr' void; do + for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do +@@ -35751,7 +35771,6 @@ + case $ac_config_target in + "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;; + "src/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/curl_config.h" ;; +- "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; diff -r 69315e61a221 -r 187aa0541610 components/curl/patches/001-Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/patches/001-Makefile.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,20 @@ +--- lib/Makefile.in 2010-10-01 13:49:18.000000000 -0700 ++++ lib/Makefile.in 2010-10-18 08:05:00.803406622 -0700 +@@ -364,7 +364,7 @@ + @USE_EMBEDDED_ARES_TRUE@ -I$(top_builddir)/ares \ + @USE_EMBEDDED_ARES_TRUE@ -I$(top_srcdir)/ares + +-@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 6:0:2 ++@SONAME_BUMP_FALSE@VERSIONINFO = -version-info 3:0:0 + + # + # Bumping of SONAME conditionally may seem like a weird thing to do, and yeah +@@ -375,7 +375,7 @@ + # + # This conditional soname bump SHOULD be removed at next "proper" bump. + # +-@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 7:0:2 ++@SONAME_BUMP_TRUE@VERSIONINFO = -version-info 3:0:0 + + # This flag accepts an argument of the form current[:revision[:age]]. So, + # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to diff -r 69315e61a221 -r 187aa0541610 components/curl/patches/002-curlbuild.h.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/patches/002-curlbuild.h.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,97 @@ +--- include/curl/curlbuild.h 2010-10-12 15:04:32.000000000 -0700 ++++ include/curl/curlbuild.h 2010-12-02 10:18:42.364070201 -0800 +@@ -496,6 +496,45 @@ + # define CURL_SIZEOF_CURL_SOCKLEN_T 4 + + /* ===================================== */ ++/* Sun Studio Compilers */ ++/* ===================================== */ ++ ++#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) ++#include ++#include ++#include ++ ++# define CURL_TYPEOF_CURL_OFF_T off_t ++# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t ++# define CURL_SIZEOF_CURL_SOCKLEN_T 4 ++# if defined(__amd64) || defined(__sparcv9) ++# define CURL_SIZEOF_CURL_OFF_T 8 ++# define CURL_SIZEOF_LONG 8 ++# define CURL_FORMAT_CURL_OFF_T "ld" ++# define CURL_FORMAT_CURL_OFF_TU "lu" ++# define CURL_FORMAT_OFF_T "%ld" ++# define CURL_SUFFIX_CURL_OFF_T L ++# define CURL_SUFFIX_CURL_OFF_TU UL ++# else ++# define CURL_SIZEOF_LONG 4 ++# if _FILE_OFFSET_BITS == 64 && _LARGEFILE_SOURCE != 0 ++# define CURL_SIZEOF_CURL_OFF_T 8 ++# define CURL_FORMAT_CURL_OFF_T "lld" ++# define CURL_FORMAT_CURL_OFF_TU "llu" ++# define CURL_FORMAT_OFF_T "%lld" ++# define CURL_SUFFIX_CURL_OFF_T LL ++# define CURL_SUFFIX_CURL_OFF_TU ULL ++# else ++# define CURL_SIZEOF_CURL_OFF_T 4 ++# define CURL_FORMAT_CURL_OFF_T "ld" ++# define CURL_FORMAT_CURL_OFF_TU "lu" ++# define CURL_FORMAT_OFF_T "%ld" ++# define CURL_SUFFIX_CURL_OFF_T L ++# define CURL_SUFFIX_CURL_OFF_TU UL ++# endif ++# endif ++ ++/* ===================================== */ + /* KEEP MSVC THE PENULTIMATE ENTRY */ + /* ===================================== */ + +@@ -527,6 +566,40 @@ + /* ===================================== */ + + #elif defined(__GNUC__) ++# if defined(sun) || defined(__sun) || defined(__sun__) ++# include ++# include ++# include ++# define CURL_TYPEOF_CURL_OFF_T off_t ++# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t ++# define CURL_SIZEOF_CURL_SOCKLEN_T 4 ++# if defined(__x86_64__) || defined(__sparcv9) ++# define CURL_SIZEOF_CURL_OFF_T 8 ++# define CURL_SIZEOF_LONG 8 ++# define CURL_FORMAT_CURL_OFF_T "ld" ++# define CURL_FORMAT_CURL_OFF_TU "lu" ++# define CURL_FORMAT_OFF_T "%ld" ++# define CURL_SUFFIX_CURL_OFF_T L ++# define CURL_SUFFIX_CURL_OFF_TU UL ++# else /* (__i386__) || (__sparc) */ ++# define CURL_SIZEOF_LONG 4 ++# if _FILE_OFFSET_BITS == 64 && _LARGEFILE_SOURCE != 0 ++# define CURL_SIZEOF_CURL_OFF_T 8 ++# define CURL_FORMAT_CURL_OFF_T "lld" ++# define CURL_FORMAT_CURL_OFF_TU "llu" ++# define CURL_FORMAT_OFF_T "%lld" ++# define CURL_SUFFIX_CURL_OFF_T LL ++# define CURL_SUFFIX_CURL_OFF_TU ULL ++# else ++# define CURL_SIZEOF_CURL_OFF_T 4 ++# define CURL_FORMAT_CURL_OFF_T "ld" ++# define CURL_FORMAT_CURL_OFF_TU "lu" ++# define CURL_FORMAT_OFF_T "%ld" ++# define CURL_SUFFIX_CURL_OFF_T L ++# define CURL_SUFFIX_CURL_OFF_TU UL ++# endif ++# endif ++# else /* !((sun) || (__sun) || (__sun__)) */ + # if defined(__i386__) || defined(__ppc__) + # define CURL_SIZEOF_LONG 4 + # define CURL_TYPEOF_CURL_OFF_T long long +@@ -550,6 +623,7 @@ + # define CURL_SIZEOF_CURL_SOCKLEN_T 4 + # define CURL_PULL_SYS_TYPES_H 1 + # define CURL_PULL_SYS_SOCKET_H 1 ++# endif /* ((sun) || (__sun) || (__sun__)) */ + + #else + # error "Unknown non-configure build target!" diff -r 69315e61a221 -r 187aa0541610 components/curl/patches/003-Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/patches/003-Makefile.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,11 @@ +--- tests/server/Makefile.in 2010-10-01 13:49:21.000000000 -0700 ++++ tests/server/Makefile.in 2010-10-18 08:05:49.792499927 -0700 +@@ -209,7 +209,7 @@ + LDFLAGS = @LDFLAGS@ + LIBCURL_LIBS = @LIBCURL_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lsocket -lresolv -lnsl -lgen + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ diff -r 69315e61a221 -r 187aa0541610 components/curl/patches/004-Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/patches/004-Makefile.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,22 @@ +--- include/curl/Makefile.in 2010-10-01 13:49:18.000000000 -0700 ++++ include/curl/Makefile.in 2011-03-31 11:29:48.945604347 -0700 +@@ -306,18 +306,8 @@ + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-curlbuild.h: stamp-h3 +- @if test ! -f $@; then \ +- rm -f stamp-h3; \ +- $(MAKE) stamp-h3; \ +- else :; fi +- +-stamp-h3: $(srcdir)/curlbuild.h.in $(top_builddir)/config.status ++stamp-h3: + @rm -f stamp-h3 +- cd $(top_builddir) && $(SHELL) ./config.status include/curl/curlbuild.h +-$(srcdir)/curlbuild.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) +- rm -f stamp-h3 + touch $@ + + distclean-hdr: diff -r 69315e61a221 -r 187aa0541610 components/curl/patches/005-libcurl.pc.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/curl/patches/005-libcurl.pc.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,11 @@ +--- libcurl.pc.in 2010-09-18 14:00:22.000000000 -0700 ++++ libcurl.pc.in 2011-03-31 15:39:42.953234906 -0700 +@@ -26,7 +26,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/curl + supported_protocols="@SUPPORT_PROTOCOLS@" + supported_features="@SUPPORT_FEATURES@" + diff -r 69315e61a221 -r 187aa0541610 components/lcms/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/Makefile Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,160 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME = lcms +COMPONENT_VERSION= 1.19 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_PROJECT_URL= http://www.littlecms.com/ +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:d5b075ccffc0068015f74f78e4bc39138bcfe2d4 +COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/lcms/files/lcms/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) + +PYTHON_VERSION = 2.6 + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk + +PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig +PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig + +PATCH_LEVEL = 0 + +LIBNAME = $(COMPONENT_NAME) +LINTOUT = lint.out + +# These aren't set by default. +PYTHON.$(PYTHON_VERSION).32 = /usr/bin/python2.6 +PYTHON.$(PYTHON_VERSION).64 = /usr/bin/$(MACH64)/python2.6 + +PYTHONMODULEDIR_32 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages +PYTHONMODULEDIR_64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 +PROTOPYTHONMODULE32DIR = $(PROTOUSRLIBDIR)/python$(PYTHON_VERSION)/vendor-packages +PROTOPYTHONMODULE64DIR = $(PROTOUSRLIBDIR)/python$(PYTHON_VERSION)/vendor-packages/64 +PROTOUSRINCLUDEDIR = $(PROTO_DIR)/usr/include + +CFLAGS += -Xc -xnorunpath $(CC_BITS) +CFLAGS += $(studio_C99_ENABLE) $(CPP_POSIX) $(CPP_LARGEFILES) +CPPFLAGS += $(CPP_POSIX) $(CPP_LARGEFILES) -DNDEBUG +CXXFLAGS += -mt -library=Crun -library=Cstd -compat=5 +CXXFLAGS += -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic +CXXFLAGS += -instances=global -template=geninlinefuncs -xlang=c99 +CXXFLAGS += -xbuiltin=%none -xinline=%auto +CXXFLAGS += -D_XPG5 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__=1 +CXXFLAGS += $(CPP_POSIX) $(CPP_LARGEFILES) $(CC_BITS) +LDFLAGS += -lpython$(PYTHON_VERSION) -lc -lm +PYTHONPATH_32 = /usr/lib/python$(PYTHON_VERSION) +PYTHONPATH_64 = /usr/lib/$(MACH64)/python$(PYTHON_VERSION) +ELFEDIT = /usr/bin/elfedit +GSED = /usr/gnu/bin/sed +DOS2UNIX = /usr/bin/dos2unix + +CONFIGURE_ENV += CXX="$(CCC)" +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" +CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ENV += CCLD="$(CC) $(CFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += CXXLD="$(CCC) $(CXXFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += CXXCPP="$(CCC) $(CPPFLAGS) $(CXXFLAGS) -E" +CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" +CONFIGURE_ENV += PYTHON="$(PYTHON)" +CONFIGURE_ENV += PYTHONPATH="$(PYTHONPATH_$(BITS))" +CONFIGURE_ENV += PYTHONMODULEDIR="$(PYTHONMODULEDIR_$(BITS))" +CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_$(BITS))" + +CONFIGURE_OPTIONS += --includedir=/usr/include/lcms +CONFIGURE_OPTIONS += --enable-shared +CONFIGURE_OPTIONS += --disable-static +CONFIGURE_OPTIONS += --with-jpeg +CONFIGURE_OPTIONS += --with-tiff +CONFIGURE_OPTIONS += --with-zlib +CONFIGURE_OPTIONS += --with-python +CONFIGURE_OPTIONS += --with-pic + +PKG_PROTO_DIRS += $(COMPONENT_SRC) + +COMPONENT_POST_CONFIGURE_ACTION = \ + ( cd $(@D); \ + $(CP) -p $(SOURCE_DIR)/include/lcms.h ./include/ ; \ + $(RM) -f $(SOURCE_DIR)/include/icc34.h ; \ + $(CP) -p include/icc34.h $(SOURCE_DIR)/include/ ) + +COMPONENT_POST_BUILD_ACTION = \ + ( cd $(@D) ; \ + $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \ + -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \ + -I$(COMPONENT_DIR)/$(COMPONENT_SRC) \ + $(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1) + +# We have to do this because libtool builds the C++ library with an +# incorrect RUNPATH/RPATH +COMPONENT_POST_INSTALL_ACTION = \ + ( $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR)" \ + $(PROTOPYTHONMODULE32DIR)/_lcms.so ; \ + $(ELFEDIT) -e "dyn:rpath $(USRLIBDIR)" \ + $(PROTOPYTHONMODULE32DIR)/_lcms.so ; \ + $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR64)" \ + $(PROTOPYTHONMODULE64DIR)/_lcms.so ; \ + $(ELFEDIT) -e "dyn:rpath $(USRLIBDIR64)" \ + $(PROTOPYTHONMODULE64DIR)/_lcms.so ; \ + $(DOS2UNIX) $(PROTOUSRINCLUDEDIR)/lcms/icc34.h > \ + $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u ; \ + $(CP) -fp $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u \ + $(PROTOUSRINCLUDEDIR)/lcms/icc34.h ; \ + $(DOS2UNIX) $(PROTOUSRINCLUDEDIR)/lcms/lcms.h > \ + $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u ; \ + $(CP) -fp $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u \ + $(PROTOUSRINCLUDEDIR)/lcms/lcms.h ; \ + $(RM) -f $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u \ + $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u ; \ + $(CP) $(COMPONENT_DIR)/llib-l$(LIBNAME) $(PROTOUSRLIBDIR)/ ; \ + cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \ + $(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)) ) + +build: $(BUILD_32_and_64) + +MAN1LIST = icc2ps.1 icclink.1 icctrans.1 \ + jpegicc.1 tifficc.1 wtpt.1 + +include ../../make-rules/shared-targets.mk + +install: $(INSTALL_32_and_64) + $(MKDIR) $(PROTOUSRSHAREMAN1DIR) ; \ + list1='$(MAN1LIST)'; for f in $$list1; do \ + $(GSED) -f oracleman-stability \ + $(PROTOUSRSHAREMAN1DIR)/$$f > \ + $(PROTOUSRSHAREMAN1DIR)/$$f.sed 2>&1 ; \ + $(CP) -fp $(PROTOUSRSHAREMAN1DIR)/$$f.sed \ + $(PROTOUSRSHAREMAN1DIR)/$$f ; \ + $(RM) -f $(PROTOUSRSHAREMAN1DIR)/$$f.sed ; \ + done + +test: $(BUILD_32_and_64) + @cd $(BUILD_DIR_32); $(GMAKE) check + @cd $(BUILD_DIR_64); $(GMAKE) check + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk + diff -r 69315e61a221 -r 187aa0541610 components/lcms/lcms.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/lcms.license Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,21 @@ +Little CMS Copyright (c) 1998-2007 Marti Maria Saguer + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff -r 69315e61a221 -r 187aa0541610 components/lcms/lcms.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/lcms.p5m Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,85 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# +set name=pkg.fmri value=pkg:/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="The Little Color Management System" +set name=pkg.description value="A small-footprint color management engine, with special focus on accuracy and performance" +set name=info.classification value="org.opensolaris.category.2008:System/Libraries" +set name=info.upstream_url value="http://www.littlecms.com/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/bin +dir path=usr/include +dir path=usr/include/lcms +dir path=usr/lib +dir path=usr/lib/$(MACH64) +dir path=usr/lib/pkgconfig +dir path=usr/lib/$(MACH64)/pkgconfig +dir path=usr/lib/python2.6 +dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/64 +dir path=usr/share +dir path=usr/share/doc +dir path=usr/share/doc/lcms +dir path=usr/share/doc/lcms/html +dir path=usr/share/man +dir path=usr/share/man/man1 +# +file path=usr/bin/icc2ps +file path=usr/bin/icclink +file path=usr/bin/icctrans +file path=usr/bin/jpegicc +file path=usr/bin/tiffdiff +file path=usr/bin/tifficc +file path=usr/bin/wtpt +file path=usr/include/lcms/lcms.h +file path=usr/include/lcms/icc34.h +file path=usr/lib/liblcms.so.1.0.19 +file path=usr/lib/$(MACH64)/liblcms.so.1.0.19 +file path=usr/lib/llib-llcms +file path=usr/lib/llib-llcms.ln +file path=usr/lib/$(MACH64)/llib-llcms.ln +file path=usr/lib/pkgconfig/lcms.pc +file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc +file path=usr/lib/python2.6/vendor-packages/_lcms.so +file path=usr/lib/python2.6/vendor-packages/64/_lcms.so +file path=usr/lib/python2.6/vendor-packages/lcms.py +file path=usr/share/man/man1/icc2ps.1 +file path=usr/share/man/man1/icclink.1 +file path=usr/share/man/man1/icctrans.1 +file path=usr/share/man/man1/jpegicc.1 +file path=usr/share/man/man1/tifficc.1 +file path=usr/share/man/man1/wtpt.1 +# +link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19 +link path=usr/lib/liblcms.so target=liblcms.so.1.0.19 +link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19 +link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19 +# +license lcms.license license="MIT" +# +legacy pkg=SUNWlcms \ + desc="LCMS - Little Color Management System (1.19)" \ + name="Little Color Management System" + diff -r 69315e61a221 -r 187aa0541610 components/lcms/llib-llcms --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/llib-llcms Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,37 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + */ + +/* LINTLIBRARY */ +/* PROTOLIB1 */ + +/* + * This little dance is necessary to avoid ftello/fseeko + * complaints vs libc. We don't use them but we do #include + * stdio.h and as we are large file aware they get defined + * differently than libc. + */ +#include +#include + diff -r 69315e61a221 -r 187aa0541610 components/lcms/oracleman-stability --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/oracleman-stability Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,27 @@ +1i\ +'\\" t\ +\.\\"\ +\.\\" Modified for Solaris to to add the Solaris stability classification,\ +\.\\" and to add a note about source availability.\ +\.\\"\ +$a\ +\.\\" Begin Oracle update\ +.SH ATTRIBUTES\ +See\ +.BR attributes (5)\ +for descriptions of the following attributes:\ +.sp\ +.TS\ +box;\ +cbp-1 | cbp-1\ +l | l .\ +ATTRIBUTE TYPE ATTRIBUTE VALUE\ +=\ +Availability library/lcms \ +=\ +Interface Stability Uncommitted \ +.TE \ +.PP\ +.SH NOTES\ +Source for LCMS is available on http://opensolaris.org.\ +\.\\" End Oracle update diff -r 69315e61a221 -r 187aa0541610 components/lcms/patches/000-configure.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/patches/000-configure.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,79 @@ +--- configure 2009-10-30 08:57:45.000000000 -0700 ++++ configure 2011-03-29 17:53:58.890691776 -0700 +@@ -5246,13 +5246,8 @@ + + + # Configure python. AM_PATH_PYTHON is basically braindead +-PYTHON='' + if test "$with_python" = 'yes' + then +- +- +- +- + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 +@@ -5400,8 +5395,7 @@ + if test "${am_cv_python_pythondir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || +- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` ++ am_cv_python_pythondir=`echo "${PYTHONMODULEDIR}"` + fi + { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 + echo "${ECHO_T}$am_cv_python_pythondir" >&6; } +@@ -5417,8 +5411,7 @@ + if test "${am_cv_python_pyexecdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || +- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` ++ am_cv_python_pyexecdir=`echo "${PYTHONMODULEDIR}"` + fi + { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 + echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } +@@ -5436,7 +5429,8 @@ + if test -n "$PYTHON" + then + LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"` +- LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"` ++ LCMS_PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` ++ LCMS_PYEXECDIR=`echo "${PYTHONMODULEDIR}"` + LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"` + LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"` + as_ac_File=`echo "ac_cv_file_$LCMS_PYINCLUDE/Python.h" | $as_tr_sh` +@@ -9481,7 +9475,7 @@ + ;; + + solaris*) +- no_undefined_flag=' -z text' ++ no_undefined_flag=' -z text -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +@@ -9489,11 +9483,11 @@ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + wlarc='' +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$CC $LTCFLAGS $LDFLAGS -G ${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ $CC $LTCFLAGS $LDFLAGS -G ${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi +- hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_libdir_flag_spec='' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; +@@ -11270,7 +11264,7 @@ + echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" +-#! $SHELL ++#! $CONFIG_SHELL + + # `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) diff -r 69315e61a221 -r 187aa0541610 components/lcms/patches/001-Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/patches/001-Makefile.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,29 @@ +--- python/Makefile.in 2009-07-17 07:35:22.000000000 -0700 ++++ python/Makefile.in 2011-03-29 18:16:55.269652847 -0700 +@@ -62,7 +62,7 @@ + _lcms_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(_lcms_la_LDFLAGS) $(LDFLAGS) -o $@ +-@SUPPORT_PYTHON_TRUE@am__lcms_la_rpath = -rpath $(pkgdir) ++@SUPPORT_PYTHON_TRUE@am__lcms_la_rpath = -rpath $(libdir) + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -71,7 +71,7 @@ + LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-CXXLD = $(CXX) ++CXXLD = $(CXX) $(CXXFLAGS) $(LDFLAGS) + CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +@@ -126,7 +126,7 @@ + LCMS_PYEXECDIR = @LCMS_PYEXECDIR@ + LCMS_PYINCLUDE = @LCMS_PYINCLUDE@ + LCMS_PYLIB = @LCMS_PYLIB@ +-LD = @LD@ ++LD = $(CXX) $(CXXFLAGS) $(LDFLAGS) + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBRARY_AGE = @LIBRARY_AGE@ diff -r 69315e61a221 -r 187aa0541610 components/lcms/patches/002-Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/patches/002-Makefile.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,11 @@ +--- src/Makefile.in 2009-07-17 07:35:22.000000000 -0700 ++++ src/Makefile.in 2010-03-23 10:23:01.305941153 -0700 +@@ -127,7 +127,7 @@ + LCMS_PYEXECDIR = @LCMS_PYEXECDIR@ + LCMS_PYINCLUDE = @LCMS_PYINCLUDE@ + LCMS_PYLIB = @LCMS_PYLIB@ +-LD = @LD@ ++LD = $(CC) $(CFLAGS) $(LDFLAGS) + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBRARY_AGE = @LIBRARY_AGE@ diff -r 69315e61a221 -r 187aa0541610 components/lcms/patches/003-icc34.h.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/patches/003-icc34.h.in.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,20 @@ +--- include/icc34.h.in 2007-05-25 07:04:02.000000000 -0700 ++++ include/icc34.h.in 2011-03-29 16:11:47.693553324 -0700 +@@ -144,7 +144,7 @@ + */ + + +-#ifdef PACKAGE_NAME ++#if !defined(HAVE_INTTYPES_H) || !defined(HAVE_STDINT_H) + /* + June 9, 2003, Adapted for use with configure by Bob Friesenhahn + Added the stupid check for autoconf by Marti Maria. +@@ -214,6 +214,8 @@ + + #if defined (__MINGW) || defined(__MINGW32__) + #include ++#elif defined(_sun) ++#include + #endif + + diff -r 69315e61a221 -r 187aa0541610 components/lcms/patches/004-ltmain.sh.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/lcms/patches/004-ltmain.sh.patch Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,20 @@ +--- ltmain.sh 2006-10-16 22:22:11.000000000 -0700 ++++ ltmain.sh 2011-03-30 09:04:38.929871299 -0700 +@@ -5972,17 +5972,6 @@ + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + +- # Don't allow the user to place us outside of our expected +- # location b/c this prevents finding dependent libraries that +- # are installed to the same prefix. +- # At present, this check doesn't affect windows .dll's that +- # are installed into $libdir/../bin (currently, that works fine) +- # but it's something to keep an eye on. +- if test "$inst_prefix_dir" = "$destdir"; then +- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit $EXIT_FAILURE +- fi +- + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` diff -r 69315e61a221 -r 187aa0541610 components/meta-packages/history/SUNWcurl.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWcurl.p5m Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,27 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri value=pkg:/SUNWcurl@7.19.5,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=web/curl@7.19.5-0.133 type=require diff -r 69315e61a221 -r 187aa0541610 components/meta-packages/history/SUNWlcms.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWlcms.p5m Mon Apr 11 08:35:06 2011 -0700 @@ -0,0 +1,27 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri value=pkg:/SUNWlcms@1.17,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=library/lcms@1.17-0.133 type=require