[Glibc-bsd-commits] r3486 - in trunk/freebsd-buildutils/debian: . patches

Robert Millan rmh at alioth.debian.org
Sun Jun 26 15:18:53 UTC 2011 

Author: rmh
Date: 2011-06-26 15:18:52 +0000 (Sun, 26 Jun 2011)
New Revision: 3486

Removed:
   trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff
   trunk/freebsd-buildutils/debian/patches/11_optreset.diff
   trunk/freebsd-buildutils/debian/patches/14_config.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/patches/00_upstream.diff
   trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
   trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
   trunk/freebsd-buildutils/debian/patches/03_glibc.diff
   trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
   trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
   trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
   trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
   trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
   trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
   trunk/freebsd-buildutils/debian/patches/17_multiarch.diff
   trunk/freebsd-buildutils/debian/patches/series
   trunk/freebsd-buildutils/debian/rules
Log:
  * 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.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/changelog	2011-06-26 15:18:52 UTC (rev 3486)
@@ -2,8 +2,12 @@
 
   * 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.
 
- -- Robert Millan <rmh at debian.org>  Sat, 25 Jun 2011 20:34:47 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 26 Jun 2011 17:18:27 +0200
 
 freebsd-buildutils (8.2-1) unstable; urgency=low
 

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/control	2011-06-26 15:18:52 UTC (rev 3486)
@@ -3,7 +3,9 @@
 Priority: extra
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 7), flex, bison, libbsd-dev
+Build-Depends: debhelper (>= 7), flex, bison,
+ libbsd-dev (>= 0.3.0),
+ pkg-config,
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-buildutils/
 Standards-Version: 3.9.2

Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -1,41 +1,6 @@
----
- src/usr.bin/cksum/cksum.c     |    1 +
- src/usr.bin/cksum/extern.h    |    1 +
- src/usr.bin/make/main.c       |    2 ++
- src/usr.sbin/config/main.c    |    7 +++++++
- src/usr.sbin/mtree/compare.c  |   16 ++++++++++------
- src/usr.sbin/mtree/create.c   |   18 +++++++++++++++---
- src/usr.sbin/mtree/extern.h   |    3 +++
- src/usr.sbin/mtree/misc.c     |    2 ++
- src/usr.sbin/mtree/mtree.h    |   14 +++++++++++++-
- src/usr.sbin/mtree/spec.c     |   10 +++++++---
- src/usr.sbin/mtree/specspec.c |    4 +++-
- src/usr.sbin/mtree/verify.c   |    2 ++
- 12 files changed, 66 insertions(+), 14 deletions(-)
-
---- a/src/usr.bin/cksum/cksum.c
-+++ b/src/usr.bin/cksum/cksum.c
-@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <stdint.h>	/* uintXX_t (glibc) */
- 
- #include "extern.h"
- 
---- a/src/usr.bin/cksum/extern.h
-+++ b/src/usr.bin/cksum/extern.h
-@@ -35,6 +35,7 @@
-  */
- 
- #include <sys/cdefs.h>
-+#include <stdint.h>		/* uintXX_t (glibc) */
- 
- __BEGIN_DECLS
- int	crc(int, uint32_t *, off_t *);
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -914,6 +914,7 @@ main(int argc, char **argv)
+@@ -914,6 +914,7 @@
  	}
  #endif
  
@@ -43,7 +8,7 @@
  	/*
  	 * Prior to 7.0, FreeBSD/pc98 kernel used to set the
  	 * utsname.machine to "i386", and MACHINE was defined as
-@@ -933,6 +934,7 @@ main(int argc, char **argv)
+@@ -933,6 +934,7 @@
  				machine = "pc98";
  		}
  	}
@@ -53,7 +18,7 @@
  	 * Get the name of this type of MACHINE from utsname
 --- a/src/usr.sbin/config/main.c
 +++ b/src/usr.sbin/config/main.c
-@@ -56,6 +56,9 @@ static const char rcsid[] =
+@@ -56,6 +56,9 @@
  #include <sysexits.h>
  #include <unistd.h>
  #include <dirent.h>
@@ -63,7 +28,7 @@
  #include "y.tab.h"
  #include "config.h"
  #include "configvers.h"
-@@ -618,7 +621,11 @@ cleanheaders(char *p)
+@@ -618,7 +621,11 @@
  	if ((dirp = opendir(p)) == NULL)
  		err(EX_OSERR, "opendir %s", p);
  	while ((dp = readdir(dirp)) != NULL) {
@@ -77,7 +42,7 @@
  			continue;
 --- a/src/usr.sbin/mtree/compare.c
 +++ b/src/usr.sbin/mtree/compare.c
-@@ -176,21 +176,22 @@ typeerr:		LABEL;
+@@ -176,21 +176,22 @@
  		    (intmax_t)s->st_size, (intmax_t)p->fts_statp->st_size);
  		tab = "\t";
  	}
@@ -106,7 +71,7 @@
  			tv[1] = tv[0];
  			if (utimes(p->fts_accpath, tv))
  				(void)printf(" not modified: %s\n",
-@@ -201,6 +202,7 @@ typeerr:		LABEL;
+@@ -201,6 +202,7 @@
  			(void)printf("\n");
  		tab = "\t";
  	}
@@ -114,7 +79,7 @@
  	if (s->flags & F_CKSUM) {
  		if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0) {
  			LABEL;
-@@ -223,6 +225,7 @@ typeerr:		LABEL;
+@@ -223,6 +225,7 @@
  			}
  		}
  	}
@@ -122,7 +87,7 @@
  	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 @@ typeerr:		LABEL;
+@@ -243,6 +246,7 @@
  			(void)printf("\n");
  		tab = "\t";
  	}
@@ -132,20 +97,7 @@
  		char *new_digest, buf[33];
 --- a/src/usr.sbin/mtree/create.c
 +++ b/src/usr.sbin/mtree/create.c
-@@ -73,7 +73,11 @@ static mode_t mode;
- static u_long flags = 0xffffffff;
- 
- static int	dsort(const FTSENT * const *, const FTSENT * const *);
--static void	output(int, int *, const char *, ...) __printflike(3, 4);
-+static void	output(int, int *, const char *, ...)
-+#ifdef __FreeBSD__
-+__printflike(3, 4)
-+#endif
-+;
- static int	statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
- static void	statf(int, FTSENT *);
- 
-@@ -211,10 +215,12 @@ statf(int indent, FTSENT *p)
+@@ -211,10 +211,12 @@
  	if (keys & F_SIZE)
  		output(indent, &offset, "size=%jd",
  		    (intmax_t)p->fts_statp->st_size);
@@ -160,7 +112,7 @@
  	if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
  		if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
  		    crc(fd, &val, &len))
-@@ -265,11 +271,13 @@ statf(int indent, FTSENT *p)
+@@ -265,11 +267,13 @@
  	if (keys & F_SLINK &&
  	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
  		output(indent, &offset, "link=%s", rlink(p->fts_accpath));
@@ -174,7 +126,7 @@
  	(void)putchar('\n');
  }
  
-@@ -328,6 +336,7 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
+@@ -328,6 +332,7 @@
  				maxuid = u[suid];
  			}
  
@@ -182,7 +134,7 @@
  			/*
  			 * XXX
  			 * note that the below will break when file flags
-@@ -341,6 +350,7 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
+@@ -341,6 +346,7 @@
  				saveflags = sflags;
  				maxflags = f[FLAGS2IDX(sflags)];
  			}
@@ -190,7 +142,7 @@
  		}
  	}
  	/*
-@@ -384,11 +394,13 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
+@@ -384,11 +390,13 @@
  			(void)printf(" mode=%#o", savemode);
  		if (keys & F_NLINK)
  			(void)printf(" nlink=1");
@@ -204,21 +156,9 @@
  		(void)printf("\n");
  		*puid = saveuid;
  		*pgid = savegid;
---- a/src/usr.sbin/mtree/extern.h
-+++ b/src/usr.sbin/mtree/extern.h
-@@ -29,6 +29,9 @@
-  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
-  * $FreeBSD$
-  */
-+
-+#include <stdint.h>
-+
- extern uint32_t crc_total;
- 
- #ifdef _FTS_H_
 --- a/src/usr.sbin/mtree/misc.c
 +++ b/src/usr.sbin/mtree/misc.c
-@@ -107,6 +107,7 @@ keycompare(const void *a, const void *b)
+@@ -107,6 +107,7 @@
  	return (strcmp(((const KEY *)a)->name, ((const KEY *)b)->name));
  }
  
@@ -226,14 +166,14 @@
  char *
  flags_to_string(u_long fflags)
  {
-@@ -122,3 +123,4 @@ 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 @@ typedef struct _node {
+@@ -42,7 +42,16 @@
  	struct _node	*parent, *child;	/* up, down */
  	struct _node	*prev, *next;		/* left, right */
  	off_t	st_size;			/* size */
@@ -251,19 +191,9 @@
  	u_long	cksum;				/* check sum */
  	char	*md5digest;			/* MD5 digest */
  	char	*sha1digest;			/* SHA-1 digest */
-@@ -51,6 +60,9 @@ typedef struct _node {
- 	char	*slink;				/* symbolic link reference */
- 	uid_t	st_uid;				/* uid */
- 	gid_t	st_gid;				/* gid */
-+#ifndef S_ISTXT
-+#define S_ISTXT S_ISVTX
-+#endif
- #define	MBITS	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
- 	mode_t	st_mode;			/* mode */
- 	u_long	st_flags;			/* flags */
 --- a/src/usr.sbin/mtree/spec.c
 +++ b/src/usr.sbin/mtree/spec.c
-@@ -204,12 +204,14 @@ set(char *t, NODE *ip)
+@@ -204,12 +204,14 @@
  			if(!ip->rmd160digest)
  				errx(1, "strdup");
  			break;
@@ -278,7 +208,7 @@
  		case F_GID:
  			ip->st_gid = strtoul(val, &ep, 10);
  			if (*ep)
-@@ -252,20 +254,22 @@ set(char *t, NODE *ip)
+@@ -252,20 +254,22 @@
  			if (strunvis(ip->slink, val) == -1)
  				errx(1, "symlink %s is ill-encoded", val);
  			break;
@@ -306,7 +236,7 @@
  			case 'b':
 --- a/src/usr.sbin/mtree/specspec.c
 +++ b/src/usr.sbin/mtree/specspec.c
-@@ -150,8 +150,10 @@ compare_nodes(NODE *n1, NODE *n2, char c
+@@ -150,8 +150,10 @@
  		differs |= F_SIZE;
  	if (FS(n1, n2, F_SLINK, slink))
  		differs |= F_SLINK;
@@ -320,7 +250,7 @@
  	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 @@ miss(NODE *p, char *tail)
+@@ -251,9 +251,11 @@
  		if (chmod(path, p->st_mode))
  			(void)printf("%s: permissions not set: %s\n",
  			    path, strerror(errno));

Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -9,7 +9,7 @@
 
 --- a/src/share/mk/bsd.incs.mk
 +++ b/src/share/mk/bsd.incs.mk
-@@ -41,7 +41,7 @@ ${group}NAME_${header:T}?=	${header:T}
+@@ -41,7 +41,7 @@
  .endif
  installincludes: _${group}INS_${header:T}
  _${group}INS_${header:T}: ${header}
@@ -18,7 +18,7 @@
  	    -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}
+@@ -53,10 +53,10 @@
  installincludes: _${group}INS
  _${group}INS: ${_${group}INCS}
  .if defined(${group}NAME)
@@ -33,7 +33,7 @@
  .endif
 --- a/src/share/mk/bsd.info.mk
 +++ b/src/share/mk/bsd.info.mk
-@@ -73,7 +73,7 @@ MAKEINFO?=	makeinfo
+@@ -73,7 +73,7 @@
  MAKEINFOFLAGS+=	--no-split # simplify some things, e.g., compression
  SRCDIR?=	${.CURDIR}
  INFODIRFILE?=   dir
@@ -42,7 +42,7 @@
  INSTALLINFOFLAGS+=--quiet
  INFOSECTION?=   Miscellaneous
  ICOMPRESS_CMD?=	${COMPRESS_CMD}
-@@ -143,18 +143,8 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
+@@ -143,18 +143,8 @@
  .for x in ${INFO}
  INSTALLINFODIRS+= ${x:S/$/-install/}
  ${x:S/$/-install/}:
@@ -65,7 +65,7 @@
  .PHONY: ${INSTALLINFODIRS}
 --- a/src/share/mk/bsd.lib.mk
 +++ b/src/share/mk/bsd.lib.mk
-@@ -161,9 +161,9 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+@@ -161,9 +161,9 @@
  	@${ECHO} building static ${LIB} library
  	@rm -f ${.TARGET}
  .if !defined(NM)
@@ -77,7 +77,7 @@
  .endif
  	${RANLIB} ${.TARGET}
  .endif
-@@ -178,9 +178,9 @@ lib${LIB}_p.a: ${POBJS}
+@@ -178,9 +178,9 @@
  	@${ECHO} building profiled ${LIB} library
  	@rm -f ${.TARGET}
  .if !defined(NM)
@@ -89,7 +89,7 @@
  .endif
  	${RANLIB} ${.TARGET}
  .endif
-@@ -197,16 +197,16 @@ ${SHLIB_NAME}: ${SOBJS}
+@@ -197,16 +197,16 @@
  	@${ECHO} building shared library ${SHLIB_NAME}
  	@rm -f ${.TARGET} ${SHLIB_LINK}
  .if defined(SHLIB_LINK)
@@ -109,7 +109,7 @@
  .endif
  .if defined(CTFMERGE)
  	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -276,11 +276,11 @@ realinstall: _libinstall
+@@ -276,11 +276,11 @@
  .ORDER: beforeinstall _libinstall
  _libinstall:
  .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -125,7 +125,7 @@
  .if defined(SHLIB_NAME)
 --- a/src/share/mk/bsd.man.mk
 +++ b/src/share/mk/bsd.man.mk
-@@ -211,12 +211,12 @@ _maninstall: ${MAN}
+@@ -211,12 +211,12 @@
  			[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
  		esac; \
  		name=$$1; shift; sect=$$1; shift; \
@@ -140,7 +140,7 @@
  	done
  .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
  	@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
-@@ -226,12 +226,12 @@ _maninstall: ${MAN}
+@@ -226,12 +226,12 @@
  			[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
  		esac; \
  		name=$$1; shift; sect=$$1; shift; \
@@ -175,7 +175,7 @@
  #
  # SHAREMODE	ASCII text file mode. [${NOBINMODE}]
  #
-@@ -113,7 +113,7 @@ SRCCONF?=	/etc/src.conf
+@@ -113,7 +113,7 @@
  
  # Binaries
  BINOWN?=	root
@@ -184,7 +184,7 @@
  BINMODE?=	555
  NOBINMODE?=	444
  
-@@ -139,7 +139,7 @@ LIBMODE?=	${NOBINMODE}
+@@ -139,7 +139,7 @@
  # Share files
  SHAREDIR?=	/usr/share
  SHAREOWN?=	root

Modified: trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/02_libbsd.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/02_libbsd.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -1,28 +1,6 @@
----
- src/share/mk/version_gen.awk    |    2 +-
- src/usr.bin/file2c/Makefile     |    1 +
- src/usr.bin/file2c/file2c.c     |    1 +
- src/usr.bin/make/Makefile       |    1 +
- src/usr.bin/make/arch.c         |    3 ++-
- src/usr.bin/make/dir.h          |    2 +-
- src/usr.bin/make/job.c          |    3 ++-
- src/usr.bin/make/main.c         |    3 ++-
- src/usr.bin/make/shell.c        |    2 +-
- src/usr.bin/make/shell.h        |    2 +-
- src/usr.bin/make/suff.c         |    2 +-
- src/usr.bin/yacc/test/ftp.tab.c |    6 +++---
- src/usr.bin/yacc/test/ftp.y     |    6 +++---
- src/usr.sbin/config/Makefile    |    2 +-
- src/usr.sbin/config/config.h    |    2 +-
- src/usr.sbin/config/mkoptions.c |    1 +
- src/usr.sbin/mtree/Makefile     |    1 +
- src/usr.sbin/mtree/excludes.c   |    3 ++-
- src/usr.sbin/mtree/spec.c       |    1 +
- 19 files changed, 27 insertions(+), 17 deletions(-)
-
 --- a/src/share/mk/version_gen.awk
 +++ b/src/share/mk/version_gen.awk
-@@ -43,7 +43,7 @@ BEGIN {
+@@ -43,7 +43,7 @@
  	version_count = 0;
  	current_version = "";
  	stderr = "/dev/stderr";
@@ -31,118 +9,9 @@
  		# Strip comments.
  		sub("#.*$", "", $0);
  
---- a/src/usr.bin/file2c/file2c.c
-+++ b/src/usr.bin/file2c/file2c.c
-@@ -10,6 +10,7 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- 
-+#include <bsd/stdlib.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
---- a/src/usr.bin/file2c/Makefile
-+++ b/src/usr.bin/file2c/Makefile
-@@ -1,5 +1,6 @@
- # $FreeBSD$
- 
- PROG=	file2c
-+LDADD= -lbsd
- WARNS?=	6
- .include <bsd.prog.mk>
---- a/src/usr.bin/make/arch.c
-+++ b/src/usr.bin/make/arch.c
-@@ -88,7 +88,8 @@ __FBSDID("$FreeBSD$");
-  */
- 
- #include <sys/param.h>
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/string.h>
- #include <sys/types.h>
- #include <ar.h>
- #include <ctype.h>
---- a/src/usr.bin/make/dir.h
-+++ b/src/usr.bin/make/dir.h
-@@ -43,7 +43,7 @@
- #ifndef dir_h_6002e3b8
- #define	dir_h_6002e3b8
- 
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include "hash.h"
- 
- struct GNode;
---- a/src/usr.bin/make/job.c
-+++ b/src/usr.bin/make/job.c
-@@ -101,7 +101,8 @@ __FBSDID("$FreeBSD$");
-  *			    thems as need creatin'
-  */
- 
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/stdlib.h>
- #include <sys/types.h>
- #include <sys/select.h>
- #include <sys/stat.h>
---- a/src/usr.bin/make/main.c
-+++ b/src/usr.bin/make/main.c
-@@ -65,7 +65,8 @@ __FBSDID("$FreeBSD$");
- #include <sys/stat.h>
- #include <sys/sysctl.h>
- #include <sys/time.h>
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/err.h>
- #include <sys/resource.h>
- #include <sys/utsname.h>
- #include <sys/wait.h>
---- a/src/usr.bin/make/shell.c
-+++ b/src/usr.bin/make/shell.c
-@@ -40,7 +40,7 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- 
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- a/src/usr.bin/make/shell.h
-+++ b/src/usr.bin/make/shell.h
-@@ -42,7 +42,7 @@
- #ifndef shell_h_6002e3b8
- #define	shell_h_6002e3b8
- 
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- 
- #include "str.h"
- #include "util.h"
---- a/src/usr.bin/make/suff.c
-+++ b/src/usr.bin/make/suff.c
-@@ -90,7 +90,7 @@ __FBSDID("$FreeBSD$");
-  *	    	  	    	if the target had no implicit sources.
-  */
- 
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include <assert.h>
- #include <string.h>
- #include <stdlib.h>
---- a/src/usr.bin/make/Makefile
-+++ b/src/usr.bin/make/Makefile
-@@ -7,6 +7,7 @@ CFLAGS+=-I${.CURDIR}
- 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
-+LDFLAGS= -lbsd
- 
- WARNS?=	6
- NO_SHARED?=	YES
 --- a/src/usr.bin/yacc/test/ftp.tab.c
 +++ b/src/usr.bin/yacc/test/ftp.tab.c
-@@ -490,10 +490,10 @@ lookup(p, cmd)
+@@ -490,10 +490,10 @@
  #include <arpa/telnet.h>
  
  /*
@@ -155,7 +24,7 @@
  	char *s;
  	register FILE *iop;
  {
-@@ -584,7 +584,7 @@ yylex()
+@@ -584,7 +584,7 @@
  		case CMD:
  			(void) signal(SIGALRM, toolong);
  			(void) alarm((unsigned) timeout);
@@ -166,7 +35,7 @@
  			}
 --- a/src/usr.bin/yacc/test/ftp.y
 +++ b/src/usr.bin/yacc/test/ftp.y
-@@ -750,10 +750,10 @@ lookup(p, cmd)
+@@ -750,10 +750,10 @@
  #include <arpa/telnet.h>
  
  /*
@@ -179,7 +48,7 @@
  	char *s;
  	register FILE *iop;
  {
-@@ -844,7 +844,7 @@ yylex()
+@@ -844,7 +844,7 @@
  		case CMD:
  			(void) signal(SIGALRM, toolong);
  			(void) alarm((unsigned) timeout);
@@ -188,67 +57,3 @@
  				reply(221, "You could at least say goodbye.");
  				dologout(0);
  			}
---- a/src/usr.sbin/config/config.h
-+++ b/src/usr.sbin/config/config.h
-@@ -34,7 +34,7 @@
-  * Config.
-  */
- #include <sys/types.h>
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include <stdlib.h>
- #include <string.h>
- 
---- a/src/usr.sbin/config/mkoptions.c
-+++ b/src/usr.sbin/config/mkoptions.c
-@@ -40,6 +40,7 @@ static const char rcsid[] =
-  * Make all the .h files for the optional entries
-  */
- 
-+#include <bsd/string.h>
- #include <ctype.h>
- #include <err.h>
- #include <stdio.h>
---- a/src/usr.sbin/config/Makefile
-+++ b/src/usr.sbin/config/Makefile
-@@ -13,7 +13,7 @@ WARNS?=	6
- CFLAGS+= -I. -I${.CURDIR}
- 
- DPADD=	${LIBL} ${LIBSBUF}
--LDADD=	-ll -lsbuf
-+LDADD=	-ll -lsbuf -lbsd
- 
- CLEANFILES+=	kernconf.c
- 
---- a/src/usr.sbin/mtree/excludes.c
-+++ b/src/usr.sbin/mtree/excludes.c
-@@ -32,7 +32,8 @@ __FBSDID("$FreeBSD$");
- 
- #include <sys/types.h>
- #include <sys/time.h>		/* XXX for mtree.h */
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/stdio.h>
- 
- #include <err.h>
- #include <fnmatch.h>
---- a/src/usr.sbin/mtree/spec.c
-+++ b/src/usr.sbin/mtree/spec.c
-@@ -35,6 +35,7 @@ static char sccsid[] = "@(#)spec.c	8.1 (
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- 
-+#include <bsd/stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <ctype.h>
---- a/src/usr.sbin/mtree/Makefile
-+++ b/src/usr.sbin/mtree/Makefile
-@@ -7,6 +7,7 @@ PROG=	mtree
- MAN=	mtree.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
- 
- WARNS?=	4
- 

Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -1,25 +1,6 @@
----
- src/usr.bin/make/cond.c       |    4 ++--
- src/usr.bin/make/job.c        |    4 ++--
- src/usr.bin/make/parse.c      |   12 ++++++------
- src/usr.bin/make/proc.h       |    2 +-
- src/usr.bin/make/shell.c      |    2 +-
- src/usr.bin/make/util.c       |    2 +-
- src/usr.bin/make/util.h       |    8 ++++----
- src/usr.bin/make/var.c        |    8 ++++----
- src/usr.bin/yacc/defs.h       |    3 +++
- src/usr.bin/yacc/main.c       |    4 ++--
- src/usr.sbin/btxld/btx.h      |    1 +
- src/usr.sbin/btxld/elfh.c     |    1 +
- src/usr.sbin/btxld/elfh.h     |    2 +-
- src/usr.sbin/mtree/Makefile   |    4 ----
- src/usr.sbin/mtree/compare.c  |    2 +-
- src/usr.sbin/mtree/specspec.c |    2 --
- 16 files changed, 30 insertions(+), 31 deletions(-)
-
 --- a/src/usr.sbin/mtree/specspec.c
 +++ b/src/usr.sbin/mtree/specspec.c
-@@ -84,8 +84,6 @@ shownode(NODE *n, int f, char const *pat
+@@ -84,8 +84,6 @@
  		printf(" rmd160digest=%s", n->rmd160digest);
  	if (f & F_SHA256)
  		printf(" sha256digest=%s", n->sha256digest);
@@ -30,7 +11,7 @@
  
 --- a/src/usr.bin/make/cond.c
 +++ b/src/usr.bin/make/cond.c
-@@ -1115,7 +1115,7 @@ Cond_If(char *line, int code, int lineno
+@@ -1115,7 +1115,7 @@
   *	Handle .else statement.
   */
  void
@@ -39,7 +20,7 @@
  {
  
  	while (isspace((u_char)*line))
-@@ -1156,7 +1156,7 @@ Cond_Else(char *line __unused, int code
+@@ -1156,7 +1156,7 @@
   *	Handle .endif statement.
   */
  void
@@ -50,7 +31,7 @@
  	while (isspace((u_char)*line))
 --- a/src/usr.bin/make/job.c
 +++ b/src/usr.bin/make/job.c
-@@ -479,7 +479,7 @@ mkfifotemp(char *template)
+@@ -478,7 +478,7 @@
  }
  
  static void
@@ -59,7 +40,7 @@
  {
  }
  
-@@ -2195,7 +2195,7 @@ Job_CatchChildren(Boolean block)
+@@ -2194,7 +2194,7 @@
   */
  void
  #ifdef USE_KQUEUE
@@ -70,7 +51,7 @@
  #endif
 --- a/src/usr.bin/make/parse.c
 +++ b/src/usr.bin/make/parse.c
-@@ -2210,13 +2210,13 @@ xparse_include(char *file, int sinclude)
+@@ -2210,13 +2210,13 @@
  }
  
  static void
@@ -86,7 +67,7 @@
  {
  	xparse_include(file, 1);
  }
-@@ -2230,7 +2230,7 @@ parse_sinclude(char *file, int code __un
+@@ -2230,7 +2230,7 @@
   *	a warning if the directive is malformed.
   */
  static void
@@ -95,7 +76,7 @@
  {
  
  	if (!isspace((u_char)*line)) {
-@@ -2257,7 +2257,7 @@ parse_message(char *line, int iserror, i
+@@ -2257,7 +2257,7 @@
   *	Parse an .undef directive.
   */
  static void
@@ -104,7 +85,7 @@
  {
  	char *cp;
  
-@@ -2279,7 +2279,7 @@ parse_undef(char *line, int code __unuse
+@@ -2279,7 +2279,7 @@
   *	Parse a .for directive.
   */
  static void
@@ -113,7 +94,7 @@
  {
  
  	if (!For_For(line)) {
-@@ -2311,7 +2311,7 @@ parse_for(char *line, int code __unused,
+@@ -2311,7 +2311,7 @@
   *	Parse endfor. This may only happen if there was no matching .for.
   */
  static void
@@ -122,19 +103,9 @@
  {
  
  	Parse_Error(PARSE_FATAL, "for-less endfor");
---- a/src/usr.bin/make/proc.h
-+++ b/src/usr.bin/make/proc.h
-@@ -48,6 +48,6 @@ typedef struct ProcStuff {
- 	pid_t	child_pid;
- } ProcStuff;
- 
--void Proc_Exec(const ProcStuff *) __dead2;
-+void Proc_Exec(const ProcStuff *);
- 
- #endif /* proc_h_458845848 */
 --- a/src/usr.bin/make/shell.c
 +++ b/src/usr.bin/make/shell.c
-@@ -120,7 +120,7 @@ struct Shell *commandShell;
+@@ -120,7 +120,7 @@
   */
  static struct Shells shells = TAILQ_HEAD_INITIALIZER(shells);
  
@@ -143,37 +114,9 @@
  
  /**
   * Helper function for sorting the builtin list alphabetically.
---- a/src/usr.bin/make/util.c
-+++ b/src/usr.bin/make/util.c
-@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
- #include "targ.h"
- #include "util.h"
- 
--static void enomem(void) __dead2;
-+static void enomem(void);
- 
- /*-
-  * Debug --
---- a/src/usr.bin/make/util.h
-+++ b/src/usr.bin/make/util.h
-@@ -103,10 +103,10 @@ do {						\
- void Debug(const char *, ...);
- void DebugM(const char *, ...);
- void Error(const char *, ...);
--void Fatal(const char *, ...) __dead2;
--void Punt(const char *, ...) __dead2;
--void DieHorribly(void) __dead2;
--void Finish(int) __dead2;
-+void Fatal(const char *, ...);
-+void Punt(const char *, ...);
-+void DieHorribly(void);
-+void Finish(int);
- char *estrdup(const char *);
- void *emalloc(size_t);
- void *erealloc(void *, size_t);
 --- a/src/usr.bin/make/var.c
 +++ b/src/usr.bin/make/var.c
-@@ -248,7 +248,7 @@ VarDestroy(Var *v, Boolean f)
+@@ -248,7 +248,7 @@
   *	The trimmed word is added to the buffer.
   */
  static Boolean
@@ -182,7 +125,7 @@
  {
  	char *slash;
  
-@@ -283,7 +283,7 @@ VarHead(const char *word, Boolean addSpa
+@@ -283,7 +283,7 @@
   *	The trimmed word is added to the buffer.
   */
  static Boolean
@@ -191,7 +134,7 @@
  {
  	const char *slash;
  
-@@ -312,7 +312,7 @@ VarTail(const char *word, Boolean addSpa
+@@ -312,7 +312,7 @@
   *	The suffix from the word is placed in the buffer.
   */
  static Boolean
@@ -200,7 +143,7 @@
  {
  	const char *dot;
  
-@@ -340,7 +340,7 @@ VarSuffix(const char *word, Boolean addS
+@@ -340,7 +340,7 @@
   *	The trimmed word is added to the buffer.
   */
  static Boolean
@@ -211,17 +154,8 @@
  
 --- a/src/usr.bin/yacc/main.c
 +++ b/src/usr.bin/yacc/main.c
-@@ -114,7 +114,7 @@ static void usage(void);
+@@ -128,7 +128,7 @@
  
- volatile sig_atomic_t sigdie;
- 
--__dead2 void
-+ void
- done(k)
- int k;
- {
-@@ -128,7 +128,7 @@ int k;
- 
  static void
  onintr(signo)
 -	int signo __unused;
@@ -231,7 +165,7 @@
      done(1);
 --- a/src/usr.sbin/mtree/compare.c
 +++ b/src/usr.sbin/mtree/compare.c
-@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
+@@ -72,7 +72,7 @@
  	}
  
  int
@@ -240,26 +174,6 @@
  {
  	struct timeval tv[2];
  	uint32_t val;
---- a/src/usr.sbin/btxld/btx.h
-+++ b/src/usr.sbin/btxld/btx.h
-@@ -30,6 +30,7 @@
- #define _BTX_H_
- 
- #include <sys/types.h>
-+#include <stdint.h>
- 
- #define BTX_PGSIZE	0x1000		/* Page size */
- #define BTX_PGBASE	0x5000		/* Start of page tables */
---- a/src/usr.sbin/btxld/elfh.c
-+++ b/src/usr.sbin/btxld/elfh.c
-@@ -30,6 +30,7 @@
- #include <sys/endian.h>
- 
- #include <stddef.h>
-+#include <stdint.h>
- #include "elfh.h"
- 
- #define SET_ME	0xeeeeeeee    /* filled in by btxld */
 --- a/src/usr.sbin/btxld/elfh.h
 +++ b/src/usr.sbin/btxld/elfh.h
 @@ -26,7 +26,7 @@
@@ -273,7 +187,7 @@
      Elf32_Ehdr e;		/* ELF header */
 --- a/src/usr.sbin/mtree/Makefile
 +++ b/src/usr.sbin/mtree/Makefile
-@@ -11,8 +11,4 @@ LDADD= -lbsd
+@@ -10,8 +10,4 @@
  
  WARNS?=	4
  
@@ -282,15 +196,3 @@
 -LDADD=	-lmd
 -
  .include <bsd.prog.mk>
---- a/src/usr.bin/yacc/defs.h
-+++ b/src/usr.bin/yacc/defs.h
-@@ -42,6 +42,9 @@
- #include <err.h>
- #include <stdio.h>
- 
-+#ifndef __dead2
-+# define __dead2
-+#endif
- 
- /*  machine-dependent definitions			*/
- /*  the following definitions are for the Tahoe		*/

Deleted: trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -1,47 +0,0 @@
----
- src/usr.sbin/btxld/btxld.c  |    1 -
- src/usr.sbin/btxld/elfh.c   |    1 -
- src/usr.sbin/kgzip/elfhdr.c |    1 -
- src/usr.sbin/kgzip/kgzld.c  |    1 -
- 4 files changed, 4 deletions(-)
-
---- a/src/usr.sbin/btxld/btxld.c
-+++ b/src/usr.sbin/btxld/btxld.c
-@@ -30,7 +30,6 @@ static const char rcsid[] =
- #endif /* not lint */
- 
- #include <sys/param.h>
--#include <sys/endian.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
- 
---- a/src/usr.sbin/btxld/elfh.c
-+++ b/src/usr.sbin/btxld/elfh.c
-@@ -27,7 +27,6 @@
-  */
- 
- #include <sys/types.h>
--#include <sys/endian.h>
- 
- #include <stddef.h>
- #include <stdint.h>
---- a/src/usr.sbin/kgzip/elfhdr.c
-+++ b/src/usr.sbin/kgzip/elfhdr.c
-@@ -26,7 +26,6 @@
-  * $FreeBSD$
-  */
- 
--#include <sys/endian.h>
- #include <stddef.h>
- #include "elfhdr.h"
- 
---- a/src/usr.sbin/kgzip/kgzld.c
-+++ b/src/usr.sbin/kgzip/kgzld.c
-@@ -27,7 +27,6 @@
-  */
- 
- #include <sys/types.h>
--#include <sys/endian.h>
- #include <sys/wait.h>
- 
- #include <err.h>

Modified: trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -32,7 +32,7 @@
  		skel.c sym.c tblcmp.c yylex.c
 --- a/src/usr.bin/yacc/Makefile
 +++ b/src/usr.bin/yacc/Makefile
-@@ -6,7 +6,7 @@ SRCS=	closure.c error.c lalr.c lr0.c mai
+@@ -6,7 +6,7 @@
  	skeleton.c symtab.c verbose.c warshall.c
  SCRIPTS=yyfix.sh
  MAN=	yacc.1 yyfix.1

Modified: trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -10,7 +10,7 @@
 
 --- a/src/usr.bin/make/arch.c
 +++ b/src/usr.bin/make/arch.c
-@@ -192,6 +192,10 @@ Boolean arch_fatal = TRUE;
+@@ -191,6 +191,10 @@
  		Error ARGS;					\
      } while (0)
  
@@ -23,7 +23,7 @@
   * Arch_ParseArchive --
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -249,6 +249,9 @@ ReadMakefile(const char p[])
+@@ -248,6 +248,9 @@
  {
  	char *fname, *fnamesave;	/* makefile to read */
  	FILE *stream;
@@ -35,7 +35,7 @@
  	int setMAKEFILE;
 --- a/src/usr.sbin/config/main.c
 +++ b/src/usr.sbin/config/main.c
-@@ -71,6 +71,10 @@ static const char rcsid[] =
+@@ -71,6 +71,10 @@
  #define FALSE	(0)
  #endif
  
@@ -48,7 +48,7 @@
  char *	PREFIX;
 --- a/src/usr.sbin/config/mkmakefile.c
 +++ b/src/usr.sbin/config/mkmakefile.c
-@@ -65,6 +65,10 @@ static const char rcsid[] =
+@@ -65,6 +65,10 @@
  		wd = word; \
  	}
  
@@ -61,7 +61,7 @@
  static void do_rules(FILE *);
 --- a/src/usr.sbin/config/mkoptions.c
 +++ b/src/usr.sbin/config/mkoptions.c
-@@ -49,6 +49,10 @@ static const char rcsid[] =
+@@ -48,6 +48,10 @@
  #include "config.h"
  #include "y.tab.h"
  
@@ -74,7 +74,7 @@
  	int	u_min;
 --- a/src/usr.sbin/mtree/create.c
 +++ b/src/usr.sbin/mtree/create.c
-@@ -67,6 +67,10 @@ __FBSDID("$FreeBSD$");
+@@ -67,6 +67,10 @@
  #define	INDENTNAMELEN	15
  #define	MAXLINELEN	80
  
@@ -87,7 +87,7 @@
  static mode_t mode;
 --- a/src/usr.sbin/mtree/extern.h
 +++ b/src/usr.sbin/mtree/extern.h
-@@ -57,6 +57,7 @@ extern int ftsoptions;
+@@ -54,6 +54,7 @@
  extern u_int keys;
  extern int lineno;
  extern int dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, wflag;

Modified: trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/09_ports_path.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/09_ports_path.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -6,7 +6,7 @@
 
 --- a/ports/Mk/bsd.port.mk
 +++ b/ports/Mk/bsd.port.mk
-@@ -3487,7 +3487,7 @@ check-vulnerable:
+@@ -3487,7 +3487,7 @@
  .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
  	@if [ -f "${AUDITFILE}" ]; then \
  		audit_created=`${_EXTRACT_AUDITFILE} | \
@@ -15,7 +15,7 @@
  		audit_expiry=`/bin/date -u -v-14d "+%Y%m%d"`; \
  		if [ "$$audit_created" -lt "$$audit_expiry" ]; then \
  			${ECHO_MSG} "===>  WARNING: Vulnerability database out of date, checking anyway"; \
-@@ -3591,7 +3591,7 @@ do-fetch:
+@@ -3591,7 +3591,7 @@
  	@cd ${_DISTDIR};\
  	${_PATCH_SITES_ENV} ; \
  	for _file in ${PATCHFILES}; do \
@@ -24,7 +24,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		force_fetch=false; \
  		filebasename=$${file##*/}; \
-@@ -4732,7 +4732,7 @@ fetch-list:
+@@ -4732,7 +4732,7 @@
  	@(cd ${_DISTDIR}; \
  	 ${_MASTER_SITES_ENV} ; \
  	 for _file in ${DISTFILES}; do \
@@ -33,7 +33,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		if [ ! -f $$file -a ! -f $${file##*/} ]; then \
  			if [ ! -z "$$select" ] ; then \
-@@ -4769,7 +4769,7 @@ fetch-list:
+@@ -4769,7 +4769,7 @@
  	@(cd ${_DISTDIR}; \
  	 ${_PATCH_SITES_ENV} ; \
  	 for _file in ${PATCHFILES}; do \
@@ -42,7 +42,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		if [ ! -f $$file -a ! -f $${file##*/} ]; then \
  			if [ ! -z "$$select" ] ; then \
-@@ -4805,7 +4805,7 @@ fetch-url-list-int:
+@@ -4805,7 +4805,7 @@
  	@(cd ${_DISTDIR}; \
  	${_MASTER_SITES_ENV}; \
  	for _file in ${DISTFILES}; do \
@@ -51,7 +51,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
  			if [ ! -z "$$select" ] ; then \
-@@ -4836,7 +4836,7 @@ fetch-url-list-int:
+@@ -4836,7 +4836,7 @@
  	@(cd ${_DISTDIR}; \
  	${_PATCH_SITES_ENV} ; \
  	for _file in ${PATCHFILES}; do \
@@ -60,7 +60,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
  			if [ ! -z "$$select" ] ; then \
-@@ -5222,7 +5222,7 @@ lib-depends:
+@@ -5222,7 +5222,7 @@
  .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
  	@for i in ${LIB_DEPENDS}; do \
  		lib=$${i%%:*}; \
@@ -69,7 +69,7 @@
  		dir=$${i#*:}; \
  		target=$${i##*:}; \
  		if ${TEST} $$dir = $$target; then \
-@@ -5486,7 +5486,7 @@ build-depends-list:
+@@ -5486,7 +5486,7 @@
  .endif
  
  BUILD-DEPENDS-LIST= \
@@ -78,7 +78,7 @@
  		if [ -d $$dir ]; then \
  			${ECHO_CMD} $$dir; \
  		else \
-@@ -5767,7 +5767,7 @@ generate-plist:
+@@ -5767,7 +5767,7 @@
  	done
  	@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
  .endif
@@ -87,7 +87,7 @@
  		${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
  	done
  .endfor
-@@ -5822,7 +5822,7 @@ ${TMPPLIST}:
+@@ -5822,7 +5822,7 @@
  add-plist-docs:
  .if defined(PORTDOCS) && !defined(NOPORTDOCS)
  	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -96,7 +96,7 @@
  		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
  	fi
  .for x in ${PORTDOCS}
-@@ -5845,7 +5845,7 @@ add-plist-docs:
+@@ -5845,7 +5845,7 @@
  add-plist-examples:
  .if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
  	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -105,7 +105,7 @@
  		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
  	fi
  .for x in ${PORTEXAMPLES}
-@@ -5869,7 +5869,7 @@ add-plist-examples:
+@@ -5869,7 +5869,7 @@
  add-plist-data:
  .if defined(PORTDATA) && !defined(NOPORTDATA)
  	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \

Modified: trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -4,7 +4,7 @@
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -949,11 +949,11 @@ main(int argc, char **argv)
+@@ -948,11 +948,11 @@
  	 * run-time.
  	 */
  	if (machine == NULL) {

Deleted: trunk/freebsd-buildutils/debian/patches/11_optreset.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/11_optreset.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/11_optreset.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -1,24 +0,0 @@
----
- src/usr.bin/make/main.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/src/usr.bin/make/main.c
-+++ b/src/usr.bin/make/main.c
-@@ -148,6 +148,8 @@ uint32_t	warn_nocmd;	/* command line no-
- time_t		now;		/* Time at start of make */
- struct GNode	*DEFAULT;	/* .DEFAULT node */
- 
-+#include <bsd/getopt.h>		/* optreset */
-+
- /**
-  * Exit with usage message.
-  */
-@@ -381,7 +383,7 @@ rearg:
- 		if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
- 			found_dd = TRUE;
- 		}
--		if ((c = getopt(argc, argv, OPTFLAGS)) == -1) {
-+		if ((c = bsd_getopt(argc, argv, OPTFLAGS)) == -1) {
- 			break;
- 		}
- 		switch(c) {

Deleted: trunk/freebsd-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/14_config.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/14_config.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -1,76 +0,0 @@
----
- src/sys/kern/subr_sbuf.c     |    4 ++--
- src/sys/sys/sbuf.h           |    9 ++++-----
- src/usr.sbin/config/Makefile |    4 ++--
- src/usr.sbin/config/main.c   |    2 ++
- 4 files changed, 10 insertions(+), 9 deletions(-)
-
---- a/src/sys/sys/sbuf.h
-+++ b/src/sys/sys/sbuf.h
-@@ -31,7 +31,8 @@
- #ifndef _SYS_SBUF_H_
- #define	_SYS_SBUF_H_
- 
--#include <sys/_types.h>
-+#include <stdarg.h>
-+#include <sys/types.h>
- 
- /*
-  * Structure definition
-@@ -64,10 +65,8 @@ int		 sbuf_bcat(struct sbuf *, const voi
- int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
- int		 sbuf_cat(struct sbuf *, const char *);
- int		 sbuf_cpy(struct sbuf *, const char *);
--int		 sbuf_printf(struct sbuf *, const char *, ...)
--	__printflike(2, 3);
--int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
--	__printflike(2, 0);
-+int		 sbuf_printf(struct sbuf *, const char *, ...);
-+int		 sbuf_vprintf(struct sbuf *, const char *, va_list);
- int		 sbuf_putc(struct sbuf *, int);
- int		 sbuf_trim(struct sbuf *);
- int		 sbuf_overflowed(struct sbuf *);
---- a/src/sys/kern/subr_sbuf.c
-+++ b/src/sys/kern/subr_sbuf.c
-@@ -77,8 +77,8 @@ static MALLOC_DEFINE(M_SBUF, "sbuf", "st
- #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
- 
- #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
--#define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
--#define	SBUF_MAXEXTENDINCR	PAGE_SIZE
-+#define	SBUF_MAXEXTENDSIZE	4096
-+#define	SBUF_MAXEXTENDINCR	SBUF_MAXEXTENDSIZE
- 
- /*
-  * Debugging support
---- a/src/usr.sbin/config/Makefile
-+++ b/src/usr.sbin/config/Makefile
-@@ -4,7 +4,7 @@
- PROG=	config
- MAN=	config.5 config.8
- SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
--	mkoptions.c y.tab.h kernconf.c
-+	mkoptions.c y.tab.h kernconf.c subr_sbuf.c
- 
- kernconf.c: kernconf.tmpl
- 	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
-@@ -13,7 +13,7 @@ WARNS?=	6
- CFLAGS+= -I. -I${.CURDIR}
- 
- DPADD=	${LIBL} ${LIBSBUF}
--LDADD=	-ll -lsbuf -lbsd
-+LDADD=	-ll -lbsd
- 
- CLEANFILES+=	kernconf.c
- 
---- a/src/usr.sbin/config/main.c
-+++ b/src/usr.sbin/config/main.c
-@@ -43,6 +43,8 @@ static const char rcsid[] =
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <bsd/string.h>
-+#include <stdarg.h>
- #include <sys/sbuf.h>
- #include <sys/file.h>
- #include <sys/mman.h>

Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -4,7 +4,7 @@
 
 --- a/src/share/mk/bsd.own.mk
 +++ b/src/share/mk/bsd.own.mk
-@@ -169,7 +169,7 @@ INCLUDEDIR?=	/usr/include
+@@ -169,7 +169,7 @@
  STRIP?=		-s
  .endif
  

Modified: trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -12,7 +12,7 @@
  	@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__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c
++	cc $(shell pkg-config --cflags libbsd-overlay) -DDEFSHELLNAME=\"sh\" -I. -c *.c
 +	cc *.o -lbsd -o pmake
  	@echo 'make completed.'
  

Modified: trunk/freebsd-buildutils/debian/patches/17_multiarch.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/17_multiarch.diff	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/17_multiarch.diff	2011-06-26 15:18:52 UTC (rev 3486)
@@ -7,7 +7,7 @@
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -861,6 +861,7 @@ main(int argc, char **argv)
+@@ -858,6 +858,7 @@
  {
  	const char *machine;
  	const char *machine_arch;
@@ -15,7 +15,7 @@
  	const char *machine_cpu;
  	Boolean outOfDate = TRUE;	/* FALSE if all targets up to date */
  	const char *p;
-@@ -947,8 +948,8 @@ main(int argc, char **argv)
+@@ -944,8 +945,8 @@
  	 * so we can share an executable for similar machines.
  	 * (i.e. m68k: amiga hp300, mac68k, sun3, ...)
  	 *
@@ -26,7 +26,7 @@
  	 */
  	if (machine == NULL) {
  #ifdef MACHINE_ARCH
-@@ -966,6 +967,14 @@ main(int argc, char **argv)
+@@ -963,6 +964,14 @@
  #endif
  	}
  
@@ -41,7 +41,7 @@
  	/*
  	 * Set machine_cpu to the minumum supported CPU revision based
  	 * on the target architecture, if not already set.
-@@ -1008,6 +1017,7 @@ main(int argc, char **argv)
+@@ -1005,6 +1014,7 @@
  	Var_SetGlobal("MFLAGS", "");
  	Var_SetGlobal("MACHINE", machine);
  	Var_SetGlobal("MACHINE_ARCH", machine_arch);
@@ -51,7 +51,7 @@
  	Var_SetGlobal("MAKE_VERSION", MAKE_VERSION);
 --- a/src/usr.bin/make/make.1
 +++ b/src/usr.bin/make/make.1
-@@ -815,6 +815,12 @@ if not defined.
+@@ -815,6 +815,12 @@
  Name of the machine architecture
  .Nm
  was compiled for, defined at compilation time.
@@ -76,7 +76,7 @@
  # LIBCOMPATDIR	Base path for compat libraries. [/usr/lib/compat]
  #
  # LIBDATADIR	Base path for misc. utility data files. [/usr/libdata]
-@@ -127,6 +130,7 @@ KMODGRP?=	${BINGRP}
+@@ -127,6 +130,7 @@
  KMODMODE?=	${BINMODE}
  
  LIBDIR?=	/usr/lib
@@ -592,7 +592,7 @@
  MINUSLPAM=	-lpam
  .if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
  .if ${MK_KERBEROS} != "no"
-@@ -127,38 +447,170 @@ MINUSLPAM+=	-lypclnt
+@@ -127,38 +447,170 @@
  .endif
  .endif
  

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-06-26 15:18:52 UTC (rev 3486)
@@ -2,14 +2,11 @@
 01_make_fixes.diff
 02_libbsd.diff
 03_glibc.diff
-04_sys_endian.diff
 05_disable_hardlinks.diff
 07_brandelf.diff
 08_maxpathlen.diff
 09_ports_path.diff
 10_non_kfreebsd.diff
-11_optreset.diff
-14_config.diff
 15_manpages_gzip.diff
 16_bootstrap_pmake.diff
 17_multiarch.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-06-26 15:15:27 UTC (rev 3485)
+++ trunk/freebsd-buildutils/debian/rules	2011-06-26 15:18:52 UTC (rev 3486)
@@ -27,10 +27,11 @@
 ORIGDIR = $(SOURCE)-$(VERSION)
 TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
 
-CFLAGS = -O2 -g -Wall -D_GNU_SOURCE -D'__FBSDID(string)=' \
+CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
          -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' \
          -DMACHINE_MULTIARCH='"$(DEB_HOST_MULTIARCH)"' \
-         -I$(CURDIR)/build-tree/src/sys
+         -I$(CURDIR)/build-tree/src/sys \
+	 $(shell pkg-config --cflags libbsd-overlay) -lbsd
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 
 PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
@@ -80,9 +81,6 @@
 		-e "s,/usr/ports,/usr/share/$(package)/ports,g" \
 	; done
 
-	cp $(CURDIR)/build-tree/src/sys/kern/subr_sbuf.c \
-	   $(CURDIR)/build-tree/src/usr.sbin/config/
-
 	touch unpack-stamp
 
 build: build-stamp
@@ -108,12 +106,6 @@
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/brandelf
 
-	cd build-tree/src/usr.sbin/config ; \
-		$(YACC) -d config.y ; \
-		cp y.tab.c config.c ; \
-		PATH=$(PATH):$(CURDIR)/build-tree/src/usr.bin/file2c \
-		$(PMAKE) $(MAKE_BUILD_FLAGS)
-
 	touch build-stamp
 
 install: build
@@ -126,7 +118,7 @@
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
-	for i in mtree config ; do \
+	for i in mtree ; do \
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done

More information about the Glibc-bsd-commits mailing list