[Glibc-bsd-commits] r3355 - in trunk/ufsutils/debian: . patches

Guillem Jover guillem at alioth.debian.org
Mon May 30 05:17:08 UTC 2011 

Author: guillem
Date: 2011-05-30 05:17:07 +0000 (Mon, 30 May 2011)
New Revision: 3355

Removed:
   trunk/ufsutils/debian/patches/01_libdisklabel.patch
   trunk/ufsutils/debian/upstream.sh
Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/00_include.patch
   trunk/ufsutils/debian/patches/00_libport.patch
   trunk/ufsutils/debian/patches/00_mount.patch
   trunk/ufsutils/debian/patches/00_param.patch
   trunk/ufsutils/debian/patches/01_libufs.patch
   trunk/ufsutils/debian/patches/02_badsect.ufs.patch
   trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch
   trunk/ufsutils/debian/patches/02_dump.ufs.patch
   trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
   trunk/ufsutils/debian/patches/02_ffsinfo.patch
   trunk/ufsutils/debian/patches/02_fsck.ufs.patch
   trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
   trunk/ufsutils/debian/patches/02_growfs.ufs.patch
   trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
   trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
   trunk/ufsutils/debian/patches/03_ufsmount.patch
   trunk/ufsutils/debian/patches/99_makefiles.patch
   trunk/ufsutils/debian/patches/series
   trunk/ufsutils/debian/rules
Log:
Reorganize source code

Switch from debian/upstream.sh to debian/rules get-orig-source target.
Switch from CVS to Subversion to retrieve the source code.
Use the same source layout as upstream (no more relocations),
i.e. lib/, sbin/, sys/sys, sys/ufs.
Move libport/ to port/.
Merge libdisklabel/ into port/.


Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/changelog	2011-05-30 05:17:07 UTC (rev 3355)
@@ -10,6 +10,13 @@
     - Remove patch target in debian/rules.
     - Remove now unneeded README.source.
     - Refresh all patches.
+  * Reorganize source code:
+    - Switch from debian/upstream.sh to debian/rules get-orig-source target.
+    - Switch from CVS to Subversion to retrieve the source code.
+    - Use the same source layout as upstream (no more relocations),
+      i.e. lib/, sbin/, sys/sys, sys/ufs.
+    - Move libport/ to port/.
+    - Merge libdisklabel/ into port/.
 
  -- Robert Millan <rmh at debian.org>  Thu, 27 Jan 2011 16:22:17 +0100
 

Modified: trunk/ufsutils/debian/patches/00_include.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_include.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/00_include.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,10 +1,10 @@
 ---
- freebsd/sys/disklabel.h |    3 ++-
- freebsd/sys/ucred.h     |    2 ++
+ sys/sys/disklabel.h |    3 ++-
+ sys/sys/ucred.h     |    2 ++
  2 files changed, 4 insertions(+), 1 deletion(-)
 
---- a/freebsd/sys/disklabel.h
-+++ b/freebsd/sys/disklabel.h
+--- a/sys/sys/disklabel.h
++++ b/sys/sys/disklabel.h
 @@ -36,7 +36,8 @@
  #ifndef _KERNEL
  #include <sys/types.h>
@@ -15,8 +15,8 @@
  
  /*
   * Disk description table, see disktab(5)
---- a/freebsd/sys/ucred.h
-+++ b/freebsd/sys/ucred.h
+--- a/sys/sys/ucred.h
++++ b/sys/sys/ucred.h
 @@ -33,7 +33,9 @@
  #ifndef _SYS_UCRED_H_
  #define	_SYS_UCRED_H_

Modified: trunk/ufsutils/debian/patches/00_libport.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_libport.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/00_libport.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,12 +1,23 @@
 ---
- include/port/blockdev.h |    9 ++++
- include/port/port.h     |   22 +++++++++++
- libport/Makefile        |   13 ++++++
- libport/blockdev.c      |   92 ++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 136 insertions(+)
+ port/Makefile       |   12 ++++++
+ port/blockdev.c     |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ port/blockdev.h     |    8 ++++
+ port/getdisklabel.c |    7 +++
+ port/port.h         |   22 ++++++++++++
+ 5 files changed, 141 insertions(+)
 
 --- /dev/null
-+++ b/include/port/port.h
++++ b/port/getdisklabel.c
+@@ -0,0 +1,7 @@
++#include <stdlib.h>
++#include <sys/disklabel.h>
++
++struct disklabel *getdiskbyname(const char *name)
++{
++	return NULL;
++}
+--- /dev/null
++++ b/port/port.h
 @@ -0,0 +1,22 @@
 +#ifndef LIBPORT_H
 +#define LIBPORT_H
@@ -31,7 +42,7 @@
 +
 +#endif
 --- /dev/null
-+++ b/libport/blockdev.c
++++ b/port/blockdev.c
 @@ -0,0 +1,92 @@
 +/*
 + * Copyright (C) 2004 Guillem Jover <guillem at debian.org>
@@ -79,7 +90,7 @@
 +#endif
 +#include <sys/stat.h>
 +#include <unistd.h>
-+#include <port/blockdev.h>
++#include "blockdev.h"
 +
 +static const int sector_size = 512;
 +
@@ -126,8 +137,8 @@
 +	return size;
 +}
 --- /dev/null
-+++ b/include/port/blockdev.h
-@@ -0,0 +1,9 @@
++++ b/port/blockdev.h
+@@ -0,0 +1,8 @@
 +#ifndef LIBPORT_BLOCKDEV_H
 +#define LIBPORT_BLOCKDEV_H
 +
@@ -136,13 +147,12 @@
 +int64_t get_block_device_size(int fd);
 +
 +#endif
-+
 --- /dev/null
-+++ b/libport/Makefile
-@@ -0,0 +1,13 @@
++++ b/port/Makefile
+@@ -0,0 +1,12 @@
 +LIB = port
 +LIB_type = static
-+LIBSRCS = blockdev.c
++LIBSRCS = blockdev.c getdisklabel.c
 +
 +ALL_CFLAGS = -D_LIBPORT
 +ifdef LIBPORT_DEBUG
@@ -152,4 +162,3 @@
 +INCLUDES =
 +
 +include ../Makefile.common
-+

Modified: trunk/ufsutils/debian/patches/00_mount.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_mount.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/00_mount.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,9 +1,9 @@
 ---
- freebsd/sys/mount.h |   19 ++++++++++---------
+ sys/sys/mount.h |   19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
---- a/freebsd/sys/mount.h
-+++ b/freebsd/sys/mount.h
+--- a/sys/sys/mount.h
++++ b/sys/sys/mount.h
 @@ -34,20 +34,16 @@
  #define _SYS_MOUNT_H_
  

Modified: trunk/ufsutils/debian/patches/00_param.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_param.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/00_param.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,9 +1,9 @@
 ---
- freebsd/sys/param.h |   10 ++++++++++
+ sys/sys/param.h |   10 ++++++++++
  1 file changed, 10 insertions(+)
 
---- a/freebsd/sys/param.h
-+++ b/freebsd/sys/param.h
+--- a/sys/sys/param.h
++++ b/sys/sys/param.h
 @@ -38,6 +38,7 @@
  #ifndef _SYS_PARAM_H_
  #define _SYS_PARAM_H_

Deleted: trunk/ufsutils/debian/patches/01_libdisklabel.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libdisklabel.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/01_libdisklabel.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,29 +0,0 @@
----
- libdisklabel/Makefile       |   10 ++++++++++
- libdisklabel/getdisklabel.c |    8 ++++++++
- 2 files changed, 18 insertions(+)
-
---- /dev/null
-+++ b/libdisklabel/Makefile
-@@ -0,0 +1,10 @@
-+LIB = disklabel
-+LIB_type = static
-+LIBSRCS = getdisklabel.c
-+
-+ALL_CFLAGS = -D_LIBDISKLABEL
-+
-+INCLUDES =
-+
-+include ../Makefile.common
-+
---- /dev/null
-+++ b/libdisklabel/getdisklabel.c
-@@ -0,0 +1,8 @@
-+#include <stdlib.h>
-+#include <sys/disklabel.h>
-+
-+struct disklabel *getdiskbyname(const char *name)
-+{
-+	return NULL;
-+}
-+

Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/01_libufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,13 +1,13 @@
 ---
- include/ufs/ffs/fs.h     |    5 ++++-
- include/ufs/ufs/dinode.h |    2 ++
- include/ufs/ufs/dir.h    |    2 ++
- libufs/Makefile          |   29 ++++++++++-------------------
- libufs/type.c            |    4 +++-
+ lib/libufs/Makefile  |   29 ++++++++++-------------------
+ lib/libufs/type.c    |    4 +++-
+ sys/ufs/ffs/fs.h     |    5 ++++-
+ sys/ufs/ufs/dinode.h |    2 ++
+ sys/ufs/ufs/dir.h    |    2 ++
  5 files changed, 21 insertions(+), 21 deletions(-)
 
---- a/libufs/type.c
-+++ b/libufs/type.c
+--- a/lib/libufs/type.c
++++ b/lib/libufs/type.c
 @@ -108,7 +108,7 @@ again:	if ((ret = stat(name, &st)) < 0)
  		 */
  		name = oname;
@@ -28,8 +28,8 @@
  	} else {
  		ERROR(disk, "could not find special device");
  		return (-1);
---- a/include/ufs/ffs/fs.h
-+++ b/include/ufs/ffs/fs.h
+--- a/sys/ufs/ffs/fs.h
++++ b/sys/ufs/ffs/fs.h
 @@ -33,6 +33,9 @@
  #ifndef _UFS_FFS_FS_H_
  #define _UFS_FFS_FS_H_
@@ -49,8 +49,8 @@
  #define	dbtofsb(fs, b)	((b) >> (fs)->fs_fsbtodb)
  
  /*
---- a/include/ufs/ufs/dinode.h
-+++ b/include/ufs/ufs/dinode.h
+--- a/sys/ufs/ufs/dinode.h
++++ b/sys/ufs/ufs/dinode.h
 @@ -68,6 +68,8 @@
  #ifndef _UFS_UFS_DINODE_H_
  #define	_UFS_UFS_DINODE_H_
@@ -60,8 +60,8 @@
  /*
   * The root inode is the root of the filesystem.  Inode 0 can't be used for
   * normal purposes and historically bad blocks were linked to inode 1, thus
---- a/include/ufs/ufs/dir.h
-+++ b/include/ufs/ufs/dir.h
+--- a/sys/ufs/ufs/dir.h
++++ b/sys/ufs/ufs/dir.h
 @@ -38,6 +38,8 @@
  #ifndef _UFS_UFS_DIR_H_
  #define	_UFS_UFS_DIR_H_
@@ -71,10 +71,10 @@
  /*
   * Theoretically, directories can be more than 2Gb in length, however, in
   * practice this seems unlikely. So, we define the type doff_t as a 32-bit
---- a/libufs/Makefile
-+++ b/libufs/Makefile
+--- a/lib/libufs/Makefile
++++ b/lib/libufs/Makefile
 @@ -1,26 +1,17 @@
- # $FreeBSD: src/lib/libufs/Makefile,v 1.14.10.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  
  LIB=	ufs
 -SHLIBDIR?= /lib
@@ -109,4 +109,4 @@
 -CFLAGS+= -I${.CURDIR}
 -
 -.include <bsd.lib.mk>
-+include ../Makefile.common
++include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_badsect.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_badsect.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_badsect.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,12 +1,12 @@
 ---
- badsect.ufs/Makefile |   14 +++++++++-----
+ sbin/badsect/Makefile |   14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
---- a/badsect.ufs/Makefile
-+++ b/badsect.ufs/Makefile
+--- a/sbin/badsect/Makefile
++++ b/sbin/badsect/Makefile
 @@ -1,9 +1,13 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/badsect/Makefile,v 1.8.36.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  
 -PROG=	badsect
 -DPADD=	${LIBUFS}
@@ -17,9 +17,9 @@
 +WARNS = 0
 +MAN = badsect.8:badsect.ufs.8
 +
-+INCLUDES = -I../libufs
-+LDADD += -L../libufs -lufs -lbsd
++INCLUDES = -I../../lib/libufs
++LDADD += -L../../lib/libufs -lufs -lbsd
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
 -.include <bsd.prog.mk>

Modified: trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,11 +1,11 @@
 ---
- bsdlabel/Makefile   |   16 ++++++----------
- bsdlabel/bsdlabel.c |   21 +++++++++++++++++++--
+ sbin/bsdlabel/Makefile   |   16 ++++++----------
+ sbin/bsdlabel/bsdlabel.c |   21 +++++++++++++++++++--
  2 files changed, 25 insertions(+), 12 deletions(-)
 
---- a/bsdlabel/bsdlabel.c
-+++ b/bsdlabel/bsdlabel.c
-@@ -60,7 +60,9 @@ __FBSDID("$FreeBSD: src/sbin/bsdlabel/bs
+--- a/sbin/bsdlabel/bsdlabel.c
++++ b/sbin/bsdlabel/bsdlabel.c
+@@ -60,7 +60,9 @@ __FBSDID("$FreeBSD$");
  #include <sys/file.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
@@ -15,7 +15,7 @@
  #define DKTYPENAMES
  #define FSTYPENAMES
  #include <sys/disklabel.h>
-@@ -68,7 +70,7 @@ __FBSDID("$FreeBSD: src/sbin/bsdlabel/bs
+@@ -68,7 +70,7 @@ __FBSDID("$FreeBSD$");
  #include <unistd.h>
  #include <string.h>
  #include <stdio.h>
@@ -83,8 +83,8 @@
  		loclab.d_ntracks = 1;
  	else if (loclab.d_secperunit <= 63*16*1024)
  		loclab.d_ntracks = 16;
---- a/bsdlabel/Makefile
-+++ b/bsdlabel/Makefile
+--- a/sbin/bsdlabel/Makefile
++++ b/sbin/bsdlabel/Makefile
 @@ -4,14 +4,8 @@
  .PATH: ${.CURDIR}/../../sys/geom
  
@@ -97,7 +97,7 @@
 -LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
 -MLINKS=	bsdlabel.8 disklabel.8
 -.endif
-+SRCS=	bsdlabel.c ../libdisklabel/geom_bsd_enc.c
++SRCS=	bsdlabel.c ../../libdisklabel/geom_bsd_enc.c
 +MAN = bsdlabel.8:bsdlabel.8
  
  DPADD=	${LIBGEOM}
@@ -113,4 +113,4 @@
 -	sh -x ${.CURDIR}/runtest.sh
 +	sh -x ${CURDIR}/runtest.sh
 +
-+include ../Makefile.common
++include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_dump.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dump.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_dump.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,9 +1,9 @@
 ---
- dump.ufs/Makefile |   11 ++++++++---
+ sbin/dump/Makefile |   11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
---- a/dump.ufs/Makefile
-+++ b/dump.ufs/Makefile
+--- a/sbin/dump/Makefile
++++ b/sbin/dump/Makefile
 @@ -15,9 +15,14 @@
  
  PROG=	dump
@@ -16,9 +16,9 @@
 +
 +ALL_CFLAGS = -DRDUMP
 +
-+LDADD += -L../libufs -lufs -L../libport -lport
-+INCLUDES = -I../include -I${CURDIR}/../../libexec/rlogind
++LDADD += -L../../lib/libufs -lufs -L../../port -lport
++INCLUDES = -I../../sys -I${CURDIR}/../../libexec/rlogind
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
 -.include <bsd.prog.mk>

Modified: trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,10 +1,10 @@
 ---
- dumpfs.ufs/Makefile |   14 +++++++++-----
- dumpfs.ufs/dumpfs.c |    1 +
+ sbin/dumpfs/Makefile |   14 +++++++++-----
+ sbin/dumpfs/dumpfs.c |    1 +
  2 files changed, 10 insertions(+), 5 deletions(-)
 
---- a/dumpfs.ufs/dumpfs.c
-+++ b/dumpfs.ufs/dumpfs.c
+--- a/sbin/dumpfs/dumpfs.c
++++ b/sbin/dumpfs/dumpfs.c
 @@ -68,6 +68,7 @@ static const char rcsid[] =
  #include <fcntl.h>
  #include <fstab.h>
@@ -13,11 +13,11 @@
  #include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
---- a/dumpfs.ufs/Makefile
-+++ b/dumpfs.ufs/Makefile
+--- a/sbin/dumpfs/Makefile
++++ b/sbin/dumpfs/Makefile
 @@ -1,9 +1,13 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9.34.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  
 -PROG=	dumpfs
 -DPADD=	${LIBUFS}
@@ -28,9 +28,9 @@
 +WARNS = 0
 +MAN = dumpfs.8:dumpfs.ufs.8
 +
-+LDADD += -L../libufs/ -lufs -lbsd
-+INCLUDES = -I../libufs
++LDADD += -L../../lib/libufs/ -lufs -lbsd
++INCLUDES = -I../../lib/libufs
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
 -.include <bsd.prog.mk>

Modified: trunk/ufsutils/debian/patches/02_ffsinfo.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_ffsinfo.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_ffsinfo.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,26 +1,26 @@
 ---
- ffsinfo/Makefile |   18 +++++++-----------
+ sbin/ffsinfo/Makefile |   18 +++++++-----------
  1 file changed, 7 insertions(+), 11 deletions(-)
 
---- a/ffsinfo/Makefile
-+++ b/ffsinfo/Makefile
+--- a/sbin/ffsinfo/Makefile
++++ b/sbin/ffsinfo/Makefile
 @@ -4,16 +4,12 @@
- # $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.7.32.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  #
  
 -GROWFS= ${.CURDIR}/../growfs
 -.PATH: ${GROWFS}
 +PROG = ffsinfo
-+SRCS = ffsinfo.c ../growfs.ufs/debug.c
++SRCS = ffsinfo.c ../growfs/debug.c
 +MAN = ffsinfo.8:ffsinfo.8
  
 -PROG=	ffsinfo
 -SRCS=	ffsinfo.c debug.c
 -MAN=	ffsinfo.8
-+ALL_CFLAGS = -DFS_DEBUG -I../growfs.ufs -I../libufs
-+LDADD += -L../libufs -lufs -lbsd
++ALL_CFLAGS = -DFS_DEBUG -I../growfs -I../../lib/libufs
++LDADD += -L../../lib/libufs -lufs -lbsd
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
 -WARNS?=	0
 -CFLAGS+=-DFS_DEBUG -I${GROWFS}

Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,22 +1,22 @@
 ---
- fsck.ufs/Makefile    |   27 +++++++++++-------------
- fsck.ufs/ea.c        |    2 -
- fsck.ufs/fsck.h      |    1 
- fsck.ufs/fsck_ffs.8  |    7 ++----
- fsck.ufs/fsutil.c    |   13 ++++++++++-
- fsck.ufs/gjournal.c  |    4 +++
- fsck.ufs/inode.c     |    3 +-
- fsck.ufs/main.c      |   56 +++++++++++++++++++++++++++++++++++++++++++++------
- fsck.ufs/pass1.c     |    2 +
- fsck.ufs/setup.c     |   14 ++++++++++++
- fsck.ufs/utilities.c |    6 +++--
+ sbin/fsck_ffs/Makefile    |   27 ++++++++++------------
+ sbin/fsck_ffs/ea.c        |    2 -
+ sbin/fsck_ffs/fsck.h      |    1 
+ sbin/fsck_ffs/fsck_ffs.8  |    7 ++---
+ sbin/fsck_ffs/fsutil.c    |   13 +++++++++-
+ sbin/fsck_ffs/gjournal.c  |    4 +++
+ sbin/fsck_ffs/inode.c     |    3 +-
+ sbin/fsck_ffs/main.c      |   56 +++++++++++++++++++++++++++++++++++++++++-----
+ sbin/fsck_ffs/pass1.c     |    2 +
+ sbin/fsck_ffs/setup.c     |   14 +++++++++++
+ sbin/fsck_ffs/utilities.c |    6 +++-
  11 files changed, 105 insertions(+), 30 deletions(-)
 
---- a/fsck.ufs/gjournal.c
-+++ b/fsck.ufs/gjournal.c
+--- a/sbin/fsck_ffs/gjournal.c
++++ b/sbin/fsck_ffs/gjournal.c
 @@ -54,6 +54,9 @@
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2.2.1.2.1 2010/02/10 00:26:20 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
  
 +
 +#if HAVE_UFS_SNAPSHOT
@@ -29,9 +29,9 @@
  	putdisk();
  }
 +#endif
---- a/fsck.ufs/ea.c
-+++ b/fsck.ufs/ea.c
-@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/ea
+--- a/sbin/fsck_ffs/ea.c
++++ b/sbin/fsck_ffs/ea.c
+@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
  
  #include <sys/param.h>
  #include <sys/time.h>
@@ -40,10 +40,10 @@
  
  #include <ufs/ufs/dinode.h>
  #include <ufs/ufs/dir.h>
---- a/fsck.ufs/fsck_ffs.8
-+++ b/fsck.ufs/fsck_ffs.8
+--- a/sbin/fsck_ffs/fsck_ffs.8
++++ b/sbin/fsck_ffs/fsck_ffs.8
 @@ -30,11 +30,11 @@
- .\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34.2.6.2.1 2010/02/10 00:26:20 kensmith Exp $
+ .\" $FreeBSD$
  .\"
  .Dd January 25, 2009
 -.Dt FSCK_FFS 8
@@ -63,9 +63,9 @@
  .Xr fsdb 8 ,
 -.Xr newfs 8 ,
  .Xr reboot 8
---- a/fsck.ufs/fsutil.c
-+++ b/fsck.ufs/fsutil.c
-@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/fs
+--- a/sbin/fsck_ffs/fsutil.c
++++ b/sbin/fsck_ffs/fsutil.c
+@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
  #include <sys/param.h>
  #include <sys/time.h>
  #include <sys/types.h>
@@ -75,7 +75,7 @@
  #include <sys/disklabel.h>
  #include <sys/stat.h>
  #include <sys/disklabel.h>
-@@ -55,6 +57,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/fs
+@@ -55,6 +57,7 @@ __FBSDID("$FreeBSD$");
  #include <stdint.h>
  #include <stdio.h>
  #include <stdlib.h>
@@ -145,10 +145,10 @@
  	ckfini(0);
  	exit(EEXIT);
  }
---- a/fsck.ufs/inode.c
-+++ b/fsck.ufs/inode.c
+--- a/sbin/fsck_ffs/inode.c
++++ b/sbin/fsck_ffs/inode.c
 @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)inode.
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38.2.1.4.1 2010/02/10 00:26:20 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
  
  #include <sys/param.h>
 -#include <sys/stdint.h>
@@ -156,7 +156,7 @@
  #include <sys/time.h>
  #include <sys/sysctl.h>
  
-@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/in
+@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
  #include <err.h>
  #include <pwd.h>
  #include <string.h>
@@ -164,9 +164,9 @@
  
  #include "fsck.h"
  
---- a/fsck.ufs/main.c
-+++ b/fsck.ufs/main.c
-@@ -45,9 +45,17 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/ma
+--- a/sbin/fsck_ffs/main.c
++++ b/sbin/fsck_ffs/main.c
+@@ -45,9 +45,17 @@ __FBSDID("$FreeBSD$");
  #include <sys/stat.h>
  #include <sys/file.h>
  #include <sys/time.h>
@@ -184,7 +184,7 @@
  #include <sys/uio.h>
  #include <sys/disklabel.h>
  
-@@ -62,14 +70,18 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/ma
+@@ -62,14 +70,18 @@ __FBSDID("$FreeBSD$");
  #include <paths.h>
  #include <stdint.h>
  #include <string.h>
@@ -394,8 +394,8 @@
 +            progname);
          exit(1);
  }
---- a/fsck.ufs/pass1.c
-+++ b/fsck.ufs/pass1.c
+--- a/sbin/fsck_ffs/pass1.c
++++ b/sbin/fsck_ffs/pass1.c
 @@ -319,9 +319,11 @@ checkinode(ino_t inumber, struct inodesc
  	inoinfo(inumber)->ino_type = IFTODT(mode);
  	badblk = dupblk = 0;
@@ -408,10 +408,10 @@
  		idesc->id_type = ADDR;
  	(void)ckinode(dp, idesc);
  	if (sblock.fs_magic == FS_UFS2_MAGIC && dp->dp2.di_extsize > 0) {
---- a/fsck.ufs/setup.c
-+++ b/fsck.ufs/setup.c
+--- a/sbin/fsck_ffs/setup.c
++++ b/sbin/fsck_ffs/setup.c
 @@ -36,11 +36,14 @@ static const char sccsid[] = "@(#)setup.
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50.2.3.2.1 2010/02/10 00:26:20 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
  
  #include <sys/param.h>
 +#include <sys/types.h>
@@ -425,7 +425,7 @@
  
  #include <ufs/ufs/dinode.h>
  #include <ufs/ffs/fs.h>
-@@ -51,6 +54,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/se
+@@ -51,6 +54,7 @@ __FBSDID("$FreeBSD$");
  #include <limits.h>
  #include <stdint.h>
  #include <string.h>
@@ -492,8 +492,8 @@
  	return (&lab);
 +#endif
  }
---- a/fsck.ufs/utilities.c
-+++ b/fsck.ufs/utilities.c
+--- a/sbin/fsck_ffs/utilities.c
++++ b/sbin/fsck_ffs/utilities.c
 @@ -108,14 +108,16 @@ retry:
  	return (origname);
  }
@@ -513,10 +513,10 @@
  {
  	got_sigalarm = 1;
  }
---- a/fsck.ufs/Makefile
-+++ b/fsck.ufs/Makefile
+--- a/sbin/fsck_ffs/Makefile
++++ b/sbin/fsck_ffs/Makefile
 @@ -1,19 +1,18 @@
- # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18.12.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  #	@(#)Makefile	8.2 (Berkeley) 4/27/95
  
 -PROG=	fsck_ffs
@@ -536,20 +536,20 @@
 +LIB_type = static
 +SRCS = main.c
 +MAN = fsck_ffs.8:fsck.ufs.8
-+UFS_SRCS = ../include/ufs/ffs/ffs_subr.c ../include/ufs/ffs/ffs_tables.c
++UFS_SRCS = ../../sys/ufs/ffs/ffs_subr.c ../../sys/ufs/ffs/ffs_tables.c
 +LIBSRCS= dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c \
 +	pass4.c pass5.c setup.c utilities.c $(UFS_SRCS) gjournal.c \
 +	../mount/getmntopts.c
  
 -.PATH:	${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
-+LDADD += -L../libport -lport -L. -l$(LIB) -L../libufs -lufs -lbsd
-+INCLUDES = -I. -I../libufs -I../mount
++LDADD += -L../../port -lport -L. -l$(LIB) -L../../lib/libufs -lufs -lbsd
++INCLUDES = -I. -I../../lib/libufs -I../mount
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
 -.include <bsd.prog.mk>
---- a/fsck.ufs/fsck.h
-+++ b/fsck.ufs/fsck.h
+--- a/sbin/fsck_ffs/fsck.h
++++ b/sbin/fsck_ffs/fsck.h
 @@ -63,6 +63,7 @@
  #include <unistd.h>
  #include <stdlib.h>

Modified: trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsdb.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_fsdb.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,12 +1,12 @@
 ---
- fsdb.ufs/Makefile   |   20 +++++++++-----------
- fsdb.ufs/fsdb.8     |    2 +-
- fsdb.ufs/fsdb.c     |   14 +++++++++++++-
- fsdb.ufs/fsdbutil.c |   13 ++++++++++++-
+ sbin/fsdb/Makefile   |   20 +++++++++-----------
+ sbin/fsdb/fsdb.8     |    2 +-
+ sbin/fsdb/fsdb.c     |   14 +++++++++++++-
+ sbin/fsdb/fsdbutil.c |   13 ++++++++++++-
  4 files changed, 35 insertions(+), 14 deletions(-)
 
---- a/fsdb.ufs/fsdb.8
-+++ b/fsdb.ufs/fsdb.8
+--- a/sbin/fsdb/fsdb.8
++++ b/sbin/fsdb/fsdb.8
 @@ -263,7 +263,7 @@ There are a bunch of other things that y
  .Nm
  does not implement.
@@ -16,8 +16,8 @@
  beyond what
  .Xr fsck 8
  can repair.
---- a/fsdb.ufs/fsdb.c
-+++ b/fsdb.ufs/fsdb.c
+--- a/sbin/fsdb/fsdb.c
++++ b/sbin/fsdb/fsdb.c
 @@ -35,13 +35,13 @@ static const char rcsid[] =
  
  #include <sys/param.h>
@@ -52,8 +52,8 @@
  static void 
  usage(void)
  {
---- a/fsdb.ufs/fsdbutil.c
-+++ b/fsdb.ufs/fsdbutil.c
+--- a/sbin/fsdb/fsdbutil.c
++++ b/sbin/fsdb/fsdbutil.c
 @@ -41,7 +41,6 @@ static const char rcsid[] =
  #include <stdint.h>
  #include <string.h>
@@ -81,11 +81,11 @@
  static int charsperline(void);
  static int printindir(ufs2_daddr_t blk, int level, char *bufp);
  static void printblocks(ino_t inum, union dinode *dp);
---- a/fsdb.ufs/Makefile
-+++ b/fsdb.ufs/Makefile
-@@ -2,15 +2,13 @@
+--- a/sbin/fsdb/Makefile
++++ b/sbin/fsdb/Makefile
+@@ -2,15 +2,12 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/fsdb/Makefile,v 1.19.24.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  
 -PROG=	fsdb
 -MAN=	fsdb.8
@@ -101,10 +101,9 @@
 +MAN = fsdb.8:fsdb.ufs.8
 +SRCS = fsdb.c fsdbutil.c
 +WARNS = 0
-+LDADD += -ledit -ltermcap -L../libufs -lufs -lbsd -L../fsck.ufs -lfsck.ufs
++LDADD += -ledit -ltermcap -L../../lib/libufs -lufs -lbsd -L../fsck_ffs -lfsck.ufs
 +DPADD += ${LIBEDIT} ${LIBTERMCAP}
-+INCLUDES = -I../fsck.ufs
++INCLUDES = -I../fsck_ffs
  
 -.include <bsd.prog.mk>
-+include ../Makefile.common
-+ 
++include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_growfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_growfs.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_growfs.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,11 +1,11 @@
 ---
- growfs.ufs/Makefile |   20 ++++++++++++--------
- growfs.ufs/growfs.c |    8 +++++++-
+ sbin/growfs/Makefile |   20 ++++++++++++--------
+ sbin/growfs/growfs.c |    8 +++++++-
  2 files changed, 19 insertions(+), 9 deletions(-)
 
---- a/growfs.ufs/growfs.c
-+++ b/growfs.ufs/growfs.c
-@@ -51,10 +51,10 @@ __FBSDID("$FreeBSD: src/sbin/growfs/grow
+--- a/sbin/growfs/growfs.c
++++ b/sbin/growfs/growfs.c
+@@ -51,10 +51,10 @@ __FBSDID("$FreeBSD$");
  
  /* ********************************************************** INCLUDES ***** */
  #include <sys/param.h>
@@ -53,9 +53,9 @@
  
      unlabeled++;
  
---- a/growfs.ufs/Makefile
-+++ b/growfs.ufs/Makefile
-@@ -6,14 +6,18 @@
+--- a/sbin/growfs/Makefile
++++ b/sbin/growfs/Makefile
+@@ -6,14 +6,17 @@
  
  #GFSDBG=
  
@@ -72,7 +72,7 @@
 +endif
 + 
 +WARNS = 6
-+LDADD += -L../libufs -lufs
++LDADD += -L../../lib/libufs -lufs
 +INCLUDES =
  
 -.if defined(GFSDBG)
@@ -80,5 +80,4 @@
 -.endif  
 -
 -.include <bsd.prog.mk>      
-+include ../Makefile.common
-+ 
++include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_mkfs.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_mkfs.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,12 +1,12 @@
 ---
- mkfs.ufs/Makefile |   23 +++++++++++++----------
- mkfs.ufs/mkfs.c   |    1 +
- mkfs.ufs/newfs.c  |   21 +++++++++++++++++----
+ sbin/newfs/Makefile |   23 +++++++++++++----------
+ sbin/newfs/mkfs.c   |    1 +
+ sbin/newfs/newfs.c  |   21 +++++++++++++++++----
  3 files changed, 31 insertions(+), 14 deletions(-)
 
---- a/mkfs.ufs/mkfs.c
-+++ b/mkfs.ufs/mkfs.c
-@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD: src/sbin/newfs/mkfs.
+--- a/sbin/newfs/mkfs.c
++++ b/sbin/newfs/mkfs.c
+@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
  #include <stdint.h>
  #include <stdio.h>
  #include <unistd.h>
@@ -14,9 +14,9 @@
  #include <sys/param.h>
  #include <sys/time.h>
  #include <sys/types.h>
---- a/mkfs.ufs/newfs.c
-+++ b/mkfs.ufs/newfs.c
-@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD: src/sbin/newfs/newfs
+--- a/sbin/newfs/newfs.c
++++ b/sbin/newfs/newfs.c
+@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
   */
  #include <sys/param.h>
  #include <sys/stat.h>
@@ -107,11 +107,11 @@
  	    " [device-type]");
  	fprintf(stderr, "where fsoptions are:\n");
  	fprintf(stderr, "\t-J Enable journaling via gjournal\n");
---- a/mkfs.ufs/Makefile
-+++ b/mkfs.ufs/Makefile
-@@ -1,17 +1,20 @@
+--- a/sbin/newfs/Makefile
++++ b/sbin/newfs/Makefile
+@@ -1,17 +1,19 @@
  #	@(#)Makefile	8.2 (Berkeley) 3/27/94
- # $FreeBSD: src/sbin/newfs/Makefile,v 1.22.34.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  
 -PROG=	newfs
 -DPADD=	${LIBUFS}
@@ -125,11 +125,11 @@
 +MAN = newfs.8:mkfs.ufs.8
  
 -.include <bsd.prog.mk>
-+LDADD += -L../libufs -lufs -L../libdisklabel -ldisklabel -L../libport -lport -lbsd
-+INCLUDES = -I../libufs \
-+           -include port/blockdev.h
++LDADD += -L../../lib/libufs -lufs -L../../port -lport -lbsd
++INCLUDES = -I../../lib/libufs \
++           -include ../../port/blockdev.h
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
  test:	${PROG}
 -	sh ${.CURDIR}/runtest01.sh 
@@ -139,4 +139,3 @@
 +	sh ${CURDIR}/runtest00.sh | tee _.test
 +	diff --ignore-matching-lines=FreeBSD _.test ${CURDIR}/ref.test
  	echo All Tests Passed
-+

Modified: trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_tunefs.ufs.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/02_tunefs.ufs.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,11 +1,11 @@
 ---
- tunefs.ufs/Makefile |   13 ++++++++-----
- tunefs.ufs/tunefs.c |   15 +++++++++++++++
+ sbin/tunefs/Makefile |   13 ++++++++-----
+ sbin/tunefs/tunefs.c |   15 +++++++++++++++
  2 files changed, 23 insertions(+), 5 deletions(-)
 
---- a/tunefs.ufs/tunefs.c
-+++ b/tunefs.ufs/tunefs.c
-@@ -48,8 +48,15 @@ __FBSDID("$FreeBSD: src/sbin/tunefs/tune
+--- a/sbin/tunefs/tunefs.c
++++ b/sbin/tunefs/tunefs.c
+@@ -48,8 +48,15 @@ __FBSDID("$FreeBSD$");
  #include <sys/mount.h>
  #include <sys/disklabel.h>
  #include <sys/stat.h>
@@ -62,11 +62,11 @@
  	exit(0);
  err:
  	if (disk.d_error != NULL)
---- a/tunefs.ufs/Makefile
-+++ b/tunefs.ufs/Makefile
+--- a/sbin/tunefs/Makefile
++++ b/sbin/tunefs/Makefile
 @@ -1,9 +1,12 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/tunefs/Makefile,v 1.8.36.1 2010/02/10 00:26:20 kensmith Exp $
+ # $FreeBSD$
  
 -PROG=	tunefs
 -DPADD=	${LIBUFS}
@@ -76,9 +76,9 @@
 +SRCS = tunefs.c
 +MAN = tunefs.8:tunefs.ufs.8
 +
-+LDADD += -L../libufs -lufs -lbsd
-+INCLUDES = -I../libufs
++LDADD += -L../../lib/libufs -lufs -lbsd
++INCLUDES = -I../../lib/libufs
 +
-+include ../Makefile.common
++include ../../Makefile.common
  
 -.include <bsd.prog.mk>

Modified: trunk/ufsutils/debian/patches/03_ufsmount.patch
===================================================================
--- trunk/ufsutils/debian/patches/03_ufsmount.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/03_ufsmount.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,9 +1,9 @@
 ---
- include/ufs/ufs/ufsmount.h |    2 --
+ sys/ufs/ufs/ufsmount.h |    2 --
  1 file changed, 2 deletions(-)
 
---- a/include/ufs/ufs/ufsmount.h
-+++ b/include/ufs/ufs/ufsmount.h
+--- a/sys/ufs/ufs/ufsmount.h
++++ b/sys/ufs/ufs/ufsmount.h
 @@ -33,8 +33,6 @@
  #ifndef _UFS_UFS_UFSMOUNT_H_
  #define _UFS_UFS_UFSMOUNT_H_

Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 05:17:07 UTC (rev 3355)
@@ -5,14 +5,14 @@
 
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +#
 +# ufsutils Makefile
 +#
 +
-+#SUBDIRS = dump.ufs
-+SUBDIRS = libport libdisklabel libufs badsect.ufs dumpfs.ufs fsck.ufs \
-+	  fsdb.ufs growfs.ufs mkfs.ufs tunefs.ufs ffsinfo
++#SUBDIRS = sbin/dump
++SUBDIRS = port lib/libufs sbin/badsect sbin/dumpfs sbin/fsck_ffs sbin/fsdb \
++	  sbin/growfs sbin/newfs sbin/tunefs sbin/ffsinfo
 +
 +clean_targets = $(addsuffix -clean,$(SUBDIRS))
 +install_targets = $(addsuffix -install,$(SUBDIRS))
@@ -33,10 +33,9 @@
 +	$(MAKE) -C $(subst -install,,$@) install
 +
 +.PHONY: all clean install $(SUBDIRS) $(clean_targets) $(install_targets)
-+
 --- /dev/null
 +++ b/Makefile.common
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,91 @@
 +#
 +# $Id: Makefile.common 45 2004-05-03 11:07:29Z guillem $
 +#
@@ -51,7 +50,7 @@
 +
 +#LDADD += -lbsd
 +CFLAGS ?= -Wall -g -O2
-+ALL_CFLAGS += -I../include -include port/port.h -include bsd/bsd.h -D_GNU_SOURCE
++ALL_CFLAGS += -I../../port -include port.h -include bsd/bsd.h -D_GNU_SOURCE
 +# -DHAVE_BSD_ERRNO -DHAVE_BSD_SIGNALS -DHAVE_BSD_STATFS -DHAVE_BSD_DISKLABEL -DHAVE_BSD_MOUNT -DHAVE_UFS_SNAPSHOT -DHAVE_BSD_SYSCTL
 +
 +INSTALL = install
@@ -128,4 +127,3 @@
 +	$(INSTALL_DATA) lib$(LIB).so $(DESTDIR)$(libdir)/lib$(LIB).so
 +	$(INSTALL_DATA) $(SHLIB_SONAME) $(DESTDIR)$(libdir)/$(SHLIB_SONAME)
 +endif
-+

Modified: trunk/ufsutils/debian/patches/series
===================================================================
--- trunk/ufsutils/debian/patches/series	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/patches/series	2011-05-30 05:17:07 UTC (rev 3355)
@@ -2,7 +2,6 @@
 00_libport.patch
 00_mount.patch
 00_param.patch
-01_libdisklabel.patch
 01_libufs.patch
 02_badsect.ufs.patch
 02_bsdlabel.ufs.patch

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/rules	2011-05-30 05:17:07 UTC (rev 3355)
@@ -19,7 +19,7 @@
 ifneq (kfreebsd,$(DEB_HOST_ARCH_OS))
 # really only on other systems, as GNU/kFreeBSD already have off_t 64bit
 # on GNU/kFreeBSD it must not be enabled, as it would change size of ino_t
-CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CURDIR)/freebsd
+CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CURDIR)/sys
 endif
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
@@ -28,6 +28,26 @@
 	CFLAGS += -O2
 endif
 
+SOURCE = $(shell dpkg-parsechangelog | sed -e '/^Source:/!d' -e 's/^Source: //g')
+VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN = http://svn.freebsd.org/base/release/$(VERSION).0
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
+
+get-orig-source:
+	rm -rf $(ORIGDIR)
+	mkdir -p $(ORIGDIR)/sys/sys
+	for i in sbin/badsect sbin/dump sbin/dumpfs sbin/fsck_ffs sbin/fsdb \
+		 sbin/growfs sbin/newfs sbin/tunefs sbin/bsdlabel \
+		 sbin/sunlabel sbin/ffsinfo sbin/mount lib/libufs sys/ufs \
+		 sys/sys/disklabel.h sys/sys/mount.h sys/sys/param.h \
+		 sys/sys/ucred.h ; \
+	do \
+	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	done
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
+	rm -rf $(ORIGDIR)
+
 build:
 	dh_testdir
 

Deleted: trunk/ufsutils/debian/upstream.sh
===================================================================
--- trunk/ufsutils/debian/upstream.sh	2011-05-30 03:32:36 UTC (rev 3354)
+++ trunk/ufsutils/debian/upstream.sh	2011-05-30 05:17:07 UTC (rev 3355)
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_3_0_RELEASE
-
-srcs=" \
-	src/sbin/badsect:badsect.ufs \
-	src/sbin/dump:dump.ufs \
-	src/sbin/dumpfs:dumpfs.ufs \
-	src/sbin/fsck_ffs:fsck.ufs \
-	src/sbin/fsdb:fsdb.ufs \
-	src/sbin/growfs:growfs.ufs \
-	src/sbin/newfs:mkfs.ufs \
-	src/sbin/tunefs:tunefs.ufs \
-	src/sbin/bsdlabel:bsdlabel \
-	src/sbin/sunlabel:sunlabel \
-	src/sbin/ffsinfo:ffsinfo \
-	src/sbin/mount:mount \
-	src/lib/libufs:libufs \
-	src/sys/ufs:include"
-
-include_files=" \
-	src/sys/sys/disklabel.h:freebsd/sys \
-	src/sys/sys/mount.h:freebsd/sys \
-	src/sys/sys/param.h:freebsd/sys \
-	src/sys/sys/ucred.h:freebsd/sys"
-	
-move_repo()
-{
-  local list=$@
-
-  for src in $list
-  do
-    repo=${src//:*/}
-    dest=${src//*:/}
-    echo " -> moving $repo to $dest"
-    mv $repo $dest
-  done
-}
-
-get_cvs_list()
-{
-  local list=$@
-
-  for src in $list
-  do
-    orig="$orig ${src//:*/}"
-  done
-  echo $orig
-}
-
-echo "-> Downloading all upstream sources ..."
-repos=`get_cvs_list $srcs $include_files`
-
-# Note: Does not use co -d because freebsd cvs server has
-#       a fascist connection limit (2)
-
-cvs -z3 -d $ANONCVS co -r $RELENG $repos
-
-rm -rf badsect.ufs bsdlabel dump.ufs dumpfs.ufs ffsinfo freebsd fsck.ufs fsdb.ufs growfs.ufs include libufs mkfs.ufs sunlabel tunefs.ufs libdisklabel
-
-mkdir -p include freebsd/sys
-
-echo "-> Moving upstream sources to the proper place ..."
-move_repo $srcs
-
-echo "-> Moving upstream includes to the proper place ..."
-move_repo $include_files
-
-echo "-> Cleaning the mess ..."
-rm -rf src

More information about the Glibc-bsd-commits mailing list