pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
kBuild: kBuild-svn: g/c - it will be replaced with new kbuild package
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Jul 6 02:24:31 2016 +0200
Changeset: 0781477deb89f685e8a3ccbde4aea9708675aa3a
Removed Files:
kBuild-svn/DESCR
kBuild-svn/Makefile
kBuild-svn/PLIST
kBuild-svn/distinfo
kBuild-svn/files/strtofflags.c
kBuild-svn/patches/patch-Config.kmk
kBuild-svn/patches/patch-kBuild_header.kmk
kBuild-svn/patches/patch-src_kash_Makefile.kmk
kBuild-svn/patches/patch-src_kash_shell.h
kBuild-svn/patches/patch-src_kmk_Makefile.kmk
kBuild-svn/patches/patch-src_kmk_kmkbuiltin_osdep.c
kBuild-svn/patches/patch-src_sed_Makefile.kmk
kBuild/DESCR
kBuild/Makefile
kBuild/PLIST
kBuild/distinfo
kBuild/files/bootstrap.sh
kBuild/files/strtofflags.c
kBuild/patches/patch-aa
kBuild/patches/patch-ab
kBuild/patches/patch-ac
kBuild/patches/patch-ad
kBuild/patches/patch-ae
kBuild/patches/patch-af
kBuild/patches/patch-ag
Log Message:
kBuild: kBuild-svn: g/c - it will be replaced with new kbuild package
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0781477deb89f685e8a3ccbde4aea9708675aa3a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
kBuild-svn/DESCR | 18 --
kBuild-svn/Makefile | 38 ----
kBuild-svn/PLIST | 28 ---
kBuild-svn/distinfo | 9 -
kBuild-svn/files/strtofflags.c | 196 ---------------------
kBuild-svn/patches/patch-Config.kmk | 13 --
kBuild-svn/patches/patch-kBuild_header.kmk | 27 ---
kBuild-svn/patches/patch-src_kash_Makefile.kmk | 15 --
kBuild-svn/patches/patch-src_kash_shell.h | 19 --
kBuild-svn/patches/patch-src_kmk_Makefile.kmk | 27 ---
.../patches/patch-src_kmk_kmkbuiltin_osdep.c | 15 --
kBuild-svn/patches/patch-src_sed_Makefile.kmk | 17 --
kBuild/DESCR | 1 -
kBuild/Makefile | 48 -----
kBuild/PLIST | 27 ---
kBuild/distinfo | 12 --
kBuild/files/bootstrap.sh | 42 -----
kBuild/files/strtofflags.c | 196 ---------------------
kBuild/patches/patch-aa | 13 --
kBuild/patches/patch-ab | 12 --
kBuild/patches/patch-ac | 15 --
kBuild/patches/patch-ad | 34 ----
kBuild/patches/patch-ae | 22 ---
kBuild/patches/patch-af | 17 --
kBuild/patches/patch-ag | 22 ---
25 files changed, 883 deletions(-)
diffs:
diff --git a/kBuild-svn/DESCR b/kBuild-svn/DESCR
deleted file mode 100644
index b6bebc0..0000000
--- a/kBuild-svn/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-kBuild is a makefile framework for writing simple makefiles for
-complex tasks.
-
-The goals of the kBuild framework:
-
- Similar behavior cross all supported platforms.
- Flexibility, don't create unnecessary restrictions preventing
- ad-hoc solutions.
- Makefile very simple to write and maintain.
-
-There are four concepts being tried out in the current kBuild
-incaration:
-
- One configuration file for a subtree automatically included.
- Target configuration templates as the primary mechanism for
- makefile simplification.
- Tools and SDKs for helping out the templates with flexibility.
- Non-recursive makefile method by using sub-makefiles.
diff --git a/kBuild-svn/Makefile b/kBuild-svn/Makefile
deleted file mode 100644
index 60b0d89..0000000
--- a/kBuild-svn/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2014/08/22 09:24:56 thomasklausner Exp $
-
-DISTNAME= kBuild
-PKGNAME= kBuild-0.1.9998
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.netlabs.org/pub/kbuild/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.virtualbox.org/wiki/kBuild
-COMMENT= Build framework based on GNU make
-LICENSE= gnu-gpl-v3
-
-BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
-
-SVN_REPOSITORIES= kBuild
-SVN_ROOT.kBuild= http://svn.netlabs.org/repos/kbuild/trunk/
-
-USE_TOOLS+= autoreconf autoconf automake gmake perl
-
-INSTALLATION_DIRS= bin
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-KBUILD_PLATFORM= ${LOWER_OPSYS}.${MACHINE_ARCH:S/x86_64/amd64/:S/i386/x86/}
-
-post-extract:
- ${CP} ${FILESDIR}/strtofflags.c ${WRKSRC}/src/kmk/strtofflags.c
-
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${WRKSRC}/kBuild/env.sh --full gmake -f bootstrap.gmk
-
-do-install:
- for f in ${WRKSRC}/out/${KBUILD_PLATFORM}/release/stage/kBuild/bin/${KBUILD_PLATFORM}/*; do \
- ${INSTALL_PROGRAM} $${f} ${DESTDIR}${PREFIX}/bin; \
- done
-
-.include "../../wip/mk/svn-package.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/kBuild-svn/PLIST b/kBuild-svn/PLIST
deleted file mode 100644
index 6eca1c0..0000000
--- a/kBuild-svn/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/08/21 10:18:18 thomasklausner Exp $
-bin/kDepIDB
-bin/kDepObj
-bin/kDepPre
-bin/kObjCache
-bin/kmk
-bin/kmk_append
-bin/kmk_ash
-bin/kmk_cat
-bin/kmk_chmod
-bin/kmk_cmp
-bin/kmk_cp
-bin/kmk_echo
-bin/kmk_expr
-bin/kmk_gmake
-bin/kmk_install
-bin/kmk_ln
-bin/kmk_md5sum
-bin/kmk_mkdir
-bin/kmk_mv
-bin/kmk_printf
-bin/kmk_redirect
-bin/kmk_rm
-bin/kmk_rmdir
-bin/kmk_sed
-bin/kmk_sleep
-bin/kmk_test
-bin/kmk_time
diff --git a/kBuild-svn/distinfo b/kBuild-svn/distinfo
deleted file mode 100644
index c823be2..0000000
--- a/kBuild-svn/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/09/05 08:50:10 makoto Exp $
-
-SHA1 (patch-Config.kmk) = 1cc54c3229c258e2b834d51faadb76fa0fdfe7cc
-SHA1 (patch-kBuild_header.kmk) = f6c67be12caf67aeb5b75e62d288f8c60e9bc5e3
-SHA1 (patch-src_kash_Makefile.kmk) = eff4dcad1c2a912b19eea097ece393969b2995a4
-SHA1 (patch-src_kash_shell.h) = f5c677df6b5a9ca5e2b7d32490f5ad6fd77d9686
-SHA1 (patch-src_kmk_Makefile.kmk) = 83f2b9bf43a29f86153d046dc2e3f24b8484fa31
-SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = be60566eddf05e2d91db07848349f40af1b622a6
-SHA1 (patch-src_sed_Makefile.kmk) = afa038eae8fb27a85eb1f1d095777ce8ef87c1e9
diff --git a/kBuild-svn/files/strtofflags.c b/kBuild-svn/files/strtofflags.c
deleted file mode 100644
index 20f93fd..0000000
--- a/kBuild-svn/files/strtofflags.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * From http://ftp.netbsd.org/pub/NetBSD/misc/alc/libc/strtofflags.c
- */
-
-/* $NetBSD: strtofflags.c,v 1.1 2014/08/21 10:18:18 thomasklausner Exp $ */
-
-/*-
- * Copyright (c) 1993
- * The Regents of the University of California. 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. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR 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.
- *
- * @(#)stat_flags.c 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.18.2.1 2000/06/28 01:52:24 joe Exp $
- * $DragonFly: src/lib/libc/gen/strtofflags.c,v 1.5 2008/06/02 20:17:07 dillon Exp $
- */
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: strtofflags.c,v 1.1 2014/08/21 10:18:18 thomasklausner Exp $");
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static struct {
- char *name;
- u_long flag;
- int invert;
-} mapping[] = {
- /* shorter names per flag first, all prefixed by "no" */
-#ifdef SF_APPEND
- { "nosappnd", SF_APPEND, 0 },
- { "nosappend", SF_APPEND, 0 },
-#endif
-#ifdef SF_ARCHIVED
- { "noarch", SF_ARCHIVED, 0 },
- { "noarchived", SF_ARCHIVED, 0 },
-#endif
-#ifdef SF_IMMUTABLE
- { "noschg", SF_IMMUTABLE, 0 },
- { "noschange", SF_IMMUTABLE, 0 },
- { "nosimmutable", SF_IMMUTABLE, 0 },
-#endif
-#ifdef SF_NOHISTORY
- { "noshistory", SF_NOHISTORY, 1 },
-#endif
-#ifdef SF_NOUNLINK
- { "nosunlnk", SF_NOUNLINK, 1 },
- { "nosunlink", SF_NOUNLINK, 1 },
-#endif
-#ifdef UF_APPEND
- { "nouappnd", UF_APPEND, 0 },
- { "nouappend", UF_APPEND, 0 },
-#endif
-#ifdef UF_IMMUTABLE
- { "nouchg", UF_IMMUTABLE, 0 },
- { "nouchange", UF_IMMUTABLE, 0 },
- { "nouimmutable", UF_IMMUTABLE, 0 },
-#endif
-#ifdef UF_NODUMP
- { "nodump", UF_NODUMP, 1 },
-#endif
-#ifdef UF_OPAQUE
- { "noopaque", UF_OPAQUE, 0 },
-#endif
-#ifdef UF_NOHISTORY
- { "nouhistory", UF_NOHISTORY, 1 },
- { "nohistory", UF_NOHISTORY, 1 },
-#endif
-#ifdef UF_NOUNLINK
- { "nouunlnk", UF_NOUNLINK, 1 },
- { "nouunlink", UF_NOUNLINK, 1 },
-#endif
-};
-
-#define MAXFLAGLEN 12
-#define NMAPPING __arraycount(mapping)
-
-/*
- * fflagstostr --
- * Convert file flags to a comma-separated string. If no flags
- * are set, return the empty string.
- */
-char *
-fflagstostr(u_long flags)
-{
- char *string;
- char *sp, *dp;
- u_long setflags;
- int i;
-
- string = malloc(NMAPPING * (MAXFLAGLEN + 1));
- if (string == NULL)
- goto out;
-
- setflags = flags;
- dp = string;
- for (i = 0; i < NMAPPING; i++) {
- if ((setflags & mapping[i].flag) == 0)
- continue;
-
- if (dp > string)
- *dp++ = ',';
-
- sp = mapping[i].name;
- if (mapping[i].invert)
- sp += 2;
-
- while (*sp != '\0')
- *dp++ = *sp++;
-
- setflags &= ~mapping[i].flag;
- }
- *dp = '\0';
-
-out:
- return string;
-}
-
-/*
- * strtofflags --
- * Take string of arguments and return file flags. Return 0 on
- * success, 1 on failure. On failure, stringp is set to point
- * to the offending token.
- */
-int
-strtofflags(char **stringp, u_long *setp, u_long *clrp)
-{
- u_long setf, clrf;
- char *string, *p;
- int i;
-
- setf = 0;
- clrf = 0;
-
- string = *stringp;
-
- while ((p = strsep(&string, "\t ,")) != NULL) {
- int p_off = 0;
-
- *stringp = p;
- if (*p == '\0')
- continue;
-
- if (strcmp(p, "no") == 0)
- p_off = 2;
-
- for (i = 0; i < NMAPPING; i++) {
- if (strcmp(p, mapping[i].name + p_off) != 0)
- continue;
-
- if (mapping[i].invert)
- clrf |= mapping[i].flag;
- else
- setf |= mapping[i].flag;
- }
-
- if (i == NMAPPING)
- return 1;
- }
-
- if (setp != NULL)
- *setp = setf;
-
- if (clrp != NULL)
- *clrp = clrf;
-
- return 0;
-}
diff --git a/kBuild-svn/patches/patch-Config.kmk b/kBuild-svn/patches/patch-Config.kmk
deleted file mode 100644
index f674eed..0000000
--- a/kBuild-svn/patches/patch-Config.kmk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Config.kmk,v 1.1 2014/08/22 09:24:56 thomasklausner Exp $
-
---- Config.kmk.orig 2014-08-22 09:15:46.000000000 +0000
-+++ Config.kmk
-@@ -353,7 +353,7 @@ endif
- TEMPLATE_BIN-THREADED = Threaded command line binary
- TEMPLATE_BIN-THREADED_EXTENDS = BIN
- TEMPLATE_BIN-THREADED_EXTENDS_BY = appending
--if1of ($(KBUILD_TARGET), dragonfly freebsd linux openbsd)
-+if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd)
- TEMPLATE_BIN-THREADED_LIBS = pthread
- endif
-
diff --git a/kBuild-svn/patches/patch-kBuild_header.kmk b/kBuild-svn/patches/patch-kBuild_header.kmk
deleted file mode 100644
index 355cfb4..0000000
--- a/kBuild-svn/patches/patch-kBuild_header.kmk
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-kBuild_header.kmk,v 1.1 2014/08/22 09:24:56 thomasklausner Exp $
-
---- kBuild/header.kmk.orig 2014-08-22 09:15:46.000000000 +0000
-+++ kBuild/header.kmk
-@@ -1280,13 +1280,21 @@ ifeq ($(KBUILD_TARGET),darwin)
- /Developer/usr/
- KBUILD_LIB_SEARCH_SUBS := lib/
-
--else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd dragonfly)
-+else if1of ($(KBUILD_TARGET), freebsd openbsd dragonfly)
- KBUILD_LIB_SEARCH_ROOTS := \
- / \
- /usr/ \
- /usr/local/
- KBUILD_LIB_SEARCH_SUBS := lib/
-
-+else if1of ($(KBUILD_TARGET), netbsd)
-+ KBUILD_LIB_SEARCH_ROOTS := \
-+ / \
-+ /usr/ \
-+ /usr/pkg/ \
-+ /usr/local/
-+ KBUILD_LIB_SEARCH_SUBS := lib/
-+
- else ifeq ($(KBUILD_TARGET),linux)
- ifeq ($(realpath /bin),/usr/bin)
- KBUILD_LIB_SEARCH_ROOTS := \
diff --git a/kBuild-svn/patches/patch-src_kash_Makefile.kmk b/kBuild-svn/patches/patch-src_kash_Makefile.kmk
deleted file mode 100644
index 7ceecbf..0000000
--- a/kBuild-svn/patches/patch-src_kash_Makefile.kmk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_kash_Makefile.kmk,v 1.1 2014/08/21 10:18:18 thomasklausner Exp $
-
-Add NetBSD case.
-
---- src/kash/Makefile.kmk.orig 2014-08-21 09:57:50.000000000 +0000
-+++ src/kash/Makefile.kmk
-@@ -54,6 +54,8 @@ kash_DEFS.freebsd = \
- HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
- kash_DEFS.openbsd = \
- HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
-+kash_DEFS.netbsd = \
-+ HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
- kash_INCS = $(kash_0_OUTDIR) . # (the last is because of error.h)
- kash_ASFLAGS.win = -g cv8
- kash_ASFLAGS.win.x86 = -f win32
diff --git a/kBuild-svn/patches/patch-src_kash_shell.h b/kBuild-svn/patches/patch-src_kash_shell.h
deleted file mode 100644
index 3a3a83b..0000000
--- a/kBuild-svn/patches/patch-src_kash_shell.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_kash_shell.h,v 1.1 2014/08/22 09:24:56 thomasklausner Exp $
-
---- src/kash/shell.h.orig 2014-08-22 09:15:47.000000000 +0000
-+++ src/kash/shell.h
-@@ -61,11 +61,14 @@
- # define BSD 1
- #endif
-
-+#if 0
-+/* bad interaction with libpthread */
- #ifndef DO_SHAREDVFORK
- # if __NetBSD_Version__ >= 104000000
- # define DO_SHAREDVFORK
- # endif
- #endif
-+#endif
-
- typedef void *pointer;
- #ifndef NULL
diff --git a/kBuild-svn/patches/patch-src_kmk_Makefile.kmk b/kBuild-svn/patches/patch-src_kmk_Makefile.kmk
deleted file mode 100644
index d663b52..0000000
--- a/kBuild-svn/patches/patch-src_kmk_Makefile.kmk
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_kmk_Makefile.kmk,v 1.2 2015/09/05 08:50:10 makoto Exp $
-
-Add NetBSD case.
-
---- src/kmk/Makefile.kmk.orig 2015-09-23 16:23:55.000000000 +0900
-+++ src/kmk/Makefile.kmk 2015-09-23 16:26:33.000000000 +0900
-@@ -107,6 +107,10 @@ kmkmissing_SOURCES.dragonfly = \
- kmkmissing_SOURCES.freebsd = \
- glob/fnmatch.c
-
-+kmkmissing_SOURCES.netbsd = \
-+ glob/fnmatch.c \
-+ strtofflags.c
-+
- kmkmissing_SOURCES.haiku = \
- kmkbuiltin/haikufakes.c \
- glob/fnmatch.c
-@@ -245,6 +248,9 @@ kmk_SOURCES = \
- kbuild-object.c
-
- kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
-+kmk_DEFS.netbsd.x86 = CONFIG_WITHOUT_THREADS
-+
-+kmk_LIBS.netbsd = pthread
-
- #kmk_LIBS.solaris = malloc
- #kmk_DEFS.solaris += HAVE_MALLINFO
diff --git a/kBuild-svn/patches/patch-src_kmk_kmkbuiltin_osdep.c b/kBuild-svn/patches/patch-src_kmk_kmkbuiltin_osdep.c
deleted file mode 100644
index cd77e8b..0000000
--- a/kBuild-svn/patches/patch-src_kmk_kmkbuiltin_osdep.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_kmk_kmkbuiltin_osdep.c,v 1.1 2014/08/21 10:18:19 thomasklausner Exp $
-
-Add NetBSD case.
-
---- src/kmk/kmkbuiltin/osdep.c.orig 2014-08-21 09:57:50.000000000 +0000
-+++ src/kmk/kmkbuiltin/osdep.c
-@@ -44,5 +44,8 @@
- #elif defined(__HAIKU__)
- # include "haikufakes.c"
-
-+#elif defined(__NetBSD__)
-+# include "strtofflags.c"
-+
- #endif
-
diff --git a/kBuild-svn/patches/patch-src_sed_Makefile.kmk b/kBuild-svn/patches/patch-src_sed_Makefile.kmk
deleted file mode 100644
index c9afd1a..0000000
--- a/kBuild-svn/patches/patch-src_sed_Makefile.kmk
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_sed_Makefile.kmk,v 1.1 2014/08/21 10:18:19 thomasklausner Exp $
-
-Add NetBSD case.
-
---- src/sed/Makefile.kmk.orig 2014-08-21 09:57:55.000000000 +0000
-+++ src/sed/Makefile.kmk
-@@ -76,6 +76,10 @@ kmk_sed_SOURCES.openbsd = \
- lib/strverscmp.c \
- lib/obstack.c \
- lib/getline.c
-+kmk_sed_SOURCES.netbsd = \
-+ lib/strverscmp.c \
-+ lib/obstack.c \
-+ lib/getline.c
- kmk_sed_SOURCES.solaris = \
- lib/strverscmp.c \
- lib/obstack.c
diff --git a/kBuild/DESCR b/kBuild/DESCR
deleted file mode 100644
index e42b9bf..0000000
--- a/kBuild/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-kBuild is a makefile framework for writing simple makefiles for complex tasks.
diff --git a/kBuild/Makefile b/kBuild/Makefile
deleted file mode 100644
index 11b59c6..0000000
--- a/kBuild/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2013/02/01 22:22:16 thomasklausner Exp $
-#
-
-DISTNAME= kBuild-0.1.5-p2-all
-PKGNAME= kBuild-0.1.5p2
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.netlabs.org/pub/kbuild/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.netlabs.org/pub/kbuild/
-COMMENT= Framework for writing simple makefiles for complex tasks
-LICENSE= gnu-gpl-v3 # but also various other licenses in 3rd party code
-
-NO_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-WRKSRC= ${WRKDIR}/kBuild-0.1.5-p2
-
-USE_TOOLS+= pax gmake autoconf automake autoreconf perl flex bison
-
-.include "../../mk/bsd.prefs.mk"
-
-KBUILD_PLATFORM= ${LOWER_OPSYS}.${MACHINE_ARCH:S/x86_64/amd64/:S/i386/x86/}
-KBUILD_BIN_PATH= ${WRKSRC}/kBuild/bin/${KBUILD_PLATFORM}
-MAKE_ENV+= WRKSRC=${WRKSRC}
-
-post-extract:
-.if ${OPSYS} == "NetBSD"
- cp ${FILESDIR}/strtofflags.c ${WRKSRC}/src/kmk
-.endif
- rm -rf ${WRKSRC}/kBuild/bin
- mkdir -p ${KBUILD_BIN_PATH}
- ln -s ${SH} ${KBUILD_BIN_PATH}/kmk_ash
-
-pre-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ${FILESDIR}/bootstrap.sh
-
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- `${SH} ${WRKSRC}/kBuild/env.sh --full --eval --set` kmk
-
-INSTALLATION_DIRS= bin
-
-do-install:
- for f in ${WRKSRC}/out/${KBUILD_PLATFORM}/release/kBuild/bin/${KBUILD_PLATFORM}/*; do \
- ${INSTALL_PROGRAM} $${f} ${DESTDIR}${PREFIX}/bin; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/kBuild/PLIST b/kBuild/PLIST
deleted file mode 100644
index 1f74bf4..0000000
--- a/kBuild/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/14 19:25:05 tnn2 Exp $
-bin/kDepIDB
-bin/kDepPre
-bin/kObjCache
-bin/kmk
-bin/kmk_append
-bin/kmk_ash
-bin/kmk_cat
-bin/kmk_chmod
-bin/kmk_cmp
-bin/kmk_cp
-bin/kmk_echo
-bin/kmk_expr
-bin/kmk_gmake
-bin/kmk_install
-bin/kmk_ln
-bin/kmk_md5sum
-bin/kmk_mkdir
-bin/kmk_mv
-bin/kmk_printf
-bin/kmk_redirect
-bin/kmk_rm
-bin/kmk_rmdir
-bin/kmk_sed
-bin/kmk_sleep
-bin/kmk_test
-bin/kmk_time
diff --git a/kBuild/distinfo b/kBuild/distinfo
deleted file mode 100644
index 53a7358..0000000
--- a/kBuild/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2011/02/17 13:14:51 tnn2 Exp $
-
-SHA1 (kBuild-0.1.5-p2-all.tar.gz) = 2fba0522d0a3e157eff68cf174086d11506e8217
-RMD160 (kBuild-0.1.5-p2-all.tar.gz) = 586bb40b94a0940e9804e0bd0ff447cb854109a0
-Size (kBuild-0.1.5-p2-all.tar.gz) = 12850632 bytes
-SHA1 (patch-aa) = de3c422312543038d06a183c0ca99587ae72b776
-SHA1 (patch-ab) = 424e3f5de4ef9bac4e1af515b53be65b3f79716b
-SHA1 (patch-ac) = 89259a4511a6a4ced2f7c3940f12d5fa4c5d2a61
-SHA1 (patch-ad) = 35a5e76a4daa0117aabfd6e8cc5d8669abf6fe7e
-SHA1 (patch-ae) = 47fabc0e9afc5b7e533e8937ec15e712b9c92140
-SHA1 (patch-af) = 3fd63f5b60d1257515b0e697becedaacd1510bf2
-SHA1 (patch-ag) = 6c2c7fe1eae31332d98b82497c2d556dbc6d4c58
diff --git a/kBuild/files/bootstrap.sh b/kBuild/files/bootstrap.sh
deleted file mode 100644
index 1e225d2..0000000
--- a/kBuild/files/bootstrap.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: bootstrap.sh,v 1.1.1.1 2009/07/14 19:25:05 tnn2 Exp $
-
-set -e
-
-# load environment
-export $(kBuild/env.sh --full --eval --set)
-
-# bootstrap kmk
-cd ${WRKSRC}/src/kmk
-autoreconf -if
-rm -rf ${WRKSRC}/src/kmk/obj
-mkdir ${WRKSRC}/src/kmk/obj
-cd ${WRKSRC}/src/kmk/obj
-../configure
-cp config.h ../config.h.${KBUILD_TARGET}
-make
-cp kmk ${KBUILD_BIN_PATH}
-cp kmk_redirect ${KBUILD_BIN_PATH}
-rm -rf obj
-
-# bootstrap ash
-cd ${WRKSRC}/src/ash
-${KBUILD_BIN_PATH}/kmk
-rm -f ${KBUILD_BIN_PATH}/kmk_ash
-cp ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_TARGET_ARCH}/${KBUILD_TYPE}/kBuild/bin/${KBUILD_TARGET}.${KBUILD_TARGET_ARCH}/kmk_ash ${KBUILD_BIN_PATH}/kmk_ash
-
-# bootstrap sed
-cd ${WRKSRC}/src/sed
-./configure --disable-nls
-mv config.h config.h.${KBUILD_TARGET}
-${KBUILD_BIN_PATH}/kmk
-cp ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_TARGET_ARCH}/${KBUILD_TYPE}/kBuild/bin/${KBUILD_TARGET}.${KBUILD_TARGET_ARCH}/kmk_sed ${KBUILD_BIN_PATH}/kmk_sed
-
-# bootstrap lib
-cd ${WRKSRC}/src/lib
-${KBUILD_BIN_PATH}/kmk
-
-# bootstrap kDepPre
-cd ${WRKSRC}/src/kDepPre
-${KBUILD_BIN_PATH}/kmk
-cp ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_TARGET_ARCH}/${KBUILD_TYPE}/kBuild/bin/${KBUILD_TARGET}.${KBUILD_TARGET_ARCH}/kDepPre ${KBUILD_BIN_PATH}/kDepPre
-
diff --git a/kBuild/files/strtofflags.c b/kBuild/files/strtofflags.c
deleted file mode 100644
index 3045444..0000000
--- a/kBuild/files/strtofflags.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * From http://ftp.netbsd.org/pub/NetBSD/misc/alc/libc/strtofflags.c
- */
-
-/* $NetBSD: strtofflags.c,v 1.1.1.1 2009/07/14 19:25:05 tnn2 Exp $ */
-
-/*-
- * Copyright (c) 1993
- * The Regents of the University of California. 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. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR 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.
- *
- * @(#)stat_flags.c 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.18.2.1 2000/06/28 01:52:24 joe Exp $
- * $DragonFly: src/lib/libc/gen/strtofflags.c,v 1.5 2008/06/02 20:17:07 dillon Exp $
- */
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: strtofflags.c,v 1.1.1.1 2009/07/14 19:25:05 tnn2 Exp $");
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static struct {
- char *name;
- u_long flag;
- int invert;
-} mapping[] = {
- /* shorter names per flag first, all prefixed by "no" */
-#ifdef SF_APPEND
- { "nosappnd", SF_APPEND, 0 },
- { "nosappend", SF_APPEND, 0 },
-#endif
-#ifdef SF_ARCHIVED
- { "noarch", SF_ARCHIVED, 0 },
- { "noarchived", SF_ARCHIVED, 0 },
-#endif
-#ifdef SF_IMMUTABLE
- { "noschg", SF_IMMUTABLE, 0 },
- { "noschange", SF_IMMUTABLE, 0 },
- { "nosimmutable", SF_IMMUTABLE, 0 },
-#endif
-#ifdef SF_NOHISTORY
- { "noshistory", SF_NOHISTORY, 1 },
-#endif
-#ifdef SF_NOUNLINK
- { "nosunlnk", SF_NOUNLINK, 1 },
- { "nosunlink", SF_NOUNLINK, 1 },
-#endif
-#ifdef UF_APPEND
- { "nouappnd", UF_APPEND, 0 },
- { "nouappend", UF_APPEND, 0 },
-#endif
-#ifdef UF_IMMUTABLE
- { "nouchg", UF_IMMUTABLE, 0 },
- { "nouchange", UF_IMMUTABLE, 0 },
- { "nouimmutable", UF_IMMUTABLE, 0 },
-#endif
-#ifdef UF_NODUMP
- { "nodump", UF_NODUMP, 1 },
-#endif
-#ifdef UF_OPAQUE
- { "noopaque", UF_OPAQUE, 0 },
-#endif
-#ifdef UF_NOHISTORY
- { "nouhistory", UF_NOHISTORY, 1 },
- { "nohistory", UF_NOHISTORY, 1 },
-#endif
-#ifdef UF_NOUNLINK
- { "nouunlnk", UF_NOUNLINK, 1 },
- { "nouunlink", UF_NOUNLINK, 1 },
-#endif
-};
-
-#define MAXFLAGLEN 12
-#define NMAPPING __arraycount(mapping)
-
-/*
- * fflagstostr --
- * Convert file flags to a comma-separated string. If no flags
- * are set, return the empty string.
- */
-char *
-fflagstostr(u_long flags)
-{
- char *string;
- char *sp, *dp;
- u_long setflags;
- int i;
-
- string = malloc(NMAPPING * (MAXFLAGLEN + 1));
- if (string == NULL)
- goto out;
-
- setflags = flags;
- dp = string;
- for (i = 0; i < NMAPPING; i++) {
- if ((setflags & mapping[i].flag) == 0)
- continue;
-
- if (dp > string)
- *dp++ = ',';
-
- sp = mapping[i].name;
- if (mapping[i].invert)
- sp += 2;
-
- while (*sp != '\0')
- *dp++ = *sp++;
-
- setflags &= ~mapping[i].flag;
- }
- *dp = '\0';
-
-out:
- return string;
-}
-
-/*
- * strtofflags --
- * Take string of arguments and return file flags. Return 0 on
- * success, 1 on failure. On failure, stringp is set to point
- * to the offending token.
- */
-int
-strtofflags(char **stringp, u_long *setp, u_long *clrp)
-{
- u_long setf, clrf;
- char *string, *p;
- int i;
-
- setf = 0;
- clrf = 0;
-
- string = *stringp;
-
- while ((p = strsep(&string, "\t ,")) != NULL) {
- int p_off = 0;
-
- *stringp = p;
- if (*p == '\0')
- continue;
-
- if (strcmp(p, "no") == 0)
- p_off = 2;
-
- for (i = 0; i < NMAPPING; i++) {
- if (strcmp(p, mapping[i].name + p_off) != 0)
- continue;
-
- if (mapping[i].invert)
- clrf |= mapping[i].flag;
- else
- setf |= mapping[i].flag;
- }
-
- if (i == NMAPPING)
- return 1;
- }
-
- if (setp != NULL)
- *setp = setf;
-
- if (clrp != NULL)
- *clrp = clrf;
-
- return 0;
-}
diff --git a/kBuild/patches/patch-aa b/kBuild/patches/patch-aa
deleted file mode 100644
index 20dc0f6..0000000
--- a/kBuild/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/07/14 19:25:05 tnn2 Exp $
-
---- src/kmk/kmkbuiltin/osdep.c.orig 2009-01-10 03:24:02.000000000 +0100
-+++ src/kmk/kmkbuiltin/osdep.c
-@@ -38,5 +38,8 @@
- #elif defined(__APPLE__)
- # include "darwin.c"
-
-+#elif defined(__NetBSD__)
-+# include "strtofflags.c"
-+
- #endif
-
diff --git a/kBuild/patches/patch-ab b/kBuild/patches/patch-ab
deleted file mode 100644
index 9a0785a..0000000
--- a/kBuild/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/07/14 19:25:05 tnn2 Exp $
-
---- src/ash/Makefile.kmk.orig 2009-01-10 03:24:02.000000000 +0100
-+++ src/ash/Makefile.kmk
-@@ -36,6 +36,7 @@ kmk_ash_DEFS.debug = DEBUG=2
- endif
- kmk_ash_DEFS.linux = BSD
- kmk_ash_DEFS.solaris = BSD
-+kmk_ash_DEFS.netbsd = BSD HAVE_SYS_SIGNAME
- kmk_ash_DEFS.win = \
- BSD PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS PC_SLASHES
- kmk_ash_DEFS.os2 = \
diff --git a/kBuild/patches/patch-ac b/kBuild/patches/patch-ac
deleted file mode 100644
index e1ff604..0000000
--- a/kBuild/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/07/21 10:56:31 tnn2 Exp $
-
---- src/sed/Makefile.kmk.orig 2009-01-10 02:24:02.000000000 +0000
-+++ src/sed/Makefile.kmk
-@@ -66,6 +66,10 @@ kmk_sed_SOURCES.freebsd = \
- lib/strverscmp.c \
- lib/obstack.c \
- lib/getline.c
-+kmk_sed_SOURCES.netbsd = \
-+ lib/strverscmp.c \
-+ lib/obstack.c \
-+ lib/getline.c
- kmk_sed_SOURCES.solaris = \
- lib/strverscmp.c \
- lib/obstack.c \
diff --git a/kBuild/patches/patch-ad b/kBuild/patches/patch-ad
deleted file mode 100644
index 4edc471..0000000
--- a/kBuild/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/07/16 13:09:26 tnn2 Exp $
-
---- src/kmk/Makefile.kmk.orig 2009-01-10 03:24:02.000000000 +0100
-+++ src/kmk/Makefile.kmk
-@@ -57,6 +57,7 @@ TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(
- TEMPLATE_BIN-KMK_INCS.darwin = glob
- TEMPLATE_BIN-KMK_INCS.dragonfly = glob
- TEMPLATE_BIN-KMK_INCS.freebsd = glob
-+TEMPLATE_BIN-KMK_INCS.netbsd = glob
- TEMPLATE_BIN-KMK_INCS.solaris = glob
- TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN_LIBS) $(TARGET_kmkmissing) $(LIB_KUTIL)
- ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
-@@ -100,6 +101,11 @@ kmkmissing_SOURCES.freebsd = \
- glob/glob.c \
- glob/fnmatch.c
-
-+kmkmissing_SOURCES.netbsd = \
-+ glob/glob.c \
-+ glob/fnmatch.c \
-+ strtofflags.c
-+
- kmkmissing_SOURCES.linux += \
- kmkbuiltin/strlcpy.c
-
-@@ -221,6 +227,9 @@ kmk_SOURCES = \
- kmk_LIBS.freebsd.amd64 = pthread
- kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
-
-+kmk_LIBS.netbsd.amd64 = pthread
-+kmk_DEFS.netbsd.x86 = CONFIG_WITHOUT_THREADS
-+
- #
- # kmkbuiltin commands
- #
diff --git a/kBuild/patches/patch-ae b/kBuild/patches/patch-ae
deleted file mode 100644
index 4c1dfeb..0000000
--- a/kBuild/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/07/21 10:56:31 tnn2 Exp $
-
---- src/sed/lib/getline.c.orig 2006-11-25 23:34:04.000000000 +0000
-+++ src/sed/lib/getline.c
-@@ -24,6 +24,11 @@
- #include <limits.h>
- #include <errno.h>
-
-+#include <sys/param.h>
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 599001600
-+/* nada */
-+#else
-+
- /* Read up to (and including) a '\n' from STREAM into *LINEPTR
- (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
- NULL), pointing to *N characters of space. It is realloc'd as
-@@ -108,3 +113,5 @@ getline (lineptr, n, stream)
- *p = '\0';
- return p - *lineptr;
- }
-+
-+#endif /* NetBSD */
diff --git a/kBuild/patches/patch-af b/kBuild/patches/patch-af
deleted file mode 100644
index 3e5e57b..0000000
--- a/kBuild/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/02/17 13:14:51 tnn2 Exp $
-
---- src/ash/output.h.orig 2006-11-26 10:49:25.000000000 +0000
-+++ src/ash/output.h
-@@ -65,8 +65,12 @@ void outfmt(struct output *, const char
- __attribute__((__format__(__printf__,2,3)));
- void out1fmt(const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-+#if defined(__NetBSD__) && __NetBSD_Version__ > 599003900
-+/* has dprintf */
-+#else
- void dprintf(const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-+#endif
- void fmtstr(char *, size_t, const char *, ...)
- __attribute__((__format__(__printf__,3,4)));
- void doformat(struct output *, const char *, va_list);
diff --git a/kBuild/patches/patch-ag b/kBuild/patches/patch-ag
deleted file mode 100644
index 4d5aed9..0000000
--- a/kBuild/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/02/17 13:14:51 tnn2 Exp $
-
---- src/ash/output.c.orig 2007-01-29 05:54:36.000000000 +0000
-+++ src/ash/output.c
-@@ -230,6 +230,9 @@ out1fmt(const char *fmt, ...)
- va_end(ap);
- }
-
-+#if defined(__NetBSD__) && __NetBSD_Version__ > 599003900
-+/* has dprintf */
-+#else
- void
- dprintf(const char *fmt, ...)
- {
-@@ -240,6 +243,7 @@ dprintf(const char *fmt, ...)
- va_end(ap);
- flushout(out2);
- }
-+#endif
-
- void
- fmtstr(char *outbuf, size_t length, const char *fmt, ...)
Home |
Main Index |
Thread Index |
Old Index