Imported Debian patch 0.24.0-3

16 files changed, 366 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..8255823
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,17 @@
+mk-configure (0.24.0-3) unstable; urgency=low
+
+  * Fix the clean-up of MKC_SOURCE_FUNCLIBS.
+
+ -- Andrew Shadura <andrewsh@debian.org>  Fri, 15 Nov 2013 17:39:37 +0100
+
+mk-configure (0.24.0-2) unstable; urgency=low
+
+  * Fix the Debhelper addon.
+
+ -- Andrew Shadura <andrewsh@debian.org>  Fri, 15 Nov 2013 15:44:39 +0100
+
+mk-configure (0.24.0-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Andrew Shadura <andrewsh@debian.org>  Thu, 15 Aug 2013 01:02:03 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..46cf158
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: mk-configure
+Section: devel
+Priority: optional
+Maintainer: Andrew Shadura <andrewsh@debian.org>
+Build-Depends: debhelper (>= 9), bmake
+Standards-Version: 3.9.4
+
+Package: mk-configure
+Architecture: all
+Depends: bmake, ${misc:Depends}
+Description: lightweight replacement for GNU autotools
+ mk-configure is a lightweight easy-to-use replacement for GNU autotools,
+ written in bmake (portable version of NetBSD make) and POSIX tools (shell,
+ awk etc).
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d8489bb
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,172 @@
+This package was downloaded from https://github.com/cheusov/mk-configure/
+
+Upstream Author: Aleksey Cheusov <vle@gmx.net>
+
+License: BSD (see below)
+
+Debian packaging in (c) 2013 Andrew Shadura <andrewsh@debian.org> and
+is licensed under the following license:
+
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE DEBIAN PROJECT 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 FOUNDATION 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.
+
+######################################################################
+
+Different parts of mk-configure have different copyright holders.
+All used licences are listed here.
+See individual files for details.
+
+######################################################################
+
+File examples/hello_strlcpy/strlcpy.c is licensed as follows:
+
+Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+######################################################################
+
+Copyright (c) 2009-2010 by Aleksey Cheusov
+
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+
+######################################################################
+
+Copyright (c) 1988, 1989, 1993
+	The Regents of the University of California.  All rights reserved.
+Copyright (c) 1988, 1989 by Adam de Boor
+Copyright (c) 1989 by Berkeley Softworks
+
+
+This code is derived from software contributed to Berkeley
+by Adam de Boor.
+
+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.
+
+
+######################################################################
+
+Copyright (c) 1994-2009 The NetBSD Foundation, Inc.
+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.
+
+THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+
+######################################################################
+
+Copyright 1991 by the Massachusetts Institute of Technology
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of M.I.T. not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  M.I.T. makes no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied warranty.
+
+Calling this script install-sh is preferred over install.sh, to
+prevent `make' implicit rules from creating a file called install from
+it when there is no Makefile.
+
+This script is compatible with the BSD install script, but was written
+from scratch.  It can only install one file at a time, a restriction
+shared with many OS's install programs.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..73286e9
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,4 @@
+FAQ
+NEWS
+README
+TODO
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..de4e45f
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+debian/sys.mk usr/share/mk-configure/mk
+debian/*.pm usr/share/perl5/Debian/Debhelper/Buildsystem/
diff --git a/debian/mkcmake.pm b/debian/mkcmake.pm
new file mode 100644
index 0000000..016685e
--- /dev/null
+++ b/debian/mkcmake.pm
@@ -0,0 +1,99 @@
+# A debhelper build system class for handling simple mk-configure-based projects.
+#
+# Copyright: © 2008 Joey Hess
+#            © 2008-2009 Modestas Vainius
+# License: GPL-2+
+
+package Debian::Debhelper::Buildsystem::mkcmake;
+
+use strict;
+use Debian::Debhelper::Dh_Lib qw(compat escape_shell clean_jobserver_makeflags dpkg_architecture_value);
+use base 'Debian::Debhelper::Buildsystem::makefile';
+
+sub DESCRIPTION {
+	"mk-configure"
+}
+
+sub exists_make_target {
+	my ($this, $target) = @_;
+
+	# Use make -n to check to see if the target would do
+	# anything. There's no good way to test if a target exists.
+	my @opts=("-s", "-n");
+	my $buildpath = $this->get_buildpath();
+	unshift @opts, "-C", $buildpath if $buildpath ne ".";
+	open(SAVEDERR, ">&STDERR");
+	open(STDERR, ">/dev/null");
+	open(MAKE, "-|", $this->{makecmd}, @opts, $target);
+	my $output=<MAKE>;
+	chomp $output;
+	close MAKE;
+	open(STDERR, ">&SAVEDERR");
+	return defined $output && length $output;
+}
+
+# Currently, we don't want parallel build with bmake.
+sub do_make {
+	my $this=shift;
+
+	# Avoid possible warnings about unavailable jobserver,
+	# and force make to start a new jobserver.
+	clean_jobserver_makeflags();
+
+	my @opts;
+	my $prefix = "/usr";
+	push @opts, "PREFIX=${prefix}";
+	push @opts, "MANDIR=${prefix}/share/man";
+	push @opts, "INFODIR=${prefix}/share/info";
+	push @opts, "SYSCONFDIR=/etc";
+	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
+	if (! compat(8)) {
+		   if (defined $multiarch) {
+					push @opts, "LIBDIR=${prefix}/lib/$multiarch";
+					push @opts, "LIBEXECDIR=${prefix}/lib/$multiarch";
+			}
+			else {
+					push @opts, "LIBEXECDIR=${prefix}/lib";
+			}
+	}
+	else {
+			push @opts, "LIBEXECDIR=${prefix}/lib/" . sourcepackage();
+	}
+
+	$this->doit_in_builddir($this->{makecmd}, @opts, @_);
+}
+
+sub check_auto_buildable {
+	my $this=shift;
+	my ($step)=@_;
+
+	if (-e $this->get_buildpath("makefile") ||
+	    -e $this->get_buildpath("Makefile"))
+	{
+        my $ret = ($this->SUPER::check_auto_buildable(@_));
+
+        open (MAKEFILE, "makefile") || open (MAKEFILE, "Makefile") ||
+            return 0;
+
+        while (<MAKEFILE>) {
+                chomp;
+                if (/^\.?\s*include\s+<mkc/) {
+                        close MAKEFILE;
+                        $ret++;
+                        return $ret;
+                }
+        }
+        close MAKEFILE;
+        return $ret;
+	}
+	return 0;
+}
+
+sub new {
+	my $class=shift;
+	my $this=$class->SUPER::new(@_);
+	$this->{makecmd} = "mkcmake";
+	return $this;
+}
+
+1
diff --git a/debian/patches/01-dont-fail-on-clean.patch b/debian/patches/01-dont-fail-on-clean.patch
new file mode 100644
index 0000000..c7df96b
--- /dev/null
+++ b/debian/patches/01-dont-fail-on-clean.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -129,7 +129,7 @@
+ 	for d in ${.CURDIR}/tests ${.CURDIR}/doc; do \
+ 	   cd $$d; \
+ 	   ${MAKE} -m ${.CURDIR} -m ${.OBJDIR} -m ${MKFILESDIR} \
+-		${MAKEFLAGS} cleandir; \
++		${MAKEFLAGS} cleandir || true; \
+ 	done
+ clean: clean_tests
+ clean_tests: configure.mk
+@@ -138,7 +138,7 @@
+ 	for d in ${.CURDIR}/tests ${.CURDIR}/doc; do \
+ 	   cd $$d; \
+ 	   ${MAKE} -m ${.CURDIR} -m ${.OBJDIR} -m ${MKFILESDIR} \
+-		${MAKEFLAGS} clean; \
++		${MAKEFLAGS} clean || true; \
+ 	done
+ 
+ ##################################################
diff --git a/debian/patches/02-cleanfiles-fix.patch b/debian/patches/02-cleanfiles-fix.patch
new file mode 100644
index 0000000..49b7032
--- /dev/null
+++ b/debian/patches/02-cleanfiles-fix.patch
@@ -0,0 +1,11 @@
+--- a/mkc.mk
++++ b/mkc.mk
+@@ -19,7 +19,7 @@
+ 
+ .include <mkc_imp.init.mk>
+ 
+-CLEANFILES += ${MKC_SOURCE_FUNCLIBS:D${MKC_SOURCE_FUNCLIBS}.o}
++CLEANFILES += ${MKC_SOURCE_FUNCLIBS:D${MKC_SOURCE_FUNCLIBS:%=%.o}}
+ .if ${MKCHECKS:tl} == "yes"
+ .include <configure.mk>
+ .endif # MKCHECKS
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b54b335
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-dont-fail-on-clean.patch
+02-cleanfiles-fix.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..9beccfd
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+export PREFIX := /usr
+export SYSCONFDIR := /etc
+export MANDIR := $(PREFIX)/share/man
+export MKFILESDIR := $(PREFIX)/share/mk-configure/mk
+
+%:
+	dh $@ --buildsystem=bmake
+
+override_dh_auto_test:
+
+.PHONY: override_dh_auto_test
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/sys.mk b/debian/sys.mk
new file mode 100644
index 0000000..86ce66b
--- /dev/null
+++ b/debian/sys.mk
@@ -0,0 +1,2 @@
+LDCOMPILER ?= yes
+
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..6c39629
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+opts=filenamemangle=s/.*\/(.*)$/mk-configure-$1/ https://github.com/cheusov/mk-configure/tags /cheusov/mk-configure/archive/mk-configure-(\d.*).tar.gz
+