Clarify my license.diff -r1.4 -r1.5 pkgsrc/pkgtools/pkgdiff/files/mkpatches.1
(wiz)
@@ -1,17 +1,38 @@ | @@ -1,17 +1,38 @@ | |||
1 | .\" $NetBSD: mkpatches.1,v 1.4 2011/02/02 10:23:02 wiz Exp $ | 1 | .\" $NetBSD: mkpatches.1,v 1.5 2011/02/02 10:36:20 wiz Exp $ | |
2 | .\" | 2 | .\" | |
3 | .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org> | 3 | .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org> | |
4 | .\" All Rights Reserved. Absolutely no warranty. | 4 | .\" All rights reserved. | |
5 | .\" | |||
6 | .\" Redistribution and use in source and binary forms, with or without | |||
7 | .\" modification, are permitted provided that the following conditions | |||
8 | .\" are met: | |||
9 | .\" 1. Redistributions of source code must retain the above copyright | |||
10 | .\" notice, this list of conditions and the following disclaimer. | |||
11 | .\" 2. Redistributions in binary form must reproduce the above copyright | |||
12 | .\" notice, this list of conditions and the following disclaimer in the | |||
13 | .\" documentation and/or other materials provided with the distribution. | |||
14 | .\" | |||
15 | .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |||
16 | .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |||
17 | .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |||
18 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |||
19 | .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |||
20 | .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |||
21 | .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |||
22 | .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |||
23 | .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
24 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
25 | .\" POSSIBILITY OF SUCH DAMAGE. | |||
5 | .\" | 26 | .\" | |
6 | .Dd January 31, 2011 | 27 | .Dd January 31, 2011 | |
7 | .Dt MKPATCHES 1 | 28 | .Dt MKPATCHES 1 | |
8 | .Os | 29 | .Os | |
9 | .Sh NAME | 30 | .Sh NAME | |
10 | .Nm mkpatches | 31 | .Nm mkpatches | |
11 | .Nd create patch files appropriate for pkgsrc | 32 | .Nd create patch files appropriate for pkgsrc | |
12 | .Sh SYNOPSIS | 33 | .Sh SYNOPSIS | |
13 | .Nm | 34 | .Nm | |
14 | .Oo Fl c | Fl r Oc | 35 | .Oo Fl c | Fl r Oc | |
15 | .Op Fl hv | 36 | .Op Fl hv | |
16 | .Sh DESCRIPTION | 37 | .Sh DESCRIPTION | |
17 | .Nm | 38 | .Nm |
@@ -1,17 +1,38 @@ | @@ -1,17 +1,38 @@ | |||
1 | .\" $NetBSD: patchdiff.1,v 1.4 2011/02/02 10:23:02 wiz Exp $ | 1 | .\" $NetBSD: patchdiff.1,v 1.5 2011/02/02 10:36:20 wiz Exp $ | |
2 | .\" | 2 | .\" | |
3 | .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org> | 3 | .\" Copyright (c) 2000-2011 by Thomas Klausner <wiz@NetBSD.org> | |
4 | .\" All Rights Reserved. Absolutely no warranty. | 4 | .\" All rights reserved. | |
5 | .\" | |||
6 | .\" Redistribution and use in source and binary forms, with or without | |||
7 | .\" modification, are permitted provided that the following conditions | |||
8 | .\" are met: | |||
9 | .\" 1. Redistributions of source code must retain the above copyright | |||
10 | .\" notice, this list of conditions and the following disclaimer. | |||
11 | .\" 2. Redistributions in binary form must reproduce the above copyright | |||
12 | .\" notice, this list of conditions and the following disclaimer in the | |||
13 | .\" documentation and/or other materials provided with the distribution. | |||
14 | .\" | |||
15 | .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |||
16 | .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |||
17 | .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |||
18 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |||
19 | .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |||
20 | .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |||
21 | .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |||
22 | .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |||
23 | .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
24 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
25 | .\" POSSIBILITY OF SUCH DAMAGE. | |||
5 | .\" | 26 | .\" | |
6 | .Dd January 31, 2011 | 27 | .Dd January 31, 2011 | |
7 | .Dt PATCHDIFF 1 | 28 | .Dt PATCHDIFF 1 | |
8 | .Os | 29 | .Os | |
9 | .Sh NAME | 30 | .Sh NAME | |
10 | .Nm patchdiff | 31 | .Nm patchdiff | |
11 | .Nd compare sets of patches | 32 | .Nd compare sets of patches | |
12 | .Sh SYNOPSIS | 33 | .Sh SYNOPSIS | |
13 | .Nm | 34 | .Nm | |
14 | .Sh DESCRIPTION | 35 | .Sh DESCRIPTION | |
15 | .Nm | 36 | .Nm | |
16 | is a perl script that simplifies comparing a set of previously | 37 | is a perl script that simplifies comparing a set of previously | |
17 | existing patches with a new one created with | 38 | existing patches with a new one created with |
@@ -1,26 +1,49 @@ | @@ -1,26 +1,49 @@ | |||
1 | #!@SH@ | 1 | #!@SH@ | |
2 | # | 2 | # | |
3 | # $NetBSD: pkgdiff,v 1.18 2011/02/02 10:23:02 wiz Exp $ | 3 | # $NetBSD: pkgdiff,v 1.19 2011/02/02 10:36:20 wiz Exp $ | |
4 | # | 4 | # | |
5 | # Usage: pkgdiff newfile | 5 | # Usage: pkgdiff newfile | |
6 | # pkgdiff oldfile newfile | 6 | # pkgdiff oldfile newfile | |
7 | # | 7 | # | |
8 | # Will output a patch ready for the NetBSD Pkgs Collection (unified | 8 | # Will output a patch ready for the NetBSD Pkgs Collection (unified | |
9 | # diff, plus no RCS IDs if possible). If only newfile is given, | 9 | # diff, plus no RCS IDs if possible). If only newfile is given, | |
10 | # oldfile is assumed as newfile.orig. | 10 | # oldfile is assumed as newfile.orig. | |
11 | # | 11 | # | |
12 | # Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org> | |||
13 | # Copyright (c) 2011 by Thomas Klausner <wiz@NetBSD.org> | 12 | # Copyright (c) 2011 by Thomas Klausner <wiz@NetBSD.org> | |
13 | # All rights reserved. | |||
14 | # | |||
15 | # Redistribution and use in source and binary forms, with or without | |||
16 | # modification, are permitted provided that the following conditions | |||
17 | # are met: | |||
18 | # 1. Redistributions of source code must retain the above copyright | |||
19 | # notice, this list of conditions and the following disclaimer. | |||
20 | # 2. Redistributions in binary form must reproduce the above copyright | |||
21 | # notice, this list of conditions and the following disclaimer in the | |||
22 | # documentation and/or other materials provided with the distribution. | |||
23 | # | |||
24 | # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |||
25 | # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |||
26 | # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |||
27 | # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |||
28 | # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |||
29 | # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |||
30 | # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |||
31 | # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |||
32 | # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
33 | # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
34 | # POSSIBILITY OF SUCH DAMAGE. | |||
35 | # | |||
36 | # Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org> | |||
14 | # All Rights Reserved. Absolutely no warranty. | 37 | # All Rights Reserved. Absolutely no warranty. | |
15 | # | 38 | # | |
16 | 39 | |||
17 | # Ensure we always use the same timezone to avoid spurious metadata diffs | 40 | # Ensure we always use the same timezone to avoid spurious metadata diffs | |
18 | export TZ=UTC | 41 | export TZ=UTC | |
19 | 42 | |||
20 | if [ $# -le 1 ] | 43 | if [ $# -le 1 ] | |
21 | then | 44 | then | |
22 | if [ -f "$1.orig" ]; then | 45 | if [ -f "$1.orig" ]; then | |
23 | old="$1.orig" | 46 | old="$1.orig" | |
24 | new="$1" | 47 | new="$1" | |
25 | else | 48 | else | |
26 | echo $0: need at least one argument >&2 | 49 | echo $0: need at least one argument >&2 |