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

Mon Apr 12 08:18:09 UTC 2010

Author: ps-guest
Date: 2010-04-12 08:18:07 +0000 (Mon, 12 Apr 2010)
New Revision: 3018

Added:
   trunk/freebsd-buildutils/debian/patches/series
Removed:
   trunk/freebsd-buildutils/fetch
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/04_sys_endian.diff
   trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
   trunk/freebsd-buildutils/debian/patches/07_brandelf.diff
   trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
   trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
   trunk/freebsd-buildutils/debian/patches/11_optreset.diff
   trunk/freebsd-buildutils/debian/patches/14_config.diff
   trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
   trunk/freebsd-buildutils/debian/rules
Log:
freebsd-buildutils - New upstream version (RELENG_7_3_0_RELEASE)
Add a get-orig-source target to debian/rules and stop using a tar in tar system.
Use quilt for patches management, refresh all of them



Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================

--- trunk/freebsd-buildutils/debian/changelog	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/changelog	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,3 +1,13 @@
+freebsd-buildutils (7.3-1) UNSTABLE; urgency=low
+
+  [ Petr Salinger ]
+  * New upstream version (RELENG_7_3_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 <aurel32 at debian.org>  Mon, 12 Apr 2010 10:03:20 +0200
+
 freebsd-buildutils (7.2-2) unstable; urgency=low
 
   * Remove part of the automatic patches in favor of patches.

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/control	2010-04-12 08:18:07 UTC (rev 3018)
@@ -3,7 +3,7 @@
 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 (>= 5.0.0), pmake, flex, bison, libbsd-dev
+Build-Depends: debhelper (>= 5.0.0), pmake, flex, bison, libbsd-dev, quilt
 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.8.4
@@ -23,4 +23,4 @@
  utilities (make, yacc, lex ..)
  .
  They have some specific modifications needed to be able to build FreeBSD
- sources (such as kfreebsd-7).
+ sources (such as kfreebsd-8).

Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,6 +1,5 @@
-diff -ur src.old/usr.bin/cksum/cksum.c src/usr.bin/cksum/cksum.c
---- src.old/usr.bin/cksum/cksum.c	2003-03-14 00:32:28.000000000 +0100
-+++ src/usr.bin/cksum/cksum.c	2006-02-09 19:27:55.000000000 +0100
+--- a/src/usr.bin/cksum/cksum.c
++++ b/src/usr.bin/cksum/cksum.c
 @@ -57,6 +57,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -9,9 +8,8 @@
  
  #include "extern.h"
  
-diff -ur src.old/usr.bin/cksum/extern.h src/usr.bin/cksum/extern.h
---- src.old/usr.bin/cksum/extern.h	2003-03-14 00:32:28.000000000 +0100
-+++ src/usr.bin/cksum/extern.h	2006-02-09 19:27:55.000000000 +0100
+--- a/src/usr.bin/cksum/extern.h
++++ b/src/usr.bin/cksum/extern.h
 @@ -35,6 +35,7 @@
   */
  
@@ -20,18 +18,17 @@
  
  __BEGIN_DECLS
  int	crc(int, uint32_t *, off_t *);
-diff -ur src.old/usr.bin/make/main.c src/usr.bin/make/main.c
---- src.old/usr.bin/make/main.c	2005-12-17 12:46:35.000000000 +0100
-+++ src/usr.bin/make/main.c	2006-02-09 19:28:13.000000000 +0100
-@@ -930,6 +930,7 @@
+--- a/src/usr.bin/make/main.c
++++ b/src/usr.bin/make/main.c
+@@ -946,6 +946,7 @@
  	}
  #endif
  
 +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  	/*
- 	 * FreeBSD/pc98 kernel used to set the utsname.machine to
- 	 * "i386", and MACHINE was defined as "i386", so it could
-@@ -950,6 +951,7 @@
+ 	 * Prior to 7.0, FreeBSD/pc98 kernel used to set the
+ 	 * utsname.machine to "i386", and MACHINE was defined as
+@@ -965,6 +966,7 @@
  				machine = "pc98";
  		}
  	}
@@ -39,10 +36,9 @@
  
  	/*
  	 * Get the name of this type of MACHINE from utsname
-diff -ur src.old/usr.sbin/config/main.c src/usr.sbin/config/main.c
---- src.old/usr.sbin/config/main.c	2005-12-17 12:47:02.000000000 +0100
-+++ src/usr.sbin/config/main.c	2006-02-09 19:27:56.000000000 +0100
-@@ -52,6 +52,9 @@
+--- a/src/usr.sbin/config/main.c
++++ b/src/usr.sbin/config/main.c
+@@ -56,6 +56,9 @@
  #include <sysexits.h>
  #include <unistd.h>
  #include <dirent.h>
@@ -52,7 +48,7 @@
  #include "y.tab.h"
  #include "config.h"
  #include "configvers.h"
-@@ -455,7 +458,11 @@
+@@ -606,7 +609,11 @@
  	if ((dirp = opendir(p)) == NULL)
  		err(EX_OSERR, "opendir %s", p);
  	while ((dp = readdir(dirp)) != NULL) {
@@ -64,9 +60,8 @@
  		/* Skip non-headers */
  		if (dp->d_name[i] != '.' || dp->d_name[i + 1] != 'h')
  			continue;
-diff -ur src.old/usr.sbin/mtree/compare.c src/usr.sbin/mtree/compare.c
---- src.old/usr.sbin/mtree/compare.c	2005-03-29 13:44:17.000000000 +0200
-+++ src/usr.sbin/mtree/compare.c	2006-02-09 19:27:56.000000000 +0100
+--- 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";
@@ -120,9 +115,8 @@
  #ifdef MD5
  	if (s->flags & F_MD5) {
  		char *new_digest, buf[33];
-diff -ur src.old/usr.sbin/mtree/create.c src/usr.sbin/mtree/create.c
---- src.old/usr.sbin/mtree/create.c	2005-03-29 13:44:17.000000000 +0200
-+++ src/usr.sbin/mtree/create.c	2006-02-09 19:27:56.000000000 +0100
+--- a/src/usr.sbin/mtree/create.c
++++ b/src/usr.sbin/mtree/create.c
 @@ -73,7 +73,11 @@
  static u_long flags = 0xffffffff;
  
@@ -195,12 +189,11 @@
  		(void)printf("\n");
  		*puid = saveuid;
  		*pgid = savegid;
-diff -ur src.old/usr.sbin/mtree/extern.h src/usr.sbin/mtree/extern.h
---- src.old/usr.sbin/mtree/extern.h	2004-01-11 20:38:48.000000000 +0100
-+++ src/usr.sbin/mtree/extern.h	2006-02-09 19:27:56.000000000 +0100
+--- 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: ./src/usr.sbin/mtree/extern.h,v 1.13 2004/01/11 19:38:48 phk Exp $
+  * $FreeBSD$
   */
 +
 +#include <stdint.h>
@@ -208,10 +201,9 @@
  extern uint32_t crc_total;
  
  #ifdef _FTS_H_
-diff -ur src.old/usr.sbin/mtree/misc.c src/usr.sbin/mtree/misc.c
---- src.old/usr.sbin/mtree/misc.c	2005-03-29 13:44:17.000000000 +0200
-+++ src/usr.sbin/mtree/misc.c	2006-02-09 19:27:56.000000000 +0100
-@@ -106,6 +106,7 @@
+--- 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));
  }
  
@@ -219,14 +211,13 @@
  char *
  flags_to_string(u_long fflags)
  {
-@@ -121,3 +122,4 @@
+@@ -122,3 +123,4 @@
  
  	return string;
  }
 +#endif /* __FreeBSD__ */
-diff -ur src.old/usr.sbin/mtree/mtree.h src/usr.sbin/mtree/mtree.h
---- src.old/usr.sbin/mtree/mtree.h	2005-03-29 13:44:17.000000000 +0200
-+++ src/usr.sbin/mtree/mtree.h	2006-02-09 19:27:56.000000000 +0100
+--- 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 */
@@ -255,10 +246,9 @@
  #define	MBITS	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
  	mode_t	st_mode;			/* mode */
  	u_long	st_flags;			/* flags */
-diff -ur src.old/usr.sbin/mtree/spec.c src/usr.sbin/mtree/spec.c
---- src.old/usr.sbin/mtree/spec.c	2005-03-29 13:44:17.000000000 +0200
-+++ src/usr.sbin/mtree/spec.c	2006-02-09 19:27:56.000000000 +0100
-@@ -204,12 +206,14 @@
+--- 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;
@@ -273,7 +263,7 @@
  		case F_GID:
  			ip->st_gid = strtoul(val, &ep, 10);
  			if (*ep)
-@@ -249,17 +253,19 @@
+@@ -252,17 +254,19 @@
  			if (strunvis(ip->slink, val) == -1)
  				errx(1, "symlink %s is ill-encoded", val);
  			break;
@@ -295,9 +285,8 @@
  		case F_TYPE:
  			switch(*val) {
  			case 'b':
-diff -ur src.old/usr.sbin/mtree/specspec.c src/usr.sbin/mtree/specspec.c
---- src.old/usr.sbin/mtree/specspec.c	2005-03-29 13:44:17.000000000 +0200
-+++ src/usr.sbin/mtree/specspec.c	2006-02-09 19:27:56.000000000 +0100
+--- 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))
@@ -310,10 +299,9 @@
  	if (FF(n1, n2, F_UID, st_uid))
  		differs |= F_UID;
  	if (FF(n1, n2, F_UNAME, st_uid))
-diff -ur src.old/usr.sbin/mtree/verify.c src/usr.sbin/mtree/verify.c
---- src.old/usr.sbin/mtree/verify.c	2005-12-17 12:47:12.000000000 +0100
-+++ src/usr.sbin/mtree/verify.c	2006-02-09 19:27:56.000000000 +0100
-@@ -243,9 +243,11 @@
+--- 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));

Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,7 +1,6 @@
-diff -ur ../foo.old/src/share/mk/bsd.incs.mk ./src/share/mk/bsd.incs.mk
---- ../foo.old/src/share/mk/bsd.incs.mk	2005-12-17 12:45:38.000000000 +0100
-+++ ./src/share/mk/bsd.incs.mk	2005-12-17 12:49:33.000000000 +0100
-@@ -39,7 +39,7 @@
+--- 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}
@@ -10,7 +9,7 @@
  	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
  	    ${.ALLSRC} \
  	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -51,10 +51,10 @@
+@@ -53,10 +53,10 @@
  installincludes: _${group}INS
  _${group}INS: ${_${group}INCS}
  .if defined(${group}NAME)
@@ -23,10 +22,9 @@
  	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
  .endif
  .endif
-diff -ur ../foo.old/src/share/mk/bsd.info.mk ./src/share/mk/bsd.info.mk
---- ../foo.old/src/share/mk/bsd.info.mk	2005-12-17 12:45:38.000000000 +0100
-+++ ./src/share/mk/bsd.info.mk	2005-12-17 12:50:33.000000000 +0100
-@@ -75,7 +75,7 @@
+--- 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
@@ -35,7 +33,7 @@
  INSTALLINFOFLAGS+=--quiet
  INFOSECTION?=   Miscellaneous
  ICOMPRESS_CMD?=	${COMPRESS_CMD}
-@@ -145,18 +145,8 @@
+@@ -143,18 +143,8 @@
  .for x in ${INFO}
  INSTALLINFODIRS+= ${x:S/$/-install/}
  ${x:S/$/-install/}:
@@ -56,10 +54,9 @@
  .endfor
  
  .PHONY: ${INSTALLINFODIRS}
-diff -ur ../foo.old/src/share/mk/bsd.lib.mk ./src/share/mk/bsd.lib.mk
---- ../foo.old/src/share/mk/bsd.lib.mk	2005-12-17 12:45:38.000000000 +0100
-+++ ./src/share/mk/bsd.lib.mk	2005-12-17 12:49:11.000000000 +0100
-@@ -124,9 +124,9 @@
+--- a/src/share/mk/bsd.lib.mk
++++ b/src/share/mk/bsd.lib.mk
+@@ -161,9 +161,9 @@
  	@${ECHO} building static ${LIB} library
  	@rm -f ${.TARGET}
  .if !defined(NM)
@@ -71,7 +68,7 @@
  .endif
  	${RANLIB} ${.TARGET}
  .endif
-@@ -141,9 +141,9 @@
+@@ -178,9 +178,9 @@
  	@${ECHO} building profiled ${LIB} library
  	@rm -f ${.TARGET}
  .if !defined(NM)
@@ -83,7 +80,7 @@
  .endif
  	${RANLIB} ${.TARGET}
  .endif
-@@ -160,16 +160,16 @@
+@@ -197,16 +197,16 @@
  	@${ECHO} building shared library ${SHLIB_NAME}
  	@rm -f ${.TARGET} ${SHLIB_LINK}
  .if defined(SHLIB_LINK)
@@ -101,9 +98,9 @@
 -	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
 +	    `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
  .endif
- .endif
- 
-@@ -236,11 +236,11 @@
+ .if defined(CTFMERGE)
+ 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+@@ -276,11 +276,11 @@
  .ORDER: beforeinstall _libinstall
  _libinstall:
  .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -117,9 +114,8 @@
  	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
  .endif
  .if defined(SHLIB_NAME)
-diff -ur ../foo.old/src/share/mk/bsd.man.mk ./src/share/mk/bsd.man.mk
---- ../foo.old/src/share/mk/bsd.man.mk	2005-01-06 12:12:43.000000000 +0100
-+++ ./src/share/mk/bsd.man.mk	2005-12-17 12:49:11.000000000 +0100
+--- a/src/share/mk/bsd.man.mk
++++ b/src/share/mk/bsd.man.mk
 @@ -211,12 +211,12 @@
  			[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
  		esac; \
@@ -150,9 +146,8 @@
  	done
  .endif
  .endif
-diff -ur ../foo.old/src/share/mk/bsd.own.mk ./src/share/mk/bsd.own.mk
---- ../foo.old/src/share/mk/bsd.own.mk	2005-04-11 09:13:29.000000000 +0200
-+++ ./src/share/mk/bsd.own.mk	2005-12-17 12:49:11.000000000 +0100
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
 @@ -18,7 +18,7 @@
  #
  # BINOWN	Binary owner. [root]
@@ -171,7 +166,7 @@
  #
  # SHAREMODE	ASCII text file mode. [${NOBINMODE}]
  #
-@@ -106,7 +106,7 @@
+@@ -113,7 +113,7 @@
  
  # Binaries
  BINOWN?=	root
@@ -180,7 +175,7 @@
  BINMODE?=	555
  NOBINMODE?=	444
  
-@@ -132,7 +132,7 @@
+@@ -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	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/02_libbsd.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,5 +1,5 @@
---- src/share/mk/version_gen.awk
-+++ src/share/mk/version_gen.awk
+--- a/src/share/mk/version_gen.awk
++++ b/src/share/mk/version_gen.awk
 @@ -41,7 +41,7 @@
  	version_count = 0;
  	current_version = "";
@@ -8,28 +8,28 @@
 +	while (bsd_getline < vfile) {
  		# Strip comments.
  		sub("#.*$", "", $0);
-
---- src/usr.bin/file2c/file2c.c
-+++ src/usr.bin/file2c/file2c.c
+ 
+--- a/src/usr.bin/file2c/file2c.c
++++ b/src/usr.bin/file2c/file2c.c
 @@ -10,6 +10,7 @@
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/usr.bin/file2c/file2c.c,v 1.10.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
  
 +#include <bsd/stdlib.h>
  #include <limits.h>
  #include <stdio.h>
  #include <stdlib.h>
---- src/usr.bin/file2c/Makefile
-+++ src/usr.bin/file2c/Makefile
+--- a/src/usr.bin/file2c/Makefile
++++ b/src/usr.bin/file2c/Makefile
 @@ -1,5 +1,6 @@
- # $FreeBSD: src/usr.bin/file2c/Makefile,v 1.8.20.1 2009/04/15 03:14:26 kensmith Exp $
+ # $FreeBSD$
  
  PROG=	file2c
 +LDADD= -lbsd
  WARNS?=	6
  .include <bsd.prog.mk>
---- src/usr.bin/make/arch.c
-+++ src/usr.bin/make/arch.c
+--- a/src/usr.bin/make/arch.c
++++ b/src/usr.bin/make/arch.c
 @@ -88,7 +88,7 @@
   */
  
@@ -39,8 +39,8 @@
  #include <sys/types.h>
  #include <ar.h>
  #include <ctype.h>
---- src/usr.bin/make/dir.h
-+++ src/usr.bin/make/dir.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
@@ -50,8 +50,8 @@
  #include "hash.h"
  
  struct GNode;
---- src/usr.bin/make/job.c
-+++ src/usr.bin/make/job.c
+--- a/src/usr.bin/make/job.c
++++ b/src/usr.bin/make/job.c
 @@ -101,7 +101,8 @@
   *			    thems as need creatin'
   */
@@ -62,8 +62,8 @@
  #include <sys/types.h>
  #include <sys/select.h>
  #include <sys/stat.h>
---- src/usr.bin/make/main.c
-+++ src/usr.bin/make/main.c
+--- a/src/usr.bin/make/main.c
++++ b/src/usr.bin/make/main.c
 @@ -65,7 +65,8 @@
  #include <sys/stat.h>
  #include <sys/sysctl.h>
@@ -74,19 +74,19 @@
  #include <sys/resource.h>
  #include <sys/utsname.h>
  #include <sys/wait.h>
---- src/usr.bin/make/shell.c
-+++ src/usr.bin/make/shell.c
+--- a/src/usr.bin/make/shell.c
++++ b/src/usr.bin/make/shell.c
 @@ -40,7 +40,7 @@
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/usr.bin/make/shell.c,v 1.1.20.1 2009/04/15 03:14:26 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
  
 -#include <sys/queue.h>
 +#include <bsd/sys/queue.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
---- src/usr.bin/make/shell.h
-+++ src/usr.bin/make/shell.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
@@ -96,8 +96,8 @@
  
  #include "str.h"
  #include "util.h"
---- src/usr.bin/make/suff.c
-+++ src/usr.bin/make/suff.c
+--- a/src/usr.bin/make/suff.c
++++ b/src/usr.bin/make/suff.c
 @@ -90,7 +90,7 @@
   *	    	  	    	if the target had no implicit sources.
   */
@@ -107,8 +107,8 @@
  #include <assert.h>
  #include <string.h>
  #include <stdlib.h>
---- src/usr.bin/make/Makefile
-+++ src/usr.bin/make/Makefile
+--- a/src/usr.bin/make/Makefile
++++ b/src/usr.bin/make/Makefile
 @@ -7,6 +7,7 @@
  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	\
@@ -117,8 +117,8 @@
  
  WARNS?=	6
  NO_SHARED?=	YES
---- src/usr.bin/yacc/test/ftp.tab.c
-+++ src/usr.bin/yacc/test/ftp.tab.c
+--- a/src/usr.bin/yacc/test/ftp.tab.c
++++ b/src/usr.bin/yacc/test/ftp.tab.c
 @@ -490,10 +490,10 @@
  #include <arpa/telnet.h>
  
@@ -141,8 +141,8 @@
  				reply(221, "You could at least say goodbye.");
  				dologout(0);
  			}
---- src/usr.bin/yacc/test/ftp.y
-+++ src/usr.bin/yacc/test/ftp.y
+--- a/src/usr.bin/yacc/test/ftp.y
++++ b/src/usr.bin/yacc/test/ftp.y
 @@ -750,10 +750,10 @@
  #include <arpa/telnet.h>
  
@@ -165,8 +165,8 @@
  				reply(221, "You could at least say goodbye.");
  				dologout(0);
  			}
---- src/usr.sbin/config/config.h
-+++ src/usr.sbin/config/config.h
+--- a/src/usr.sbin/config/config.h
++++ b/src/usr.sbin/config/config.h
 @@ -34,7 +34,7 @@
   * Config.
   */
@@ -176,8 +176,8 @@
  #include <stdlib.h>
  #include <string.h>
  
---- src/usr.sbin/config/mkoptions.c
-+++ src/usr.sbin/config/mkoptions.c
+--- a/src/usr.sbin/config/mkoptions.c
++++ b/src/usr.sbin/config/mkoptions.c
 @@ -40,6 +40,7 @@
   * Make all the .h files for the optional entries
   */
@@ -186,8 +186,8 @@
  #include <ctype.h>
  #include <err.h>
  #include <stdio.h>
---- src/usr.sbin/config/Makefile
-+++ src/usr.sbin/config/Makefile
+--- a/src/usr.sbin/config/Makefile
++++ b/src/usr.sbin/config/Makefile
 @@ -13,7 +13,7 @@
  CFLAGS+= -I. -I${.CURDIR}
  
@@ -197,8 +197,8 @@
  
  CLEANFILES+=	kernconf.c
  
---- src/usr.sbin/mtree/excludes.c
-+++ src/usr.sbin/mtree/excludes.c
+--- a/src/usr.sbin/mtree/excludes.c
++++ b/src/usr.sbin/mtree/excludes.c
 @@ -32,7 +32,8 @@
  
  #include <sys/types.h>
@@ -209,18 +209,18 @@
  
  #include <err.h>
  #include <fnmatch.h>
---- src/usr.sbin/mtree/spec.c
-+++ src/usr.sbin/mtree/spec.c
+--- a/src/usr.sbin/mtree/spec.c
++++ b/src/usr.sbin/mtree/spec.c
 @@ -35,6 +35,7 @@
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/usr.sbin/mtree/spec.c,v 1.23.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
  
 +#include <bsd/stdlib.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <ctype.h>
---- src/usr.sbin/mtree/Makefile
-+++ src/usr.sbin/mtree/Makefile
+--- a/src/usr.sbin/mtree/Makefile
++++ b/src/usr.sbin/mtree/Makefile
 @@ -7,6 +7,7 @@
  MAN=	mtree.8
  SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c

Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,52 +1,6 @@
-diff -ur ../foo.old/src/usr.sbin/btxld/btx.h ./src/usr.sbin/btxld/btx.h
---- ../foo.old/src/usr.sbin/btxld/btx.h	1999-08-28 03:15:41.000000000 +0200
-+++ ./src/usr.sbin/btxld/btx.h	2005-12-16 23:52:43.000000000 +0100
-@@ -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 */
-diff -ur ../foo.old/src/usr.sbin/btxld/elfh.c ./src/usr.sbin/btxld/elfh.c
---- ../foo.old/src/usr.sbin/btxld/elfh.c	2004-06-22 19:05:37.000000000 +0200
-+++ ./src/usr.sbin/btxld/elfh.c	2005-12-16 23:52:43.000000000 +0100
-@@ -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 */
-diff -ur ../foo.old/src/usr.sbin/btxld/elfh.h ./src/usr.sbin/btxld/elfh.h
---- ../foo.old/src/usr.sbin/btxld/elfh.h	2000-01-04 15:10:36.000000000 +0100
-+++ ./src/usr.sbin/btxld/elfh.h	2005-12-16 23:52:43.000000000 +0100
-@@ -26,7 +26,7 @@
-  * $FreeBSD: ./src/usr.sbin/btxld/elfh.h,v 1.3 2000/01/04 14:10:36 marcel Exp $
-  */
- 
--#include <sys/elf32.h>
-+#include "elf32.h"
- 
- struct elfh {
-     Elf32_Ehdr e;		/* ELF header */
-diff -ur ../foo.old/src/usr.sbin/mtree/Makefile ./src/usr.sbin/mtree/Makefile
---- ../foo.old/src/usr.sbin/mtree/Makefile	2005-03-29 13:44:17.000000000 +0200
-+++ ./src/usr.sbin/mtree/Makefile	2005-12-16 23:53:50.000000000 +0100
-@@ -10,8 +10,4 @@
- 
- WARNS?=	4
- 
--CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
--DPADD=	${LIBMD}
--LDADD=	-lmd
--
- .include <bsd.prog.mk>
---- src/usr.sbin/mtree/specspec.c~	2005-12-17 11:59:50.000000000 +0100
-+++ src/usr.sbin/mtree/specspec.c	2005-12-17 12:04:11.000000000 +0100
-@@ -83,8 +83,6 @@
+--- 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);
@@ -55,8 +9,8 @@
  	printf("\n");
  }
  
---- src/usr.bin/make/cond.c
-+++ src/usr.bin/make/cond.c
+--- a/src/usr.bin/make/cond.c
++++ b/src/usr.bin/make/cond.c
 @@ -1115,7 +1115,7 @@
   *	Handle .else statement.
   */
@@ -75,9 +29,9 @@
  {
  
  	while (isspace((u_char)*line))
---- src/usr.bin/make/job.c
-+++ src/usr.bin/make/job.c
-@@ -473,7 +473,7 @@
+--- a/src/usr.bin/make/job.c
++++ b/src/usr.bin/make/job.c
+@@ -474,7 +474,7 @@
  }
  
  static void
@@ -86,7 +40,7 @@
  {
  }
  
-@@ -2189,7 +2189,7 @@
+@@ -2190,7 +2190,7 @@
   */
  void
  #ifdef USE_KQUEUE
@@ -95,8 +49,8 @@
  #else
  Job_CatchOutput(int flag)
  #endif
---- src/usr.bin/make/parse.c
-+++ src/usr.bin/make/parse.c
+--- a/src/usr.bin/make/parse.c
++++ b/src/usr.bin/make/parse.c
 @@ -2210,13 +2210,13 @@
  }
  
@@ -149,8 +103,8 @@
  {
  
  	Parse_Error(PARSE_FATAL, "for-less endfor");
---- src/usr.bin/make/proc.h
-+++ src/usr.bin/make/proc.h
+--- a/src/usr.bin/make/proc.h
++++ b/src/usr.bin/make/proc.h
 @@ -48,6 +48,6 @@
  	pid_t	child_pid;
  } ProcStuff;
@@ -159,8 +113,8 @@
 +void Proc_Exec(const ProcStuff *);
  
  #endif /* proc_h_458845848 */
---- src/usr.bin/make/shell.c
-+++ src/usr.bin/make/shell.c
+--- a/src/usr.bin/make/shell.c
++++ b/src/usr.bin/make/shell.c
 @@ -120,7 +120,7 @@
   */
  static struct Shells shells = TAILQ_HEAD_INITIALIZER(shells);
@@ -170,8 +124,8 @@
  
  /**
   * Helper function for sorting the builtin list alphabetically.
---- src/usr.bin/make/util.c
-+++ src/usr.bin/make/util.c
+--- a/src/usr.bin/make/util.c
++++ b/src/usr.bin/make/util.c
 @@ -61,7 +61,7 @@
  #include "targ.h"
  #include "util.h"
@@ -181,8 +135,8 @@
  
  /*-
   * Debug --
---- src/usr.bin/make/util.h
-+++ src/usr.bin/make/util.h
+--- a/src/usr.bin/make/util.h
++++ b/src/usr.bin/make/util.h
 @@ -103,10 +103,10 @@
  void Debug(const char *, ...);
  void DebugM(const char *, ...);
@@ -198,8 +152,8 @@
  char *estrdup(const char *);
  void *emalloc(size_t);
  void *erealloc(void *, size_t);
---- src/usr.bin/make/var.c
-+++ src/usr.bin/make/var.c
+--- a/src/usr.bin/make/var.c
++++ b/src/usr.bin/make/var.c
 @@ -248,7 +248,7 @@
   *	The trimmed word is added to the buffer.
   */
@@ -236,8 +190,8 @@
  {
  	char *dot;
  
---- src/usr.bin/yacc/main.c
-+++ src/usr.bin/yacc/main.c
+--- a/src/usr.bin/yacc/main.c
++++ b/src/usr.bin/yacc/main.c
 @@ -114,7 +114,7 @@
  
  volatile sig_atomic_t sigdie;
@@ -256,8 +210,8 @@
  {
      sigdie = 1;
      done(1);
---- src/usr.sbin/mtree/compare.c
-+++ src/usr.sbin/mtree/compare.c
+--- a/src/usr.sbin/mtree/compare.c
++++ b/src/usr.sbin/mtree/compare.c
 @@ -72,7 +72,7 @@
  	}
  
@@ -267,3 +221,45 @@
  {
  	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 @@
+  * $FreeBSD$
+  */
+ 
+-#include <sys/elf32.h>
++#include "elf32.h"
+ 
+ struct elfh {
+     Elf32_Ehdr e;		/* ELF header */
+--- a/src/usr.sbin/mtree/Makefile
++++ b/src/usr.sbin/mtree/Makefile
+@@ -11,8 +11,4 @@
+ 
+ WARNS?=	4
+ 
+-CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
+-DPADD=	${LIBMD}
+-LDADD=	-lmd
+-
+ .include <bsd.prog.mk>

Modified: trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,6 +1,5 @@
-diff -ur src.old/usr.sbin/btxld/btxld.c src/usr.sbin/btxld/btxld.c
---- src.old/usr.sbin/btxld/btxld.c	2004-06-22 19:05:37.000000000 +0200
-+++ src/usr.sbin/btxld/btxld.c	2004-10-28 23:38:43.000000000 +0200
+--- a/src/usr.sbin/btxld/btxld.c
++++ b/src/usr.sbin/btxld/btxld.c
 @@ -30,7 +30,6 @@
  #endif /* not lint */
  
@@ -9,9 +8,8 @@
  #include <sys/stat.h>
  #include <sys/mman.h>
  
-diff -ur src.old/usr.sbin/btxld/elfh.c src/usr.sbin/btxld/elfh.c
---- src.old/usr.sbin/btxld/elfh.c	2004-10-28 23:36:25.000000000 +0200
-+++ src/usr.sbin/btxld/elfh.c	2004-10-28 23:38:56.000000000 +0200
+--- a/src/usr.sbin/btxld/elfh.c
++++ b/src/usr.sbin/btxld/elfh.c
 @@ -27,7 +27,6 @@
   */
  
@@ -20,20 +18,18 @@
  
  #include <stddef.h>
  #include <stdint.h>
-diff -ur src.old/usr.sbin/kgzip/elfhdr.c src/usr.sbin/kgzip/elfhdr.c
---- src.old/usr.sbin/kgzip/elfhdr.c	2004-06-22 19:05:39.000000000 +0200
-+++ src/usr.sbin/kgzip/elfhdr.c	2004-10-28 23:39:06.000000000 +0200
+--- a/src/usr.sbin/kgzip/elfhdr.c
++++ b/src/usr.sbin/kgzip/elfhdr.c
 @@ -26,7 +26,6 @@
-  * $FreeBSD: src/usr.sbin/kgzip/elfhdr.c,v 1.4 2004/06/22 17:05:39 obrien Exp $
+  * $FreeBSD$
   */
  
 -#include <sys/endian.h>
  #include <stddef.h>
  #include "elfhdr.h"
  
-diff -ur src.old/usr.sbin/kgzip/kgzld.c src/usr.sbin/kgzip/kgzld.c
---- src.old/usr.sbin/kgzip/kgzld.c	2004-06-22 19:05:39.000000000 +0200
-+++ src/usr.sbin/kgzip/kgzld.c	2004-10-28 23:39:15.000000000 +0200
+--- a/src/usr.sbin/kgzip/kgzld.c
++++ b/src/usr.sbin/kgzip/kgzld.c
 @@ -27,7 +27,6 @@
   */
  

Modified: trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,6 +1,5 @@
-diff -ur src.old/usr.bin/cksum/Makefile src/usr.bin/cksum/Makefile
---- src.old/usr.bin/cksum/Makefile	2002-02-08 23:31:36.000000000 +0100
-+++ src/usr.bin/cksum/Makefile	2004-03-11 23:28:08.000000000 +0100
+--- a/src/usr.bin/cksum/Makefile
++++ b/src/usr.bin/cksum/Makefile
 @@ -3,7 +3,7 @@
  
  PROG=	cksum
@@ -10,9 +9,8 @@
  MLINKS=	cksum.1 sum.1
  
  .include <bsd.prog.mk>
-diff -ur src.old/usr.bin/lex/Makefile src/usr.bin/lex/Makefile
---- src.old/usr.bin/lex/Makefile	2002-05-12 18:00:44.000000000 +0200
-+++ src/usr.bin/lex/Makefile	2004-03-11 23:28:24.000000000 +0100
+--- a/src/usr.bin/lex/Makefile
++++ b/src/usr.bin/lex/Makefile
 @@ -10,9 +10,9 @@
  #
  
@@ -26,9 +24,8 @@
  
  SRCS=		scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \
  		skel.c sym.c tblcmp.c yylex.c
-diff -ur src.old/usr.bin/yacc/Makefile src/usr.bin/yacc/Makefile
---- src.old/usr.bin/yacc/Makefile	2002-02-09 00:07:36.000000000 +0100
-+++ src/usr.bin/yacc/Makefile	2004-03-11 23:27:28.000000000 +0100
+--- a/src/usr.bin/yacc/Makefile
++++ b/src/usr.bin/yacc/Makefile
 @@ -6,7 +6,7 @@
  	skeleton.c symtab.c verbose.c warshall.c
  SCRIPTS=yyfix.sh

Modified: trunk/freebsd-buildutils/debian/patches/07_brandelf.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/07_brandelf.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/07_brandelf.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,8 +1,7 @@
-diff -Nur src/usr.bin/brandelf.old/brandelf.c src/usr.bin/brandelf/brandelf.c
---- src/usr.bin/brandelf.old/brandelf.c	2004-12-27 22:19:41.000000000 +0100
-+++ src/usr.bin/brandelf/brandelf.c	2004-12-27 22:24:22.000000000 +0100
-@@ -30,7 +30,7 @@
- #include <sys/cdefs.h>
+--- a/src/usr.bin/brandelf/brandelf.c
++++ b/src/usr.bin/brandelf/brandelf.c
+@@ -31,7 +31,7 @@
+ __FBSDID("$FreeBSD$");
  
  #include <sys/types.h>
 -#include <sys/elf_common.h>
@@ -10,9 +9,8 @@
  #include <sys/errno.h>
  #include <err.h>
  #include <fcntl.h>
-diff -Nur src/usr.bin/brandelf.old/elf_common.h src/usr.bin/brandelf/elf_common.h
---- src/usr.bin/brandelf.old/elf_common.h	1970-01-01 01:00:00.000000000 +0100
-+++ src/usr.bin/brandelf/elf_common.h	2004-12-27 22:24:12.000000000 +0100
+--- /dev/null
++++ b/src/usr.bin/brandelf/elf_common.h
 @@ -0,0 +1,299 @@
 +/*-
 + * Copyright (c) 1998 John D. Polstra.

Modified: trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,6 +1,5 @@
-diff -ur ../foo.old/src/usr.bin/make/arch.c ./src/usr.bin/make/arch.c
---- ../foo.old/src/usr.bin/make/arch.c	2005-05-24 17:58:34.000000000 +0200
-+++ ./src/usr.bin/make/arch.c	2005-12-16 23:56:52.000000000 +0100
+--- a/src/usr.bin/make/arch.c
++++ b/src/usr.bin/make/arch.c
 @@ -190,6 +190,10 @@
  		Error ARGS;					\
      } while (0)
@@ -12,10 +11,9 @@
  /*-
   *-----------------------------------------------------------------------
   * Arch_ParseArchive --
-diff -ur ../foo.old/src/usr.bin/make/main.c ./src/usr.bin/make/main.c
---- ../foo.old/src/usr.bin/make/main.c	2005-12-16 23:54:51.000000000 +0100
-+++ ./src/usr.bin/make/main.c	2005-12-16 23:57:36.000000000 +0100
-@@ -236,6 +236,9 @@
+--- a/src/usr.bin/make/main.c
++++ b/src/usr.bin/make/main.c
+@@ -248,6 +248,9 @@
  {
  	char *fname, *fnamesave;	/* makefile to read */
  	FILE *stream;
@@ -25,10 +23,9 @@
  	char *name, path[MAXPATHLEN];
  	char *MAKEFILE;
  	int setMAKEFILE;
-diff -ur ../foo.old/src/usr.sbin/config/main.c ./src/usr.sbin/config/main.c
---- ../foo.old/src/usr.sbin/config/main.c	2005-12-16 23:54:51.000000000 +0100
-+++ ./src/usr.sbin/config/main.c	2005-12-16 23:56:52.000000000 +0100
-@@ -67,6 +67,10 @@
+--- a/src/usr.sbin/config/main.c
++++ b/src/usr.sbin/config/main.c
+@@ -71,6 +71,10 @@
  #define FALSE	(0)
  #endif
  
@@ -39,9 +36,8 @@
  #define	CDIR	"../compile/"
  
  char *	PREFIX;
-diff -ur ../foo.old/src/usr.sbin/config/mkmakefile.c ./src/usr.sbin/config/mkmakefile.c
---- ../foo.old/src/usr.sbin/config/mkmakefile.c	2005-11-27 22:41:57.000000000 +0100
-+++ ./src/usr.sbin/config/mkmakefile.c	2005-12-16 23:56:52.000000000 +0100
+--- a/src/usr.sbin/config/mkmakefile.c
++++ b/src/usr.sbin/config/mkmakefile.c
 @@ -65,6 +65,10 @@
  		wd = word; \
  	}
@@ -53,10 +49,9 @@
  static char *tail(char *);
  static void do_clean(FILE *);
  static void do_rules(FILE *);
-diff -ur ../foo.old/src/usr.sbin/config/mkoptions.c ./src/usr.sbin/config/mkoptions.c
---- ../foo.old/src/usr.sbin/config/mkoptions.c	2004-08-07 06:19:37.000000000 +0200
-+++ ./src/usr.sbin/config/mkoptions.c	2005-12-16 23:56:52.000000000 +0100
-@@ -48,6 +48,10 @@
+--- a/src/usr.sbin/config/mkoptions.c
++++ b/src/usr.sbin/config/mkoptions.c
+@@ -49,6 +49,10 @@
  #include "config.h"
  #include "y.tab.h"
  
@@ -67,10 +62,9 @@
  static	struct users {
  	int	u_default;
  	int	u_min;
-diff -ur ../foo.old/src/usr.sbin/mtree/create.c ./src/usr.sbin/mtree/create.c
---- ../foo.old/src/usr.sbin/mtree/create.c	2005-12-16 23:54:51.000000000 +0100
-+++ ./src/usr.sbin/mtree/create.c	2005-12-16 23:56:52.000000000 +0100
-@@ -66,6 +66,10 @@
+--- a/src/usr.sbin/mtree/create.c
++++ b/src/usr.sbin/mtree/create.c
+@@ -67,6 +67,10 @@
  #define	INDENTNAMELEN	15
  #define	MAXLINELEN	80
  
@@ -81,9 +75,8 @@
  static gid_t gid;
  static uid_t uid;
  static mode_t mode;
-diff -ur ../foo.old/src/usr.sbin/mtree/extern.h ./src/usr.sbin/mtree/extern.h
---- ../foo.old/src/usr.sbin/mtree/extern.h	2005-12-16 23:52:51.000000000 +0100
-+++ ./src/usr.sbin/mtree/extern.h	2005-12-16 23:56:52.000000000 +0100
+--- a/src/usr.sbin/mtree/extern.h
++++ b/src/usr.sbin/mtree/extern.h
 @@ -57,6 +57,7 @@
  extern u_int keys;
  extern int lineno;

Modified: trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/09_ports_path.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/09_ports_path.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,16 +1,15 @@
-diff -ur ports.old/Mk/bsd.port.mk ports/Mk/bsd.port.mk
---- ports.old/Mk/bsd.port.mk	2006-02-13 14:38:58.000000000 +0100
-+++ ports/Mk/bsd.port.mk	2006-02-13 14:40:38.000000000 +0100
-@@ -3336,7 +3332,7 @@
+--- a/ports/Mk/bsd.port.mk
++++ b/ports/Mk/bsd.port.mk
+@@ -3484,7 +3484,7 @@
  .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
  	@if [ -f "${AUDITFILE}" ]; then \
  		audit_created=`${_EXTRACT_AUDITFILE} | \
 -			${SED} -nEe "1s/^#CREATED: *([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
 +			${SED} -ne "1s/^#CREATED: *([0-9]{4})-?([0-9]{2})-?([0-9]{2}).*$$/\1\2\3/p"`; \
- 		audit_expiry=`date -u -v-14d "+%Y%m%d"`; \
+ 		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"; \
-@@ -3440,7 +3436,7 @@
+@@ -3588,7 +3588,7 @@
  	@cd ${_DISTDIR};\
  	${_PATCH_SITES_ENV} ; \
  	for _file in ${PATCHFILES}; do \
@@ -19,7 +18,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		force_fetch=false; \
  		filebasename=$${file##*/}; \
-@@ -4415,7 +4411,7 @@
+@@ -4665,7 +4665,7 @@
  	@(cd ${_DISTDIR}; \
  	 ${_MASTER_SITES_ENV} ; \
  	 for _file in ${DISTFILES}; do \
@@ -28,7 +27,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		if [ ! -f $$file -a ! -f $${file##*/} ]; then \
  			if [ ! -z "$$select" ] ; then \
-@@ -4452,7 +4448,7 @@
+@@ -4702,7 +4702,7 @@
  	@(cd ${_DISTDIR}; \
  	 ${_PATCH_SITES_ENV} ; \
  	 for _file in ${PATCHFILES}; do \
@@ -37,7 +36,7 @@
  		select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
  		if [ ! -f $$file -a ! -f $${file##*/} ]; then \
  			if [ ! -z "$$select" ] ; then \
-@@ -4488,7 +4484,7 @@
+@@ -4738,7 +4738,7 @@
  	@(cd ${_DISTDIR}; \
  	${_MASTER_SITES_ENV}; \
  	for _file in ${DISTFILES}; do \
@@ -46,7 +45,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 \
-@@ -4519,7 +4515,7 @@
+@@ -4769,7 +4769,7 @@
  	@(cd ${_DISTDIR}; \
  	${_PATCH_SITES_ENV} ; \
  	for _file in ${PATCHFILES}; do \
@@ -55,7 +54,16 @@
  		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 \
-@@ -5173,7 +5169,7 @@
+@@ -5155,7 +5155,7 @@
+ .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
+ 	@for i in ${LIB_DEPENDS}; do \
+ 		lib=$${i%%:*}; \
+-		pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
++		pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
+ 		dir=$${i#*:}; \
+ 		target=$${i##*:}; \
+ 		if ${TEST} $$dir = $$target; then \
+@@ -5419,7 +5419,7 @@
  .endif
  
  BUILD-DEPENDS-LIST= \
@@ -64,7 +72,7 @@
  		if [ -d $$dir ]; then \
  			${ECHO_CMD} $$dir; \
  		else \
-@@ -5489,7 +5485,7 @@
+@@ -5768,7 +5768,7 @@
  	done
  	@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
  .endif
@@ -73,7 +81,7 @@
  		${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
  	done
  .endfor
-@@ -5540,7 +5536,7 @@
+@@ -5826,7 +5826,7 @@
  add-plist-docs:
  .if defined(PORTDOCS) && !defined(NOPORTDOCS)
  	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -82,7 +90,7 @@
  		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
  	fi
  .for x in ${PORTDOCS}
-@@ -5563,7 +5559,7 @@
+@@ -5849,7 +5849,7 @@
  add-plist-examples:
  .if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
  	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -91,7 +99,7 @@
  		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
  	fi
  .for x in ${PORTEXAMPLES}
-@@ -5587,7 +5583,7 @@
+@@ -5873,7 +5873,7 @@
  add-plist-data:
  .if defined(PORTDATA) && !defined(NOPORTDATA)
  	@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -100,22 +108,20 @@
  		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
  	fi
  .for x in ${PORTDATA}
-diff -ur src/share/mk.old/bsd.port.mk src/share/mk/bsd.port.mk
---- src/share/mk.old/bsd.port.mk	2006-02-17 14:36:48.000000000 +0100
-+++ src/share/mk/bsd.port.mk	2006-02-17 14:37:53.000000000 +0100
+--- a/src/share/mk/bsd.port.mk
++++ b/src/share/mk/bsd.port.mk
 @@ -1,6 +1,6 @@
- # $FreeBSD: src/share/mk/bsd.port.mk,v 1.307 2004/07/02 20:47:18 eik Exp $
+ # $FreeBSD$
  
 -PORTSDIR?=	/usr/ports
 +PORTSDIR?=	/usr/share
  BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
  
- .include <bsd.own.mk>
-diff -ur src/share/mk.old/bsd.port.subdir.mk src/share/mk/bsd.port.subdir.mk
---- src/share/mk.old/bsd.port.subdir.mk	2006-02-17 14:36:48.000000000 +0100
-+++ src/share/mk/bsd.port.subdir.mk	2006-02-17 14:38:03.000000000 +0100
+ # Needed to keep bsd.own.mk from reading in /etc/src.conf
+--- a/src/share/mk/bsd.port.subdir.mk
++++ b/src/share/mk/bsd.port.subdir.mk
 @@ -1,6 +1,6 @@
- # $FreeBSD: src/share/mk/bsd.port.subdir.mk,v 1.31 2004/07/02 20:47:18 eik Exp $
+ # $FreeBSD$
  
 -PORTSDIR?=	/usr/ports
 +PORTSDIR?=	/usr/share

Modified: trunk/freebsd-buildutils/debian/patches/11_optreset.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/11_optreset.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/11_optreset.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,6 +1,6 @@
---- src/usr.bin/make/main.c~	2006-02-13 20:44:23.000000000 +0100
-+++ src/usr.bin/make/main.c	2006-02-13 20:46:55.000000000 +0100@
-@@ -136,6 +136,8 @@
+--- a/src/usr.bin/make/main.c
++++ b/src/usr.bin/make/main.c
+@@ -147,6 +147,8 @@
  time_t		now;		/* Time at start of make */
  struct GNode	*DEFAULT;	/* .DEFAULT node */
  
@@ -9,7 +9,7 @@
  /**
   * Exit with usage message.
   */
-@@ -358,7 +358,7 @@
+@@ -380,7 +382,7 @@
  		if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
  			found_dd = TRUE;
  		}

Modified: trunk/freebsd-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/14_config.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/14_config.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,6 +1,5 @@
-diff -u src/sys/sys/sbuf.h src/sys/sys/sbuf.h
---- src/sys/sys/sbuf.h
-+++ src/sys/sys/sbuf.h
+--- a/src/sys/sys/sbuf.h
++++ b/src/sys/sys/sbuf.h
 @@ -31,7 +31,8 @@
  #ifndef _SYS_SBUF_H_
  #define	_SYS_SBUF_H_
@@ -11,7 +10,7 @@
  
  /*
   * Structure definition
-@@ -63,8 +63,8 @@
+@@ -64,8 +65,8 @@
  int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
  int		 sbuf_cat(struct sbuf *, const char *);
  int		 sbuf_cpy(struct sbuf *, const char *);
@@ -22,10 +21,9 @@
  int		 sbuf_putc(struct sbuf *, int);
  int		 sbuf_trim(struct sbuf *);
  int		 sbuf_overflowed(struct sbuf *);
-diff -u src/sys/kern/subr_sbuf.c src/sys/kern/subr_sbuf.c
---- src/sys/kern/subr_sbuf.c
-+++ src/sys/kern/subr_sbuf.c
-@@ -76,8 +76,8 @@
+--- a/src/sys/kern/subr_sbuf.c
++++ b/src/sys/kern/subr_sbuf.c
+@@ -77,8 +77,8 @@
  #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
  
  #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
@@ -36,9 +34,8 @@
  
  /*
   * Debugging support
-diff -u src/usr.sbin/config/Makefile src/usr.sbin/config/Makefile
---- src/usr.sbin/config/Makefile
-+++ src/usr.sbin/config/Makefile
+--- a/src/usr.sbin/config/Makefile
++++ b/src/usr.sbin/config/Makefile
 @@ -4,7 +4,7 @@
  PROG=	config
  MAN=	config.5 config.8
@@ -57,9 +54,8 @@
  
  CLEANFILES+=	kernconf.c
  
-diff -u src/usr.sbin/config/main.c src/usr.sbin/config/main.c
---- src/usr.sbin/config/main.c
-+++ src/usr.sbin/config/main.c
+--- a/src/usr.sbin/config/main.c
++++ b/src/usr.sbin/config/main.c
 @@ -43,6 +43,8 @@
  
  #include <sys/types.h>

Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,5 +1,5 @@
---- src/share/mk/bsd.own.mk.orig	2009-04-07 17:46:36.000000000 +0200
-+++ src/share/mk/bsd.own.mk	2009-04-07 17:46:43.000000000 +0200
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
 @@ -171,7 +171,7 @@
  STRIP?=		-s
  .endif

Added: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/series	2010-04-12 08:18:07 UTC (rev 3018)
@@ -0,0 +1,12 @@
+00_upstream.diff
+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
+11_optreset.diff
+14_config.diff
+15_manpages_gzip.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/debian/rules	2010-04-12 08:18:07 UTC (rev 3018)
@@ -16,7 +16,11 @@
 endif
 
 VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN=svn://svn.freebsd.org/base/release/$(VERSION).0
+SVN=http://svn.freebsd.org/base/release/$(VERSION).0
+
+PCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
+PTAG=RELEASE_7_3_0
+
 ORIGDIR=freebsd-buildutils-$(VERSION)
 PMAKE=pmake
 CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE -D'__FBSDID(string)=' -I$(CURDIR)/build-tree/src/sys
@@ -27,18 +31,35 @@
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
-	for i in sbin/dmesg sbin/sysctl usr.bin/kdump usr.bin/ktrace \
-	        sys/kern/syscalls.c ; do \
-	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	mkdir -p $(ORIGDIR)/src/sys/sys $(ORIGDIR)/src/sys/kern/
+	for i in \
+		share/mk \
+		usr.bin/cksum \
+		usr.bin/file2c \
+		usr.bin/lex \
+		usr.bin/make \
+		usr.bin/mkdep \
+		usr.bin/yacc \
+		usr.bin/brandelf \
+		usr.sbin/btxld \
+		usr.sbin/config \
+		usr.sbin/kgzip \
+		usr.sbin/mtree \
+		sys/sys/sbuf.h \
+		sys/kern/subr_sbuf.c \
+	; do \
+		svn export $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
 	done
+	cd $(ORIGDIR); cvs -d $(PCVS) export -r $(PTAG) ports/Mk ; cd ..
 	tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-buildutils_$(VERSION).orig.tar.gz $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
+include /usr/share/quilt/quilt.make
+
 unpack: unpack-stamp
-unpack-stamp:
+unpack-stamp: debian/stamp-patched
 	mkdir build-tree
-	tar -C build-tree -xzf src.tar.gz
-	find build-tree -type d -name CVS | xargs rm -rf
+	cp -a src ports build-tree/
 	set -e ; for i in \
 		build-tree/ports/Mk/bsd.port.mk \
 		build-tree/ports/Mk/bsd.port.subdir.mk \
@@ -49,19 +70,14 @@
 		-e "s,/sbin/,,g" \
 		-e "s,/usr/ports,/usr/share/$(package)/ports,g" \
 	; done
-	set -e ; cd build-tree && \
-		for i in $(CURDIR)/debian/patches/*.diff ; do \
-		  echo "--- Patch $$i ---" ; \
-		  patch -p0 < $$i ; \
-		done
 
 	cp $(CURDIR)/build-tree/src/sys/kern/subr_sbuf.c \
 	   $(CURDIR)/build-tree/src/usr.sbin/config/
 
 	touch unpack-stamp
 
-build: unpack-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: unpack-stamp
 	dh_testdir
 
 	cd build-tree/src/usr.bin/yacc ; \
@@ -127,7 +143,7 @@
 	done
 	rmdir $(CURDIR)/debian/$(package)/usr/sbin
 
-clean:
+clean:  unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf build-tree

Deleted: trunk/freebsd-buildutils/fetch
===================================================================
--- trunk/freebsd-buildutils/fetch	2010-04-10 14:52:51 UTC (rev 3017)
+++ trunk/freebsd-buildutils/fetch	2010-04-12 08:18:07 UTC (rev 3018)
@@ -1,42 +0,0 @@
-#!/bin/bash
-set -ex
-
-ANONCVS=:pserver:anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-
-RELENG=RELENG_7_2_0_RELEASE
-RPORTS=RELEASE_7_2_0
-
-rm -rf src ports
-
-if test -e src.tar.gz ; then
-  tar -xzpf src.tar.gz
-  action="update"
-else
-  action="checkout"
-fi
-
-cvs -d $ANONCVS ${action} -r $RPORTS ports/Mk
-for i in \
-    src/share/mk \
-    src/usr.bin/cksum \
-    src/usr.bin/file2c \
-    src/usr.bin/lex \
-    src/usr.bin/make \
-    src/usr.bin/mkdep \
-    src/usr.bin/yacc \
-    src/usr.bin/brandelf \
-    src/usr.sbin/btxld \
-    src/usr.sbin/config \
-    src/usr.sbin/kgzip \
-    src/usr.sbin/mtree \
-    src/sys/sys/sbuf.h \
-    src/sys/kern/subr_sbuf.c \
-  ; do
-  cvs -d $ANONCVS ${action} -r $RELENG $i
-  test -e $i
-done
-
-rm -f src.tar.gz
-tar -czpf src.tar.gz src/ ports/
-
-rm -rf src ports


