debian/0000775000000000000000000000000012323047526007174 5ustar debian/rules0000775000000000000000000001533012323047314010251 0ustar #!/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 -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 debian/changelog0000664000000000000000000006235012323047433011051 0ustar freebsd-buildutils (10.0-3ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - Prototype setmode since freebsd-glue and libbsd don't do the right thing. -- Logan Rosen Mon, 14 Apr 2014 17:11:31 -0400 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 Fri, 21 Feb 2014 20:31:13 +0100 freebsd-buildutils (10.0-2ubuntu1) trusty; urgency=medium * Resynchronise with Debian. Remaining changes: - Prototype setmode since freebsd-glue and libbsd don't do the right thing. -- Colin Watson Sat, 08 Feb 2014 15:05:00 +0000 freebsd-buildutils (10.0-2) unstable; urgency=low * Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance. -- Robert Millan Wed, 15 Jan 2014 17:26:00 +0100 freebsd-buildutils (10.0-1) unstable; urgency=low * New upstream release. -- Robert Millan Wed, 15 Jan 2014 13:37:23 +0100 freebsd-buildutils (10.0~svn259404-6) unstable; urgency=low * Upload to unstable. -- Robert Millan 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 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 Thu, 02 Jan 2014 17:43:51 +0100 freebsd-buildutils (10.0~svn259404-3) unstable; urgency=low * Fix aicasm install path. -- Robert Millan Wed, 18 Dec 2013 12:15:59 +0100 freebsd-buildutils (10.0~svn259404-2) unstable; urgency=low * kldxref is kFreeBSD-only. -- Robert Millan 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 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 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 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 Mon, 22 Jul 2013 21:57:31 +0200 freebsd-buildutils (10~svn251967-5) unstable; urgency=low * Reupload. -- Robert Millan 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 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 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 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 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 Sat, 16 Jun 2012 12:17:10 +0200 freebsd-buildutils (9.0-11ubuntu1) quantal; urgency=low * Prototype fgetln and setmode since freebsd-glue and libbsd don't do the right thing. This fixes an AMD64 FTBS where the build filter complains about pointer conversions. debian/patches/prototype-fgetln-and-setmode Function `fgetln' implicitly converted to pointer at excludes.c:75 Function `setmode' implicitly converted to pointer at spec.c:229 Our automated build log filter detected the problem(s) above that will likely cause your package to segfault on architectures where the size of a pointer is greater than the size of an integer, such as ia64 and amd64. This is often due to a missing function prototype definition. Since use of implicitly converted pointers is always fatal to the application on ia64, they are errors. Please correct them for your next upload. More information can be found at: http://wiki.debian.org/ImplicitPointerConversions -- Tim Gardner Tue, 26 Jun 2012 20:25:37 +0000 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 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 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 Thu, 23 Feb 2012 20:58:39 +0100 freebsd-buildutils (9.0-7) unstable; urgency=low * sys/endian.h: Don't include_next , just include. * Add execvP(). -- Robert Millan Wed, 15 Feb 2012 22:57:13 +0100 freebsd-buildutils (9.0-6) unstable; urgency=low * Make imply , even on non-kFreeBSD platforms (we always have in local directory). -- Robert Millan 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 Sat, 04 Feb 2012 17:14:34 +0100 freebsd-buildutils (9.0-4) unstable; urgency=low * FreeBSD code expects that implicitly defines SIG* macros. * Cherry-pick MK_SOURCELESS build option from 10-CURRENT. -- Robert Millan 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 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 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 Sun, 08 Jan 2012 00:45:11 +0100 freebsd-buildutils (9.0-1) unstable; urgency=low * New upstream release. -- Robert Millan 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 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 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 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 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 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 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 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 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 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 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 includes instead of . * 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Thu, 25 Nov 2004 20:14:35 +0100 freebsd-buildutils (5.2.1+20041028.1-1) unstable; urgency=low * Add file2c command. -- Robert Millan 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 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 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 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 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 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 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 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 Sun, 2 May 2004 18:06:29 +0200 freebsd-buildutils (5.2.1+20040403-4) unstable; urgency=low * Add awk and config. -- Robert Millan 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 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 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 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 Sat, 3 Apr 2004 13:39:03 +0200 freebsd-buildutils (5.1-3) unstable; urgency=low * control (Build-Depends): Add bison. -- Robert Millan 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 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 Tue, 7 Oct 2003 15:18:34 -0500 freebsd-utils (5.0-2) unstable; urgency=low * Set maintainer to glibc-bsd-devel@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 Fri, 11 Jul 2003 04:28:37 +0200 freebsd-utils-5.0 (5.0-1) unstable; urgency=low * Initial Release. -- Nathan Hawkins Fri, 11 Oct 2002 20:43:20 -0400 debian/freebsd-mk.dirs0000664000000000000000000000002512323047314012066 0ustar usr/share/mk-freebsd debian/compat0000664000000000000000000000000212323047314010365 0ustar 7 debian/copyright0000664000000000000000000000505012323047314011122 0ustar This package was debianized by Nathan Hawkins on Fri, 11 Oct 2002 20:43:20 -0400. It was downloaded from FreeBSD CVS (http://www.freebsd.org/) Upstream Author: The FreeBSD Project Copyright: Copyright (c) 1980, 1983, 1985, 1987, 1988, 1989, 1990, 1991, 1993 The Regents of the University of California Copyright (c) 1988, 1989 Adam de Boor Copyright (c) 1989 by Berkeley Softworks Copyright (c) 1995 Peter Wemm Copyright (c) 1996 Søren Schmidt Copyright (c) 1998 John D. Polstra. Copyright (c) 1997 John-Mark Gurney Copyright (c) 1998, 2000 Robert Nordier Copyright (c) 1999 Global Technology Associates, Inc. Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav Copyright (c) 2000 Massachusetts Institute of Technology Copyright (c) 2000, 2001 David O'Brien Copyright (c) 2002 Juli Mallett Copyright (c) 2003 Joseph Koshy Copyright (c) 2003 Poul-Henning Kamp Copyright (c) 2003 Dan Nelson Copyright (c) 2005 Max Okumoto Copyright (c) 2006 Daniel M. Eischen License: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. debian/source/0000775000000000000000000000000012323047526010474 5ustar debian/source/format0000664000000000000000000000001412323047314011675 0ustar 3.0 (quilt) debian/control0000664000000000000000000000335312323047314010576 0ustar Source: freebsd-buildutils Section: devel Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: GNU/kFreeBSD Maintainers Uploaders: Aurelien Jarno , Robert Millan Build-Depends: debhelper (>= 7), flex | flex-old, bison, libbsd-dev (>= 0.3.0), freebsd-glue (>= 0.0.9), bmake, byacc (>= 20120115~), # for freebsd-config libsbuf-dev, Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-buildutils/ Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-buildutils/ Standards-Version: 3.9.2 Package: freebsd-buildutils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, bsdmainutils, unzip, patchutils, freebsd-glue (>= 0.2.8~), # Required by lex m4, # Not strictly required anymore. But let's drag it in for now, to avoid breaking # expectations. freebsd-mk, Conflicts: freebsd5-buildutils, freebsd6-buildutils Provides: freebsd6-buildutils, freebsd7-buildutils Description: Utilities for building FreeBSD sources This package contains the FreeBSD counterparts of some standard build utilities (make, mkdep, lex ..) . They have some specific modifications needed to be able to build FreeBSD sources. Package: freebsd-mk Architecture: all Replaces: freebsd-buildutils (<< 10.0~svn259404-5~) Enhances: bmake Description: FreeBSD makefile templates for bmake This package contains the makefile templates from the FreeBSD project. They provide simple rules to build programs, libraries, etc. . These templates provide an alternative to the default makefile templates shipped with bmake. If you want to enable them in your programs, simply invoke bmake as follows: . bmake -m /usr/share/mk-freebsd debian/dirs0000664000000000000000000000016312323047314010053 0ustar usr/share usr/sbin usr/bin usr/share/man/man1 usr/share/man/man5 usr/share/man/man8 usr/lib var/db usr/lib/freebsd debian/patches/0000775000000000000000000000000012323047526010623 5ustar debian/patches/16_bootstrap_pmake.diff0000664000000000000000000000127112323047314015151 0ustar Author: Guillem Jover --- src/usr.bin/make/Makefile.dist | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/src/usr.bin/make/Makefile.dist +++ b/src/usr.bin/make/Makefile.dist @@ -2,9 +2,12 @@ # a simple makefile to help builds on !FreeBSD systems pmake: @echo 'make started.' - cc -D__dead2="" -D__unused="" -Darc4random=random -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c - cc *.o -o pmake + cc -D_GNU_SOURCE=1 -isystem /usr/include/freebsd -DDEFSHELLNAME=\"sh\" -I. -c *.c -g + cc *.o -lbsd -o pmake @echo 'make completed.' -clean: - @rm -f *.o pmake +mostlyclean: + @rm -f *.o + +clean: mostlyclean + @rm -f pmake debian/patches/04_lex_disable_unused.diff0000664000000000000000000000077412323047314015621 0ustar Defining __unused causes breakage in system headers (see #522773 and #522774). Note: special care should be taken with flex.skl; this code isn't compiled in lex itself, it is used as template to generate code that will later be built in other packages (e.g. kfreebsd-9). --- a/src/contrib/flex/flex.skl +++ b/src/contrib/flex/flex.skl @@ -202,8 +202,10 @@ #include #include #else +#ifndef __dead2 #define __dead2 #endif +#endif /* begin standard C headers. */ %if-c-only debian/patches/00_upstream.diff0000664000000000000000000001263112323047314013612 0ustar --- a/src/usr.sbin/mtree/compare.c +++ b/src/usr.sbin/mtree/compare.c @@ -176,21 +176,22 @@ (intmax_t)s->st_size, (intmax_t)p->fts_statp->st_size); tab = "\t"; } +#ifdef ST_MTIM /* * XXX * Catches nano-second differences, but doesn't display them. */ if ((s->flags & F_TIME) && - ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtim.tv_sec) || - (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) { + ((s->ST_MTIM.tv_sec != p->fts_statp->st_mtim.tv_sec) || + (s->ST_MTIM.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) { LABEL; (void)printf("%smodification time expected %.24s ", - tab, ctime(&s->st_mtimespec.tv_sec)); + tab, ctime(&s->ST_MTIM.tv_sec)); (void)printf("found %.24s", ctime(&p->fts_statp->st_mtim.tv_sec)); if (uflag) { - tv[0].tv_sec = s->st_mtimespec.tv_sec; - tv[0].tv_usec = s->st_mtimespec.tv_nsec / 1000; + tv[0].tv_sec = s->ST_MTIM.tv_sec; + tv[0].tv_usec = s->ST_MTIM.tv_nsec / 1000; tv[1] = tv[0]; if (utimes(p->fts_accpath, tv)) (void)printf(" not modified: %s\n", @@ -201,6 +202,7 @@ (void)printf("\n"); tab = "\t"; } +#endif /* ST_MTIM */ if (s->flags & F_CKSUM) { if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0) { LABEL; @@ -223,6 +225,7 @@ } } } +#if defined(__FreeBSD__) if ((s->flags & F_FLAGS) && s->st_flags != p->fts_statp->st_flags) { LABEL; fflags = flags_to_string(s->st_flags); @@ -243,6 +246,7 @@ (void)printf("\n"); tab = "\t"; } +#endif #ifdef MD5 if (s->flags & F_MD5) { char *new_digest, buf[33]; --- a/src/usr.sbin/mtree/create.c +++ b/src/usr.sbin/mtree/create.c @@ -265,11 +265,13 @@ if (keys & F_SLINK && (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) output(indent, &offset, "link=%s", rlink(p->fts_accpath)); +#if defined(__FreeBSD__) if (keys & F_FLAGS && p->fts_statp->st_flags != flags) { fflags = flags_to_string(p->fts_statp->st_flags); output(indent, &offset, "flags=%s", fflags); free(fflags); } +#endif (void)putchar('\n'); } @@ -328,6 +330,7 @@ maxuid = u[suid]; } +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* * XXX * note that the below will break when file flags @@ -341,6 +344,7 @@ saveflags = sflags; maxflags = f[FLAGS2IDX(sflags)]; } +#endif /* __FreeBSD__ */ } } /* @@ -384,11 +388,13 @@ (void)printf(" mode=%#o", savemode); if (keys & F_NLINK) (void)printf(" nlink=1"); +#if defined(__FreeBSD__) if (keys & F_FLAGS) { fflags = flags_to_string(saveflags); (void)printf(" flags=%s", fflags); free(fflags); } +#endif (void)printf("\n"); *puid = saveuid; *pgid = savegid; --- a/src/usr.sbin/mtree/misc.c +++ b/src/usr.sbin/mtree/misc.c @@ -107,6 +107,7 @@ return (strcmp(((const KEY *)a)->name, ((const KEY *)b)->name)); } +#if defined(__FreeBSD__) char * flags_to_string(u_long fflags) { @@ -122,3 +123,4 @@ return string; } +#endif /* __FreeBSD__ */ --- a/src/usr.sbin/mtree/mtree.h +++ b/src/usr.sbin/mtree/mtree.h @@ -42,7 +42,16 @@ struct _node *parent, *child; /* up, down */ struct _node *prev, *next; /* left, right */ off_t st_size; /* size */ - struct timespec st_mtimespec; /* last modification time */ +#ifdef __GLIBC__ +# ifdef _STATBUF_ST_NSEC +# define ST_MTIM st_mtim +# endif +#else +# define ST_MTIM st_mtimespec +#endif +#ifdef ST_MTIM + struct timespec ST_MTIM; /* last modification time */ +#endif u_long cksum; /* check sum */ char *md5digest; /* MD5 digest */ char *sha1digest; /* SHA-1 digest */ --- a/src/usr.sbin/mtree/spec.c +++ b/src/usr.sbin/mtree/spec.c @@ -204,12 +204,14 @@ if(!ip->rmd160digest) errx(1, "strdup"); break; +#if defined(__FreeBSD__) case F_FLAGS: if (strcmp("none", val) == 0) ip->st_flags = 0; else if (strtofflags(&val, &ip->st_flags, NULL) != 0) errx(1, "line %d: invalid flag %s",lineno, val); break; +#endif case F_GID: ip->st_gid = strtoul(val, &ep, 10); if (*ep) @@ -252,20 +254,22 @@ if (strunvis(ip->slink, val) == -1) errx(1, "symlink %s is ill-encoded", val); break; +#ifdef ST_MTIM case F_TIME: - ip->st_mtimespec.tv_sec = strtoul(val, &ep, 10); + ip->ST_MTIM.tv_sec = strtoul(val, &ep, 10); if (*ep == '.') { /* Note: we require exactly nine * digits after the decimal point. */ val = ep + 1; - ip->st_mtimespec.tv_nsec + ip->ST_MTIM.tv_nsec = strtoul(val, &ep, 10); } else - ip->st_mtimespec.tv_nsec = 0; + ip->ST_MTIM.tv_nsec = 0; if (*ep) errx(1, "line %d: invalid time %s", lineno, val); break; +#endif case F_TYPE: switch(*val) { case 'b': --- a/src/usr.sbin/mtree/specspec.c +++ b/src/usr.sbin/mtree/specspec.c @@ -150,8 +150,10 @@ differs |= F_SIZE; if (FS(n1, n2, F_SLINK, slink)) differs |= F_SLINK; - if (FM(n1, n2, F_TIME, st_mtimespec)) +#ifdef ST_MTIM + if (FM(n1, n2, F_TIME, ST_MTIM)) differs |= F_TIME; +#endif if (FF(n1, n2, F_UID, st_uid)) differs |= F_UID; if (FF(n1, n2, F_UNAME, st_uid)) --- a/src/usr.sbin/mtree/verify.c +++ b/src/usr.sbin/mtree/verify.c @@ -251,9 +251,11 @@ if (chmod(path, p->st_mode)) (void)printf("%s: permissions not set: %s\n", path, strerror(errno)); +#if defined(__FreeBSD__) if ((p->flags & F_FLAGS) && p->st_flags && chflags(path, p->st_flags)) (void)printf("%s: file flags not set: %s\n", path, strerror(errno)); +#endif } } debian/patches/yacc_is_byacc.diff0000664000000000000000000000024112323047314014220 0ustar --- 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 debian/patches/15_manpages_gzip.diff0000664000000000000000000000045112323047314014601 0ustar --- 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) debian/patches/08_maxpathlen.diff0000664000000000000000000000300312323047314014114 0ustar --- src/usr.bin/make/arch.c | 4 ++++ src/usr.bin/make/main.c | 3 +++ src/usr.sbin/config/main.c | 4 ++++ src/usr.sbin/config/mkmakefile.c | 4 ++++ src/usr.sbin/config/mkoptions.c | 4 ++++ src/usr.sbin/mtree/create.c | 4 ++++ src/usr.sbin/mtree/extern.h | 5 +++-- 7 files changed, 26 insertions(+), 2 deletions(-) --- a/src/usr.bin/make/arch.c +++ b/src/usr.bin/make/arch.c @@ -191,6 +191,10 @@ Error ARGS; \ } while (0) +#ifndef MAXPATHLEN +# define MAXPATHLEN 4096 +#endif + /*- *----------------------------------------------------------------------- * Arch_ParseArchive -- --- a/src/usr.bin/make/main.c +++ b/src/usr.bin/make/main.c @@ -255,6 +255,9 @@ { char *fname, *fnamesave; /* makefile to read */ FILE *stream; +#ifndef MAXPATHLEN +# define MAXPATHLEN 4096 +#endif char *name, path[MAXPATHLEN]; char *MAKEFILE; int setMAKEFILE; --- a/src/usr.sbin/mtree/create.c +++ b/src/usr.sbin/mtree/create.c @@ -67,6 +67,10 @@ #define INDENTNAMELEN 15 #define MAXLINELEN 80 +#ifndef MAXHOSTNAMELEN +# define MAXHOSTNAMELEN 255 +#endif + static gid_t gid; static uid_t uid; static mode_t mode; --- a/src/usr.sbin/mtree/extern.h +++ b/src/usr.sbin/mtree/extern.h @@ -54,6 +54,7 @@ extern u_int keys; extern int lineno; extern int dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, wflag; -#ifdef MAXPATHLEN -extern char fullpath[MAXPATHLEN]; +#ifndef MAXPATHLEN +# define MAXPATHLEN 4096 #endif +extern char fullpath[MAXPATHLEN]; debian/patches/20_libbsd_overlay.diff0000664000000000000000000000024212323047314014747 0ustar --- a/src/usr.bin/file2c/Makefile +++ b/src/usr.bin/file2c/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= file2c +LDADD= -lbsd WARNS?= 6 .include debian/patches/aicasm.diff0000664000000000000000000000052712323047314012711 0ustar 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} debian/patches/21_endian.diff0000664000000000000000000000235112323047314013211 0ustar If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are defined, default to native compilation. FIXME: This only checks for variable definition (i.e. via environment), not for command-line assignment parameters. --- a/src/usr.bin/make/main.c +++ b/src/usr.bin/make/main.c @@ -61,6 +61,7 @@ * the .MFLAGS target. */ +#include #include #include #include @@ -881,6 +882,7 @@ const char *machine; const char *machine_arch; const char *machine_cpu; + int machine_endian_little; Boolean outOfDate = TRUE; /* FALSE if all targets up to date */ const char *p; const char *pathp; @@ -1014,6 +1016,16 @@ Var_SetGlobal("MACHINE", machine); Var_SetGlobal("MACHINE_ARCH", machine_arch); Var_SetGlobal("MACHINE_CPU", machine_cpu); + if (!Var_Exists("TARGET_BIG_ENDIAN", VAR_GLOBAL) && !Var_Exists("TARGET_LITTLE_ENDIAN", VAR_GLOBAL)) { + /* + * If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are defined, + * default to native compilation. + */ + if (_BYTE_ORDER == _LITTLE_ENDIAN) + Var_SetGlobal("TARGET_LITTLE_ENDIAN", "true"); + else + Var_SetGlobal("TARGET_BIG_ENDIAN", "true"); + } #ifdef MAKE_VERSION Var_SetGlobal("MAKE_VERSION", MAKE_VERSION); #endif debian/patches/prototype-setmode.diff0000664000000000000000000000061012323047314015150 0ustar Description: Prototype setmode Index: b/src/usr.sbin/mtree/spec.c =================================================================== --- a/src/usr.sbin/mtree/spec.c +++ b/src/usr.sbin/mtree/spec.c @@ -49,6 +49,8 @@ #include "mtree.h" #include "extern.h" +extern void *setmode(const char *mode_str); + int lineno; /* Current spec line number. */ static void set(char *, NODE *); debian/patches/makefiles.diff0000664000000000000000000000040212323047314013404 0ustar --- a/src/usr.sbin/kldxref/Makefile +++ b/src/usr.sbin/kldxref/Makefile @@ -7,6 +7,8 @@ WARNS?= 2 CFLAGS+=-fno-strict-aliasing +LDADD+= -lbsd + .if exists(ef_${MACHINE_CPUARCH}.c) && ${MACHINE_ARCH} != "powerpc64" SRCS+= ef_${MACHINE_CPUARCH}.c .else debian/patches/series0000664000000000000000000000121012323047343012027 0ustar # Patches from (or merged in) upstream # Patches that are in good shape for merging upstream mk_ncp.diff 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 prototype-setmode.diff # Patches that are likely to be Debian-specific avoid_defsyspath_collision.diff aicasm.diff makefiles.diff #test debian/patches/17_multiarch.diff0000664000000000000000000006134612323047314013761 0ustar --- src/share/mk/bsd.libnames.mk | 680 +++++++++++++++++++++++++++++++++++-------- src/share/mk/bsd.own.mk | 4 src/usr.bin/make/main.c | 14 src/usr.bin/make/make.1 | 6 4 files changed, 588 insertions(+), 116 deletions(-) --- a/src/usr.bin/make/main.c +++ b/src/usr.bin/make/main.c @@ -860,6 +860,7 @@ { const char *machine; const char *machine_arch; + const char *machine_multiarch; const char *machine_cpu; Boolean outOfDate = TRUE; /* FALSE if all targets up to date */ const char *p; @@ -946,8 +947,8 @@ * so we can share an executable for similar machines. * (i.e. m68k: amiga hp300, mac68k, sun3, ...) * - * Note that both MACHINE and MACHINE_ARCH are decided at - * run-time. + * Note that all of MACHINE, MACHINE_ARCH and MACHINE_MULTIARCH + * are decided at run-time. */ if (machine == NULL) { #ifdef MACHINE_ARCH @@ -965,6 +966,14 @@ #endif } + if ((machine_multiarch = getenv("MACHINE_MULTIARCH")) == NULL) { +#ifdef MACHINE_MULTIARCH + machine_multiarch = MACHINE_MULTIARCH; +#else + machine_multiarch = "unknown-unknown-unknown"; +#endif + } + /* * Set machine_cpu to the minumum supported CPU revision based * on the target architecture, if not already set. @@ -1007,6 +1016,7 @@ Var_SetGlobal("MFLAGS", ""); Var_SetGlobal("MACHINE", machine); Var_SetGlobal("MACHINE_ARCH", machine_arch); + Var_SetGlobal("MACHINE_MULTIARCH", machine_multiarch); Var_SetGlobal("MACHINE_CPU", machine_cpu); #ifdef MAKE_VERSION Var_SetGlobal("MAKE_VERSION", MAKE_VERSION); --- a/src/usr.bin/make/make.1 +++ b/src/usr.bin/make/make.1 @@ -815,6 +815,12 @@ Name of the machine architecture .Nm was compiled for, defined at compilation time. +.It Va MACHINE_MULTIARCH +Name of the machine multiarch triplet +.Nm +was compiler for, defined at compilation time. It's common use is for path +components, to allow co-installation in multiarch environment. +. .It Va VPATH Makefiles may assign a colon-delimited list of directories to .Va VPATH . --- a/src/share/mk/bsd.own.mk +++ b/src/share/mk/bsd.own.mk @@ -26,6 +26,9 @@ # # LIBDIR Base path for libraries. [/usr/lib] # +# LIBARCHDIR Base path for multi-arch libraries. +# [/usr/lib/${MACHINE_MULTIARCH}] +# # LIBCOMPATDIR Base path for compat libraries. [/usr/lib/compat] # # LIBDATADIR Base path for misc. utility data files. [/usr/libdata] @@ -127,6 +130,7 @@ KMODMODE?= ${BINMODE} LIBDIR?= /usr/lib +LIBARCHDIR?= /usr/lib/${MACHINE_MULTIARCH} LIBCOMPATDIR?= /usr/lib/compat LIBDATADIR?= /usr/libdata LINTLIBDIR?= /usr/libdata/lint --- a/src/share/mk/bsd.libnames.mk +++ b/src/share/mk/bsd.libnames.mk @@ -8,104 +8,424 @@ .error bsd.libnames.mk cannot be included directly. .endif -LIBCRT0?= ${DESTDIR}${LIBDIR}/crt0.o +.if exists(${DESTDIR}${LIBARCHDIR}/crt0.o) +LIBCRT0?= ${DESTDIR}${LIBARCHDIR}/crt0.o +.else +LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o +.endif -LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a -LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a -LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a -LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a -LIBAUDITD?= ${DESTDIR}${LIBDIR}/libauditd.a -LIBAVL?= ${DESTDIR}${LIBDIR}/libavl.a -LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a +.if exists(${DESTDIR}${LIBARCHDIR}/libalias.a) +LIBALIAS?= ${DESTDIR}${LIBARCHDIR}/libalias.a +.else +LIBALIAS?= ${DESTDIR}/usr/lib/libalias.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libarchive.a) +LIBARCHIVE?= ${DESTDIR}${LIBARCHDIR}/libarchive.a +.else +LIBARCHIVE?= ${DESTDIR}/usr/lib/libarchive.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libasn1.a) +LIBASN1?= ${DESTDIR}${LIBARCHDIR}/libasn1.a +.else +LIBASN1?= ${DESTDIR}/usr/lib/libasn1.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libatm.a) +LIBATM?= ${DESTDIR}${LIBARCHDIR}/libatm.a +.else +LIBATM?= ${DESTDIR}/usr/lib/libatm.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libauditd.a) +LIBAUDITD?= ${DESTDIR}${LIBARCHDIR}/libauditd.a +.else +LIBAUDITD?= ${DESTDIR}/usr/lib/libauditd.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libavl.a) +LIBAVL?= ${DESTDIR}${LIBARCHDIR}/libavl.a +.else +LIBAVL?= ${DESTDIR}/usr/lib/libavl.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbegemot.a) +LIBBEGEMOT?= ${DESTDIR}${LIBARCHDIR}/libbegemot.a +.else +LIBBEGEMOT?= ${DESTDIR}/usr/lib/libbegemot.a +.endif .if ${MK_BIND_LIBS} != "no" -LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a -LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a +.if exists(${DESTDIR}${LIBARCHDIR}/libbind.a) +LIBBIND?= ${DESTDIR}${LIBARCHDIR}/libbind.a +.else +LIBBIND?= ${DESTDIR}/usr/lib/libbind.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbind9.a) +LIBBIND9?= ${DESTDIR}${LIBARCHDIR}/libbind9.a +.else +LIBBIND9?= ${DESTDIR}/usr/lib/libbind9.a +.endif +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbluetooth.a) +LIBBLUETOOTH?= ${DESTDIR}${LIBARCHDIR}/libbluetooth.a +.else +LIBBLUETOOTH?= ${DESTDIR}/usr/lib/libbluetooth.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbsdxml.a) +LIBBSDXML?= ${DESTDIR}${LIBARCHDIR}/libbsdxml.a +.else +LIBBSDXML?= ${DESTDIR}/usr/lib/libbsdxml.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbsm.a) +LIBBSM?= ${DESTDIR}${LIBARCHDIR}/libbsm.a +.else +LIBBSM?= ${DESTDIR}/usr/lib/libbsm.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbsnmp.a) +LIBBSNMP?= ${DESTDIR}${LIBARCHDIR}/libbsnmp.a +.else +LIBBSNMP?= ${DESTDIR}/usr/lib/libbsnmp.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libbz2.a) +LIBBZ2?= ${DESTDIR}${LIBARCHDIR}/libbz2.a +.else +LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libc.a) +LIBC?= ${DESTDIR}${LIBARCHDIR}/libc.a +.else +LIBC?= ${DESTDIR}/usr/lib/libc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libc_pic.a) +LIBC_PIC?= ${DESTDIR}${LIBARCHDIR}/libc_pic.a +.else +LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcalendar.a) +LIBCALENDAR?= ${DESTDIR}${LIBARCHDIR}/libcalendar.a +.else +LIBCALENDAR?= ${DESTDIR}/usr/lib/libcalendar.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcam.a) +LIBCAM?= ${DESTDIR}${LIBARCHDIR}/libcam.a +.else +LIBCAM?= ${DESTDIR}/usr/lib/libcam.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcom_err.a) +LIBCOM_ERR?= ${DESTDIR}${LIBARCHDIR}/libcom_err.a +.else +LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcompat.a) +LIBCOMPAT?= ${DESTDIR}${LIBARCHDIR}/libcompat.a +.else +LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcrypt.a) +LIBCRYPT?= ${DESTDIR}${LIBARCHDIR}/libcrypt.a +.else +LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcrypto.a) +LIBCRYPTO?= ${DESTDIR}${LIBARCHDIR}/libcrypto.a +.else +LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libctf.a) +LIBCTF?= ${DESTDIR}${LIBARCHDIR}/libctf.a +.else +LIBCTF?= ${DESTDIR}/usr/lib/libctf.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libcurses.a) +LIBCURSES?= ${DESTDIR}${LIBARCHDIR}/libcurses.a +.else +LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdevinfo.a) +LIBDEVINFO?= ${DESTDIR}${LIBARCHDIR}/libdevinfo.a +.else +LIBDEVINFO?= ${DESTDIR}/usr/lib/libdevinfo.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdevstat.a) +LIBDEVSTAT?= ${DESTDIR}${LIBARCHDIR}/libdevstat.a +.else +LIBDEVSTAT?= ${DESTDIR}/usr/lib/libdevstat.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdialog.a) +LIBDIALOG?= ${DESTDIR}${LIBARCHDIR}/libdialog.a +.else +LIBDIALOG?= ${DESTDIR}/usr/lib/libdialog.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdisk.a) +LIBDISK?= ${DESTDIR}${LIBARCHDIR}/libdisk.a +.else +LIBDISK?= ${DESTDIR}/usr/lib/libdisk.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdns.a) +LIBDNS?= ${DESTDIR}${LIBARCHDIR}/libdns.a +.else +LIBDNS?= ${DESTDIR}/usr/lib/libdns.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdtrace.a) +LIBDTRACE?= ${DESTDIR}${LIBARCHDIR}/libdtrace.a +.else +LIBDTRACE?= ${DESTDIR}/usr/lib/libdtrace.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libdwarf.a) +LIBDWARF?= ${DESTDIR}${LIBARCHDIR}/libdwarf.a +.else +LIBDWARF?= ${DESTDIR}/usr/lib/libdwarf.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libedit.a) +LIBEDIT?= ${DESTDIR}${LIBARCHDIR}/libedit.a +.else +LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libelf.a) +LIBELF?= ${DESTDIR}${LIBARCHDIR}/libelf.a +.else +LIBELF?= ${DESTDIR}/usr/lib/libelf.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libfetch.a) +LIBFETCH?= ${DESTDIR}${LIBARCHDIR}/libfetch.a +.else +LIBFETCH?= ${DESTDIR}/usr/lib/libfetch.a .endif -LIBBLUETOOTH?= ${DESTDIR}${LIBDIR}/libbluetooth.a -LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxml.a -LIBBSM?= ${DESTDIR}${LIBDIR}/libbsm.a -LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a -LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a -LIBC?= ${DESTDIR}${LIBDIR}/libc.a -LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a -LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a -LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a -LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a -LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a -LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a -LIBCRYPTO?= ${DESTDIR}${LIBDIR}/libcrypto.a -LIBCTF?= ${DESTDIR}${LIBDIR}/libctf.a -LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a -LIBDEVINFO?= ${DESTDIR}${LIBDIR}/libdevinfo.a -LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a -LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a -LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a -LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a -LIBDTRACE?= ${DESTDIR}${LIBDIR}/libdtrace.a -LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a -LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a -LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a -LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a LIBFL?= "don't use LIBFL, use LIBL" -LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a -LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a -LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a -LIBGCC_PIC?= ${DESTDIR}${LIBDIR}/libgcc_pic.a -LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a -LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a -LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a -LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a -LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a -LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a -LIBHEIMNTLM?= ${DESTDIR}${LIBDIR}/libheimntlm.a -LIBHX509?= ${DESTDIR}${LIBDIR}/libhx509.a -LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a +.if exists(${DESTDIR}${LIBARCHDIR}/libform.a) +LIBFORM?= ${DESTDIR}${LIBARCHDIR}/libform.a +.else +LIBFORM?= ${DESTDIR}/usr/lib/libform.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libftpio.a) +LIBFTPIO?= ${DESTDIR}${LIBARCHDIR}/libftpio.a +.else +LIBFTPIO?= ${DESTDIR}/usr/lib/libftpio.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libg2c.a) +LIBG2C?= ${DESTDIR}${LIBARCHDIR}/libg2c.a +.else +LIBG2C?= ${DESTDIR}/usr/lib/libg2c.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libgcc.a) +LIBGCC?= ${DESTDIR}${LIBARCHDIR}/libgcc.a +.else +LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libgcc_pic.a) +LIBGCC_PIC?= ${DESTDIR}${LIBARCHDIR}/libgcc_pic.a +.else +LIBGCC_PIC?= ${DESTDIR}/usr/lib/libgcc_pic.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libgeom.a) +LIBGEOM?= ${DESTDIR}${LIBARCHDIR}/libgeom.a +.else +LIBGEOM?= ${DESTDIR}/usr/lib/libgeom.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libgnuregex.a) +LIBGNUREGEX?= ${DESTDIR}${LIBARCHDIR}/libgnuregex.a +.else +LIBGNUREGEX?= ${DESTDIR}/usr/lib/libgnuregex.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libgssapi.a) +LIBGSSAPI?= ${DESTDIR}${LIBARCHDIR}/libgssapi.a +.else +LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libgssapi_krb5.a) +LIBGSSAPI_KRB5?= ${DESTDIR}${LIBARCHDIR}/libgssapi_krb5.a +.else +LIBGSSAPI_KRB5?= ${DESTDIR}/usr/lib/libgssapi_krb5.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libhdb.a) +LIBHDB?= ${DESTDIR}${LIBARCHDIR}/libhdb.a +.else +LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libhistory.a) +LIBHISTORY?= ${DESTDIR}${LIBARCHDIR}/libhistory.a +.else +LIBHISTORY?= ${DESTDIR}/usr/lib/libhistory.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libheimntlm.a) +LIBHEIMNTLM?= ${DESTDIR}${LIBARCHDIR}/libheimntlm.a +.else +LIBHEIMNTLM?= ${DESTDIR}/usr/lib/libheimntlm.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libhx509.a) +LIBHX509?= ${DESTDIR}${LIBARCHDIR}/libhx509.a +.else +LIBHX509?= ${DESTDIR}/usr/lib/libhx509.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libipsec.a) +LIBIPSEC?= ${DESTDIR}${LIBARCHDIR}/libipsec.a +.else +LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a +.endif .if ${MK_IPX} != "no" -LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a +.if exists(${DESTDIR}${LIBARCHDIR}/libipx.a) +LIBIPX?= ${DESTDIR}${LIBARCHDIR}/libipx.a +.else +LIBIPX?= ${DESTDIR}/usr/lib/libipx.a +.endif .endif .if ${MK_BIND_LIBS} != "no" -LIBISC?= ${DESTDIR}${LIBDIR}/libisc.a -LIBISCCC?= ${DESTDIR}${LIBDIR}/libisccc.a -LIBISCCFG?= ${DESTDIR}${LIBDIR}/libisccfg.a -.endif -LIBJAIL?= ${DESTDIR}${LIBDIR}/libjail.a -LIBKADM5CLNT?= ${DESTDIR}${LIBDIR}/libkadm5clnt.a -LIBKADM5SRV?= ${DESTDIR}${LIBDIR}/libkadm5srv.a -LIBKAFS5?= ${DESTDIR}${LIBDIR}/libkafs5.a -LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a -LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a -LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a -LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a -LIBL?= ${DESTDIR}${LIBDIR}/libl.a +.if exists(${DESTDIR}${LIBARCHDIR}/libisc.a) +LIBISC?= ${DESTDIR}${LIBARCHDIR}/libisc.a +.else +LIBISC?= ${DESTDIR}/usr/lib/libisc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libisccc.a) +LIBISCCC?= ${DESTDIR}${LIBARCHDIR}/libisccc.a +.else +LIBISCCC?= ${DESTDIR}/usr/lib/libisccc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libisccfg.a) +LIBISCCFG?= ${DESTDIR}${LIBARCHDIR}/libisccfg.a +.else +LIBISCCFG?= ${DESTDIR}/usr/lib/libisccfg.a +.endif +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libjail.a) +LIBJAIL?= ${DESTDIR}${LIBARCHDIR}/libjail.a +.else +LIBJAIL?= ${DESTDIR}/usr/lib/libjail.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkadm5clnt.a) +LIBKADM5CLNT?= ${DESTDIR}${LIBARCHDIR}/libkadm5clnt.a +.else +LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkadm5srv.a) +LIBKADM5SRV?= ${DESTDIR}${LIBARCHDIR}/libkadm5srv.a +.else +LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkafs5.a) +LIBKAFS5?= ${DESTDIR}${LIBARCHDIR}/libkafs5.a +.else +LIBKAFS5?= ${DESTDIR}/usr/lib/libkafs5.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkeycap.a) +LIBKEYCAP?= ${DESTDIR}${LIBARCHDIR}/libkeycap.a +.else +LIBKEYCAP?= ${DESTDIR}/usr/lib/libkeycap.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkiconv.a) +LIBKICONV?= ${DESTDIR}${LIBARCHDIR}/libkiconv.a +.else +LIBKICONV?= ${DESTDIR}/usr/lib/libkiconv.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkrb5.a) +LIBKRB5?= ${DESTDIR}${LIBARCHDIR}/libkrb5.a +.else +LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libkvm.a) +LIBKVM?= ${DESTDIR}${LIBARCHDIR}/libkvm.a +.else +LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libl.a) +LIBL?= ${DESTDIR}${LIBARCHDIR}/libl.a +.else +LIBL?= ${DESTDIR}/usr/lib/libl.a +.endif LIBLN?= "don't use LIBLN, use LIBL" .if ${MK_BIND} != "no" -LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a +.if exists(${DESTDIR}${LIBARCHDIR}/liblwres.a) +LIBLWRES?= ${DESTDIR}${LIBARCHDIR}/liblwres.a +.else +LIBLWRES?= ${DESTDIR}/usr/lib/liblwres.a +.endif +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/liblzma.a) +LIBLZMA?= ${DESTDIR}${LIBARCHDIR}/liblzma.a +.else +LIBLZMA?= ${DESTDIR}/usr/lib/liblzma.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libm.a) +LIBM?= ${DESTDIR}${LIBARCHDIR}/libm.a +.else +LIBM?= ${DESTDIR}/usr/lib/libm.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libmagic.a) +LIBMAGIC?= ${DESTDIR}${LIBARCHDIR}/libmagic.a +.else +LIBMAGIC?= ${DESTDIR}/usr/lib/libmagic.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libmd.a) +LIBMD?= ${DESTDIR}${LIBARCHDIR}/libmd.a +.else +LIBMD?= ${DESTDIR}/usr/lib/libmd.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libmemstat.a) +LIBMEMSTAT?= ${DESTDIR}${LIBARCHDIR}/libmemstat.a +.else +LIBMEMSTAT?= ${DESTDIR}/usr/lib/libmemstat.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libmenu.a) +LIBMENU?= ${DESTDIR}${LIBARCHDIR}/libmenu.a +.else +LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a .endif -LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a -LIBM?= ${DESTDIR}${LIBDIR}/libm.a -LIBMAGIC?= ${DESTDIR}${LIBDIR}/libmagic.a -LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a -LIBMEMSTAT?= ${DESTDIR}${LIBDIR}/libmemstat.a -LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a .if ${MK_SENDMAIL} != "no" -LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a +.if exists(${DESTDIR}${LIBARCHDIR}/libmilter.a) +LIBMILTER?= ${DESTDIR}${LIBARCHDIR}/libmilter.a +.else +LIBMILTER?= ${DESTDIR}/usr/lib/libmilter.a +.endif +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libmp.a) +LIBMP?= ${DESTDIR}${LIBARCHDIR}/libmp.a +.else +LIBMP?= ${DESTDIR}/usr/lib/libmp.a .endif -LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a .if ${MK_NCP} != "no" -LIBNCP?= ${DESTDIR}${LIBDIR}/libncp.a +.if exists(${DESTDIR}${LIBARCHDIR}/libncp.a) +LIBNCP?= ${DESTDIR}${LIBARCHDIR}/libncp.a +.else +LIBNCP?= ${DESTDIR}/usr/lib/libncp.a +.endif +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libncurses.a) +LIBNCURSES?= ${DESTDIR}${LIBARCHDIR}/libncurses.a +.else +LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libncursesw.a) +LIBNCURSESW?= ${DESTDIR}${LIBARCHDIR}/libncursesw.a +.else +LIBNCURSESW?= ${DESTDIR}/usr/lib/libncursesw.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libnetgraph.a) +LIBNETGRAPH?= ${DESTDIR}${LIBARCHDIR}/libnetgraph.a +.else +LIBNETGRAPH?= ${DESTDIR}/usr/lib/libnetgraph.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libngatm.a) +LIBNGATM?= ${DESTDIR}${LIBARCHDIR}/libngatm.a +.else +LIBNGATM?= ${DESTDIR}/usr/lib/libngatm.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libnvpair.a) +LIBNVPAIR?= ${DESTDIR}${LIBARCHDIR}/libnvpair.a +.else +LIBNVPAIR?= ${DESTDIR}/usr/lib/libnvpair.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libobjc.a) +LIBOBJC?= ${DESTDIR}${LIBARCHDIR}/libobjc.a +.else +LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libopie.a) +LIBOPIE?= ${DESTDIR}${LIBARCHDIR}/libopie.a +.else +LIBOPIE?= ${DESTDIR}/usr/lib/libopie.a .endif -LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a -LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a -LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a -LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a -LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a -LIBOBJC?= ${DESTDIR}${LIBDIR}/libobjc.a -LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a # The static PAM library doesn't know its secondary dependencies, # so we have to specify them explicitly. -LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a +.if exists(${DESTDIR}${LIBARCHDIR}/libpam.a) +LIBPAM?= ${DESTDIR}${LIBARCHDIR}/libpam.a +.else +LIBPAM?= ${DESTDIR}/usr/lib/libpam.a +.endif MINUSLPAM= -lpam .if defined(LDFLAGS) && !empty(LDFLAGS:M-static) .if ${MK_KERBEROS} != "no" @@ -127,38 +447,170 @@ .endif .endif -LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a -LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a -LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a -LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a -LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a -LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a -LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a -LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a -LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a -LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a -LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a -LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a -LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a -LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a -LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a -LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a -LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a -LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a +.if exists(${DESTDIR}${LIBARCHDIR}/libpanel.a) +LIBPANEL?= ${DESTDIR}${LIBARCHDIR}/libpanel.a +.else +LIBPANEL?= ${DESTDIR}/usr/lib/libpanel.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libpcap.a) +LIBPCAP?= ${DESTDIR}${LIBARCHDIR}/libpcap.a +.else +LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libpmc.a) +LIBPMC?= ${DESTDIR}${LIBARCHDIR}/libpmc.a +.else +LIBPMC?= ${DESTDIR}/usr/lib/libpmc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libproc.a) +LIBPROC?= ${DESTDIR}${LIBARCHDIR}/libproc.a +.else +LIBPROC?= ${DESTDIR}/usr/lib/libproc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libpthread.a) +LIBPTHREAD?= ${DESTDIR}${LIBARCHDIR}/libpthread.a +.else +LIBPTHREAD?= ${DESTDIR}/usr/lib/libpthread.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libradius.a) +LIBRADIUS?= ${DESTDIR}${LIBARCHDIR}/libradius.a +.else +LIBRADIUS?= ${DESTDIR}/usr/lib/libradius.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libreadline.a) +LIBREADLINE?= ${DESTDIR}${LIBARCHDIR}/libreadline.a +.else +LIBREADLINE?= ${DESTDIR}/usr/lib/libreadline.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libroken.a) +LIBROKEN?= ${DESTDIR}${LIBARCHDIR}/libroken.a +.else +LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/librpcsvc.a) +LIBRPCSVC?= ${DESTDIR}${LIBARCHDIR}/librpcsvc.a +.else +LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libsbuf.a) +LIBSBUF?= ${DESTDIR}${LIBARCHDIR}/libsbuf.a +.else +LIBSBUF?= ${DESTDIR}/usr/lib/libsbuf.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libsdp.a) +LIBSDP?= ${DESTDIR}${LIBARCHDIR}/libsdp.a +.else +LIBSDP?= ${DESTDIR}/usr/lib/libsdp.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libsmb.a) +LIBSMB?= ${DESTDIR}${LIBARCHDIR}/libsmb.a +.else +LIBSMB?= ${DESTDIR}/usr/lib/libsmb.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libssh.a) +LIBSSH?= ${DESTDIR}${LIBARCHDIR}/libssh.a +.else +LIBSSH?= ${DESTDIR}/usr/lib/libssh.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libssl.a) +LIBSSL?= ${DESTDIR}${LIBARCHDIR}/libssl.a +.else +LIBSSL?= ${DESTDIR}/usr/lib/libssl.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libstand.a) +LIBSTAND?= ${DESTDIR}${LIBARCHDIR}/libstand.a +.else +LIBSTAND?= ${DESTDIR}/usr/lib/libstand.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libstdc++.a) +LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBARCHDIR}/libstdc++.a +.else +LIBSTDCPLUSPLUS?= ${DESTDIR}/usr/lib/libstdc++.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libtacplus.a) +LIBTACPLUS?= ${DESTDIR}${LIBARCHDIR}/libtacplus.a +.else +LIBTACPLUS?= ${DESTDIR}/usr/lib/libtacplus.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libtermcap.a) +LIBTERMCAP?= ${DESTDIR}${LIBARCHDIR}/libtermcap.a +.else +LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a +.endif LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES" -LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a -LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a -LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a -LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a -LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a -LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a -LIBUUTIL?= ${DESTDIR}${LIBDIR}/libuutil.a -LIBVGL?= ${DESTDIR}${LIBDIR}/libvgl.a -LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a -LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a -LIBY?= ${DESTDIR}${LIBDIR}/liby.a -LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a -LIBZ?= ${DESTDIR}${LIBDIR}/libz.a -LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a -LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a +.if exists(${DESTDIR}${LIBARCHDIR}/libufs.a) +LIBUFS?= ${DESTDIR}${LIBARCHDIR}/libufs.a +.else +LIBUFS?= ${DESTDIR}/usr/lib/libufs.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libugidfw.a) +LIBUGIDFW?= ${DESTDIR}${LIBARCHDIR}/libugidfw.a +.else +LIBUGIDFW?= ${DESTDIR}/usr/lib/libugidfw.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libumem.a) +LIBUMEM?= ${DESTDIR}${LIBARCHDIR}/libumem.a +.else +LIBUMEM?= ${DESTDIR}/usr/lib/libumem.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libusbhid.a) +LIBUSBHID?= ${DESTDIR}${LIBARCHDIR}/libusbhid.a +.else +LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libusb.a) +LIBUSB?= ${DESTDIR}${LIBARCHDIR}/libusb.a +.else +LIBUSB?= ${DESTDIR}/usr/lib/libusb.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libutil.a) +LIBUTIL?= ${DESTDIR}${LIBARCHDIR}/libutil.a +.else +LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libuutil.a) +LIBUUTIL?= ${DESTDIR}${LIBARCHDIR}/libuutil.a +.else +LIBUUTIL?= ${DESTDIR}/usr/lib/libuutil.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libvgl.a) +LIBVGL?= ${DESTDIR}${LIBARCHDIR}/libvgl.a +.else +LIBVGL?= ${DESTDIR}/usr/lib/libvgl.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libwrap.a) +LIBWRAP?= ${DESTDIR}${LIBARCHDIR}/libwrap.a +.else +LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libxpg4.a) +LIBXPG4?= ${DESTDIR}${LIBARCHDIR}/libxpg4.a +.else +LIBXPG4?= ${DESTDIR}/usr/lib/libxpg4.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/liby.a) +LIBY?= ${DESTDIR}${LIBARCHDIR}/liby.a +.else +LIBY?= ${DESTDIR}/usr/lib/liby.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libypclnt.a) +LIBYPCLNT?= ${DESTDIR}${LIBARCHDIR}/libypclnt.a +.else +LIBYPCLNT?= ${DESTDIR}/usr/lib/libypclnt.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libz.a) +LIBZ?= ${DESTDIR}${LIBARCHDIR}/libz.a +.else +LIBZ?= ${DESTDIR}/usr/lib/libz.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libzfs.a) +LIBZFS?= ${DESTDIR}${LIBARCHDIR}/libzfs.a +.else +LIBZFS?= ${DESTDIR}/usr/lib/libzfs.a +.endif +.if exists(${DESTDIR}${LIBARCHDIR}/libzpool.a) +LIBZPOOL?= ${DESTDIR}${LIBARCHDIR}/libzpool.a +.else +LIBZPOOL?= ${DESTDIR}/usr/lib/libzpool.a +.endif debian/patches/nostrip.diff0000664000000000000000000000134312323047314013147 0ustar 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") debian/patches/01_make_fixes.diff0000664000000000000000000001634212323047314014071 0ustar --- 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 debian/patches/18_fix_sysdir.diff0000664000000000000000000000137312323047314014147 0ustar --- 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" debian/patches/avoid_defsyspath_collision.diff0000664000000000000000000000256012323047314017062 0ustar 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 */ debian/patches/03_glibc.diff0000664000000000000000000000115512323047314013034 0ustar --- a/src/usr.sbin/mtree/specspec.c +++ b/src/usr.sbin/mtree/specspec.c @@ -84,8 +84,6 @@ printf(" rmd160digest=%s", n->rmd160digest); if (f & F_SHA256) printf(" sha256digest=%s", n->sha256digest); - if (f & F_FLAGS) - printf(" flags=%s", flags_to_string(n->st_flags)); printf("\n"); } --- a/src/usr.sbin/mtree/Makefile +++ b/src/usr.sbin/mtree/Makefile @@ -10,9 +10,6 @@ SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c SRCS+= specspec.c -CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256 -DPADD= ${LIBMD} -LDADD= -lmd .if ${MK_NMTREE} == "no" LINKS= ${BINDIR}/fmtree ${BINDIR}/mtree debian/patches/mk_ncp.diff0000664000000000000000000000066012323047314012721 0ustar 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 debian/patches/disable_wsystem_headers.diff0000664000000000000000000000052712323047314016345 0ustar --- a/src/share/mk/bsd.sys.mk +++ b/src/share/mk/bsd.sys.mk @@ -29,7 +29,8 @@ #CFLAGS+= -pedantic .if defined(WARNS) .if ${WARNS} >= 1 -CWARNFLAGS+= -Wsystem-headers +# Disabled (see #664242) +#CWARNFLAGS+= -Wsystem-headers .if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ || !defined(NO_WERROR.clang)) CWARNFLAGS+= -Werror debian/patches/kldxref_abort_on_error.diff0000664000000000000000000000152112323047343016204 0ustar With kldxref from 10.0-2, this warnc() reports EFAULT, rendering the output useless. However this is no longer reproducible after rebuilding 10.0-2 with recent unstable. Let's treat this warnc() as fatal so that at least we know if/when trouble comes back. It's probably related to offset types (Elf_Off / off_t). Unfortunately I haven't been able to diagnose it: $ kldxref -dv /tmp/t/ /tmp/t/drm2.ko kldxref: ef_seg_read_rel(/tmp/t/drm2.ko): bad offset/len (4800000130808b48:33) kldxref: error while reading /tmp/t/drm2.ko: Bad address --- a/src/usr.sbin/kldxref/kldxref.c +++ b/src/usr.sbin/kldxref/kldxref.c @@ -230,7 +230,7 @@ parse_entry(&md, cval, &ef, kldname); } if (error) - warnc(error, "error while reading %s", filename); + errc(error, "error while reading %s", filename); free(orgp); } while(0); EF_CLOSE(&ef); debian/patches/config_ldflags.diff0000664000000000000000000000032012323047314014404 0ustar --- a/src/usr.sbin/config/Makefile +++ b/src/usr.sbin/config/Makefile @@ -16,6 +16,8 @@ DPADD= ${LIBL} ${LIBSBUF} LDADD= -ll -lsbuf +LDADD+= -lbsd + CLEANFILES+= kernconf.c mkmakefile.o: configvers.h debian/patches/05_disable_hardlinks.diff0000664000000000000000000000122412323047314015415 0ustar --- a/src/usr.bin/cksum/Makefile +++ b/src/usr.bin/cksum/Makefile @@ -3,7 +3,7 @@ PROG= cksum SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c -LINKS= ${BINDIR}/cksum ${BINDIR}/sum +SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum MLINKS= cksum.1 sum.1 .include --- a/src/usr.bin/lex/Makefile +++ b/src/usr.bin/lex/Makefile @@ -10,9 +10,9 @@ # PROG= lex -LINKS+= ${BINDIR}/lex ${BINDIR}/lex++ -LINKS+= ${BINDIR}/lex ${BINDIR}/flex -LINKS+= ${BINDIR}/lex ${BINDIR}/flex++ +SIMLINKS+= ${BINDIR}/lex ${BINDIR}/lex++ +SIMLINKS+= ${BINDIR}/lex ${BINDIR}/flex +SIMLINKS+= ${BINDIR}/lex ${BINDIR}/flex++ FLEXDIR= ${.CURDIR}/../../contrib/flex debian/patches/22_ld_as_needed.diff0000664000000000000000000000205112323047314014337 0ustar --- 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 --- 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