summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_install
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-04-04 06:30:10 +0000
committerwiz <wiz@pkgsrc.org>2006-04-04 06:30:10 +0000
commit0d252fca2c0feb5fd073a6c396e602a8f765ac96 (patch)
treef24b7fa0ca3752999e59aa4a7af1f06c79abc517 /pkgtools/pkg_install
parent680f66a11db6119873feed89a910bd5c3e8f1c0b (diff)
downloadpkgsrc-0d252fca2c0feb5fd073a6c396e602a8f765ac96.tar.gz
Pull over v1.5 and v1.6 from src/usr.sbin:
revision 1.6 date: 2005/11/13 20:37:23; author: agc; state: Exp; lines: +1 -10 Get rid of cvs merge botch in previous. ---------------------------- revision 1.5 date: 2005/11/13 20:07:41; author: agc; state: Exp; lines: +25 -8 The Dewey number comparison routines were added by myself in 2002 in revision 1.32 of pkg_install/lib/str.c, and have absolutely nothing to do with the original FreeBSD utilities. Place the appropriate (3 clause) copyright on this file.
Diffstat (limited to 'pkgtools/pkg_install')
-rw-r--r--pkgtools/pkg_install/files/lib/dewey.c34
1 files changed, 21 insertions, 13 deletions
diff --git a/pkgtools/pkg_install/files/lib/dewey.c b/pkgtools/pkg_install/files/lib/dewey.c
index ac8da696c8d..f476b92042b 100644
--- a/pkgtools/pkg_install/files/lib/dewey.c
+++ b/pkgtools/pkg_install/files/lib/dewey.c
@@ -1,13 +1,7 @@
-/* $NetBSD: dewey.c,v 1.4 2005/11/13 19:51:14 wiz Exp $ */
-
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <nbcompat.h>
+/* $NetBSD: dewey.c,v 1.5 2006/04/04 06:30:10 wiz Exp $ */
/*
- * FreeBSD install - a package for the installation and maintainance
- * of non-core utilities.
+ * Copyright © 2002 Alistair G. Crooks. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -17,14 +11,28 @@
* 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 name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
*
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous string utilities.
- *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * 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 THE AUTHOR 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.
*/
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <nbcompat.h>
+
#if HAVE_CTYPE_H
#include <ctype.h>
#endif