# HG changeset patch # User Mike Sullivan # Date 1308688834 25200 # Node ID b3a36ee9301292a7f5049daaeca7362307fc03a5 # Parent 36f3560adf050ccf2e3792aeb20332972cf32849 7057088 move quilt to userland diff -r 36f3560adf05 -r b3a36ee93012 components/meta-packages/history/SUNWquilt.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWquilt.p5m Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,29 @@ +# +# 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:/SUNWquilt@0.47,5.11-0.133 +set name=pkg.renamed value=true + +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +depend fmri=developer/quilt@0.47-0.133 type=require diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/Makefile Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,82 @@ +# +# 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= quilt +COMPONENT_VERSION= 0.47 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_PROJECT_URL= http://savannah.nongnu.org/projects/quilt +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:028dadd5ab60b1df12edd18af600e59fe0a83525 +COMPONENT_ARCHIVE_URL= http://download.savannah.gnu.org/releases/quilt/$(COMPONENT_ARCHIVE) + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk + +COMPONENT_PRE_CONFIGURE_ACTION = \ + ($(CLONEY) $(SOURCE_DIR) $(@D)) + +COMPONENT_PREP_ACTION = \ + (cd $(@D) ; autoconf ) + +PATCH_LEVEL= 0 + +# without this, some make messages end up in the +# generated README and man pages. +COMPONENT_BUILD_ARGS+= --no-print-directory + +# Quilt will need this option until Solaris has GNU getopt. +CONFIGURE_OPTIONS += --without-getopt + +CONFIGURE_OPTIONS += --with-cp=/usr/gnu/bin/cp +CONFIGURE_OPTIONS += --with-date=/usr/gnu/bin/date +CONFIGURE_OPTIONS += --with-grep=/usr/gnu/bin/grep +CONFIGURE_OPTIONS += --with-tail=/usr/gnu/bin/tail +CONFIGURE_OPTIONS += --with-tr=/usr/gnu/bin/tr +CONFIGURE_OPTIONS += --with-sed=/usr/gnu/bin/sed +CONFIGURE_OPTIONS += --with-diff=/usr/gnu/bin/diff +CONFIGURE_OPTIONS += --with-patch=/usr/gnu/bin/patch +CONFIGURE_OPTIONS += --with-perl=/usr/perl5/$(PERL_VERSION)/bin/perl +CONFIGURE_OPTIONS += --with-pod2man=/usr/perl5/$(PERL_VERSION)/bin/pod2man +CONFIGURE_OPTIONS += --with-xgettext=/usr/bin/gxgettext +CONFIGURE_OPTIONS += --with-msgfmt=/usr/bin/gmsgfmt + +CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" + +COMPONENT_INSTALL_ARGS += BUILD_ROOT=$(PROTO_DIR) + + +# common targets +build: $(BUILD_32) + +install: $(INSTALL_32) + +test: $(TEST_32) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/01-import-mkdir.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/01-import-mkdir.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,38 @@ +From: Wolfram Sang +Subject: [Quilt-dev] [patch 2/3] import.test: always have a local patches-dir +Date: Sat, 11 Oct 2008 15:47:22 +0200 +To: quilt-dev@nongnu.org +cc: + +The test for import did not always recreate a patches-dir inside the temporary +location, so it would fail if you modified quilt using quilt. + +Signed-off-by: Wolfram Sang +--- + test/import.test | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +Index: test/import.test +=================================================================== +--- test/import.test.orig 2008-11-05 14:14:37.911126000 -0600 ++++ test/import.test 2008-11-05 14:14:41.151317000 -0600 +@@ -229,7 +229,8 @@ + > No patches applied + + # Test importing multiple patches at once +- $ rm -rf .pc patches ++ $ rm -rf patches/ .pc/ ++ $ mkdir patches + $ quilt import t/patch1.diff t/patchR.diff + > Importing patch t/patch1.diff (stored as patches/patch1.diff) + > Importing patch t/patchR.diff (stored as patches/patchR.diff) +@@ -238,7 +239,8 @@ + > patch1.diff + > patchR.diff + +- $ rm -rf .pc patches ++ $ rm -rf patches/ .pc/ ++ $ mkdir patches + $ quilt import t/patchR.diff + > Importing patch t/patchR.diff (stored as patches/patchR.diff) + $ quilt import t/patch1.diff diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/02-makefile-install.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/02-makefile-install.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,28 @@ +(Message quiltdev.in:9) + +From: Dean Roehrich +Subject: [Quilt-dev] [patch] Use INSTALL when installing LC_MESSAGES files +Date: Wed, 22 Oct 2008 11:14:10 CDT +To: quilt-dev@nongnu.org + +I ran into a case solaris ON build 99 where configure found ginstall, but the +Makefile.in used something else, and that led to things going a bit haywire. + +Dean + + +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2008-11-05 14:11:24.269682000 -0600 ++++ Makefile.in 2008-11-05 14:15:59.439693000 -0600 +@@ -426,8 +426,8 @@ ifeq ($(USE_NLS),yes) + install-main :: + for lang in $(LINGUAS) ; do \ + dir=$(BUILD_ROOT)$(localedir)/$$lang/LC_MESSAGES; \ +- install -d $$dir; \ +- install -m 644 po/$$lang.mo \ ++ $(INSTALL) -d $$dir; \ ++ $(INSTALL) -m 644 po/$$lang.mo \ + $$dir/quilt.mo ; \ + done + diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/03-find-path.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/03-find-path.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,116 @@ +Someday GNU find will be available for the SFW build environment (maybe +LSARC/2008/531). When that happens this patch will no longer be required. + + + + +Index: quilt/fold.in +=================================================================== +--- quilt/fold.in.orig 2008-11-05 14:11:24.246878000 -0600 ++++ quilt/fold.in 2008-11-05 14:18:18.240681000 -0600 +@@ -103,7 +103,7 @@ if [ -z "$failed" ] + then + # Copy additional files from workdir to the backup directory + # For this patch +- for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp") ++ for file in $(find $workdir -type f | @GREP@ -v -E "^$workdir/.timestamp$") + do + file="${file:${#workdir}+1}" + backup_file="$(backup_file_name $top "$file")" +@@ -121,7 +121,7 @@ fi + if [ -n "$failed" ] + then + # Restore all files to the state from before applying the patch +- for file in $(find $workdir -type f -a ! -path "$workdir/.timestamp") ++ for file in $(find $workdir -type f | @GREP@ -v -E "^$workdir/.timestamp$") + do + file="${file:${#workdir}+1}" + if ! mv -f "$workdir/$file" "$file" +Index: quilt/scripts/patchfns.in +=================================================================== +--- quilt/scripts/patchfns.in.orig 2008-11-05 14:11:24.251209000 -0600 ++++ quilt/scripts/patchfns.in 2008-11-05 14:18:18.242696000 -0600 +@@ -649,8 +649,8 @@ files_in_patch() + if [ -d "$path" ] + then + local files +- files=( $(find "$path" -type f \ +- -a ! -path "$path/.timestamp") ) \ ++ files=( $(find "$path" -type f | \ ++ @GREP@ -v -E "^$path/.timestamp$") ) \ + || return 1 + printf "%s\n" "${files[@]#$path/}" + fi +Index: quilt/grep.in +=================================================================== +--- quilt/grep.in.orig 2008-11-05 14:11:24.257342000 -0600 ++++ quilt/grep.in 2008-11-05 14:18:18.243720000 -0600 +@@ -114,10 +114,9 @@ fi + # may pass a single filename to grep and cause it to omit the file name. + [ -z "$opt_h" ] && opt_H=-H + +-find "${myargs[@]}" \( \ +- -path "./$QUILT_PATCHES/*" -o \ +- -path "./$QUILT_PC/*" \) -prune -o \ ++find "${myargs[@]}" \ + -type f -print \ ++| @GREP@ -v -E "^\./$QUILT_(PATCHES|PC)/" \ + | xargs grep $opt_H "${args[@]}" \ + | if [ ${#myargs[@]} -eq 0 ]; then + sed -e 's,^./,,' +Index: configure.ac +=================================================================== +--- configure.ac.orig 2008-11-05 14:11:24.263434000 -0600 ++++ configure.ac 2008-11-05 14:18:18.244870000 -0600 +@@ -296,18 +296,18 @@ fi + + QUILT_COMPAT_PROG_PATH(FIND, find) + +-AC_MSG_CHECKING([whether $FIND -path works]) +-if $FIND . -path '*' >/dev/null 2>&1; then +- AC_MSG_RESULT(yes) +-else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([ +-Sorry, you have a version of find which doesn't understand -path. +-$PACKAGE_NAME needs it. If you have access to a version of find which +-does understand -path, you can supply its path with the +-'--with-find=' option. +-]) +-fi ++# AC_MSG_CHECKING([whether $FIND -path works]) ++# if $FIND . -path '*' >/dev/null 2>&1; then ++# AC_MSG_RESULT(yes) ++# else ++# AC_MSG_RESULT(no) ++# AC_MSG_ERROR([ ++# Sorry, you have a version of find which doesn't understand -path. ++# $PACKAGE_NAME needs it. If you have access to a version of find which ++# does understand -path, you can supply its path with the ++# '--with-find=' option. ++# ]) ++# fi + + QUILT_COMPAT_PROG_PATH_OPT(DIFFSTAT, diffstat) + +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2008-11-05 14:15:59.439693000 -0600 ++++ Makefile.in 2008-11-05 14:18:18.246168000 -0600 +@@ -262,6 +262,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu + -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g' \ + -e 's:@PERL''@:$(PERL):g' \ + -e 's:@BASH''@:$(BASH):g' \ ++ -e 's:@GREP''@:$(GREP):g' \ + -e 's:@PATCH''@:$(PATCH):g' \ + -e 's:@VERSION''@:$(VERSION):g' \ + -e 's:@RELEASE''@:$(RELEASE):g' \ +@@ -281,7 +282,7 @@ Makefile : Makefile.in configure + @echo "Please run ./configure" + @false + +-compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1 -type f -perm +111)) ++compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm +rwx)) + + .PHONY :: compat + compat :: $(COMPAT) diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/04-import2-zcat.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/04-import2-zcat.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,34 @@ +From: Dean Roehrich +Subject: [Quilt-dev] [patch] use gzip rather than zcat in test/import2.test +Date: Wed, 05 Nov 2008 19:34:14 CST +To: quilt-dev@nongnu.org + +The tests expect zcat to understand the .gz suffix, but in the Solaris +environment the zcat is not GNU and it expects a .Z suffix. This modifies +the test to use gzip -dc, instead. + +Dean + + +Index: test/import2.test +=================================================================== +--- test/import2.test.orig 2008-11-05 20:00:39.305395000 -0600 ++++ test/import2.test 2008-11-05 20:01:03.827736000 -0600 +@@ -90,7 +90,7 @@ + > Replacing patch %{P}patch1.diff.gz with new version + + # an import requiring a description merge +- $ zcat patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz ++ $ gzip -dc patches/patch1.diff.gz | sed -e 's/original/new/' | gzip > t/patch1.diff.gz + $ quilt import t/patch1.diff.gz + > Patch %{P}patch1.diff.gz exists. Replace with -f. + +@@ -105,7 +105,7 @@ + > Replacing patch %{P}patch1.diff.gz with new version + + # quilt header does not work in this case because it stops at '---' +- $ zcat patches/patch1.diff.gz | head -n 3 ++ $ gzip -dc patches/patch1.diff.gz | head -n 3 + > original description + > --- + > new description diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/05-with-xgettext.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/05-with-xgettext.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,54 @@ +From: Dean Roehrich +Subject: [Quilt-dev] [patch] allow --with-xgettext and --with-msgfmt +Date: Wed, 05 Nov 2008 20:47:31 CST +To: quilt-dev@nongnu.org + +I needed to specify the GNU versions of xgettext and msgfmt on solaris, +and this was all I could think of to get me there. Anyone have a better +way to do this? + +Dean + + +Index: configure.ac +=================================================================== +--- configure.ac.orig 2008-11-05 20:57:14.054642000 -0600 ++++ configure.ac 2008-11-05 20:57:38.805910000 -0600 +@@ -342,9 +342,35 @@ fi + + QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) + ++XGETTEXT=xgettext ++AC_MSG_CHECKING(for xgettext) ++AC_ARG_WITH(xgettext, AC_HELP_STRING( ++ [--with-xgettext], ++ [name of the xgettext executable to use]), ++ [ ++ XGETTEXT=$withval ++ ],[ ++ AC_PATH_PROG(XGETTEXT, xgettext) ++ ] ++ ) ++AC_MSG_RESULT($XGETTEXT) ++AC_SUBST(XGETTEXT) ++ ++MSGFMT=msgfmt ++AC_MSG_CHECKING(for msgfmt) ++AC_ARG_WITH(msgfmt, AC_HELP_STRING( ++ [--with-msgfmt], ++ [name of the msgfmt executable to use]), ++ [ ++ MSGFMT=$withval ++ ],[ ++ AC_PATH_PROG(MSGFMT, msgfmt) ++ ] ++ ) ++AC_MSG_RESULT($MSGFMT) ++AC_SUBST(MSGFMT) ++ + AC_PATH_PROG(MSGMERGE, [msgmerge]) +-AC_PATH_PROG(MSGFMT, [msgfmt]) +-AC_PATH_PROG(XGETTEXT, [xgettext]) + AC_PATH_PROG(MSGUNIQ, [msguniq]) + AC_PATH_PROG(MSGCAT, [msgcat]) + if test -n "$MSGFMT" -a -n "$MSGMERGE" -a -n "$XGETTEXT" -a -n "$MSGUNIQ" -a -n "$MSGCAT" ; then diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/06-refresh-z.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/06-refresh-z.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,21 @@ +Someday, when Solaris has GNU getopts, we won't need this kludge. This allows +test/refresh-z to pass where it wants to use -z without a name argument. + +Index: quilt/refresh.in +=================================================================== +--- quilt/refresh.in.orig 2008-11-05 14:11:23.795325000 -0600 ++++ quilt/refresh.in 2008-11-05 14:20:40.965293000 -0600 +@@ -117,7 +117,12 @@ do + -z) + opt_fork=1 + opt_new_name=$2 +- shift 2 ;; ++ shift 2 ++ if [ "$opt_new_name" = "--" ] ++ then ++ opt_new_name= ++ break; ++ fi ;; + -h) + usage -h ;; + --no-timestamps) diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/07-refresh-z-test.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/07-refresh-z-test.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,18 @@ +Someday, when Solaris has GNU getopts, we won't need this kludge. This allows +test/refresh-z to pass where it wants to use -z with an argument, but without +a space between the -z and the arg. + + +Index: test/refresh-z.test +=================================================================== +--- test/refresh-z.test.orig 2008-11-05 14:10:52.524371000 -0600 ++++ test/refresh-z.test 2008-11-05 14:20:59.946848000 -0600 +@@ -17,7 +17,7 @@ + > Fork of patch patches/test.diff created as patches/test-2.diff + + $ echo baz >> foo +- $ quilt refresh -zbaz.diff ++ $ quilt refresh -z baz.diff + > Fork of patch patches/test-2.diff created as patches/baz.diff + + $ quilt series diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/08-with-gtar.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/08-with-gtar.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,36 @@ +From: Dean Roehrich +Subject: [Quilt-dev] [patch] Use GNU tar, even on Solaris +Date: Wed, 05 Nov 2008 16:13:24 CST +To: quilt-dev@nongnu.org + +This ensures that, no matter what the user's PATH may be, we always +use the GNU tar on Solaris. + +Dean + + +Index: configure.ac +=================================================================== +--- configure.ac.orig 2008-11-05 20:32:35.587999000 -0600 ++++ configure.ac 2008-11-05 20:32:37.206676000 -0600 +@@ -379,6 +379,8 @@ else + HAVE_NLS=no + fi + ++QUILT_COMPAT_PROG_PATH(TAR, tar, [gtar tar]) ++ + USE_NLS=no + AC_ARG_ENABLE(nls, AC_HELP_STRING( + [--disable-nls], [exclude natural language support]), +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2008-11-05 20:32:35.594219000 -0600 ++++ Makefile.in 2008-11-05 20:32:37.207914000 -0600 +@@ -26,6 +26,7 @@ BASH := @BASH@ + GREP := @GREP@ + TAIL := @TAIL@ + TR := @TR@ ++TAR := @TAR@ + SED := @SED@ + AWK := @AWK@ + FIND := @FIND@ diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/patches/09-no-patch-wrapper-test.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/patches/09-no-patch-wrapper-test.patch Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,17 @@ +This is the temporary solution to the patch-wrapper problem. It was checked +into the quilt CVS repo shortly after 0.47 was created. + + +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2008-11-05 14:25:47.778964000 -0600 ++++ Makefile.in 2008-11-05 14:25:49.154202000 -0600 +@@ -126,7 +126,7 @@ NON_EXEC_IN := doc/quilt.1 doc/README qu + + ISODATE := $(shell date +m%d) + +-TESTS := $(wildcard test/*.test) ++TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) + DIRT += test/.depend $(wildcard test/.*.ok) + + # Settings for running the uninstalled version of quilt in the source tree: diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/quilt.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/quilt.license Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,349 @@ +Oracle elects to use only the GNU Lesser General Public License version +2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software +where a choice of LGPL/GPL license versions are made available with the +language indicating that LGPLv2.1/GPLv2 or any later version may be +used, or where a choice of which version of the LGPL/GPL is applied is +unspecified. Unless specifically stated otherwise, where a choice +exists between another license and either the GPL or the LGPL, Oracle +chooses the other license. +======================================================================= + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -r 36f3560adf05 -r b3a36ee93012 components/quilt/quilt.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/quilt/quilt.p5m Tue Jun 21 13:40:34 2011 -0700 @@ -0,0 +1,145 @@ +# +# 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> +default mode 0555> + +set name=pkg.fmri value=pkg:/developer/quilt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Quilt - tool to manage series of patches" +set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management" +set name=info.upstream_url value=$(COMPONENT_PROJECT_URL) +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/LSARC/2008/653 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +license quilt.license license='GPLv2' + +dir path=etc +dir path=etc/bash/bash_completion.d +dir path=usr +dir path=usr/bin +dir path=usr/lib +dir path=usr/lib/quilt +dir path=usr/share +dir path=usr/share/doc +dir path=usr/share/doc/quilt-$(COMPONENT_VERSION) +dir path=usr/share/emacs +dir path=usr/share/emacs/site-lisp +dir path=usr/share/locale +dir path=usr/share/locale/de +dir path=usr/share/locale/de/LC_MESSAGES +dir path=usr/share/locale/fr +dir path=usr/share/locale/fr/LC_MESSAGES +dir path=usr/share/locale/ja +dir path=usr/share/locale/ja/LC_MESSAGES +dir path=usr/share/man +dir path=usr/share/man/man1 +dir path=usr/share/quilt +dir path=usr/share/quilt/compat +dir path=usr/share/quilt/scripts +file etc/bash_completion.d/quilt path=etc/bash/bash_completion.d/quilt +file path=etc/quilt.quiltrc \ + preserve=true original_name=SUNWquilt:etc/quilt.quiltrc \ + mode=0644 +file path=usr/bin/guards +file path=usr/bin/quilt +file path=usr/lib/quilt/backup-files mode=0555 +file path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README +file path=usr/share/doc/quilt-$(COMPONENT_VERSION)/README.MAIL +file path=usr/share/doc/quilt-$(COMPONENT_VERSION)/quilt.pdf +file path=usr/share/emacs/site-lisp/quilt.el +file path=usr/share/locale/de/LC_MESSAGES/quilt.mo +file path=usr/share/locale/fr/LC_MESSAGES/quilt.mo +file path=usr/share/locale/ja/LC_MESSAGES/quilt.mo +file path=usr/share/man/man1/guards.1 +file path=usr/share/man/man1/quilt.1 +file path=usr/share/quilt/add +file path=usr/share/quilt/annotate +file path=usr/share/quilt/applied +file path=usr/share/quilt/compat/column +file path=usr/share/quilt/compat/getopt +file path=usr/share/quilt/delete +file path=usr/share/quilt/diff +file path=usr/share/quilt/edit +file path=usr/share/quilt/files +file path=usr/share/quilt/fold +file path=usr/share/quilt/fork +file path=usr/share/quilt/graph +file path=usr/share/quilt/grep +file path=usr/share/quilt/header +file path=usr/share/quilt/import +file path=usr/share/quilt/mail +file path=usr/share/quilt/new +file path=usr/share/quilt/next +file path=usr/share/quilt/patches +file path=usr/share/quilt/pop +file path=usr/share/quilt/previous +file path=usr/share/quilt/push +file path=usr/share/quilt/refresh +file path=usr/share/quilt/rename +file path=usr/share/quilt/revert +file path=usr/share/quilt/scripts/dependency-graph +file path=usr/share/quilt/scripts/edmail +file path=usr/share/quilt/scripts/inspect +file path=usr/share/quilt/scripts/parse-patch +file path=usr/share/quilt/scripts/patchfns mode=444 +file path=usr/share/quilt/scripts/remove-trailing-ws +file path=usr/share/quilt/series +file path=usr/share/quilt/setup +file path=usr/share/quilt/snapshot +file path=usr/share/quilt/top +file path=usr/share/quilt/unapplied +file path=usr/share/quilt/upgrade +link path=usr/share/quilt/compat/awk target=../../../bin/gawk +link path=usr/share/quilt/compat/cp target=../../../gnu/bin/cp +link path=usr/share/quilt/compat/date target=../../../gnu/bin/date +link path=usr/share/quilt/compat/diff target=../../../gnu/bin/diff +link path=usr/share/quilt/compat/grep target=../../../gnu/bin/grep +link path=usr/share/quilt/compat/patch target=../../../gnu/bin/patch +link path=usr/share/quilt/compat/sed target=../../../gnu/bin/sed +link path=usr/share/quilt/compat/sendmail target=../../../lib/sendmail +link path=usr/share/quilt/compat/tail target=../../../gnu/bin/tail +link path=usr/share/quilt/compat/tar target=../../../bin/gtar +link path=usr/share/quilt/compat/tr target=../../../gnu/bin/tr + +legacy pkg=SUNWquiltr \ + desc="Quilt - tool to manage series of patches (0.47) (root)" \ + name=Quilt + +legacy pkg=SUNWquiltu \ + desc="Quilt - tool to manage series of patches (0.47)" \ + name=Quilt + +depend fmri=__TBD pkg.debug.depend.file=usr/bin/gawk type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/cp type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/date type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/diff type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/grep type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/patch type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/sed type=require +depend fmri=__TBD pkg.debug.depend.file=usr/lib/sendmail type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tail type=require +depend fmri=__TBD pkg.debug.depend.file=usr/bin/gtar type=require +depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/tr type=require + diff -r 36f3560adf05 -r b3a36ee93012 make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Tue Jun 21 13:39:40 2011 -0700 +++ b/make-rules/shared-macros.mk Tue Jun 21 13:40:34 2011 -0700 @@ -43,7 +43,18 @@ # The workspace starts at the mercurial root export WS_TOP ?= $(shell hg root) -export SHELLOPTS = pipefail +# we want our pkg piplines to fail if there is an error +# (like if pkgdepend fails in the middle of a pipe), but +# we don't want the builds or ./configure's failing as well. +# so we only set pipefail for the publish target and have +# to reset it for the others since they might be invoked +# as dependencies of publish. +export SHELLOPTS +build: SHELLOPTS= +test: SHELLOPTS= +install: SHELLOPTS= +publish: SHELLOPTS=pipefail + SHELL= /bin/bash CONSOLIDATION = userland