[Glibc-bsd-commits] r5814 - in tags/freebsd-buildutils: . 10.2-2/debian 10.2-2/debian/patches
christoph at alioth.debian.org
christoph at alioth.debian.org
Wed Oct 21 12:33:24 UTC 2015
Author: christoph
Date: 2015-10-21 12:33:23 +0000 (Wed, 21 Oct 2015)
New Revision: 5814
Added:
tags/freebsd-buildutils/10.2-2/
tags/freebsd-buildutils/10.2-2/debian/changelog
tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff
tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff
tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff
tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff
tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff
tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff
tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff
tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff
tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff
tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff
tags/freebsd-buildutils/10.2-2/debian/patches/series
tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff
tags/freebsd-buildutils/10.2-2/debian/rules
Removed:
tags/freebsd-buildutils/10.2-2/debian/changelog
tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff
tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff
tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff
tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff
tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff
tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff
tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff
tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff
tags/freebsd-buildutils/10.2-2/debian/patches/mk_hyperv.diff
tags/freebsd-buildutils/10.2-2/debian/patches/mk_ncp.diff
tags/freebsd-buildutils/10.2-2/debian/patches/mk_tests.diff
tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff
tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff
tags/freebsd-buildutils/10.2-2/debian/patches/series
tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff
tags/freebsd-buildutils/10.2-2/debian/rules
Log:
[svn-buildpackage] Tagging freebsd-buildutils 10.2-2
Deleted: tags/freebsd-buildutils/10.2-2/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/changelog 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,738 +0,0 @@
-freebsd-buildutils (10.0-7) unstable; urgency=medium
-
- * Cherry-pick r276494 from HEAD:
- Don't include bsd.sys.mk within bsd.kmod.mk
-
- -- Steven Chamberlain <steven at pyro.eu.org> Wed, 08 Jul 2015 16:44:07 +0100
-
-freebsd-buildutils (10.0-6) experimental; urgency=medium
-
- * Raise Build-Depends on freebsd-glue to >= 0.2.20~, to not be
- affected by #759249 if the installed libbsd-dev is newer
- * Do not use -fstack-protector on alpha
-
- -- Steven Chamberlain <steven at pyro.eu.org> Tue, 21 Oct 2014 22:50:38 +0100
-
-freebsd-buildutils (10.0-5) unstable; urgency=medium
-
- [ Petr Salinger ]
- * Backport mk_hyperv, needed by 10.1 RC
-
- [ Steven Chamberlain ]
- * backports MK_TESTS for freebsd-utils (>> 10.1~)
- * Do not use -fstack-protector on hppa/parisc arch (thanks, Helge
- Deller) (Closes: #758377)
- * In get-orig-source, svn export with --ignore-keywords so that
- revision tags do not fuzzy the patches
- * Add myself to Uploaders
-
- -- Petr Salinger <Petr.Salinger at seznam.cz> Sat, 04 Oct 2014 18:16:23 +0200
-
-freebsd-buildutils (10.0-4) unstable; urgency=low
-
- * Add MK_EISA.
-
- -- Robert Millan <rmh at debian.org> Sun, 04 May 2014 14:15:29 +0200
-
-freebsd-buildutils (10.0-3) unstable; urgency=low
-
- * kldxref_abort_on_error.diff: Treat EFAULT condition as fatal (see
- comment in patch header).
-
- -- Robert Millan <rmh at debian.org> Fri, 21 Feb 2014 20:31:13 +0100
-
-freebsd-buildutils (10.0-2) unstable; urgency=low
-
- * Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance.
-
- -- Robert Millan <rmh at debian.org> Wed, 15 Jan 2014 17:26:00 +0100
-
-freebsd-buildutils (10.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Robert Millan <rmh at debian.org> Wed, 15 Jan 2014 13:37:23 +0100
-
-freebsd-buildutils (10.0~svn259404-6) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Robert Millan <rmh at debian.org> Fri, 03 Jan 2014 17:12:31 +0100
-
-freebsd-buildutils (10.0~svn259404-5) experimental; urgency=low
-
- * Break circular build-dependency with freebsd-glue by splitting
- freebsd-mk into a package of its own.
-
- -- Robert Millan <rmh at debian.org> Thu, 02 Jan 2014 23:17:49 +0100
-
-freebsd-buildutils (10.0~svn259404-4) unstable; urgency=low
-
- * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
- * Install make and mtree by their upstream names (fmake and fmtree).
- Remove the legacy symlinks (leave them to freebsd-glue).
- * Install file2c and brandelf directly to /usr/bin.
- * Move /usr/share/mk to /usr/share/mk-freebsd. This allows
- freebsd-buildutils to be installed alongside bmake.
- * Remove bootstrap magic. bmake is the default in upstream now: just
- use it to build fmake.
-
- -- Robert Millan <rmh at debian.org> Thu, 02 Jan 2014 17:43:51 +0100
-
-freebsd-buildutils (10.0~svn259404-3) unstable; urgency=low
-
- * Fix aicasm install path.
-
- -- Robert Millan <rmh at debian.org> Wed, 18 Dec 2013 12:15:59 +0100
-
-freebsd-buildutils (10.0~svn259404-2) unstable; urgency=low
-
- * kldxref is kFreeBSD-only.
-
- -- Robert Millan <rmh at debian.org> Tue, 17 Dec 2013 23:34:15 +0100
-
-freebsd-buildutils (10.0~svn259404-1) unstable; urgency=low
-
- * New upstream snapshot (10.0-RC2).
- - Switch to releng/10.0 branch.
- - Add kldxref.
-
- [ Robert Millan ]
- * Fetch source code securely (https) in get-orig-source.
-
- -- Robert Millan <rmh at debian.org> Tue, 17 Dec 2013 22:28:15 +0100
-
-freebsd-buildutils (10~svn258496-1) unstable; urgency=low
-
- * New upstream snapshot.
- - Refresh all patches.
- - Add aicasm. It is now required by kernel builds.
-
- [ Guillem Jover ]
- * Remove myself from Uploaders.
-
- -- Robert Millan <rmh at debian.org> Sat, 23 Nov 2013 15:48:42 +0100
-
-freebsd-buildutils (10~svn253832-1) unstable; urgency=low
-
- * New upstream snapshot (provides MK_USB_GADGET_EXAMPLES).
-
- -- Robert Millan <rmh at debian.org> Fri, 02 Aug 2013 21:04:11 +0200
-
-freebsd-buildutils (10~svn251967-6) unstable; urgency=low
-
- * Bump freebsd-glue B-D to fix FTBFS.
-
- -- Robert Millan <rmh at debian.org> Mon, 22 Jul 2013 21:57:31 +0200
-
-freebsd-buildutils (10~svn251967-5) unstable; urgency=low
-
- * Reupload.
-
- -- Robert Millan <rmh at debian.org> Mon, 22 Jul 2013 20:10:42 +0200
-
-freebsd-buildutils (10~svn251967-4) experimental; urgency=low
-
- * Bring back MK_NCP (needed by kfreebsd-9).
-
- -- Robert Millan <rmh at debian.org> Sat, 06 Jul 2013 22:49:13 +0200
-
-freebsd-buildutils (10~svn251967-3) experimental; urgency=low
-
- * Depend on m4 as it's now required by lex (no pun intended).
-
- -- Robert Millan <rmh at debian.org> Fri, 05 Jul 2013 23:25:44 +0200
-
-freebsd-buildutils (10~svn251967-2) experimental; urgency=low
-
- * Depend on suitable version of freebsd-glue (for _SAFE macros).
-
- -- Robert Millan <rmh at debian.org> Fri, 05 Jul 2013 23:06:31 +0200
-
-freebsd-buildutils (10~svn251967-1) experimental; urgency=low
-
- * New upstream snapshot.
-
- [ Guillem Jover ]
- * Switch to canonical Vcs URLs.
-
- [ Robert Millan ]
- * Add freebsd-config back. (Closes: #712633)
- * Ease flex build-dependency.
-
- -- Robert Millan <rmh at debian.org> Wed, 19 Jun 2013 12:23:55 +0200
-
-freebsd-buildutils (10~svn237137-1) experimental; urgency=low
-
- * New upstream snapshot.
- - Removes yacc (it's been replaced by byacc in upstream).
-
- -- Robert Millan <rmh at debian.org> Sat, 16 Jun 2012 12:17:10 +0200
-
-freebsd-buildutils (9.0-10) unstable; urgency=low
-
- * disable_wsystem_headers.diff: Disable -Wsystem-headers to avoid
- triggering #664242.
- * Fix getopt declaration.
- * Add MK_CTF build option.
- * nostrip.diff: By default, install without -s. Let dh_strip, etc
- handle stripping (and honor DEB_BUILD_OPTIONS=nostrip, etc).
- * Remove compatibility hacks (now provided by freebsd-glue).
-
- -- Robert Millan <rmh at debian.org> Fri, 25 May 2012 19:16:53 +0200
-
-freebsd-buildutils (9.0-9) unstable; urgency=low
-
- * Add MK_CLANG_IS_CC build option (needed by recent kfreebsd-10).
-
- -- Robert Millan <rmh at debian.org> Fri, 09 Mar 2012 22:57:12 +0100
-
-freebsd-buildutils (9.0-8) unstable; urgency=low
-
- * Add getosreldate() to local headers.
- * Make feature_present() backward-compatible with pre-900038 kernels.
-
- -- Robert Millan <rmh at debian.org> Thu, 23 Feb 2012 20:58:39 +0100
-
-freebsd-buildutils (9.0-7) unstable; urgency=low
-
- * sys/endian.h: Don't include_next <machine/endian.h>, just include.
- * Add execvP().
-
- -- Robert Millan <rmh at debian.org> Wed, 15 Feb 2012 22:57:13 +0100
-
-freebsd-buildutils (9.0-6) unstable; urgency=low
-
- * Make <sys/types.h> imply <machine/endian.h>, even on non-kFreeBSD
- platforms (we always have <machine/endian.h> in local directory).
-
- -- Robert Millan <rmh at debian.org> Wed, 15 Feb 2012 20:45:29 +0100
-
-freebsd-buildutils (9.0-5) unstable; urgency=low
-
- * Add implicit includes to sys/stdint.h.
- * Steal a few more definitions for sys/cdefs.h.
-
- -- Robert Millan <rmh at debian.org> Sat, 04 Feb 2012 17:14:34 +0100
-
-freebsd-buildutils (9.0-4) unstable; urgency=low
-
- * FreeBSD code expects that <sys/param.h> implicitly defines SIG*
- macros.
- * Cherry-pick MK_SOURCELESS build option from 10-CURRENT.
-
- -- Robert Millan <rmh at debian.org> Sat, 04 Feb 2012 12:27:38 +0100
-
-freebsd-buildutils (9.0-3) unstable; urgency=low
-
- * Replace 10_non_kfreebsd.diff with equivalent patch from upstream
- HEAD.
- * Add __BEGIN_DECLS / __END_DECLS in local unistd.h.
- * Fix local endian.h to use native <sys/endian.h> on GNU/kFreeBSD.
- * Add local sys/errno.h and sys/stdint.h.
- * Add a few more definitions to local sys/cdefs.h.
- * Remove getline kludge. The second part was unneeded, the first one
- caused version_gen.awk to hang.
- * Add __offsetof().
- * Add nfssvc, closefrom and feature_present to unistd.h.
- * Add sys/time.h.
-
- -- Robert Millan <rmh at debian.org> Sun, 29 Jan 2012 02:59:54 +0100
-
-freebsd-buildutils (9.0-2) unstable; urgency=low
-
- * Add elf_common.h to local includes to fix FTBFS on GNU/Linux.
- * Install headers in freebsd hierrachy.
-
- -- Robert Millan <rmh at debian.org> Sun, 08 Jan 2012 00:45:11 +0100
-
-freebsd-buildutils (9.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Robert Millan <rmh at debian.org> Sat, 07 Jan 2012 20:34:01 +0100
-
-freebsd-buildutils (8.2-8) unstable; urgency=low
-
- [ Matthias Klose ]
- * Fix FTBFS with ld --as-needed. (Closes: #642091, LP: #749170)
-
- [ Robert Millan ]
- * Export CFLAGS in debian/rules so that it is actually propagated.
- (Closes: #642700)
- * Fix bsd.dep.mk so that -U flags are propagated in kernel builds.
-
- -- Robert Millan <rmh at debian.org> Thu, 03 Nov 2011 15:02:07 +0100
-
-freebsd-buildutils (8.2-7) unstable; urgency=low
-
- * 04_lex_disable_unused.diff: Fix generation of code in lex, which
- defined __unused and broke system headers (see #522773 and #522774).
-
- -- Robert Millan <rmh at debian.org> Tue, 12 Jul 2011 17:53:12 +0200
-
-freebsd-buildutils (8.2-6) unstable; urgency=low
-
- * 21_endian.diff: If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are
- defined, default to native compilation (fixes FTBFS on mips and armeb).
-
- -- Robert Millan <rmh at debian.org> Wed, 06 Jul 2011 19:48:48 +0200
-
-freebsd-buildutils (8.2-5) unstable; urgency=low
-
- * Disable libbsd overlay untill #630907 is fixed. (Closes: #632600)
-
- -- Robert Millan <rmh at debian.org> Mon, 04 Jul 2011 15:43:02 +0200
-
-freebsd-buildutils (8.2-4) unstable; urgency=low
-
- * MACHINE_ARCH is now set to "mips" on mipsel. (Closes: #631890)
-
- -- Robert Millan <rmh at debian.org> Sat, 02 Jul 2011 13:13:57 +0200
-
-freebsd-buildutils (8.2-3) unstable; urgency=low
-
- * 18_fix_sysdir.diff: Bring back search in relative paths (removing it
- breaks kfreebsd builds). (Closes: #631889, #631892)
-
- -- Robert Millan <rmh at debian.org> Tue, 28 Jun 2011 15:23:42 +0200
-
-freebsd-buildutils (8.2-2) unstable; urgency=low
-
- * 18_fix_sysdir.diff: Fix SYSDIR path to make kernel modules buildable.
- (Closes: #594183).
- * Switch to use the libbsd-overlay:
- - Bump libbsd-dev Build-Depends to (>= 0.3.0).
- - Add pkg-config to Build-Depends.
- - Remove some now obsolete porting code.
- * Disable FreeBSD/pc98 pre-7.0 compatibility on non-FreeBSD (fixes FTBFS on
- hurd-i386).
- * 19_fix_cmd_pathnames.diff: Fix pathnames for a number of commands.
- (Closes: #625261)
- * Add myself to Uploaders.
-
- -- Robert Millan <rmh at debian.org> Sun, 26 Jun 2011 17:47:37 +0200
-
-freebsd-buildutils (8.2-1) unstable; urgency=low
-
- [ Robert Millan ]
- * 10_non_kfreebsd.diff: Make freebsd-make usable on non-kFreeBSD
- systems. (Closes: #602768)
-
- [ Guillem Jover ]
- * Now using Standards-Version 3.9.2 (no changes needed).
- * Switch to source format “3.0 (quilt)”.
- - Remove quilt from Build-Depends.
- - Remove patch target in debian/rules.
- - Remove now unneeded README.source.
- - Refresh all patches.
- * Use -C option for pmake instead of manually changing dir.
- * Stop Build-Depending on pmake, bootstrap freebsd-make using GNU make
- and use it as pmake instead of using it from the pmake package.
- * Switch to debhelper compatibility level 7.
- - Use dh_prep instead of “dh_clean -k”.
- * Only use MACHINE_ARCH in freebsd-make if it's defined.
- * Add support for Multi-Arch directories to freebsd-make:
- - Do not switch LIBDIR yet, the dynamic linker does not have the
- correct paths for i386 based architectures.
- - Add builtin MACHINE_MULTIARCH make variable.
- * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
- * Line-wrap CFLAGS variable in debian/rules.
- * Install binaries directly to /usr/lib/freebsd instead of relocating them
- from /usr/bin and /usr/sbin.
- * Install the man pages. (Closes: #493898)
- * Change ‘unix’ freebsd-make variable to “We run Debian, not UNIX.” and
- remove ‘.FreeBSD’ freebsd-make variable. (Closes: #493841)
- * Intersperse Depends description comments between the actual dependencies.
- * Do not install profile and libfl.a hardlinks for freebsd-lex libln.a.
-
- -- Guillem Jover <guillem at debian.org> Tue, 31 May 2011 04:20:37 +0200
-
-freebsd-buildutils (8.1-1) unstable; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_8_1_0_RELEASE)
-
- [ Aurelien Jarno ]
- * Update debian/copyright.
- * Bumped Standard-Versions to 3.9.1 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org> Thu, 29 Jul 2010 21:33:33 +0200
-
-freebsd-buildutils (8.0-1) unstable; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_8_0_0_RELEASE)
- * Add a get-orig-source target to debian/rules and
- stop using a tar in tar system.
- * Use quilt for patches management
-
- [ Aurelien Jarno ]
- * Add a README.source.
-
- -- Aurelien Jarno <aurel32 at debian.org> Mon, 12 Apr 2010 23:53:50 +0200
-
-freebsd-buildutils (7.2-2) unstable; urgency=low
-
- * Remove part of the automatic patches in favor of patches.
- * Use libbsd instead of hacked funtions (Closes: #379259).
- * Use <bsd/sys/*.h> includes instead of <bsd/*.h>.
- * Remove depends on dash, it is now essential.
- * Add depends on ${misc:Depends}.
- * Bumped Standard-Versions to 3.8.4 (no changes).
- * Handle nostrip build options (Closes: #436857).
-
- -- Aurelien Jarno <aurel32 at debian.org> Sat, 10 Apr 2010 16:49:49 +0200
-
-freebsd-buildutils (7.2-1) unstable; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_7_2_0_RELEASE)
-
- -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 May 2009 09:03:20 +0200
-
-freebsd-buildutils (7.1-2) unstable; urgency=low
-
- * patches/15_manpages_gzip.diff: new patch to gzip manpages with -9 by
- default, as required on Debian systems.
- * Switch to debhelper 5.
- * Bumped Standard-Versions to 3.8.1 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org> Tue, 07 Apr 2009 17:49:03 +0200
-
-freebsd-buildutils (7.1-1) unstable; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_7_1_0_RELEASE)
-
- -- Aurelien Jarno <aurel32 at debian.org> Sun, 11 Jan 2009 11:59:32 +0100
-
-freebsd-buildutils (7.0-2) unstable; urgency=low
-
- [ Petr Salinger ]
- * fix implicit-pointer-conversion by including appropriate headers.
- Closes: #493770.
- * add Vcs-* fields into debian/control.
-
- -- Aurelien Jarno <aurel32 at debian.org> Tue, 05 Aug 2008 14:30:25 +0200
-
-freebsd-buildutils (7.0-1) unstable; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_7_0_0_RELEASE)
- - drop upstream patches 000_fix_make_double_free.diff,
- 000_7-current_support_in_bsd.own.mk.diff
- - replace 02_silly_macros.diff via sed and 12_unused.diff
- - add 13_bsd_sys.diff, 14_config.diff
- - update remaining patches
- * Package rename, cleanup
- * Upload to Debian. Closes: #344417.
- See also #474761, #474762.
-
- [ Aurelien Jarno ]
- * Drop symlink pointing to gcc-3.4.
- * Bumped Standard-Versions to 3.8.0 (no changes).
- * Update debian/copyright.
-
- -- Aurelien Jarno <aurel32 at debian.org> Tue, 15 Jul 2008 19:37:00 +0200
-
-freebsd6-buildutils (6.3-2) unreleased; urgency=low
-
- * Don't build-depends nor depends on gcc-3.4.
-
- -- Aurelien Jarno <aurel32 at debian.org> Sat, 12 Jan 2008 18:02:07 +0100
-
-freebsd6-buildutils (6.3-1) unreleased; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_6_3_0_RELEASE)
-
- [ Aurelien Jarno ]
- * Bumped Standard-Versions to 3.7.3 (no changes).
- * Gzip manpages with -9.
-
- -- Aurelien Jarno <aurel32 at debian.org> Thu, 10 Jan 2008 14:03:04 +0100
-
-freebsd6-buildutils (6.2-1) unreleased; urgency=low
-
- [ Petr Salinger ]
- * New upstream version (RELENG_6_2_0_RELEASE)
-
- -- Aurelien Jarno <aurel32 at debian.org> Mon, 15 Jan 2007 13:38:31 +0100
-
-freebsd6-buildutils (6.0-0.2) unreleased; urgency=low
-
- * Add cruft to bsd.own.mk necessary to build latest kernel.
-
- -- Robert Millan <rmh at aybabtu.com> Sat, 6 May 2006 13:10:05 +0200
-
-freebsd6-buildutils (6.0-0.1) unreleased; urgency=low
-
- * Fork 6.x branch.
- * Switch to libbsd.
- - control (Build-Depends): Add libbsd-dev.
- - rules: export LDADD=-lbsd
- - patches/03_glibc.diff:
- - usr.sbin/config/main.c: Nuke strl{cpy,cat} hack.
- - usr.sbin/mtree/excludes.c: Nuke fgetln hack.
- - usr.bin/make/Makefile: Stop adding LDADD=-lbsd (now passed from rules).
- - patches/11_config_allow_override.diff:
- - usr.sbin/config/Makefile: s/LDADD=/LDADD+=/g.
- * Make dash and gcc-3.4 the default "sh" and "cc".
- - control (Depends): Add gcc-3.4.
- - links: New. Setup sh and cc symlinks.
- * Pass NO_SHARED=NO from debian/rules
- - rules
- - patches/01_make_fixes.diff: Nuke part that disables NO_SHARED.
- * patches/03_glibc.diff:
- - Remove s,sys/time.h/time.h,g (was it ever needed?)
- - Nuke LIST_* defines (should be in sys/queue.h, or find another
- solution, like s,sys/queue.h,bsd/queue.h,g)
- * rules:
- - Only apply patches with *.diff suffix.
- * Move /usr/share/freebsd6-buildutils to /usr/share.
- - control (Conflicts): Add pmake.
- - patches/01_make_fixes.diff (usr.bin/make/pathnames.h): Remove
- PATH_DEFSYSPATH redefinition.
- - rules: Install mk and Mk in /usr/share.
- * patches/000_fix_make_double_free.diff: New. Patch from upstream
- (1.155:1.158). Thanks to Petr for spotting this.
- * Build using gcc 3.4, like upstream.
- - control (Build-Depends): Add gcc-3.4.
- - rules: Pass CC=gcc-3.4 to make.
- - patches/06_ftbfs_gcc-4.0.diff: Remove.
- * Fixes runtime getopt parsing infin loop.
- - rules (COPTS): Build with -D_GNU_SOURCE.
- - rules: Rename internal getline function to avoid collision with the one
- from Glibc (s/getline/bsd_&/g).
- - patches/06_ftbfs_gcc-4.0.diff: Remove (it had dirty getopt hacks as well).
- * patches/11_optreset.diff: New. Replace unportable optreset mangling
- with reset_getopt () from libbsd.
- * Our awk wasn't actualy from FreeBSD, but imported from original-awk.
- Let's use that directly instead.
- - control (Depends): Add original-awk.
- - links: Add link to original-awk.
- - patches/00_upstream.diff: Remove hunks that apply to awk.
- - patches/05_disable_hardlinks.diff: Ditto.
- - rules: Remove commands that work with awk.
- - fetch: Remove awk dirs from checkout/update.
- * Add gmake (as alias for gnu make).
- - control (Depends): Add make.
- - links: Add gmake link.
- * Massive cleanup in ports/Mk patches.
- - rules: Add sed rules that superceed most of the changes.
- - patches/09_ports_path.diff: Remove most of the patch, and re-diff.
- - patches/10_linux_utils.diff: Merge into 09_ports_path.diff
- * patches/09_ports_path.diff: Set PORTSDIR to /usr/share (instead of
- /usr/ports).
- * patches/09_ports_path.diff: Fix sed regexp.
-
- -- Robert Millan <rmh at aybabtu.com> Fri, 17 Feb 2006 17:20:38 +0100
-
-freebsd5-buildutils (5.4-3) unstable; urgency=low
-
- * Fixed the MACHINE_ARCH variable on i386 (closes: bug#328604).
-
- -- Aurelien Jarno <aurel32 at debian.org> Sat, 17 Sep 2005 04:36:26 +0200
-
-freebsd5-buildutils (5.4-2) unstable; urgency=low
-
- * Added a dependency on bsdmainutils (closes: bug#323758).
- * Bumped Standard-Versions to 3.6.2 (no changes).
-
- -- Aurelien Jarno <aurel32 at debian.org> Fri, 19 Aug 2005 17:47:15 +0200
-
-freebsd5-buildutils (5.4-1) unstable; urgency=low
-
- * New upstream version.
- * Added a fix for GNU/Hurd: define MAXPATHLEN if it is not already fixed.
-
- -- Aurelien Jarno <aurel32 at debian.org> Fri, 17 Jun 2005 18:53:06 +0200
-
-freebsd5-buildutils (5.3+2-4) unstable; urgency=low
-
- * Use md5sum.textutils instead of md5sum to compute md5. Thanks to Robert
- Millan for the patch (closes: bug#313618).
-
- -- Aurelien Jarno <aurel32 at debian.org> Tue, 14 Jun 2005 20:42:27 +0200
-
-freebsd5-buildutils (5.3+2-3) unstable; urgency=low
-
- * Package adopted by the GNU/kFreeBSD Maintainers. Thanks to Robert
- Millan for all the work done on this package.
- * Added patch from Victor Hsieh to fix incompatibilities with linux
- utilities (closes: bug#306146).
-
- -- Aurelien Jarno <aurel32 at debian.org> Thu, 9 Jun 2005 01:02:28 +0200
-
-freebsd5-buildutils (5.3+2-2) unstable; urgency=low
-
- * Replace Architecture with Cpu/System in control.in.
- * Add /usr/ports, installed as /usr/share/freebsd5-buildutils/ports.
- * Move /usr/share/fbmk to /usr/share/freebsd5-buildutils/mk for consistency.
- * Misc package cleanup (Nuked debian/mk, etc).
-
- -- Robert Millan <rmh at debian.org> Fri, 4 Feb 2005 01:30:26 +0100
-
-freebsd5-buildutils (5.3+1-1) unstable; urgency=low
-
- * Add brandelf.
- - patches/07_brandelf.diff
-
- -- Robert Millan <rmh at debian.org> Mon, 27 Dec 2004 21:39:45 +0100
-
-freebsd5-buildutils (5.3-2) unstable; urgency=low
-
- * patches/01_make_fixes.diff:
- - Set INSTALLINFO to `which ginstall-info || which install-info`.
- - Do, however, not run install-info at all, and use manual install instead.
- * patches/06_ftbfs_gcc-4.0.diff: New. Don't declare maxJobs as static.
- This fixes build on gcc-4.0. Thanks Andreas Jochens. (Closes: #285953)
-
- -- Robert Millan <rmh at debian.org> Sat, 18 Dec 2004 01:50:04 +0100
-
-freebsd5-buildutils (5.3-1) unstable; urgency=low
-
- * Fork for 5.x branch (package been renamed).
- - patches/02_silly_macros.diff: Sync.
-
- -- Robert Millan <rmh at debian.org> Thu, 25 Nov 2004 20:14:35 +0100
-
-freebsd-buildutils (5.2.1+20041028.1-1) unstable; urgency=low
-
- * Add file2c command.
-
- -- Robert Millan <rmh at debian.org> Fri, 12 Nov 2004 20:13:06 +0100
-
-freebsd-buildutils (5.2.1+20041028-1) unstable; urgency=low
-
- * New upstream snapshot (6.x branch). Drop support for btxld.
- - patches/*.diff: Sync.
- * Use new CDBS debian/control auto-generation method.
- - control.in: New. Set Build-Depends on @cdbs@ tag.
- - rules: Set DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes.
-
- -- Robert Millan <rmh at debian.org> Thu, 28 Oct 2004 22:53:34 +0200
-
-freebsd-buildutils (5.2.1+20040403-11) unstable; urgency=low
-
- * patches/002_upstream.diff: Unfuck __unused definition in
- usr.bin/lex/flex.skl.
-
- -- Robert Millan <rmh at debian.org> Sun, 20 Jun 2004 13:05:13 +0200
-
-freebsd-buildutils (5.2.1+20040403-10) unstable; urgency=low
-
- * patches/002_upstream.diff: Nuke __unused completely instead of defining
- it as empty macro. (Closes: #249892)
-
- -- Robert Millan <rmh at debian.org> Wed, 9 Jun 2004 18:18:47 +0200
-
-freebsd-buildutils (5.2.1+20040403-9) unstable; urgency=low
-
- * control (Build-Depends): Add flex. (Closes: #248265)
-
- -- Robert Millan <rmh at debian.org> Mon, 10 May 2004 14:11:02 +0200
-
-freebsd-buildutils (5.2.1+20040403-8) unstable; urgency=low
-
- * Fix strl{cpy,cat} porting properly in config/main.c.
-
- -- Robert Millan <rmh at debian.org> Mon, 10 May 2004 02:48:47 +0200
-
-freebsd-buildutils (5.2.1+20040403-7) unstable; urgency=low
-
- * Fix stupid FTBFS.
- mk/build.mk: Don't attempt to use our make after building it!
- * mk/build.mk: Misc cleanup.
-
- -- Robert Millan <rmh at debian.org> Sat, 8 May 2004 21:21:45 +0200
-
-freebsd-buildutils (5.2.1+20040403-6) unstable; urgency=low
-
- * 003_glibc.diff: Fix stupid segfault in config.
- * mk/build.mk: Set MACHINE_ARCH for make.
-
- -- Robert Millan <rmh at debian.org> Tue, 4 May 2004 16:20:17 +0200
-
-freebsd-buildutils (5.2.1+20040403-5) unstable; urgency=low
-
- * Fix FTBFS.
- mk/build.mk: Set PATH so that our own yacc is used for building config.
-
- -- Robert Millan <rmh at debian.org> Sun, 2 May 2004 18:06:29 +0200
-
-freebsd-buildutils (5.2.1+20040403-4) unstable; urgency=low
-
- * Add awk and config.
-
- -- Robert Millan <rmh at debian.org> Sun, 2 May 2004 14:40:25 +0200
-
-freebsd-buildutils (5.2.1+20040403-3) unstable; urgency=low
-
- * patches/004_lex_bootstrap.diff: Nuked.
- * mk/build.mk: Use yacc to generate parse.h for src/usr.bin/lex.
-
- -- Robert Millan <rmh at debian.org> Wed, 14 Apr 2004 14:59:23 +0200
-
-freebsd-buildutils (5.2.1+20040403-2) unstable; urgency=low
-
- * control (Depends): Add dash.
- * patches/*.diff: Cleanup in order to submit upstream.
-
- -- Robert Millan <rmh at debian.org> Thu, 8 Apr 2004 00:17:41 +0200
-
-freebsd-buildutils (5.2.1+20040403-1) unstable; urgency=low
-
- * New upstream snapshot.
- - patches/*.diff: Resync.
- * Really apply the change (Really Closes: #240023)
-
- -- Robert Millan <rmh at debian.org> Sat, 3 Apr 2004 16:02:23 +0200
-
-freebsd-buildutils (5.1-4) unstable; urgency=low
-
- * Fix FTBFS on alpha. (Closes: #240023)
- - patches/003_glibc.diff (mtree): Check for _STATBUF_ST_NSEC before
- attempting nanosecond tests.
- * control: Fix typo in description. (Closes: #239923)
-
- -- Robert Millan <rmh at debian.org> Sat, 3 Apr 2004 13:39:03 +0200
-
-freebsd-buildutils (5.1-3) unstable; urgency=low
-
- * control (Build-Depends): Add bison.
-
- -- Robert Millan <rmh at debian.org> Wed, 24 Mar 2004 22:45:55 +0100
-
-freebsd-buildutils (5.1-2) unstable; urgency=low
-
- * New package: freebsd-buildutils (based on freebsd-utils).
- (Closes: #233074)
-
- -- Robert Millan <rmh at debian.org> Tue, 17 Feb 2004 13:36:30 +0100
-
-freebsd-utils (5.1-1) unstable; urgency=low
-
- * Upgraded to 5.1
- * Converted to cdbs, and added Build-Depends for freebsd-source-5.1,
- which contains the actual source code.
-
- -- Nathan Hawkins <utsl at debian.org> Tue, 7 Oct 2003 15:18:34 -0500
-
-freebsd-utils (5.0-2) unstable; urgency=low
-
- * Set maintainer to glibc-bsd-devel at lists.alioth.debian.org
- * Added me to Uploaders.
- * Turn into non-native package.
- * Added missing packages to Build-Depends (-libc5-dev, -gcc, byacc)
- * Minor fixes in debian/copyright.
- * Added dummy freebsd-utils package for upgrading.
-
- -- Robert Millan <rmh at debian.org> Fri, 11 Jul 2003 04:28:37 +0200
-
-freebsd-utils-5.0 (5.0-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Nathan Hawkins <utsl at debian.org> Fri, 11 Oct 2002 20:43:20 -0400
Copied: tags/freebsd-buildutils/10.2-2/debian/changelog (from rev 5811, trunk/freebsd-buildutils/debian/changelog)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/changelog (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/changelog 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,754 @@
+freebsd-buildutils (10.2-2) experimental; urgency=medium
+
+ * arch=all autobuilding doesn't seem to work for this yet
+
+ -- Christoph Egger <christoph at debian.org> Wed, 21 Oct 2015 14:28:20 +0200
+
+freebsd-buildutils (10.2-1) experimental; urgency=medium
+
+ * Update to 10.2 source
+ * refresh patches
+ * drop mk_ncp.diff -- was a workaround for kfreebsd-9
+ * drop mk_hyperv.diff and mk_tests.diff now upstream
+ * Compress orig-source with xz
+
+ -- Christoph Egger <christoph at debian.org> Wed, 21 Oct 2015 12:10:45 +0200
+
+freebsd-buildutils (10.0-7) unstable; urgency=medium
+
+ * Cherry-pick r276494 from HEAD:
+ Don't include bsd.sys.mk within bsd.kmod.mk
+
+ -- Steven Chamberlain <steven at pyro.eu.org> Wed, 08 Jul 2015 16:44:07 +0100
+
+freebsd-buildutils (10.0-6) experimental; urgency=medium
+
+ * Raise Build-Depends on freebsd-glue to >= 0.2.20~, to not be
+ affected by #759249 if the installed libbsd-dev is newer
+ * Do not use -fstack-protector on alpha
+
+ -- Steven Chamberlain <steven at pyro.eu.org> Tue, 21 Oct 2014 22:50:38 +0100
+
+freebsd-buildutils (10.0-5) unstable; urgency=medium
+
+ [ Petr Salinger ]
+ * Backport mk_hyperv, needed by 10.1 RC
+
+ [ Steven Chamberlain ]
+ * backports MK_TESTS for freebsd-utils (>> 10.1~)
+ * Do not use -fstack-protector on hppa/parisc arch (thanks, Helge
+ Deller) (Closes: #758377)
+ * In get-orig-source, svn export with --ignore-keywords so that
+ revision tags do not fuzzy the patches
+ * Add myself to Uploaders
+
+ -- Petr Salinger <Petr.Salinger at seznam.cz> Sat, 04 Oct 2014 18:16:23 +0200
+
+freebsd-buildutils (10.0-4) unstable; urgency=low
+
+ * Add MK_EISA.
+
+ -- Robert Millan <rmh at debian.org> Sun, 04 May 2014 14:15:29 +0200
+
+freebsd-buildutils (10.0-3) unstable; urgency=low
+
+ * kldxref_abort_on_error.diff: Treat EFAULT condition as fatal (see
+ comment in patch header).
+
+ -- Robert Millan <rmh at debian.org> Fri, 21 Feb 2014 20:31:13 +0100
+
+freebsd-buildutils (10.0-2) unstable; urgency=low
+
+ * Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance.
+
+ -- Robert Millan <rmh at debian.org> Wed, 15 Jan 2014 17:26:00 +0100
+
+freebsd-buildutils (10.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Wed, 15 Jan 2014 13:37:23 +0100
+
+freebsd-buildutils (10.0~svn259404-6) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Robert Millan <rmh at debian.org> Fri, 03 Jan 2014 17:12:31 +0100
+
+freebsd-buildutils (10.0~svn259404-5) experimental; urgency=low
+
+ * Break circular build-dependency with freebsd-glue by splitting
+ freebsd-mk into a package of its own.
+
+ -- Robert Millan <rmh at debian.org> Thu, 02 Jan 2014 23:17:49 +0100
+
+freebsd-buildutils (10.0~svn259404-4) unstable; urgency=low
+
+ * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
+ * Install make and mtree by their upstream names (fmake and fmtree).
+ Remove the legacy symlinks (leave them to freebsd-glue).
+ * Install file2c and brandelf directly to /usr/bin.
+ * Move /usr/share/mk to /usr/share/mk-freebsd. This allows
+ freebsd-buildutils to be installed alongside bmake.
+ * Remove bootstrap magic. bmake is the default in upstream now: just
+ use it to build fmake.
+
+ -- Robert Millan <rmh at debian.org> Thu, 02 Jan 2014 17:43:51 +0100
+
+freebsd-buildutils (10.0~svn259404-3) unstable; urgency=low
+
+ * Fix aicasm install path.
+
+ -- Robert Millan <rmh at debian.org> Wed, 18 Dec 2013 12:15:59 +0100
+
+freebsd-buildutils (10.0~svn259404-2) unstable; urgency=low
+
+ * kldxref is kFreeBSD-only.
+
+ -- Robert Millan <rmh at debian.org> Tue, 17 Dec 2013 23:34:15 +0100
+
+freebsd-buildutils (10.0~svn259404-1) unstable; urgency=low
+
+ * New upstream snapshot (10.0-RC2).
+ - Switch to releng/10.0 branch.
+ - Add kldxref.
+
+ [ Robert Millan ]
+ * Fetch source code securely (https) in get-orig-source.
+
+ -- Robert Millan <rmh at debian.org> Tue, 17 Dec 2013 22:28:15 +0100
+
+freebsd-buildutils (10~svn258496-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ - Refresh all patches.
+ - Add aicasm. It is now required by kernel builds.
+
+ [ Guillem Jover ]
+ * Remove myself from Uploaders.
+
+ -- Robert Millan <rmh at debian.org> Sat, 23 Nov 2013 15:48:42 +0100
+
+freebsd-buildutils (10~svn253832-1) unstable; urgency=low
+
+ * New upstream snapshot (provides MK_USB_GADGET_EXAMPLES).
+
+ -- Robert Millan <rmh at debian.org> Fri, 02 Aug 2013 21:04:11 +0200
+
+freebsd-buildutils (10~svn251967-6) unstable; urgency=low
+
+ * Bump freebsd-glue B-D to fix FTBFS.
+
+ -- Robert Millan <rmh at debian.org> Mon, 22 Jul 2013 21:57:31 +0200
+
+freebsd-buildutils (10~svn251967-5) unstable; urgency=low
+
+ * Reupload.
+
+ -- Robert Millan <rmh at debian.org> Mon, 22 Jul 2013 20:10:42 +0200
+
+freebsd-buildutils (10~svn251967-4) experimental; urgency=low
+
+ * Bring back MK_NCP (needed by kfreebsd-9).
+
+ -- Robert Millan <rmh at debian.org> Sat, 06 Jul 2013 22:49:13 +0200
+
+freebsd-buildutils (10~svn251967-3) experimental; urgency=low
+
+ * Depend on m4 as it's now required by lex (no pun intended).
+
+ -- Robert Millan <rmh at debian.org> Fri, 05 Jul 2013 23:25:44 +0200
+
+freebsd-buildutils (10~svn251967-2) experimental; urgency=low
+
+ * Depend on suitable version of freebsd-glue (for _SAFE macros).
+
+ -- Robert Millan <rmh at debian.org> Fri, 05 Jul 2013 23:06:31 +0200
+
+freebsd-buildutils (10~svn251967-1) experimental; urgency=low
+
+ * New upstream snapshot.
+
+ [ Guillem Jover ]
+ * Switch to canonical Vcs URLs.
+
+ [ Robert Millan ]
+ * Add freebsd-config back. (Closes: #712633)
+ * Ease flex build-dependency.
+
+ -- Robert Millan <rmh at debian.org> Wed, 19 Jun 2013 12:23:55 +0200
+
+freebsd-buildutils (10~svn237137-1) experimental; urgency=low
+
+ * New upstream snapshot.
+ - Removes yacc (it's been replaced by byacc in upstream).
+
+ -- Robert Millan <rmh at debian.org> Sat, 16 Jun 2012 12:17:10 +0200
+
+freebsd-buildutils (9.0-10) unstable; urgency=low
+
+ * disable_wsystem_headers.diff: Disable -Wsystem-headers to avoid
+ triggering #664242.
+ * Fix getopt declaration.
+ * Add MK_CTF build option.
+ * nostrip.diff: By default, install without -s. Let dh_strip, etc
+ handle stripping (and honor DEB_BUILD_OPTIONS=nostrip, etc).
+ * Remove compatibility hacks (now provided by freebsd-glue).
+
+ -- Robert Millan <rmh at debian.org> Fri, 25 May 2012 19:16:53 +0200
+
+freebsd-buildutils (9.0-9) unstable; urgency=low
+
+ * Add MK_CLANG_IS_CC build option (needed by recent kfreebsd-10).
+
+ -- Robert Millan <rmh at debian.org> Fri, 09 Mar 2012 22:57:12 +0100
+
+freebsd-buildutils (9.0-8) unstable; urgency=low
+
+ * Add getosreldate() to local headers.
+ * Make feature_present() backward-compatible with pre-900038 kernels.
+
+ -- Robert Millan <rmh at debian.org> Thu, 23 Feb 2012 20:58:39 +0100
+
+freebsd-buildutils (9.0-7) unstable; urgency=low
+
+ * sys/endian.h: Don't include_next <machine/endian.h>, just include.
+ * Add execvP().
+
+ -- Robert Millan <rmh at debian.org> Wed, 15 Feb 2012 22:57:13 +0100
+
+freebsd-buildutils (9.0-6) unstable; urgency=low
+
+ * Make <sys/types.h> imply <machine/endian.h>, even on non-kFreeBSD
+ platforms (we always have <machine/endian.h> in local directory).
+
+ -- Robert Millan <rmh at debian.org> Wed, 15 Feb 2012 20:45:29 +0100
+
+freebsd-buildutils (9.0-5) unstable; urgency=low
+
+ * Add implicit includes to sys/stdint.h.
+ * Steal a few more definitions for sys/cdefs.h.
+
+ -- Robert Millan <rmh at debian.org> Sat, 04 Feb 2012 17:14:34 +0100
+
+freebsd-buildutils (9.0-4) unstable; urgency=low
+
+ * FreeBSD code expects that <sys/param.h> implicitly defines SIG*
+ macros.
+ * Cherry-pick MK_SOURCELESS build option from 10-CURRENT.
+
+ -- Robert Millan <rmh at debian.org> Sat, 04 Feb 2012 12:27:38 +0100
+
+freebsd-buildutils (9.0-3) unstable; urgency=low
+
+ * Replace 10_non_kfreebsd.diff with equivalent patch from upstream
+ HEAD.
+ * Add __BEGIN_DECLS / __END_DECLS in local unistd.h.
+ * Fix local endian.h to use native <sys/endian.h> on GNU/kFreeBSD.
+ * Add local sys/errno.h and sys/stdint.h.
+ * Add a few more definitions to local sys/cdefs.h.
+ * Remove getline kludge. The second part was unneeded, the first one
+ caused version_gen.awk to hang.
+ * Add __offsetof().
+ * Add nfssvc, closefrom and feature_present to unistd.h.
+ * Add sys/time.h.
+
+ -- Robert Millan <rmh at debian.org> Sun, 29 Jan 2012 02:59:54 +0100
+
+freebsd-buildutils (9.0-2) unstable; urgency=low
+
+ * Add elf_common.h to local includes to fix FTBFS on GNU/Linux.
+ * Install headers in freebsd hierrachy.
+
+ -- Robert Millan <rmh at debian.org> Sun, 08 Jan 2012 00:45:11 +0100
+
+freebsd-buildutils (9.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Sat, 07 Jan 2012 20:34:01 +0100
+
+freebsd-buildutils (8.2-8) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Fix FTBFS with ld --as-needed. (Closes: #642091, LP: #749170)
+
+ [ Robert Millan ]
+ * Export CFLAGS in debian/rules so that it is actually propagated.
+ (Closes: #642700)
+ * Fix bsd.dep.mk so that -U flags are propagated in kernel builds.
+
+ -- Robert Millan <rmh at debian.org> Thu, 03 Nov 2011 15:02:07 +0100
+
+freebsd-buildutils (8.2-7) unstable; urgency=low
+
+ * 04_lex_disable_unused.diff: Fix generation of code in lex, which
+ defined __unused and broke system headers (see #522773 and #522774).
+
+ -- Robert Millan <rmh at debian.org> Tue, 12 Jul 2011 17:53:12 +0200
+
+freebsd-buildutils (8.2-6) unstable; urgency=low
+
+ * 21_endian.diff: If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are
+ defined, default to native compilation (fixes FTBFS on mips and armeb).
+
+ -- Robert Millan <rmh at debian.org> Wed, 06 Jul 2011 19:48:48 +0200
+
+freebsd-buildutils (8.2-5) unstable; urgency=low
+
+ * Disable libbsd overlay untill #630907 is fixed. (Closes: #632600)
+
+ -- Robert Millan <rmh at debian.org> Mon, 04 Jul 2011 15:43:02 +0200
+
+freebsd-buildutils (8.2-4) unstable; urgency=low
+
+ * MACHINE_ARCH is now set to "mips" on mipsel. (Closes: #631890)
+
+ -- Robert Millan <rmh at debian.org> Sat, 02 Jul 2011 13:13:57 +0200
+
+freebsd-buildutils (8.2-3) unstable; urgency=low
+
+ * 18_fix_sysdir.diff: Bring back search in relative paths (removing it
+ breaks kfreebsd builds). (Closes: #631889, #631892)
+
+ -- Robert Millan <rmh at debian.org> Tue, 28 Jun 2011 15:23:42 +0200
+
+freebsd-buildutils (8.2-2) unstable; urgency=low
+
+ * 18_fix_sysdir.diff: Fix SYSDIR path to make kernel modules buildable.
+ (Closes: #594183).
+ * Switch to use the libbsd-overlay:
+ - Bump libbsd-dev Build-Depends to (>= 0.3.0).
+ - Add pkg-config to Build-Depends.
+ - Remove some now obsolete porting code.
+ * Disable FreeBSD/pc98 pre-7.0 compatibility on non-FreeBSD (fixes FTBFS on
+ hurd-i386).
+ * 19_fix_cmd_pathnames.diff: Fix pathnames for a number of commands.
+ (Closes: #625261)
+ * Add myself to Uploaders.
+
+ -- Robert Millan <rmh at debian.org> Sun, 26 Jun 2011 17:47:37 +0200
+
+freebsd-buildutils (8.2-1) unstable; urgency=low
+
+ [ Robert Millan ]
+ * 10_non_kfreebsd.diff: Make freebsd-make usable on non-kFreeBSD
+ systems. (Closes: #602768)
+
+ [ Guillem Jover ]
+ * Now using Standards-Version 3.9.2 (no changes needed).
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
+ * Use -C option for pmake instead of manually changing dir.
+ * Stop Build-Depending on pmake, bootstrap freebsd-make using GNU make
+ and use it as pmake instead of using it from the pmake package.
+ * Switch to debhelper compatibility level 7.
+ - Use dh_prep instead of “dh_clean -k”.
+ * Only use MACHINE_ARCH in freebsd-make if it's defined.
+ * Add support for Multi-Arch directories to freebsd-make:
+ - Do not switch LIBDIR yet, the dynamic linker does not have the
+ correct paths for i386 based architectures.
+ - Add builtin MACHINE_MULTIARCH make variable.
+ * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
+ * Line-wrap CFLAGS variable in debian/rules.
+ * Install binaries directly to /usr/lib/freebsd instead of relocating them
+ from /usr/bin and /usr/sbin.
+ * Install the man pages. (Closes: #493898)
+ * Change ‘unix’ freebsd-make variable to “We run Debian, not UNIX.” and
+ remove ‘.FreeBSD’ freebsd-make variable. (Closes: #493841)
+ * Intersperse Depends description comments between the actual dependencies.
+ * Do not install profile and libfl.a hardlinks for freebsd-lex libln.a.
+
+ -- Guillem Jover <guillem at debian.org> Tue, 31 May 2011 04:20:37 +0200
+
+freebsd-buildutils (8.1-1) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_8_1_0_RELEASE)
+
+ [ Aurelien Jarno ]
+ * Update debian/copyright.
+ * Bumped Standard-Versions to 3.9.1 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 29 Jul 2010 21:33:33 +0200
+
+freebsd-buildutils (8.0-1) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_8_0_0_RELEASE)
+ * Add a get-orig-source target to debian/rules and
+ stop using a tar in tar system.
+ * Use quilt for patches management
+
+ [ Aurelien Jarno ]
+ * Add a README.source.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 12 Apr 2010 23:53:50 +0200
+
+freebsd-buildutils (7.2-2) unstable; urgency=low
+
+ * Remove part of the automatic patches in favor of patches.
+ * Use libbsd instead of hacked funtions (Closes: #379259).
+ * Use <bsd/sys/*.h> includes instead of <bsd/*.h>.
+ * Remove depends on dash, it is now essential.
+ * Add depends on ${misc:Depends}.
+ * Bumped Standard-Versions to 3.8.4 (no changes).
+ * Handle nostrip build options (Closes: #436857).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 10 Apr 2010 16:49:49 +0200
+
+freebsd-buildutils (7.2-1) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_7_2_0_RELEASE)
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 May 2009 09:03:20 +0200
+
+freebsd-buildutils (7.1-2) unstable; urgency=low
+
+ * patches/15_manpages_gzip.diff: new patch to gzip manpages with -9 by
+ default, as required on Debian systems.
+ * Switch to debhelper 5.
+ * Bumped Standard-Versions to 3.8.1 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 07 Apr 2009 17:49:03 +0200
+
+freebsd-buildutils (7.1-1) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_7_1_0_RELEASE)
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 11 Jan 2009 11:59:32 +0100
+
+freebsd-buildutils (7.0-2) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * fix implicit-pointer-conversion by including appropriate headers.
+ Closes: #493770.
+ * add Vcs-* fields into debian/control.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 05 Aug 2008 14:30:25 +0200
+
+freebsd-buildutils (7.0-1) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_7_0_0_RELEASE)
+ - drop upstream patches 000_fix_make_double_free.diff,
+ 000_7-current_support_in_bsd.own.mk.diff
+ - replace 02_silly_macros.diff via sed and 12_unused.diff
+ - add 13_bsd_sys.diff, 14_config.diff
+ - update remaining patches
+ * Package rename, cleanup
+ * Upload to Debian. Closes: #344417.
+ See also #474761, #474762.
+
+ [ Aurelien Jarno ]
+ * Drop symlink pointing to gcc-3.4.
+ * Bumped Standard-Versions to 3.8.0 (no changes).
+ * Update debian/copyright.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 15 Jul 2008 19:37:00 +0200
+
+freebsd6-buildutils (6.3-2) unreleased; urgency=low
+
+ * Don't build-depends nor depends on gcc-3.4.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 12 Jan 2008 18:02:07 +0100
+
+freebsd6-buildutils (6.3-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_6_3_0_RELEASE)
+
+ [ Aurelien Jarno ]
+ * Bumped Standard-Versions to 3.7.3 (no changes).
+ * Gzip manpages with -9.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 10 Jan 2008 14:03:04 +0100
+
+freebsd6-buildutils (6.2-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_6_2_0_RELEASE)
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 15 Jan 2007 13:38:31 +0100
+
+freebsd6-buildutils (6.0-0.2) unreleased; urgency=low
+
+ * Add cruft to bsd.own.mk necessary to build latest kernel.
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 6 May 2006 13:10:05 +0200
+
+freebsd6-buildutils (6.0-0.1) unreleased; urgency=low
+
+ * Fork 6.x branch.
+ * Switch to libbsd.
+ - control (Build-Depends): Add libbsd-dev.
+ - rules: export LDADD=-lbsd
+ - patches/03_glibc.diff:
+ - usr.sbin/config/main.c: Nuke strl{cpy,cat} hack.
+ - usr.sbin/mtree/excludes.c: Nuke fgetln hack.
+ - usr.bin/make/Makefile: Stop adding LDADD=-lbsd (now passed from rules).
+ - patches/11_config_allow_override.diff:
+ - usr.sbin/config/Makefile: s/LDADD=/LDADD+=/g.
+ * Make dash and gcc-3.4 the default "sh" and "cc".
+ - control (Depends): Add gcc-3.4.
+ - links: New. Setup sh and cc symlinks.
+ * Pass NO_SHARED=NO from debian/rules
+ - rules
+ - patches/01_make_fixes.diff: Nuke part that disables NO_SHARED.
+ * patches/03_glibc.diff:
+ - Remove s,sys/time.h/time.h,g (was it ever needed?)
+ - Nuke LIST_* defines (should be in sys/queue.h, or find another
+ solution, like s,sys/queue.h,bsd/queue.h,g)
+ * rules:
+ - Only apply patches with *.diff suffix.
+ * Move /usr/share/freebsd6-buildutils to /usr/share.
+ - control (Conflicts): Add pmake.
+ - patches/01_make_fixes.diff (usr.bin/make/pathnames.h): Remove
+ PATH_DEFSYSPATH redefinition.
+ - rules: Install mk and Mk in /usr/share.
+ * patches/000_fix_make_double_free.diff: New. Patch from upstream
+ (1.155:1.158). Thanks to Petr for spotting this.
+ * Build using gcc 3.4, like upstream.
+ - control (Build-Depends): Add gcc-3.4.
+ - rules: Pass CC=gcc-3.4 to make.
+ - patches/06_ftbfs_gcc-4.0.diff: Remove.
+ * Fixes runtime getopt parsing infin loop.
+ - rules (COPTS): Build with -D_GNU_SOURCE.
+ - rules: Rename internal getline function to avoid collision with the one
+ from Glibc (s/getline/bsd_&/g).
+ - patches/06_ftbfs_gcc-4.0.diff: Remove (it had dirty getopt hacks as well).
+ * patches/11_optreset.diff: New. Replace unportable optreset mangling
+ with reset_getopt () from libbsd.
+ * Our awk wasn't actualy from FreeBSD, but imported from original-awk.
+ Let's use that directly instead.
+ - control (Depends): Add original-awk.
+ - links: Add link to original-awk.
+ - patches/00_upstream.diff: Remove hunks that apply to awk.
+ - patches/05_disable_hardlinks.diff: Ditto.
+ - rules: Remove commands that work with awk.
+ - fetch: Remove awk dirs from checkout/update.
+ * Add gmake (as alias for gnu make).
+ - control (Depends): Add make.
+ - links: Add gmake link.
+ * Massive cleanup in ports/Mk patches.
+ - rules: Add sed rules that superceed most of the changes.
+ - patches/09_ports_path.diff: Remove most of the patch, and re-diff.
+ - patches/10_linux_utils.diff: Merge into 09_ports_path.diff
+ * patches/09_ports_path.diff: Set PORTSDIR to /usr/share (instead of
+ /usr/ports).
+ * patches/09_ports_path.diff: Fix sed regexp.
+
+ -- Robert Millan <rmh at aybabtu.com> Fri, 17 Feb 2006 17:20:38 +0100
+
+freebsd5-buildutils (5.4-3) unstable; urgency=low
+
+ * Fixed the MACHINE_ARCH variable on i386 (closes: bug#328604).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 17 Sep 2005 04:36:26 +0200
+
+freebsd5-buildutils (5.4-2) unstable; urgency=low
+
+ * Added a dependency on bsdmainutils (closes: bug#323758).
+ * Bumped Standard-Versions to 3.6.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 19 Aug 2005 17:47:15 +0200
+
+freebsd5-buildutils (5.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added a fix for GNU/Hurd: define MAXPATHLEN if it is not already fixed.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 17 Jun 2005 18:53:06 +0200
+
+freebsd5-buildutils (5.3+2-4) unstable; urgency=low
+
+ * Use md5sum.textutils instead of md5sum to compute md5. Thanks to Robert
+ Millan for the patch (closes: bug#313618).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 14 Jun 2005 20:42:27 +0200
+
+freebsd5-buildutils (5.3+2-3) unstable; urgency=low
+
+ * Package adopted by the GNU/kFreeBSD Maintainers. Thanks to Robert
+ Millan for all the work done on this package.
+ * Added patch from Victor Hsieh to fix incompatibilities with linux
+ utilities (closes: bug#306146).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 9 Jun 2005 01:02:28 +0200
+
+freebsd5-buildutils (5.3+2-2) unstable; urgency=low
+
+ * Replace Architecture with Cpu/System in control.in.
+ * Add /usr/ports, installed as /usr/share/freebsd5-buildutils/ports.
+ * Move /usr/share/fbmk to /usr/share/freebsd5-buildutils/mk for consistency.
+ * Misc package cleanup (Nuked debian/mk, etc).
+
+ -- Robert Millan <rmh at debian.org> Fri, 4 Feb 2005 01:30:26 +0100
+
+freebsd5-buildutils (5.3+1-1) unstable; urgency=low
+
+ * Add brandelf.
+ - patches/07_brandelf.diff
+
+ -- Robert Millan <rmh at debian.org> Mon, 27 Dec 2004 21:39:45 +0100
+
+freebsd5-buildutils (5.3-2) unstable; urgency=low
+
+ * patches/01_make_fixes.diff:
+ - Set INSTALLINFO to `which ginstall-info || which install-info`.
+ - Do, however, not run install-info at all, and use manual install instead.
+ * patches/06_ftbfs_gcc-4.0.diff: New. Don't declare maxJobs as static.
+ This fixes build on gcc-4.0. Thanks Andreas Jochens. (Closes: #285953)
+
+ -- Robert Millan <rmh at debian.org> Sat, 18 Dec 2004 01:50:04 +0100
+
+freebsd5-buildutils (5.3-1) unstable; urgency=low
+
+ * Fork for 5.x branch (package been renamed).
+ - patches/02_silly_macros.diff: Sync.
+
+ -- Robert Millan <rmh at debian.org> Thu, 25 Nov 2004 20:14:35 +0100
+
+freebsd-buildutils (5.2.1+20041028.1-1) unstable; urgency=low
+
+ * Add file2c command.
+
+ -- Robert Millan <rmh at debian.org> Fri, 12 Nov 2004 20:13:06 +0100
+
+freebsd-buildutils (5.2.1+20041028-1) unstable; urgency=low
+
+ * New upstream snapshot (6.x branch). Drop support for btxld.
+ - patches/*.diff: Sync.
+ * Use new CDBS debian/control auto-generation method.
+ - control.in: New. Set Build-Depends on @cdbs@ tag.
+ - rules: Set DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes.
+
+ -- Robert Millan <rmh at debian.org> Thu, 28 Oct 2004 22:53:34 +0200
+
+freebsd-buildutils (5.2.1+20040403-11) unstable; urgency=low
+
+ * patches/002_upstream.diff: Unfuck __unused definition in
+ usr.bin/lex/flex.skl.
+
+ -- Robert Millan <rmh at debian.org> Sun, 20 Jun 2004 13:05:13 +0200
+
+freebsd-buildutils (5.2.1+20040403-10) unstable; urgency=low
+
+ * patches/002_upstream.diff: Nuke __unused completely instead of defining
+ it as empty macro. (Closes: #249892)
+
+ -- Robert Millan <rmh at debian.org> Wed, 9 Jun 2004 18:18:47 +0200
+
+freebsd-buildutils (5.2.1+20040403-9) unstable; urgency=low
+
+ * control (Build-Depends): Add flex. (Closes: #248265)
+
+ -- Robert Millan <rmh at debian.org> Mon, 10 May 2004 14:11:02 +0200
+
+freebsd-buildutils (5.2.1+20040403-8) unstable; urgency=low
+
+ * Fix strl{cpy,cat} porting properly in config/main.c.
+
+ -- Robert Millan <rmh at debian.org> Mon, 10 May 2004 02:48:47 +0200
+
+freebsd-buildutils (5.2.1+20040403-7) unstable; urgency=low
+
+ * Fix stupid FTBFS.
+ mk/build.mk: Don't attempt to use our make after building it!
+ * mk/build.mk: Misc cleanup.
+
+ -- Robert Millan <rmh at debian.org> Sat, 8 May 2004 21:21:45 +0200
+
+freebsd-buildutils (5.2.1+20040403-6) unstable; urgency=low
+
+ * 003_glibc.diff: Fix stupid segfault in config.
+ * mk/build.mk: Set MACHINE_ARCH for make.
+
+ -- Robert Millan <rmh at debian.org> Tue, 4 May 2004 16:20:17 +0200
+
+freebsd-buildutils (5.2.1+20040403-5) unstable; urgency=low
+
+ * Fix FTBFS.
+ mk/build.mk: Set PATH so that our own yacc is used for building config.
+
+ -- Robert Millan <rmh at debian.org> Sun, 2 May 2004 18:06:29 +0200
+
+freebsd-buildutils (5.2.1+20040403-4) unstable; urgency=low
+
+ * Add awk and config.
+
+ -- Robert Millan <rmh at debian.org> Sun, 2 May 2004 14:40:25 +0200
+
+freebsd-buildutils (5.2.1+20040403-3) unstable; urgency=low
+
+ * patches/004_lex_bootstrap.diff: Nuked.
+ * mk/build.mk: Use yacc to generate parse.h for src/usr.bin/lex.
+
+ -- Robert Millan <rmh at debian.org> Wed, 14 Apr 2004 14:59:23 +0200
+
+freebsd-buildutils (5.2.1+20040403-2) unstable; urgency=low
+
+ * control (Depends): Add dash.
+ * patches/*.diff: Cleanup in order to submit upstream.
+
+ -- Robert Millan <rmh at debian.org> Thu, 8 Apr 2004 00:17:41 +0200
+
+freebsd-buildutils (5.2.1+20040403-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ - patches/*.diff: Resync.
+ * Really apply the change (Really Closes: #240023)
+
+ -- Robert Millan <rmh at debian.org> Sat, 3 Apr 2004 16:02:23 +0200
+
+freebsd-buildutils (5.1-4) unstable; urgency=low
+
+ * Fix FTBFS on alpha. (Closes: #240023)
+ - patches/003_glibc.diff (mtree): Check for _STATBUF_ST_NSEC before
+ attempting nanosecond tests.
+ * control: Fix typo in description. (Closes: #239923)
+
+ -- Robert Millan <rmh at debian.org> Sat, 3 Apr 2004 13:39:03 +0200
+
+freebsd-buildutils (5.1-3) unstable; urgency=low
+
+ * control (Build-Depends): Add bison.
+
+ -- Robert Millan <rmh at debian.org> Wed, 24 Mar 2004 22:45:55 +0100
+
+freebsd-buildutils (5.1-2) unstable; urgency=low
+
+ * New package: freebsd-buildutils (based on freebsd-utils).
+ (Closes: #233074)
+
+ -- Robert Millan <rmh at debian.org> Tue, 17 Feb 2004 13:36:30 +0100
+
+freebsd-utils (5.1-1) unstable; urgency=low
+
+ * Upgraded to 5.1
+ * Converted to cdbs, and added Build-Depends for freebsd-source-5.1,
+ which contains the actual source code.
+
+ -- Nathan Hawkins <utsl at debian.org> Tue, 7 Oct 2003 15:18:34 -0500
+
+freebsd-utils (5.0-2) unstable; urgency=low
+
+ * Set maintainer to glibc-bsd-devel at lists.alioth.debian.org
+ * Added me to Uploaders.
+ * Turn into non-native package.
+ * Added missing packages to Build-Depends (-libc5-dev, -gcc, byacc)
+ * Minor fixes in debian/copyright.
+ * Added dummy freebsd-utils package for upgrading.
+
+ -- Robert Millan <rmh at debian.org> Fri, 11 Jul 2003 04:28:37 +0200
+
+freebsd-utils-5.0 (5.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Nathan Hawkins <utsl at debian.org> Fri, 11 Oct 2002 20:43:20 -0400
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,234 +0,0 @@
----
- src/share/mk/bsd.incs.mk | 6 +++---
- src/share/mk/bsd.info.mk | 16 +++-------------
- src/share/mk/bsd.lib.mk | 18 +++++++++---------
- src/share/mk/bsd.man.mk | 8 ++++----
- src/share/mk/bsd.own.mk | 8 ++++----
- src/share/mk/sys.mk | 3 +--
- 6 files changed, 24 insertions(+), 35 deletions(-)
-
---- a/src/share/mk/bsd.incs.mk
-+++ b/src/share/mk/bsd.incs.mk
-@@ -41,7 +41,7 @@
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
-+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -53,10 +53,10 @@
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
---- a/src/share/mk/bsd.info.mk
-+++ b/src/share/mk/bsd.info.mk
-@@ -73,7 +73,7 @@
- MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression
- SRCDIR?= ${.CURDIR}
- INFODIRFILE?= dir
--INSTALLINFO?= install-info
-+INSTALLINFO?= `which ginstall-info || which install-info`
- INSTALLINFOFLAGS+=--quiet
- INFOSECTION?= Miscellaneous
- ICOMPRESS_CMD?= ${COMPRESS_CMD}
-@@ -143,18 +143,8 @@
- .for x in ${INFO}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
--.if !empty(.MAKEFLAGS:M-j)
-- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
-- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
-- --defsection=${INFOSECTION} \
-- --defentry=${INFOENTRY_${x}} \
-- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
--.else
-- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
-- --defsection=${INFOSECTION} \
-- --defentry=${INFOENTRY_${x}} \
-- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
--.endif
-+ mkdir -p ${DESTDIR}${INFODIR}
-+ install -m 644 ${x}.info ${DESTDIR}${INFODIR}/
- .endfor
-
- .PHONY: ${INSTALLINFODIRS}
---- a/src/share/mk/bsd.lib.mk
-+++ b/src/share/mk/bsd.lib.mk
-@@ -168,9 +168,9 @@
- @${ECHO} building static ${LIB} library
- @rm -f ${.TARGET}
- .if !defined(NM)
-- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+ @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
- .else
-- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
- .endif
- ${RANLIB} ${.TARGET}
- .endif
-@@ -185,9 +185,9 @@
- @${ECHO} building profiled ${LIB} library
- @rm -f ${.TARGET}
- .if !defined(NM)
-- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-+ @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort` ${ARADD}
- .else
-- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
-+ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD}
- .endif
- ${RANLIB} ${.TARGET}
- .endif
-@@ -218,11 +218,11 @@
- .if !defined(NM)
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
-+ `lorder ${SOBJS} | tsort` ${LDADD}
- .else
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
-+ `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
- .endif
- .if ${MK_CTF} != "no"
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -302,11 +302,11 @@
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-@@ -343,7 +343,7 @@
- sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
- -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
- ${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
-- ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
- ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
- rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
---- a/src/share/mk/bsd.man.mk
-+++ b/src/share/mk/bsd.man.mk
-@@ -216,7 +216,7 @@
- t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
- ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
- rm -f $${t} $${t}${MCOMPRESS_EXT}; \
-- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
-+ ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
- done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
-@@ -231,7 +231,7 @@
- t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
- ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
- rm -f $${t} $${t}${MCOMPRESS_EXT}; \
-- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
-+ ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
- done
- .endif
- .endif
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -18,7 +18,7 @@
- #
- # BINOWN Binary owner. [root]
- #
--# BINGRP Binary group. [wheel]
-+# BINGRP Binary group. [root]
- #
- # BINMODE Binary mode. [555]
- #
-@@ -65,7 +65,7 @@
- #
- # SHAREOWN ASCII text file owner. [root]
- #
--# SHAREGRP ASCII text file group. [wheel]
-+# SHAREGRP ASCII text file group. [root]
- #
- # SHAREMODE ASCII text file mode. [${NOBINMODE}]
- #
-@@ -131,7 +131,7 @@
-
- # Binaries
- BINOWN?= root
--BINGRP?= wheel
-+BINGRP?= root
- BINMODE?= 555
- NOBINMODE?= 444
-
-@@ -147,9 +147,9 @@
- LIBDIR?= /usr/lib
- LIBCOMPATDIR?= /usr/lib/compat
- LIBPRIVATEDIR?= /usr/lib/private
--LIBDATADIR?= /usr/libdata
--LIBEXECDIR?= /usr/libexec
--LINTLIBDIR?= /usr/libdata/lint
-+LIBDATADIR?= /usr/share
-+LIBEXECDIR?= ${LIBDIR}
-+LINTLIBDIR?= ${LIBDATADIR}/lint
- SHLIBDIR?= ${LIBDIR}
- LIBOWN?= ${BINOWN}
- LIBGRP?= ${BINGRP}
-@@ -162,7 +162,7 @@
- # Share files
- SHAREDIR?= /usr/share
- SHAREOWN?= root
--SHAREGRP?= wheel
-+SHAREGRP?= root
- SHAREMODE?= ${NOBINMODE}
-
- CONFDIR?= /etc
-@@ -198,8 +198,8 @@
- HRDLINK?= -l h
- SYMLINK?= -l s
-
--INSTALL_LINK?= ${INSTALL} ${HRDLINK}
--INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
-+INSTALL_LINK?= ln
-+INSTALL_SYMLINK?= ln -s
-
- # Common variables
- .if !defined(DEBUG_FLAGS)
---- a/src/share/mk/sys.mk
-+++ b/src/share/mk/sys.mk
-@@ -1,8 +1,7 @@
- # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94
- # $FreeBSD$
-
--unix ?= We run FreeBSD, not UNIX.
--.FreeBSD ?= true
-+unix ?= We run Debian, not UNIX.
-
- .if !defined(%POSIX)
- #
---- a/src/share/mk/bsd.compiler.mk
-+++ b/src/share/mk/bsd.compiler.mk
-@@ -14,7 +14,8 @@
- . elif ${_COMPILER_VERSION:Mclang}
- COMPILER_TYPE:= clang
- . else
--.error Unable to determine compiler type for ${CC}. Consider setting COMPILER_TYPE.
-+# Fallback to gcc in order to support CC="cc" case
-+COMPILER_TYPE:= gcc
- . endif
- . undef _COMPILER_VERSION
- . endif
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/01_make_fixes.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,237 @@
+---
+ src/share/mk/bsd.incs.mk | 6 +++---
+ src/share/mk/bsd.info.mk | 16 +++-------------
+ src/share/mk/bsd.lib.mk | 18 +++++++++---------
+ src/share/mk/bsd.man.mk | 8 ++++----
+ src/share/mk/bsd.own.mk | 8 ++++----
+ src/share/mk/sys.mk | 3 +--
+ 6 files changed, 24 insertions(+), 35 deletions(-)
+
+Index: freebsd-buildutils/src/share/mk/bsd.incs.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.incs.mk
++++ freebsd-buildutils/src/share/mk/bsd.incs.mk
+@@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T}
+ .endif
+ installincludes: _${group}INS_${header:T}
+ _${group}INS_${header:T}: ${header}
+- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
++ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ ${.ALLSRC} \
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
+@@ -53,10 +53,10 @@ _${group}INCS+= ${header}
+ installincludes: _${group}INS
+ _${group}INS: ${_${group}INCS}
+ .if defined(${group}NAME)
+- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
++ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
+ .else
+- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
++ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}
+ .endif
+ .endif
+Index: freebsd-buildutils/src/share/mk/bsd.info.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.info.mk
++++ freebsd-buildutils/src/share/mk/bsd.info.mk
+@@ -73,7 +73,7 @@ MAKEINFO?= makeinfo
+ MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression
+ SRCDIR?= ${.CURDIR}
+ INFODIRFILE?= dir
+-INSTALLINFO?= install-info
++INSTALLINFO?= `which ginstall-info || which install-info`
+ INSTALLINFOFLAGS+=--quiet
+ INFOSECTION?= Miscellaneous
+ ICOMPRESS_CMD?= ${COMPRESS_CMD}
+@@ -143,18 +143,8 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
+ .for x in ${INFO}
+ INSTALLINFODIRS+= ${x:S/$/-install/}
+ ${x:S/$/-install/}:
+-.if !empty(.MAKEFLAGS:M-j)
+- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
+- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
+- --defsection=${INFOSECTION} \
+- --defentry=${INFOENTRY_${x}} \
+- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+-.else
+- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
+- --defsection=${INFOSECTION} \
+- --defentry=${INFOENTRY_${x}} \
+- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+-.endif
++ mkdir -p ${DESTDIR}${INFODIR}
++ install -m 644 ${x}.info ${DESTDIR}${INFODIR}/
+ .endfor
+
+ .PHONY: ${INSTALLINFODIRS}
+Index: freebsd-buildutils/src/share/mk/bsd.lib.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk
++++ freebsd-buildutils/src/share/mk/bsd.lib.mk
+@@ -175,7 +175,7 @@ _LIBS= lib${LIB}.a
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+ @${ECHO} building static ${LIB} library
+ @rm -f ${.TARGET}
+- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
++ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
+ .endif
+
+@@ -188,7 +188,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
+ lib${LIB}_p.a: ${POBJS}
+ @${ECHO} building profiled ${LIB} library
+ @rm -f ${.TARGET}
+- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
++ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
+ .endif
+
+@@ -217,7 +217,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
+ .endif
+ ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+ -o ${.TARGET} -Wl,-soname,${SONAME} \
+- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
++ `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
+ .if ${MK_CTF} != "no"
+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+ .endif
+@@ -296,11 +296,11 @@ realinstall: _libinstall
+ .ORDER: beforeinstall _libinstall
+ _libinstall:
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
+- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
++ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
+ .endif
+ .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
+- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
++ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
+ .endif
+ .if defined(SHLIB_NAME)
+@@ -337,7 +337,7 @@ _libinstall:
+ sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
+ -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
+ ${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
+- ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
++ ${INSTALL} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
+ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
+ rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
+Index: freebsd-buildutils/src/share/mk/bsd.man.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.man.mk
++++ freebsd-buildutils/src/share/mk/bsd.man.mk
+@@ -216,7 +216,7 @@ _maninstall: ${MAN}
+ t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
+ ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
+ rm -f $${t} $${t}${MCOMPRESS_EXT}; \
+- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
++ ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
+ done
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+ @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
+@@ -231,7 +231,7 @@ _maninstall: ${MAN}
+ t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
+ ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
+ rm -f $${t} $${t}${MCOMPRESS_EXT}; \
+- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
++ ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
+ done
+ .endif
+ .endif
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -18,7 +18,7 @@
+ #
+ # BINOWN Binary owner. [root]
+ #
+-# BINGRP Binary group. [wheel]
++# BINGRP Binary group. [root]
+ #
+ # BINMODE Binary mode. [555]
+ #
+@@ -65,7 +65,7 @@
+ #
+ # SHAREOWN ASCII text file owner. [root]
+ #
+-# SHAREGRP ASCII text file group. [wheel]
++# SHAREGRP ASCII text file group. [root]
+ #
+ # SHAREMODE ASCII text file mode. [${NOBINMODE}]
+ #
+@@ -131,7 +131,7 @@ SRCCONF?= /etc/src.conf
+
+ # Binaries
+ BINOWN?= root
+-BINGRP?= wheel
++BINGRP?= root
+ BINMODE?= 555
+ NOBINMODE?= 444
+
+@@ -151,9 +151,9 @@ DTBMODE?= 444
+ LIBDIR?= /usr/lib
+ LIBCOMPATDIR?= /usr/lib/compat
+ LIBPRIVATEDIR?= /usr/lib/private
+-LIBDATADIR?= /usr/libdata
+-LIBEXECDIR?= /usr/libexec
+-LINTLIBDIR?= /usr/libdata/lint
++LIBDATADIR?= /usr/share
++LIBEXECDIR?= ${LIBDIR}
++LINTLIBDIR?= ${LIBDATADIR}/lint
+ SHLIBDIR?= ${LIBDIR}
+ LIBOWN?= ${BINOWN}
+ LIBGRP?= ${BINGRP}
+@@ -166,7 +166,7 @@ DEBUGMODE?= ${NOBINMODE}
+ # Share files
+ SHAREDIR?= /usr/share
+ SHAREOWN?= root
+-SHAREGRP?= wheel
++SHAREGRP?= root
+ SHAREMODE?= ${NOBINMODE}
+
+ CONFDIR?= /etc
+@@ -202,8 +202,8 @@ INCLUDEDIR?= /usr/include
+ HRDLINK?= -l h
+ SYMLINK?= -l s
+
+-INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+-INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
++INSTALL_LINK?= ln
++INSTALL_SYMLINK?= ln -s
+
+ # Common variables
+ .if !defined(DEBUG_FLAGS)
+Index: freebsd-buildutils/src/share/mk/sys.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/sys.mk
++++ freebsd-buildutils/src/share/mk/sys.mk
+@@ -1,8 +1,7 @@
+ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94
+ # $FreeBSD$
+
+-unix ?= We run FreeBSD, not UNIX.
+-.FreeBSD ?= true
++unix ?= We run Debian, not UNIX.
+
+ .if !defined(%POSIX)
+ #
+Index: freebsd-buildutils/src/share/mk/bsd.compiler.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.compiler.mk
++++ freebsd-buildutils/src/share/mk/bsd.compiler.mk
+@@ -36,7 +36,8 @@ COMPILER_TYPE:= gcc
+ . elif ${_v:Mclang}
+ COMPILER_TYPE:= clang
+ . else
+-.error Unable to determine compiler type for ${CC}. Consider setting COMPILER_TYPE.
++# Fallback to gcc in order to support CC="cc" case
++COMPILER_TYPE:= gcc
+ . endif
+ .endif
+ .if !defined(COMPILER_VERSION)
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,15 +0,0 @@
----
- src/share/mk/bsd.own.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -206,7 +206,7 @@
- STRIP?= -s
- .endif
-
--COMPRESS_CMD?= gzip -cn
-+COMPRESS_CMD?= gzip -cn -9
- COMPRESS_EXT?= .gz
-
- .if !defined(_WITHOUT_SRCCONF)
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/15_manpages_gzip.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,17 @@
+---
+ src/share/mk/bsd.own.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -210,7 +210,7 @@ INSTALL_SYMLINK?= ln -s
+ STRIP?= -s
+ .endif
+
+-COMPRESS_CMD?= gzip -cn
++COMPRESS_CMD?= gzip -cn -9
+ COMPRESS_EXT?= .gz
+
+ .if !defined(_WITHOUT_SRCCONF)
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,22 +0,0 @@
---- a/src/share/mk/bsd.kmod.mk
-+++ b/src/share/mk/bsd.kmod.mk
-@@ -1,15 +1,17 @@
- # $FreeBSD$
-
-+KVER!= uname -r
-+
- # Search for kernel source tree in standard places.
- .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
-- ${.CURDIR}/../../../../.. /sys /usr/src/sys
-+ ${.CURDIR}/../../../../.. /usr/src/kfreebsd-headers-${KVER}/sys
- .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
- SYSDIR= ${_dir}
- .endif
- .endfor
- .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
- !exists(${SYSDIR}/conf/kmod.mk)
--.error Unable to locate the kernel source tree. Set SYSDIR to override.
-+.error "can't find kernel headers, install kfreebsd-headers-${KVER} package"
- .endif
-
- .include "${SYSDIR}/conf/kmod.mk"
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/18_fix_sysdir.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,24 @@
+Index: freebsd-buildutils/src/share/mk/bsd.kmod.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.kmod.mk
++++ freebsd-buildutils/src/share/mk/bsd.kmod.mk
+@@ -1,15 +1,17 @@
+ # $FreeBSD$
+
++KVER!= uname -r
++
+ # Search for kernel source tree in standard places.
+ .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+- ${.CURDIR}/../../../../.. /sys /usr/src/sys
++ ${.CURDIR}/../../../../.. /usr/src/kfreebsd-headers-${KVER}/sys
+ .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
+ SYSDIR= ${_dir}
+ .endif
+ .endfor
+ .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
+ !exists(${SYSDIR}/conf/kmod.mk)
+-.error Unable to locate the kernel source tree. Set SYSDIR to override.
++.error "can't find kernel headers, install kfreebsd-headers-${KVER} package"
+ .endif
+
+ .include "${SYSDIR}/conf/kmod.mk"
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,47 +0,0 @@
---- a/src/usr.bin/make/Makefile
-+++ b/src/usr.bin/make/Makefile
-@@ -6,6 +6,7 @@
-
- PROG= make
- CFLAGS+=-I${.CURDIR}
-+LDADD+=-lbsd
- SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
- lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
- util.c var.c
---- a/src/usr.sbin/mtree/Makefile
-+++ b/src/usr.sbin/mtree/Makefile
-@@ -9,6 +9,7 @@
- MAN= fmtree.8 mtree.5
- SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
- SRCS+= specspec.c
-+LDADD+= -lbsd
-
-
- .if ${MK_NMTREE} == "no"
---- a/src/usr.bin/brandelf/Makefile
-+++ b/src/usr.bin/brandelf/Makefile
-@@ -1,5 +1,6 @@
- # $FreeBSD$
-
- PROG= brandelf
-+LDADD= -lbsd
-
- .include <bsd.prog.mk>
---- a/src/usr.bin/cksum/Makefile
-+++ b/src/usr.bin/cksum/Makefile
-@@ -3,6 +3,7 @@
-
- PROG= cksum
- SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c
-+LDADD+= -lbsd
- SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum
- MLINKS= cksum.1 sum.1
-
---- a/src/usr.bin/file2c/Makefile
-+++ b/src/usr.bin/file2c/Makefile
-@@ -1,4 +1,5 @@
- # $FreeBSD$
-
- PROG= file2c
-+LDADD+= -lbsd
- .include <bsd.prog.mk>
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/22_ld_as_needed.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,59 @@
+Index: freebsd-buildutils/src/usr.bin/make/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/make/Makefile
++++ freebsd-buildutils/src/usr.bin/make/Makefile
+@@ -6,6 +6,7 @@
+
+ PROG= make
+ CFLAGS+=-I${.CURDIR}
++LDADD+=-lbsd
+ SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
+ lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
+ util.c var.c
+Index: freebsd-buildutils/src/usr.sbin/mtree/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.sbin/mtree/Makefile
++++ freebsd-buildutils/src/usr.sbin/mtree/Makefile
+@@ -9,6 +9,7 @@ PROG= fmtree
+ MAN= fmtree.8 mtree.5
+ SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
+ SRCS+= specspec.c
++LDADD+= -lbsd
+
+
+ .if ${MK_NMTREE} == "no"
+Index: freebsd-buildutils/src/usr.bin/brandelf/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/brandelf/Makefile
++++ freebsd-buildutils/src/usr.bin/brandelf/Makefile
+@@ -1,5 +1,6 @@
+ # $FreeBSD$
+
+ PROG= brandelf
++LDADD= -lbsd
+
+ .include <bsd.prog.mk>
+Index: freebsd-buildutils/src/usr.bin/cksum/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/cksum/Makefile
++++ freebsd-buildutils/src/usr.bin/cksum/Makefile
+@@ -3,6 +3,7 @@
+
+ PROG= cksum
+ SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c
++LDADD+= -lbsd
+ SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum
+ MLINKS= cksum.1 sum.1
+
+Index: freebsd-buildutils/src/usr.bin/file2c/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/file2c/Makefile
++++ freebsd-buildutils/src/usr.bin/file2c/Makefile
+@@ -3,6 +3,7 @@
+ .include <bsd.own.mk>
+
+ PROG= file2c
++LDADD+= -lbsd
+
+ .if ${MK_TESTS} != "no"
+ SUBDIR+= tests
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/aicasm.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,16 +0,0 @@
-
-Partially sent to freebsd-hackers (2011-07-02)
-
---- a/src/sys/dev/aic7xxx/aicasm/Makefile
-+++ b/src/sys/dev/aic7xxx/aicasm/Makefile
-@@ -24,6 +24,10 @@
- DEPENDFILE= .depend_aicasm
- .endif
-
-+NO_WERROR?= 1
-+LDADD+= -ldb -lbsd
-+CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
-+
- CFLAGS+= -I.
- .ifdef MAKESRCPATH
- CFLAGS+= -I${MAKESRCPATH}
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/aicasm.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/aicasm.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,18 @@
+
+Partially sent to freebsd-hackers (2011-07-02)
+
+Index: freebsd-buildutils/src/sys/dev/aic7xxx/aicasm/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/sys/dev/aic7xxx/aicasm/Makefile
++++ freebsd-buildutils/src/sys/dev/aic7xxx/aicasm/Makefile
+@@ -24,6 +24,10 @@ WARNS?= 0
+ DEPENDFILE= .depend_aicasm
+ .endif
+
++NO_WERROR?= 1
++LDADD+= -ldb -lbsd
++CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
++
+ CFLAGS+= -I${.CURDIR}
+ .ifdef MAKESRCPATH
+ CFLAGS+= -I${MAKESRCPATH}
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,56 +0,0 @@
-
-This allows freebsd-buildutils to be installed alongside bmake.
-
---- a/src/share/mk/Makefile
-+++ b/src/share/mk/Makefile
-@@ -41,7 +41,7 @@
- version_gen.awk
-
- NO_OBJ=
--FILESDIR= ${BINDIR}/mk
-+FILESDIR= ${BINDIR}/mk-freebsd
-
- .if ${MK_ATF} != "no"
- FILES+= atf.test.mk
---- a/src/share/mk/bsd.symver.mk
-+++ b/src/share/mk/bsd.symver.mk
-@@ -23,7 +23,7 @@
- .endif
- _oarg= ${_arg}
- .endfor
--_mpath+= /usr/share/mk
-+_mpath+= /usr/share/mk-freebsd
-
- # Look up ${VERSION_GEN} in ${_mpath}.
- _vgen=
---- a/src/usr.bin/make/make.1
-+++ b/src/usr.bin/make/make.1
-@@ -235,7 +235,7 @@
- .Fl m
- options can be specified to form a search path.
- This path will override the default system include path,
--.Pa /usr/share/mk .
-+.Pa /usr/share/mk-freebsd .
- The system include path will always be appended to the search path used
- for "..."-style inclusions and makefile searches (see the
- .Fl I
-@@ -1721,7 +1721,7 @@
- object directory
- .It Pa sys.mk
- system makefile
--.It Pa /usr/share/mk
-+.It Pa /usr/share/mk-freebsd
- default system makefile directory
- .It Pa /usr/share/doc/psd/12.make
- PMake tutorial
---- a/src/usr.bin/make/pathnames.h
-+++ b/src/usr.bin/make/pathnames.h
-@@ -50,7 +50,7 @@
- #endif /* ! PATH_DEFSYSMK */
-
- #ifndef PATH_DEFSYSPATH
--#define PATH_DEFSYSPATH "/usr/share/mk"
-+#define PATH_DEFSYSPATH "/usr/share/mk-freebsd"
- #endif /* ! PATH_DEFSYSPATH */
-
- #endif /* pathnames_h_235b888a */
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/avoid_defsyspath_collision.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,64 @@
+
+This allows freebsd-buildutils to be installed alongside bmake.
+
+Index: freebsd-buildutils/src/share/mk/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/Makefile
++++ freebsd-buildutils/src/share/mk/Makefile
+@@ -41,7 +41,7 @@ FILES= \
+ version_gen.awk
+
+ NO_OBJ=
+-FILESDIR= ${BINDIR}/mk
++FILESDIR= ${BINDIR}/mk-freebsd
+
+ .if ${MK_TESTS} != "no"
+ FILES+= atf.test.mk
+Index: freebsd-buildutils/src/share/mk/bsd.symver.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.symver.mk
++++ freebsd-buildutils/src/share/mk/bsd.symver.mk
+@@ -23,7 +23,7 @@ _mpath+= ${_arg}
+ .endif
+ _oarg= ${_arg}
+ .endfor
+-_mpath+= /usr/share/mk
++_mpath+= /usr/share/mk-freebsd
+
+ # Look up ${VERSION_GEN} in ${_mpath}.
+ _vgen=
+Index: freebsd-buildutils/src/usr.bin/make/make.1
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/make/make.1
++++ freebsd-buildutils/src/usr.bin/make/make.1
+@@ -235,7 +235,7 @@ Multiple
+ .Fl m
+ options can be specified to form a search path.
+ This path will override the default system include path,
+-.Pa /usr/share/mk .
++.Pa /usr/share/mk-freebsd .
+ The system include path will always be appended to the search path used
+ for "..."-style inclusions and makefile searches (see the
+ .Fl I
+@@ -1721,7 +1721,7 @@ list of dependencies
+ object directory
+ .It Pa sys.mk
+ system makefile
+-.It Pa /usr/share/mk
++.It Pa /usr/share/mk-freebsd
+ default system makefile directory
+ .It Pa /usr/share/doc/psd/12.make
+ PMake tutorial
+Index: freebsd-buildutils/src/usr.bin/make/pathnames.h
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/make/pathnames.h
++++ freebsd-buildutils/src/usr.bin/make/pathnames.h
+@@ -50,7 +50,7 @@
+ #endif /* ! PATH_DEFSYSMK */
+
+ #ifndef PATH_DEFSYSPATH
+-#define PATH_DEFSYSPATH "/usr/share/mk"
++#define PATH_DEFSYSPATH "/usr/share/mk-freebsd"
+ #endif /* ! PATH_DEFSYSPATH */
+
+ #endif /* pathnames_h_235b888a */
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/hppa.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,22 +0,0 @@
-From: Helge Deller <deller at gmx.de>
-Subject: Do not use -fstack-protector on hppa/parisc arch.
-Bug-Debian: https://bugs.debian.org/758377
-Forwarded: not-needed
-
---- a/src/share/mk/bsd.sys.mk
-+++ b/src/share/mk/bsd.sys.mk
-@@ -123,11 +123,12 @@
- .endif # CLANG
-
- .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
-- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
-+ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
-+ ${MACHINE_CPUARCH} != "hppa" && ${MACHINE_CPUARCH} != "alpha"
- # Don't use -Wstack-protector as it breaks world with -Werror.
- SSP_CFLAGS?= -fstack-protector
- CFLAGS+= ${SSP_CFLAGS}
--.endif # SSP && !IA64 && !ARM && !MIPS
-+.endif # SSP && !IA64 && !ARM && !MIPS && !HPPA && !ALPHA
-
- # Allow user-specified additional warning flags
- CFLAGS+= ${CWARNFLAGS}
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/hppa.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/hppa.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,24 @@
+From: Helge Deller <deller at gmx.de>
+Subject: Do not use -fstack-protector on hppa/parisc arch.
+Bug-Debian: https://bugs.debian.org/758377
+Forwarded: not-needed
+
+Index: freebsd-buildutils/src/share/mk/bsd.sys.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.sys.mk
++++ freebsd-buildutils/src/share/mk/bsd.sys.mk
+@@ -144,11 +144,12 @@ CXXFLAGS+= ${CXXFLAGS.gcc}
+ .endif # !EARLY_BUILD
+
+ .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
++ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \
++ ${MACHINE_CPUARCH} != "hppa" && ${MACHINE_CPUARCH} != "alpha"
+ # Don't use -Wstack-protector as it breaks world with -Werror.
+ SSP_CFLAGS?= -fstack-protector
+ CFLAGS+= ${SSP_CFLAGS}
+-.endif # SSP && !IA64 && !ARM && !MIPS
++.endif # SSP && !IA64 && !ARM && !MIPS && !HPPA && !ALPHA
+
+ # Allow user-specified additional warning flags
+ CFLAGS+= ${CWARNFLAGS}
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_eisa.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,10 +0,0 @@
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -365,6 +365,7 @@
- __DEFAULT_NO_OPTIONS = \
- BSD_GREP \
- CLANG_EXTRAS \
-+ EISA \
- CTF \
- DEBUG_FILES \
- GPL_DTC \
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/mk_eisa.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/mk_eisa.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,12 @@
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -390,6 +390,7 @@ __DEFAULT_YES_OPTIONS = \
+ __DEFAULT_NO_OPTIONS = \
+ BSD_GREP \
+ CLANG_EXTRAS \
++ EISA \
+ CTF \
+ DEBUG_FILES \
+ HESIOD \
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/mk_hyperv.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_hyperv.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/mk_hyperv.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,15 +0,0 @@
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -444,6 +444,12 @@
- .else
- __DEFAULT_NO_OPTIONS+=FDT
- .endif
-+# HyperV is only available for x86 and amd64.
-+.if ${__T} == "amd64" || ${__T} == "i386"
-+__DEFAULT_YES_OPTIONS+=HYPERV
-+.else
-+__DEFAULT_NO_OPTIONS+=HYPERV
-+.endif
- .undef __T
-
- #
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/mk_ncp.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_ncp.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/mk_ncp.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,25 +0,0 @@
-
-MK_NCP was removed from HEAD in rev 241629, but kfreebsd-9 still
-uses it (in sys/modules/Makefile).
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -314,6 +314,7 @@
- MAILWRAPPER \
- MAKE \
- MAN \
-+ NCP \
- NDIS \
- NETCAT \
- NETGRAPH \
-@@ -516,6 +517,10 @@
- MK_GROFF:= no
- .endif
-
-+.if ${MK_IPX} == "no"
-+MK_NCP:= no
-+.endif
-+
- .if ${MK_MAIL} == "no"
- MK_MAILWRAPPER:= no
- MK_SENDMAIL:= no
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/mk_tests.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_tests.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/mk_tests.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,34 +0,0 @@
-Subject: backport MK_TESTS for freebsd-utils (>> 10.1~)
-Origin: vendor, http://svnweb.freebsd.org/base/stable/10/share/mk/bsd.own.mk?r1=260012&r2=260013&view=patch
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -376,6 +376,7 @@
- PKGTOOLS \
- SHARED_TOOLCHAIN \
- SVN \
-+ TESTS \
- USB_GADGET_EXAMPLES
-
- #
-@@ -555,6 +556,20 @@
- MK_LLDB:= no
- .endif
-
-+.if defined(NO_TESTS)
-+# This should be handled above along the handling of all other NO_* options.
-+# However, the above is broken when WITH_*=yes are passed to make(1) as
-+# command line arguments. See PR bin/183762.
-+#
-+# Because the TESTS option is new and it will default to yes, it's likely
-+# that people will pass WITHOUT_TESTS=yes to make(1) directly and get a broken
-+# build. So, just in case, it's better to explicitly handle this case here.
-+#
-+# TODO(jmmv): Either fix make to allow us putting this override where it
-+# belongs above or fix this file to cope with the make bug.
-+MK_TESTS:= no
-+.endif
-+
- #
- # Set defaults for the MK_*_SUPPORT variables.
- #
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/nostrip.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,37 +0,0 @@
-
-By default, install without -s. Let dh_strip, etc handle stripping
-(and honor DEB_BUILD_OPTIONS=nostrip, etc).
-
---- a/src/share/mk/bsd.lib.mk
-+++ b/src/share/mk/bsd.lib.mk
-@@ -40,7 +40,7 @@
- CTFFLAGS+= -g
- .endif
- .else
--STRIP?= -s
-+#STRIP?= -s
- .endif
-
- .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -203,7 +203,7 @@
-
- # Common variables
- .if !defined(DEBUG_FLAGS)
--STRIP?= -s
-+#STRIP?= -s
- .endif
-
- COMPRESS_CMD?= gzip -cn -9
---- a/src/share/mk/bsd.prog.mk
-+++ b/src/share/mk/bsd.prog.mk
-@@ -45,7 +45,7 @@
- .endif
-
- .if !defined(DEBUG_FLAGS)
--STRIP?= -s
-+#STRIP?= -s
- .endif
-
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/nostrip.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/nostrip.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,43 @@
+
+By default, install without -s. Let dh_strip, etc handle stripping
+(and honor DEB_BUILD_OPTIONS=nostrip, etc).
+
+Index: freebsd-buildutils/src/share/mk/bsd.lib.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk
++++ freebsd-buildutils/src/share/mk/bsd.lib.mk
+@@ -47,7 +47,7 @@ CFLAGS+= ${DEBUG_FLAGS}
+ CTFFLAGS+= -g
+ .endif
+ .else
+-STRIP?= -s
++#STRIP?= -s
+ .endif
+
+ .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -207,7 +207,7 @@ INSTALL_SYMLINK?= ln -s
+
+ # Common variables
+ .if !defined(DEBUG_FLAGS)
+-STRIP?= -s
++#STRIP?= -s
+ .endif
+
+ COMPRESS_CMD?= gzip -cn -9
+Index: freebsd-buildutils/src/share/mk/bsd.prog.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.prog.mk
++++ freebsd-buildutils/src/share/mk/bsd.prog.mk
+@@ -43,7 +43,7 @@ CTFFLAGS+= -g
+ .endif
+
+ .if !defined(DEBUG_FLAGS)
+-STRIP?= -s
++#STRIP?= -s
+ .endif
+
+ .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/r276494.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,14 +0,0 @@
-r276494 from upstream HEAD
-
-Don't include bsd.sys.mk within bsd.kmod.mk, else CFLAGS will be given
-twice on the command line. That would override CWARNFLAGS, and causes
-some modules to fail to build under Clang.
-
---- a/src/share/mk/bsd.kmod.mk
-+++ b/src/share/mk/bsd.kmod.mk
-@@ -15,5 +15,3 @@
- .endif
-
- .include "${SYSDIR}/conf/kmod.mk"
--
--.include <bsd.sys.mk>
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/r276494.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/r276494.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,16 @@
+r276494 from upstream HEAD
+
+Don't include bsd.sys.mk within bsd.kmod.mk, else CFLAGS will be given
+twice on the command line. That would override CWARNFLAGS, and causes
+some modules to fail to build under Clang.
+
+Index: freebsd-buildutils/src/share/mk/bsd.kmod.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.kmod.mk
++++ freebsd-buildutils/src/share/mk/bsd.kmod.mk
+@@ -13,5 +13,3 @@ SYSDIR= ${_dir}
+ .endif
+
+ .include "${SYSDIR}/conf/kmod.mk"
+-
+-.include <bsd.sys.mk>
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/series 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,34 +0,0 @@
-# Patches from (or merged in) upstream
-mk_ncp.diff
-mk_eisa.diff
-mk_hyperv.diff
-mk_tests.diff
-r276494.diff
-
-# Patches that are in good shape for merging upstream
-yacc_is_byacc.diff
-kldxref_abort_on_error.diff
-
-# Other patches that might or might not be mergeable
-00_upstream.diff
-01_make_fixes.diff
-03_glibc.diff
-04_lex_disable_unused.diff
-05_disable_hardlinks.diff
-08_maxpathlen.diff
-15_manpages_gzip.diff
-16_bootstrap_pmake.diff
-#17_multiarch.diff
-18_fix_sysdir.diff
-21_endian.diff
-22_ld_as_needed.diff
-disable_wsystem_headers.diff
-nostrip.diff
-config_ldflags.diff
-
-# Patches that are likely to be Debian-specific
-avoid_defsyspath_collision.diff
-aicasm.diff
-makefiles.diff
-#test
-hppa.diff
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/series (from rev 5810, trunk/freebsd-buildutils/debian/patches/series)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/series (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/series 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,31 @@
+# Patches from (or merged in) upstream
+mk_eisa.diff
+r276494.diff
+
+# Patches that are in good shape for merging upstream
+yacc_is_byacc.diff
+kldxref_abort_on_error.diff
+
+# Other patches that might or might not be mergeable
+00_upstream.diff
+01_make_fixes.diff
+03_glibc.diff
+04_lex_disable_unused.diff
+05_disable_hardlinks.diff
+08_maxpathlen.diff
+15_manpages_gzip.diff
+16_bootstrap_pmake.diff
+#17_multiarch.diff
+18_fix_sysdir.diff
+21_endian.diff
+22_ld_as_needed.diff
+disable_wsystem_headers.diff
+nostrip.diff
+config_ldflags.diff
+
+# Patches that are likely to be Debian-specific
+avoid_defsyspath_collision.diff
+aicasm.diff
+makefiles.diff
+#test
+hppa.diff
Deleted: tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,11 +0,0 @@
---- a/src/share/mk/sys.mk
-+++ b/src/share/mk/sys.mk
-@@ -150,7 +150,7 @@
-
- SHELL ?= sh
-
--YACC ?= yacc
-+YACC ?= byacc
- .if defined(%POSIX)
- YFLAGS ?=
- .else
Copied: tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff (from rev 5810, trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/patches/yacc_is_byacc.diff 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,13 @@
+Index: freebsd-buildutils/src/share/mk/sys.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/sys.mk
++++ freebsd-buildutils/src/share/mk/sys.mk
+@@ -153,7 +153,7 @@ RFLAGS ?=
+
+ SHELL ?= sh
+
+-YACC ?= yacc
++YACC ?= byacc
+ .if defined(%POSIX)
+ YFLAGS ?=
+ .else
Deleted: tags/freebsd-buildutils/10.2-2/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2015-10-21 00:12:57 UTC (rev 5809)
+++ tags/freebsd-buildutils/10.2-2/debian/rules 2015-10-21 12:33:23 UTC (rev 5814)
@@ -1,229 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-ifeq ($(DEB_HOST_ARCH_CPU), mipsel)
-MACHINE_ARCH := mips
-else
-MACHINE_ARCH := $(DEB_HOST_ARCH_CPU)
-endif
-
-ifeq ($(DEB_HOST_MULTIARCH), mipsel)
-MACHINE_MULTIARCH := mips
-else
-MACHINE_MULTIARCH := $(DEB_HOST_MULTIARCH)
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- export STRIPFLAG=
-endif
-
-full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
-tar_version := $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
-version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
-pversion := $(shell echo $(version) | sed -e 's/\./_/g')
-major := $(shell echo $(version) | sed -e 's/\..*//g')
-revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-
-SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN := https://svn0.us-west.freebsd.org/base/releng/$(version)
-#SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
-#SVN := https://svn0.us-west.freebsd.org/base/head
-
-SOURCE = freebsd-buildutils
-ORIGDIR = $(SOURCE)-$(tar_version)
-TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-
- # Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
- BSD_MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-export CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
- -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
- -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
- -I$(CURDIR)/build-tree/src/sys \
- -D_GNU_SOURCE=1 -isystem /usr/include/freebsd
-# disabled due to #630907 (see also 20_libbsd_overlay.diff)
-# $(shell pkg-config --cflags libbsd-overlay)
-MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
-
-PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
-PMAKE = \
- MAKEFLAGS=$(BSD_MAKEFLAGS) \
- bmake $(PMAKE_FLAGS)
-YACC = byacc
-
-package = $(SOURCE)
-
-get-orig-source:
- rm -rf $(ORIGDIR)
- mkdir -p $(ORIGDIR)/src/sys/sys $(ORIGDIR)/src/sys/kern/
- for i in \
- share/mk \
- usr.bin/cksum \
- usr.bin/elfdump \
- usr.bin/file2c \
- usr.bin/lex \
- contrib/flex \
- usr.bin/make \
- usr.bin/mkdep \
- usr.bin/brandelf \
- usr.sbin/btxld \
- usr.sbin/config \
- usr.sbin/kgzip \
- usr.sbin/kldxref \
- usr.sbin/mtree \
- sys/dev/aic7xxx/aicasm \
- ; do \
- svn export --ignore-keywords -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
- done
- tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
- rm -rf $(ORIGDIR)
-
-unpack: unpack-stamp
-unpack-stamp:
- mkdir build-tree
- cp -a src build-tree/
-
- touch unpack-stamp
-
-build: build-stamp
-build-stamp: unpack-stamp
- dh_testdir
-
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
-
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/cksum
-
- cd build-tree/src/usr.bin/lex ; \
- $(PMAKE) bootstrap ; \
- $(PMAKE) $(MAKE_BUILD_FLAGS) NO_PROFILE=1 NO_INSTALLLIB=1
-
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/mkdep
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/mtree
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/brandelf
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/sys/dev/aic7xxx/aicasm
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- # Not portable yet. Maybe someday...
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/kldxref
-endif
-
- PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \
- $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/config
-
- touch build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(PMAKE) -C build-tree/src/usr.bin/file2c install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
- $(PMAKE) -C build-tree/src/usr.bin/brandelf install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
-
- for i in cksum lex mkdep ; do \
- $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
- DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
- done
- for i in config ; do \
- $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \
- DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
- done
- $(PMAKE) -C build-tree/src/share/mk install \
- DESTDIR=$(CURDIR)/debian/freebsd-mk BINDIR=/usr/share
-
- $(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm install \
- DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
-
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
- $(PMAKE) -C build-tree/src/usr.sbin/kldxref install \
- DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
-endif
-
- # Legacy make (aka fmake / fmtree)
- $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/make install \
- DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
- $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/mtree install \
- DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
-
- # remove trash
- rm -rf $(CURDIR)/debian/$(package)/usr/include \
- $(CURDIR)/debian/$(package)/var
- for i in `find $(CURDIR)/debian/$(package)/usr/share/man -type l` ; do \
- rm $$i ; \
- done
- rm -f $(CURDIR)/debian/$(package)/usr/share/man/man5/mtree.5.gz
-
- # relocate files
- for i in `cd $(CURDIR)/debian/$(package)/usr/lib/freebsd && ls` ; do \
- ln -s ../lib/freebsd/$$i \
- $(CURDIR)/debian/$(package)/usr/bin/freebsd-$$i ; \
- for m in $(CURDIR)/debian/$(package)/usr/share/man/man[0-9]/$$i.* ; do \
- mv $$m `echo $$m | sed -e 's:\(man[0-9]/\):\1freebsd-:'` ; \
- done ; \
- done
- rmdir $(CURDIR)/debian/$(package)/usr/sbin
-
- dh_install
-
-clean:
- dh_testdir
- dh_testroot
- rm -rf build-tree
- rm -f *-stamp
-
- dh_clean
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
- dh_installman
-# dh_installinfo
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Copied: tags/freebsd-buildutils/10.2-2/debian/rules (from rev 5810, trunk/freebsd-buildutils/debian/rules)
===================================================================
--- tags/freebsd-buildutils/10.2-2/debian/rules (rev 0)
+++ tags/freebsd-buildutils/10.2-2/debian/rules 2015-10-21 12:33:23 UTC (rev 5814)
@@ -0,0 +1,229 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq ($(DEB_HOST_ARCH_CPU), mipsel)
+MACHINE_ARCH := mips
+else
+MACHINE_ARCH := $(DEB_HOST_ARCH_CPU)
+endif
+
+ifeq ($(DEB_HOST_MULTIARCH), mipsel)
+MACHINE_MULTIARCH := mips
+else
+MACHINE_MULTIARCH := $(DEB_HOST_MULTIARCH)
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ export STRIPFLAG=
+endif
+
+full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version := $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
+version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
+pversion := $(shell echo $(version) | sed -e 's/\./_/g')
+major := $(shell echo $(version) | sed -e 's/\..*//g')
+revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+
+SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
+#SVN := https://svn0.us-west.freebsd.org/base/releng/$(version)
+#SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
+#SVN := https://svn0.us-west.freebsd.org/base/head
+
+SOURCE = freebsd-buildutils
+ORIGDIR = $(SOURCE)-$(tar_version)
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.xz
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+
+ # Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
+ BSD_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+export CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
+ -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
+ -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
+ -I$(CURDIR)/build-tree/src/sys \
+ -D_GNU_SOURCE=1 -isystem /usr/include/freebsd
+# disabled due to #630907 (see also 20_libbsd_overlay.diff)
+# $(shell pkg-config --cflags libbsd-overlay)
+MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+
+PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
+PMAKE = \
+ MAKEFLAGS=$(BSD_MAKEFLAGS) \
+ bmake $(PMAKE_FLAGS)
+YACC = byacc
+
+package = $(SOURCE)
+
+get-orig-source:
+ rm -rf $(ORIGDIR)
+ mkdir -p $(ORIGDIR)/src/sys/sys $(ORIGDIR)/src/sys/kern/
+ for i in \
+ share/mk \
+ usr.bin/cksum \
+ usr.bin/elfdump \
+ usr.bin/file2c \
+ usr.bin/lex \
+ contrib/flex \
+ usr.bin/make \
+ usr.bin/mkdep \
+ usr.bin/brandelf \
+ usr.sbin/btxld \
+ usr.sbin/config \
+ usr.sbin/kgzip \
+ usr.sbin/kldxref \
+ usr.sbin/mtree \
+ sys/dev/aic7xxx/aicasm \
+ ; do \
+ svn export --ignore-keywords -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
+ done
+ tar --numeric-owner --owner 0 --group 0 -cJf ../$(TARNAME) $(ORIGDIR)
+ rm -rf $(ORIGDIR)
+
+unpack: unpack-stamp
+unpack-stamp:
+ mkdir build-tree
+ cp -a src build-tree/
+
+ touch unpack-stamp
+
+build: build-stamp
+build-stamp: unpack-stamp
+ dh_testdir
+
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
+
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/cksum
+
+ cd build-tree/src/usr.bin/lex ; \
+ $(PMAKE) bootstrap ; \
+ $(PMAKE) $(MAKE_BUILD_FLAGS) NO_PROFILE=1 NO_INSTALLLIB=1
+
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/mkdep
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/mtree
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/brandelf
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/sys/dev/aic7xxx/aicasm
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ # Not portable yet. Maybe someday...
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/kldxref
+endif
+
+ PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \
+ $(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/config
+
+ touch build-stamp
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ $(PMAKE) -C build-tree/src/usr.bin/file2c install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+ $(PMAKE) -C build-tree/src/usr.bin/brandelf install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+
+ for i in cksum lex mkdep ; do \
+ $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
+ DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
+ done
+ for i in config ; do \
+ $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \
+ DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
+ done
+ $(PMAKE) -C build-tree/src/share/mk install \
+ DESTDIR=$(CURDIR)/debian/freebsd-mk BINDIR=/usr/share
+
+ $(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm install \
+ DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+ $(PMAKE) -C build-tree/src/usr.sbin/kldxref install \
+ DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+endif
+
+ # Legacy make (aka fmake / fmtree)
+ $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/make install \
+ DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+ $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/mtree install \
+ DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+
+ # remove trash
+ rm -rf $(CURDIR)/debian/$(package)/usr/include \
+ $(CURDIR)/debian/$(package)/var
+ for i in `find $(CURDIR)/debian/$(package)/usr/share/man -type l` ; do \
+ rm $$i ; \
+ done
+ rm -f $(CURDIR)/debian/$(package)/usr/share/man/man5/mtree.5.gz
+
+ # relocate files
+ for i in `cd $(CURDIR)/debian/$(package)/usr/lib/freebsd && ls` ; do \
+ ln -s ../lib/freebsd/$$i \
+ $(CURDIR)/debian/$(package)/usr/bin/freebsd-$$i ; \
+ for m in $(CURDIR)/debian/$(package)/usr/share/man/man[0-9]/$$i.* ; do \
+ mv $$m `echo $$m | sed -e 's:\(man[0-9]/\):\1freebsd-:'` ; \
+ done ; \
+ done
+ rmdir $(CURDIR)/debian/$(package)/usr/sbin
+
+ dh_install
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -rf build-tree
+ rm -f *-stamp
+
+ dh_clean
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+# dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+ dh_installman
+# dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
More information about the Glibc-bsd-commits
mailing list