# HG changeset patch # User Stefan Teleman # Date 1303773257 25200 # Node ID 936900594dbaf7ec4afe619701d54363e0d8eaaf # Parent b87534be1a7649cb92d6996bf761224c819ba45c 7031770 libmng needs to move to Userland 7038171 Upgrade subversion to 1.6.16 7035672 subversion needs to move to Userland diff -r b87534be1a76 -r 936900594dba components/libmng/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libmng/Makefile Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,137 @@ +# +# 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= libmng +COMPONENT_VERSION= 1.0.10 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:78ad516a1de79d00de720bf2a7c9afea2c896b09 +COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/libmng/files/libmng-devel/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) +COMPONENT_ARCHIVE_1 = mng-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_HASH_1 = sha1:074c31b6f6f7c8ee98b4f0b893dfefcba6fd926f +COMPONENT_ARCHIVE_URL_1 = http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_2 = mng-lc-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_HASH_2 = sha1:42f01c79cfbd226a9d4b327017e49b5fd4856f94 +COMPONENT_ARCHIVE_URL_2 = http://www.libpng.org/pub/mng/spec/mng-lc-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_3 = mng-vlc-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_HASH_3 = sha1:906c1db4ff9efc3f36b913651c6e9b05256d25ec +COMPONENT_ARCHIVE_URL_3 = http://www.libpng.org/pub/mng/spec/mng-vlc-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_4 = jng-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_HASH_4 = sha1:b5a036d6249ebbbad04e80bd7d203cbb5b31f0de +COMPONENT_ARCHIVE_URL_4 = http://www.libpng.org/pub/mng/spec/jng-1.0-20010209-pdg.html +COMPONENT_ARCHIVE_5 = index.html +COMPONENT_ARCHIVE_HASH_5 = sha1:074c31b6f6f7c8ee98b4f0b893dfefcba6fd926f +COMPONENT_ARCHIVE_URL_5 = http://www.libpng.org/pub/mng/spec/index.html + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk +include ../../make-rules/lint-libraries.mk + +CFLAGS += -Xc $(CC_BITS) +CFLAGS += $(studio_C99_ENABLE) $(CPP_POSIX) +CFLAGS += `pkg-config --cflags lcms` +CPPFLAGS += $(CPP_LARGEFILES) $(CPP_POSIX) +CPPFLAGS += `pkg-config --cflags lcms` +LDFLAGS += `pkg-config --libs lcms` + +CONFIGURE_ENV += CC="$(CC)" +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" +CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ENV += CPP="$(CC) $(CPPFLAGS) $(CFLAGS) -E" +CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" +CONFIGURE_ENV += LD="$(CC) $(CFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += CCLD="$(CC) $(CFLAGS) $(LDFLAGS)" + +CONFIGURE_OPTIONS += --includedir=/usr/include/libmng +CONFIGURE_OPTIONS += --disable-static +CONFIGURE_OPTIONS += --with-pic +CONFIGURE_OPTIONS += --enable-shared +CONFIGURE_OPTIONS += --disable-static +CONFIGURE_OPTIONS += --disable-libtool-lock +CONFIGURE_OPTIONS += --enable-largefile +CONFIGURE_OPTIONS += --enable-buildso +CONFIGURE_OPTIONS += --enable-read +CONFIGURE_OPTIONS += --enable-write +CONFIGURE_OPTIONS += --enable-display +CONFIGURE_OPTIONS += --enable-dynamic +CONFIGURE_OPTIONS += --enable-chunks +CONFIGURE_OPTIONS += --enable-storechunks +CONFIGURE_OPTIONS += --with-lcms +CONFIGURE_OPTIONS += --with-zlib +CONFIGURE_OPTIONS += --with-jpeg + +GSED = /usr/gnu/bin/sed + +PROTOUSRSHAREDOCDIR = $(PROTOUSRSHAREDIR)/doc/libmng/html +PROTOUSRLIBPKGCONFIGDIR = $(PROTOUSRLIBDIR)/pkgconfig +PROTOUSRLIB64PKGCONFIGDIR = $(PROTOUSRLIBDIR64)/pkgconfig + +HTMLDOCLIST = index.html \ + mng-1.0-20010209-pdg.html \ + mng-lc-1.0-20010209-pdg.html \ + mng-vlc-1.0-20010209-pdg.html \ + jng-1.0-20010209-pdg.html + +PNGLIST = Plan1.png Plan2.png + +COMPONENT_PREP_ACTION = \ + ( cd $(@D) ; \ + $(CP) makefiles/configure.in makefiles/Makefile.am . ; \ + libtoolize --force --copy ; aclocal-1.10 ; \ + automake-1.10 --add-missing --copy ; autoconf ) + +# common targets +build: $(BUILD_32_and_64) + +install: $(INSTALL_32_and_64) + $(MKDIR) $(PROTOUSRSHAREDOCDIR) ; \ + $(MKDIR) $(PROTOUSRLIBPKGCONFIGDIR) ; \ + $(MKDIR) $(PROTOUSRLIB64PKGCONFIGDIR) ; \ + list1='$(HTMLDOCLIST)' ; for f in $$list1; do \ + $(INSTALL) -m 0644 $(COMPONENT_DIR)/$$f \ + $(PROTOUSRSHAREDOCDIR)/ ; \ + done + list2='$(PNGLIST)' ; for f in $$list2 ; do \ + $(INSTALL) -m 0644 $(COMPONENT_DIR)/$(COMPONENT_SRC)/doc/$$f \ + $(PROTOUSRSHAREDOCDIR)/ ; \ + done + $(INSTALL) -m 0644 $(COMPONENT_DIR)/Solaris/libmng.pc \ + $(PROTOUSRLIBPKGCONFIGDIR)/ + $(GSED) -e "s#MACH64#$(MACH64)#g" \ + $(COMPONENT_DIR)/Solaris/libmng-64.pc > \ + $(COMPONENT_DIR)/libmng.pc + $(INSTALL) -m 0644 $(COMPONENT_DIR)/libmng.pc \ + $(PROTOUSRLIB64PKGCONFIGDIR)/ + $(RM) $(COMPONENT_DIR)/libmng.pc + +test: $(NO_TESTS) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk + diff -r b87534be1a76 -r 936900594dba components/libmng/Solaris/libmng-64.pc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libmng/Solaris/libmng-64.pc Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib/MACH64 +includedir=${prefix}/include/libmng + +Name: libmng +Description: Multiple-Image Network Graphics Library +Version: 1.0.10 +Libs: -L${libdir} -lmng +Cflags: -I${includedir} diff -r b87534be1a76 -r 936900594dba components/libmng/Solaris/libmng.pc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libmng/Solaris/libmng.pc Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include/libmng + +Name: libmng +Description: Multiple-Image Network Graphics Library +Version: 1.0.10 +Libs: -L${libdir} -lmng +Cflags: -I${includedir} diff -r b87534be1a76 -r 936900594dba components/libmng/libmng.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libmng/libmng.license Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,58 @@ +/* ************************************************************************** */ +/* * * */ +/* * COPYRIGHT NOTICE: * */ +/* * * */ +/* * Copyright (c) 2000-2007 Gerard Juyn (gerard@libmng.com) * */ +/* * [You may insert additional notices after this sentence if you modify * */ +/* * this source] * */ +/* * * */ +/* * For the purposes of this copyright and license, "Contributing Authors" * */ +/* * is defined as the following set of individuals: * */ +/* * * */ +/* * Gerard Juyn * */ +/* * Glenn Randers-Pehrson * */ +/* * * */ +/* * The MNG Library is supplied "AS IS". The Contributing Authors * */ +/* * disclaim all warranties, expressed or implied, including, without * */ +/* * limitation, the warranties of merchantability and of fitness for any * */ +/* * purpose. The Contributing Authors assume no liability for direct, * */ +/* * indirect, incidental, special, exemplary, or consequential damages, * */ +/* * which may result from the use of the MNG Library, even if advised of * */ +/* * the possibility of such damage. * */ +/* * * */ +/* * Permission is hereby granted to use, copy, modify, and distribute this * */ +/* * source code, or portions hereof, for any purpose, without fee, subject * */ +/* * to the following restrictions: * */ +/* * * */ +/* * 1. The origin of this source code must not be misrepresented; * */ +/* * you must not claim that you wrote the original software. * */ +/* * * */ +/* * 2. Altered versions must be plainly marked as such and must not be * */ +/* * misrepresented as being the original source. * */ +/* * * */ +/* * 3. This Copyright notice may not be removed or altered from any source * */ +/* * or altered source distribution. * */ +/* * * */ +/* * The Contributing Authors specifically permit, without fee, and * */ +/* * encourage the use of this source code as a component to supporting * */ +/* * the MNG and JNG file format in commercial products. If you use this * */ +/* * source code in a product, acknowledgment would be highly appreciated. * */ +/* * * */ +/* ************************************************************************** */ +/* * * */ +/* * Parts of this software have been adapted from the libpng package. * */ +/* * Although this library supports all features from the PNG specification * */ +/* * (as MNG descends from it) it does not require the libpng package. * */ +/* * It does require the zlib library and optionally the IJG jpeg library, * */ +/* * and/or the "little-cms" library by Marti Maria (depending on the * */ +/* * inclusion of support for JNG and Full-Color-Management respectively. * */ +/* * * */ +/* * This library's function is primarily to read and display MNG * */ +/* * animations. It is not meant as a full-featured image-editing * */ +/* * component! It does however offer creation and editing functionality * */ +/* * at the chunk level. * */ +/* * (future modifications may include some more support for creation * */ +/* * and or editing) * */ +/* * * */ +/* ************************************************************************** */ + diff -r b87534be1a76 -r 936900594dba components/libmng/libmng.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libmng/libmng.p5m Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,81 @@ +# +# 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. +# + default mangler.man.stability uncommitted> + +set name=pkg.fmri value=pkg:/library/graphics/libmng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="The Multiple Image Network Graphics Library" +set name=pkg.description value="A PNG-like image format library supporting multiple images, animations and transparent JPEG" +set name=info.classification value="org.opensolaris.category.2008:System/Libraries" +set name=info.upstream_url value="http://www.libmng.com/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2008/072 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/include +dir path=usr/include/libmng +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/libmng +dir path=usr/share/doc/libmng/html +dir path=usr/share/man +dir path=usr/share/man/man3 +dir path=usr/share/man/man5 +# +file path=usr/include/libmng/libmng.h +file path=usr/include/libmng/libmng_conf.h +file path=usr/include/libmng/libmng_types.h +file path=usr/lib/libmng.so.1.0.0 +file path=usr/lib/$(MACH64)/libmng.so.1.0.0 +file path=usr/lib/llib-lmng +file path=usr/lib/llib-lmng.ln +file path=usr/lib/$(MACH64)/llib-lmng.ln +file path=usr/lib/pkgconfig/libmng.pc +file path=usr/lib/$(MACH64)/pkgconfig/libmng.pc +file path=usr/share/doc/libmng/html/Plan1.png +file path=usr/share/doc/libmng/html/Plan2.png +file path=usr/share/doc/libmng/html/index.html +file path=usr/share/doc/libmng/html/jng-1.0-20010209-pdg.html +file path=usr/share/doc/libmng/html/mng-1.0-20010209-pdg.html +file path=usr/share/doc/libmng/html/mng-lc-1.0-20010209-pdg.html +file path=usr/share/doc/libmng/html/mng-vlc-1.0-20010209-pdg.html +file path=usr/share/man/man3/libmng.3 +file path=usr/share/man/man5/mng.5 +file path=usr/share/man/man5/jng.5 +# +link path=usr/lib/libmng.so.1 target=libmng.so.1.0.0 +link path=usr/lib/libmng.so target=libmng.so.1.0.0 +link path=usr/lib/$(MACH64)/libmng.so.1 target=libmng.so.1.0.0 +link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.1.0.0 +# +license libmng.license license="MNG License (BSD-like)" +# +legacy pkg=SUNWlibmng \ + desc="LibMNG - Multiple Image Network Graphics Library (1.0.10)" \ + name="Multiple Image Network Graphics Library" + diff -r b87534be1a76 -r 936900594dba components/libmng/llib-lmng --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libmng/llib-lmng Mon Apr 25 16:14:17 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 b87534be1a76 -r 936900594dba components/meta-packages/history/SUNWlibmng.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWlibmng.p5m Mon Apr 25 16:14:17 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:/SUNWlibmng@1.0.10,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=library/graphics/libmng@1.0.10-0.133 type=require diff -r b87534be1a76 -r 936900594dba components/meta-packages/history/SUNWsvn-java.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWsvn-java.p5m Mon Apr 25 16:14:17 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:/SUNWsvn-java@1.6.5,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=library/java/subversion@1.6.5-0.133 type=require diff -r b87534be1a76 -r 936900594dba components/meta-packages/history/SUNWsvn-perl.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWsvn-perl.p5m Mon Apr 25 16:14:17 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:/SUNWsvn-perl@1.6.5,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=library/perl-5/subversion@1.6.5-0.133 type=require diff -r b87534be1a76 -r 936900594dba components/meta-packages/history/SUNWsvn-python.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWsvn-python.p5m Mon Apr 25 16:14:17 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:/SUNWsvn-python@1.6.5,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=library/python-2/subversion@1.6.5-0.133 type=require diff -r b87534be1a76 -r 936900594dba components/meta-packages/history/SUNWsvn.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWsvn.p5m Mon Apr 25 16:14:17 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:/SUNWsvn@1.6.5,5.11-0.133 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=developer/versioning/subversion@1.6.5-0.133 type=require diff -r b87534be1a76 -r 936900594dba components/subversion/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/Makefile Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,181 @@ +# +# 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= subversion +COMPONENT_VERSION= 1.6.16 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:e957da04252d4d7e0fff72fdcf72c715bfbaa393 +COMPONENT_ARCHIVE_URL= http://subversion.tigris.org/downloads/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk + +PATCH_LEVEL = 0 + +# We need to remove these environment files when +# apache2, apr and apr-util move to Userland +include $(COMPONENT_DIR)/apache.build.env +include $(COMPONENT_DIR)/apr.build.env +include $(COMPONENT_DIR)/apr-util.build.env + +PYMODS = client core delta fs ra repos wc + +ARCH = $(shell arch) +PERL = /usr/perl5/bin/perl +PLVER = 5.8.4 +PLARCH = $(ARCH)-solaris-64int +PLDIR = /usr/perl5/$(PLVER) +PLVENDORDIR = /usr/perl5/vendor_perl/$(PLVER) +PLVENDORARCHDIR = $(PLVENDORDIR)/$(PLARCH) +PLMODS= Fs Core Wc Client Repos Ra Delta +SWIGPROG = /usr/bin/swig +ELFEDIT = /usr/bin/elfedit +JAVA_ROOT = $(JAVA_HOME) +PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig +PROTOUSRSHAREJAVADIR = $(PROTOUSRSHAREDIR)/lib/java +SVN_LDFLAGS = -R/usr/lib/svn:$(APR_USR_PREFIX)/lib:$(APR_UTIL_USR_PREFIX)/lib \ + -L$(APR_USR_PREFIX)/lib \ + -L$(APR_UTIL_USR_PREFIX)/lib \ + -lc -lm -lsocket -lresolv -lnsl -lgen + +CFLAGS += -Xc -xnorunpath $(CC_BITS) +CFLAGS += -features=extinl,extensions +CFLAGS += -xustr=ascii_utf16_ushort -xcsi +CFLAGS += $(studio_C99_ENABLE) +CFLAGS += $(CPP_XPG6MODE) +CXXFLAGS += $(CC_BITS) +CXXFLAGS += -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic +CXXFLAGS += -instances=global +CXXFLAGS += -template=geninlinefuncs +CXXFLAGS += -verbose=template +CXXFLAGS += -xustr=ascii_utf16_ushort +CXXFLAGS += -norunpath +CXXFLAGS += $(PICFLAG) +CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS +CXXFLAGS += $(studio_cplusplus_C99_ENABLE) +CXXFLAGS += $(CPP_XPG5MODE) +CPPFLAGS += `pkg-config --cflags neon` +CPPFLAGS += $(CPP_LARGEFILES) $(CPP_POSIX) +CPPFLAGS += -DNDEBUG -DSOLARIS + +# Let's write some post-configure hacks +COMPONENT_POST_CONFIGURE_ACTION = \ + ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \ + cd $(SOURCE_DIR) ; \ + $(CONFIG_SHELL) ./build/transform_sql.sh ./subversion/libsvn_fs_fs/rep-cache-db.sql < ./subversion/libsvn_fs_fs/rep-cache-db.sql > $(BUILD_DIR_32)/subversion/libsvn_fs_fs/rep-cache-db.h 2>&1 ) + +COMPONENT_BUILD_TARGETS = all swig-py swig-pl javahl +COMPONENT_INSTALL_TARGETS = install install-lib \ + install-swig-pl-lib install-swig-py \ + install-javahl install-javahl-lib \ + install-mods-shared \ + install-bin install-docs + +CONFIGURE_ENV += CC="$(CC)" +CONFIGURE_ENV += CXX="$(CCC)" +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" +CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_ENV += CPP="$(CC) $(CPPFLAGS) $(CFLAGS) -E" +CONFIGURE_ENV += CXXCPP="$(CCC) $(CPPFLAGS) $(CXXFLAGS) -E" +CONFIGURE_ENV += LDFLAGS="$(SVN_LDFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += LD="$(CC) $(CFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += CCLD="$(CC) $(CFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += CXXLD="$(CCC) $(CXXFLAGS) $(LDFLAGS)" +CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH_$(BITS))" +CONFIGURE_ENV += SWIG_LDFLAGS="$(LDFLAGS) $(SWIG_LDFLAGS)" +CONFIGURE_ENV += NEON_LIBS="`pkg-config --libs neon`" +CONFIGURE_ENV += PYTHON="$(PYTHON)" +CONFIGURE_ENV += PYMODS="$(PYMODS)" +CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)" +CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" +CONFIGURE_ENV += PERL="$(PERL)" +CONFIGURE_ENV += PLARCH="$(PLARCH)" +CONFIGURE_ENV += PLVER="$(PLVER)" +CONFIGURE_ENV += PLDIR="$(PLDIR)" +CONFIGURE_ENV += PLVENDORDIR="$(PLVENDORDIR)" +CONFIGURE_ENV += PLVENDORARCHDIR="$(PLVENDORARCHDIR)" +CONFIGURE_ENV += PLMODS="$(PLMODS)" + +LD_OPTIONS += $(SVN_LDFLAGS) $(SWIG_LDFLAGS) + +# Let's make noise just because we have to override --libdir +CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) +CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) +CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) +CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS)) +CONFIGURE_OPTIONS += --libdir=$(CONFIGURE_PREFIX)/lib/svn +CONFIGURE_OPTIONS += --localstatedir=/var +CONFIGURE_OPTIONS += --enable-shared +CONFIGURE_OPTIONS += --disable-static +CONFIGURE_OPTIONS += --disable-libtool-lock +CONFIGURE_OPTIONS += --disable-neon-version-check +CONFIGURE_OPTIONS += --disable-experimental-libtool +CONFIGURE_OPTIONS += --with-apxs=$(APACHE_USR_PREFIX)/bin/apxs +CONFIGURE_OPTIONS += --with-ssl +CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX) +CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT) +CONFIGURE_OPTIONS += --with-apr=$(APR_USR_PREFIX) +CONFIGURE_OPTIONS += --with-apr-util=$(APR_UTIL_USR_PREFIX) +CONFIGURE_OPTIONS += --enable-nls +CONFIGURE_OPTIONS += --disable-mod-activation +CONFIGURE_OPTIONS += --enable-javahl +CONFIGURE_OPTIONS += --with-swig +CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX) + +# elfedit to remove the wrong RUNPATH/RPATH from the C++ library +COMPONENT_POST_INSTALL_ACTION = \ + ( cd $(PROTO_DIR)/$(CONFIGURE_INCLUDEDIR) ; \ + $(MV) subversion-1 svn ; \ + cd $(PROTOUSRLIBDIR)/svn ; \ + $(ELFEDIT) -e 'dyn:runpath /usr/lib/svn:/usr/apr/1.3/lib:/usr/apr-util/1.3/lib' libsvnjavahl-1.so.0.0.0 ; \ + $(ELFEDIT) -e 'dyn:rpath /usr/lib/svn:/usr/apr/1.3/lib:/usr/apr-util/1.3/lib' libsvnjavahl-1.so.0.0.0 ) + +# Perl target +install_perl: + $(PERL) -MExtUtils::Install -e \ + 'install({@ARGV}, '\''0'\'', 0, '\''0'\'');' \ + $(BUILD_DIR_32)/subversion/bindings/swig/perl/native/blib/lib $(PROTO_DIR)/$(PLVENDORDIR) \ + $(BUILD_DIR_32)/subversion/bindings/swig/perl/native/blib/arch $(PROTO_DIR)/$(PLVENDORDIR)/$(PLARCH) \ + $(BUILD_DIR_32)/subversion/bindings/swig/perl/native/blib/man3 $(PROTO_DIR)/$(PLDIR)/man/man3 + +# common targets - we only build 32-bit subversion +build: $(BUILD_32) + +install: $(INSTALL_32) install_perl + $(MKDIR) $(PROTOUSRSHAREJAVADIR) ; \ + $(INSTALL) -m 0644 $(PROTOUSRLIBDIR)/svn/svn-javahl/svn-javahl.jar \ + $(PROTOUSRSHAREJAVADIR)/ + +test: $(TEST_32) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk + diff -r b87534be1a76 -r 936900594dba components/subversion/apache.build.env --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/apache.build.env Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,39 @@ +# +# 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) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +# +# + +APACHE_VERSION=2.2.16 +APACHE_VERSION_DIR=2.2 +APACHE_DIR=httpd-${APACHE_VERSION} +APACHE_PREFORK_DIR=${APACHE_DIR}-prefork +APACHE_PREFORK_DIR64=${APACHE_PREFORK_DIR}-64 +APACHE_WORKER_DIR=${APACHE_DIR}-worker +APACHE_WORKER_DIR64=${APACHE_WORKER_DIR}-64 + +APACHE_DIR_PREFIX=apache2/${APACHE_VERSION_DIR} +APACHE_USR_PREFIX=/usr/${APACHE_DIR_PREFIX} +APACHE_VAR_PREFIX=/var/${APACHE_DIR_PREFIX} +APACHE_ETC_PREFIX=/etc/${APACHE_DIR_PREFIX} +APACHE_LAYOUT=Solaris-Apache2 diff -r b87534be1a76 -r 936900594dba components/subversion/apr-util.build.env --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/apr-util.build.env Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,34 @@ +# +# 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) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# + +APR_UTIL_VERSION=1.3.9 +APR_UTIL_VERSION_DIR=1.3 +APR_UTIL_DIR=apr-util-${APR_UTIL_VERSION} +APR_UTIL_DIR32=${APR_UTIL_DIR}-32 +APR_UTIL_DIR64=${APR_UTIL_DIR}-64 + +APR_UTIL_DIR_PREFIX=apr-util/${APR_UTIL_VERSION_DIR} +APR_UTIL_USR_PREFIX=/usr/${APR_UTIL_DIR_PREFIX} +APR_UTIL_LAYOUT=OpenSolaris diff -r b87534be1a76 -r 936900594dba components/subversion/apr.build.env --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/apr.build.env Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,34 @@ +# +# 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) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# + +APR_VERSION=1.3.9 +APR_VERSION_DIR=1.3 +APR_DIR=apr-${APR_VERSION} +APR_DIR32=${APR_DIR}-32 +APR_DIR64=${APR_DIR}-64 + +APR_DIR_PREFIX=apr/${APR_VERSION_DIR} +APR_USR_PREFIX=/usr/${APR_DIR_PREFIX} +APR_LAYOUT=OpenSolaris diff -r b87534be1a76 -r 936900594dba components/subversion/patches/000-Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/patches/000-Makefile.in.patch Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,13 @@ +--- Makefile.in 2010-11-25 09:55:59.000000000 -0800 ++++ Makefile.in 2011-04-14 11:19:09.472192719 -0700 +@@ -76,8 +76,8 @@ + swig_rb_libdir = @libdir@ + + ### these possibly need further discussion +-swig_pydir = @libdir@/svn-python/libsvn +-swig_pydir_extra = @libdir@/svn-python/svn ++swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn ++swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn + swig_pldir = @libdir@/svn-perl + swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext + contribdir = @bindir@/svn-contrib diff -r b87534be1a76 -r 936900594dba components/subversion/subversion-java.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion-java.p5m Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,51 @@ +# +# 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/java/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Java bindings for the Subversion SCM" +set name=pkg.description value="Java bindings for the Subversion SCM" +set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.upstream_url value="http://subversion.apache.org/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2006/563 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/lib +dir path=usr/lib/svn +dir path=usr/share +dir path=usr/share/lib +dir path=usr/share/lib/java +# +file path=usr/lib/svn/libsvnjavahl-1.so.0.0.0 +file path=usr/share/lib/java/svn-javahl.jar +# +link path=usr/lib/svn/libsvnjavahl-1.so target=libsvnjavahl-1.so.0.0.0 +link path=usr/lib/svn/libsvnjavahl-1.so.0 target=libsvnjavahl-1.so.0.0.0 +# +license subversion.license license="Subversion License" +# +legacy pkg=SUNWsvn-java \ + desc="Java bindings for the subversion source control management system" \ + name="Java bindings for Subversion" + diff -r b87534be1a76 -r 936900594dba components/subversion/subversion-perl.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion-perl.p5m Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,73 @@ +# +# 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. +# + default mangler.man.stability uncommitted> + +set name=pkg.fmri value=pkg:/library/perl-5/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Perl bindings for the Subversion SCM" +set name=pkg.description value="Perl bindings for the Subversion SCM" +set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.upstream_url value="http://subversion.apache.org/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2006/563 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/bin +dir path=usr/lib +dir path=usr/lib/svn +dir path=usr/perl5 +dir path=usr/perl5/5.8.4 +dir path=usr/perl5/5.8.4/man +dir path=usr/perl5/5.8.4/man/man3 +dir path=usr/perl5/vendor_perl +dir path=usr/perl5/vendor_perl/5.8.4 +dir path=usr/perl5/vendor_perl/5.8.4/SVN +# +file path=usr/lib/svn/libsvn_swig_perl-1.so.0.0.0 +file path=usr/perl5/5.8.4/man/man3/SVN::Base.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Client.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Core.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Delta.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Fs.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Ra.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Repos.3 +file path=usr/perl5/5.8.4/man/man3/SVN::Wc.3 +file path=usr/perl5/vendor_perl/5.8.4/SVN/Wc.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Delta.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Client.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Core.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Ra.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Fs.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Base.pm +file path=usr/perl5/vendor_perl/5.8.4/SVN/Repos.pm +# +link path=usr/lib/svn/libsvn_swig_perl-1.so target=libsvn_swig_perl-1.so.0.0.0 +link path=usr/lib/svn/libsvn_swig_perl-1.so.0 target=libsvn_swig_perl-1.so.0.0.0 +# +license subversion.license license="Subversion License" +# +legacy pkg=SUNWsvn-perl \ + desc="Perl Bindings for the Subversion Source Control Management System" \ + name="Subversion Perl Bindings" + diff -r b87534be1a76 -r 936900594dba components/subversion/subversion-python.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion-python.p5m Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,95 @@ +# +# 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/python-2/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Python bindings for the Subversion SCM" +set name=pkg.description value="Python bindings for the Subversion SCM" +set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.upstream_url value="http://subversion.apache.org/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2006/563 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/lib +dir path=usr/lib/python2.6 +dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/libsvn +dir path=usr/lib/python2.6/vendor-packages/svn +dir path=usr/lib/svn +# +file path=usr/lib/python2.6/vendor-packages/libsvn/_client.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_core.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_delta.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_diff.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_fs.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_ra.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_repos.so +file path=usr/lib/python2.6/vendor-packages/libsvn/_wc.so +file path=usr/lib/python2.6/vendor-packages/libsvn/client.py +file path=usr/lib/python2.6/vendor-packages/libsvn/client.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/core.py +file path=usr/lib/python2.6/vendor-packages/libsvn/core.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/delta.py +file path=usr/lib/python2.6/vendor-packages/libsvn/delta.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/diff.py +file path=usr/lib/python2.6/vendor-packages/libsvn/diff.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/fs.py +file path=usr/lib/python2.6/vendor-packages/libsvn/fs.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/ra.py +file path=usr/lib/python2.6/vendor-packages/libsvn/ra.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/repos.py +file path=usr/lib/python2.6/vendor-packages/libsvn/repos.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/wc.py +file path=usr/lib/python2.6/vendor-packages/libsvn/wc.pyc +file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py +file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.pyc +file path=usr/lib/python2.6/vendor-packages/svn/client.py +file path=usr/lib/python2.6/vendor-packages/svn/client.pyc +file path=usr/lib/python2.6/vendor-packages/svn/core.py +file path=usr/lib/python2.6/vendor-packages/svn/core.pyc +file path=usr/lib/python2.6/vendor-packages/svn/delta.py +file path=usr/lib/python2.6/vendor-packages/svn/delta.pyc +file path=usr/lib/python2.6/vendor-packages/svn/diff.py +file path=usr/lib/python2.6/vendor-packages/svn/diff.pyc +file path=usr/lib/python2.6/vendor-packages/svn/fs.py +file path=usr/lib/python2.6/vendor-packages/svn/fs.pyc +file path=usr/lib/python2.6/vendor-packages/svn/ra.py +file path=usr/lib/python2.6/vendor-packages/svn/ra.pyc +file path=usr/lib/python2.6/vendor-packages/svn/repos.py +file path=usr/lib/python2.6/vendor-packages/svn/repos.pyc +file path=usr/lib/python2.6/vendor-packages/svn/wc.py +file path=usr/lib/python2.6/vendor-packages/svn/wc.pyc +file path=usr/lib/python2.6/vendor-packages/svn/__init__.py +file path=usr/lib/python2.6/vendor-packages/svn/__init__.pyc +file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0 +# +link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0 +link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0 +# +license subversion.license license="Subversion License" +# +legacy pkg=SUNWsvn-python \ + desc="Python Bindings for the Subversion Source Control Management System" \ + name="Subversion Python Bindings" + diff -r b87534be1a76 -r 936900594dba components/subversion/subversion.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion.license Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,58 @@ +This license applies to all portions of Subversion which are not +externally-maintained libraries (e.g. apr/, apr-util/, and neon/). +Such libraries have their own licenses; we recommend you read them, as +their terms may differ from the terms below. + +This is version 1 of this license. It is also available online at +http://subversion.tigris.org/license-1.html. If newer versions of +this license are posted there (the same URL, but with the version +number incremented: .../license-2.html, .../license-3.html, and so +on), you may use a newer version instead, at your option. + +================================================================ +Copyright (c) 2000-2009 CollabNet. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes software developed by + CollabNet (http://www.Collab.Net/)." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + +4. The hosted project names must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact info@collab.net. + +5. Products derived from this software may not use the "Tigris" name + nor may "Tigris" appear in their names without prior written + permission of CollabNet. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL COLLABNET OR ITS CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +==================================================================== + +This software consists of voluntary contributions made by many +individuals on behalf of CollabNet. + diff -r b87534be1a76 -r 936900594dba components/subversion/subversion.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/subversion/subversion.p5m Mon Apr 25 16:14:17 2011 -0700 @@ -0,0 +1,192 @@ +# +# 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. +# + default mangler.man.stability uncommitted> + +set name=pkg.fmri value=pkg:/developer/versioning/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Subversion" +set name=pkg.description value="A full-featured version control and source code management system designed to be a better CVS" +set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.upstream_url value="http://subversion.apache.org/" +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2006/563 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +# +dir path=usr +dir path=usr/apache2 +dir path=usr/apache2/2.2 +dir path=usr/apache2/2.2/libexec +dir path=usr/bin +dir path=usr/include +dir path=usr/include/svn +dir path=usr/lib +dir path=usr/lib/svn +dir path=usr/share +dir path=usr/share/locale +dir path=usr/share/locale/de +dir path=usr/share/locale/de/LC_MESSAGES +dir path=usr/share/locale/es +dir path=usr/share/locale/es/LC_MESSAGES +dir path=usr/share/locale/fr +dir path=usr/share/locale/fr/LC_MESSAGES +dir path=usr/share/locale/it +dir path=usr/share/locale/it/LC_MESSAGES +dir path=usr/share/locale/ja +dir path=usr/share/locale/ja/LC_MESSAGES +dir path=usr/share/locale/ko +dir path=usr/share/locale/ko/LC_MESSAGES +dir path=usr/share/locale/nb +dir path=usr/share/locale/nb/LC_MESSAGES +dir path=usr/share/locale/pl +dir path=usr/share/locale/pl/LC_MESSAGES +dir path=usr/share/locale/pt_BR +dir path=usr/share/locale/pt_BR/LC_MESSAGES +dir path=usr/share/locale/sv +dir path=usr/share/locale/sv/LC_MESSAGES +dir path=usr/share/locale/zh_CN +dir path=usr/share/locale/zh_CN/LC_MESSAGES +dir path=usr/share/locale/zh_TW +dir path=usr/share/locale/zh_TW/LC_MESSAGES +dir path=usr/share/man +dir path=usr/share/man/man1 +dir path=usr/share/man/man5 +dir path=usr/share/man/man8 +# +file path=usr/apache2/2.2/libexec/mod_authz_svn.so +file path=usr/apache2/2.2/libexec/mod_dav_svn.so +file path=usr/bin/svn +file path=usr/bin/svnadmin +file path=usr/bin/svndumpfilter +file path=usr/bin/svnlook +file path=usr/bin/svnserve +file path=usr/bin/svnsync +file path=usr/bin/svnversion +file path=usr/include/svn/mod_authz_svn.h +file path=usr/include/svn/mod_dav_svn.h +file path=usr/include/svn/svn_auth.h +file path=usr/include/svn/svn_base64.h +file path=usr/include/svn/svn_checksum.h +file path=usr/include/svn/svn_client.h +file path=usr/include/svn/svn_cmdline.h +file path=usr/include/svn/svn_compat.h +file path=usr/include/svn/svn_config.h +file path=usr/include/svn/svn_ctype.h +file path=usr/include/svn/svn_dav.h +file path=usr/include/svn/svn_delta.h +file path=usr/include/svn/svn_diff.h +file path=usr/include/svn/svn_dirent_uri.h +file path=usr/include/svn/svn_dso.h +file path=usr/include/svn/svn_error.h +file path=usr/include/svn/svn_error_codes.h +file path=usr/include/svn/svn_fs.h +file path=usr/include/svn/svn_hash.h +file path=usr/include/svn/svn_io.h +file path=usr/include/svn/svn_iter.h +file path=usr/include/svn/svn_md5.h +file path=usr/include/svn/svn_mergeinfo.h +file path=usr/include/svn/svn_nls.h +file path=usr/include/svn/svn_opt.h +file path=usr/include/svn/svn_path.h +file path=usr/include/svn/svn_pools.h +file path=usr/include/svn/svn_props.h +file path=usr/include/svn/svn_quoprint.h +file path=usr/include/svn/svn_ra.h +file path=usr/include/svn/svn_ra_svn.h +file path=usr/include/svn/svn_repos.h +file path=usr/include/svn/svn_sorts.h +file path=usr/include/svn/svn_string.h +file path=usr/include/svn/svn_subst.h +file path=usr/include/svn/svn_time.h +file path=usr/include/svn/svn_types.h +file path=usr/include/svn/svn_user.h +file path=usr/include/svn/svn_utf.h +file path=usr/include/svn/svn_version.h +file path=usr/include/svn/svn_wc.h +file path=usr/include/svn/svn_xml.h +file path=usr/lib/svn/libsvn_client-1.so.0.0.0 +file path=usr/lib/svn/libsvn_delta-1.so.0.0.0 +file path=usr/lib/svn/libsvn_diff-1.so.0.0.0 +file path=usr/lib/svn/libsvn_fs-1.so.0.0.0 +file path=usr/lib/svn/libsvn_fs_fs-1.so.0.0.0 +file path=usr/lib/svn/libsvn_fs_util-1.so.0.0.0 +file path=usr/lib/svn/libsvn_ra-1.so.0.0.0 +file path=usr/lib/svn/libsvn_ra_local-1.so.0.0.0 +file path=usr/lib/svn/libsvn_ra_neon-1.so.0.0.0 +file path=usr/lib/svn/libsvn_ra_svn-1.so.0.0.0 +file path=usr/lib/svn/libsvn_repos-1.so.0.0.0 +file path=usr/lib/svn/libsvn_subr-1.so.0.0.0 +file path=usr/lib/svn/libsvn_wc-1.so.0.0.0 +file path=usr/share/locale/de/LC_MESSAGES/subversion.mo +file path=usr/share/locale/es/LC_MESSAGES/subversion.mo +file path=usr/share/locale/fr/LC_MESSAGES/subversion.mo +file path=usr/share/locale/it/LC_MESSAGES/subversion.mo +file path=usr/share/locale/ja/LC_MESSAGES/subversion.mo +file path=usr/share/locale/ko/LC_MESSAGES/subversion.mo +file path=usr/share/locale/nb/LC_MESSAGES/subversion.mo +file path=usr/share/locale/pl/LC_MESSAGES/subversion.mo +file path=usr/share/locale/pt_BR/LC_MESSAGES/subversion.mo +file path=usr/share/locale/sv/LC_MESSAGES/subversion.mo +file path=usr/share/locale/zh_CN/LC_MESSAGES/subversion.mo +file path=usr/share/locale/zh_TW/LC_MESSAGES/subversion.mo +file path=usr/share/man/man1/svn.1 +file path=usr/share/man/man1/svnadmin.1 +file path=usr/share/man/man1/svndumpfilter.1 +file path=usr/share/man/man1/svnlook.1 +file path=usr/share/man/man1/svnsync.1 +file path=usr/share/man/man1/svnversion.1 +file path=usr/share/man/man5/svnserve.conf.5 +file path=usr/share/man/man8/svnserve.8 +# +link path=usr/lib/svn/libsvn_client-1.so.0 target=libsvn_client-1.so.0.0.0 +link path=usr/lib/svn/libsvn_client-1.so target=libsvn_client-1.so.0.0.0 +link path=usr/lib/svn/libsvn_delta-1.so.0 target=libsvn_delta-1.so.0.0.0 +link path=usr/lib/svn/libsvn_delta-1.so target=libsvn_delta-1.so.0.0.0 +link path=usr/lib/svn/libsvn_diff-1.so.0 target=libsvn_diff-1.so.0.0.0 +link path=usr/lib/svn/libsvn_diff-1.so target=libsvn_diff-1.so.0.0.0 +link path=usr/lib/svn/libsvn_fs-1.so.0 target=libsvn_fs-1.so.0.0.0 +link path=usr/lib/svn/libsvn_fs-1.so target=libsvn_fs-1.so.0.0.0 +link path=usr/lib/svn/libsvn_fs_fs-1.so.0 target=libsvn_fs_fs-1.so.0.0.0 +link path=usr/lib/svn/libsvn_fs_fs-1.so target=libsvn_fs_fs-1.so.0.0.0 +link path=usr/lib/svn/libsvn_fs_util-1.so.0 target=libsvn_fs_util-1.so.0.0.0 +link path=usr/lib/svn/libsvn_fs_util-1.so target=libsvn_fs_util-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra-1.so.0 target=libsvn_ra-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra-1.so target=libsvn_ra-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_local-1.so.0 target=libsvn_ra_local-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_local-1.so target=libsvn_ra_local-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_neon-1.so.0 target=libsvn_ra_neon-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_neon-1.so target=libsvn_ra_neon-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_svn-1.so.0 target=libsvn_ra_svn-1.so.0.0.0 +link path=usr/lib/svn/libsvn_ra_svn-1.so target=libsvn_ra_svn-1.so.0.0.0 +link path=usr/lib/svn/libsvn_repos-1.so.0 target=libsvn_repos-1.so.0.0.0 +link path=usr/lib/svn/libsvn_repos-1.so target=libsvn_repos-1.so.0.0.0 +link path=usr/lib/svn/libsvn_subr-1.so.0 target=libsvn_subr-1.so.0.0.0 +link path=usr/lib/svn/libsvn_subr-1.so target=libsvn_subr-1.so.0.0.0 +link path=usr/lib/svn/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0 +link path=usr/lib/svn/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0 +# +license subversion.license license="Subversion License" +# +legacy pkg=SUNWsvn \ + desc="The Subversion Source Control Management System (1.6.16)" \ + name="Subversion" + diff -r b87534be1a76 -r 936900594dba make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Mon Apr 25 15:05:59 2011 -0700 +++ b/make-rules/shared-macros.mk Mon Apr 25 16:14:17 2011 -0700 @@ -287,6 +287,9 @@ # CFLAGS instead of using this directly CPP_XPG6MODE= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__=1 -D_XPG6 +# XPG5 mode. These options are specific for C++, where _XPG6, +# _XOPEN_SOURCE=600 and C99 are illegal. -D__EXTENSIONS__=1 is legal in C++. +CPP_XPG5MODE= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__=1 -D_XPG5 # # Studio C compiler flag sets to ease feature selection. Add the required @@ -320,6 +323,16 @@ # Use the compiler default 'xc99=all,no_lib' studio_C99MODE = +# For C++, compatibility with C99 (which is technically illegal) is +# enabled in a different way. So, we must use a different macro for it. +studio_cplusplus_C99_ENABLE = -xlang=c99 + +# Turn it off. +studio_cplusplus_C99_DISABLE = + +# And this is the macro you should actually use +studio_cplusplus_C99MODE = + # Allow zero-sized struct/union declarations and void functions with return # statements. studio_FEATURES_EXTENSIONS = -features=extensions @@ -371,6 +384,10 @@ studio_XPG6MODE = $(studio_C99MODE) $(CPP_XPG6MODE) XPG6MODE = $(studio_XPG6MODE) +# See CPP_XPG5MODE comment above. You can only use this in C++, not in C99. +studio_XPG5MODE = $(studio_cplusplus_C99MODE) $(CPP_XPG5MODE) +XPG5MODE = $(studio_XPG5MODE) + # Default Studio C compiler flags. Add the required feature to your Makefile # with CFLAGS += $(FEATURE_MACRO) and add to the component build with # CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" or similiar. In most cases, it diff -r b87534be1a76 -r 936900594dba transforms/defaults --- a/transforms/defaults Mon Apr 25 15:05:59 2011 -0700 +++ b/transforms/defaults Mon Apr 25 16:14:17 2011 -0700 @@ -44,6 +44,7 @@ default group other> default group other> default group sys> + default group sys> # # Most directories and files under /etc/security are group sys