[Glibc-bsd-commits] r2970 - in trunk/kfreebsd-8/debian: . patches

[Robert Millan]

Author: rmh
Date: 2010-01-29 13:35:15 +0000 (Fri, 29 Jan 2010)
New Revision: 2970

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.in
   trunk/kfreebsd-8/debian/patches/008_config.diff
   trunk/kfreebsd-8/debian/rules
Log:
  * Remove build kludge in favour of using libsbuf-dev.



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2010-01-29 11:14:03 UTC (rev 2969)
+++ trunk/kfreebsd-8/debian/changelog	2010-01-29 13:35:15 UTC (rev 2970)
@@ -1,3 +1,9 @@
+kfreebsd-8 (8.0-4) UNRELEASED; urgency=low
+
+  * Remove build kludge in favour of using libsbuf-dev.
+
+ -- Robert Millan <rmh.debian at aybabtu.com>  Fri, 29 Jan 2010 14:34:15 +0100
+
 kfreebsd-8 (8.0-3) unstable; urgency=low
 
   * Enable superpages by default on i386.

Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in	2010-01-29 11:14:03 UTC (rev 2969)
+++ trunk/kfreebsd-8/debian/control.in	2010-01-29 13:35:15 UTC (rev 2970)
@@ -5,7 +5,7 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= 7) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
+Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, freebsd-buildutils (>= 7) [kfreebsd-i386 kfreebsd-amd64], libdb-dev, flex-old | flex, libbsd-dev [kfreebsd-i386 kfreebsd-amd64], libsbuf-dev [kfreebsd-i386 kfreebsd-amd64], gcc-4.3 [kfreebsd-i386 kfreebsd-amd64], sharutils
 Standards-Version: 3.8.3
 
 Package: kfreebsd-source- at version@

Modified: trunk/kfreebsd-8/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff	2010-01-29 11:14:03 UTC (rev 2969)
+++ trunk/kfreebsd-8/debian/patches/008_config.diff	2010-01-29 13:35:15 UTC (rev 2970)
@@ -16,13 +16,13 @@
  
  DPADD=	${LIBL} ${LIBSBUF}
 -LDADD=	-ll -lsbuf
-+LDADD=	-ll -lbsd
++LDADD=	-ll -lsbuf -lbsd
  
  CLEANFILES+=	kernconf.c
  
 --- a/usr.sbin/config/main.c
 +++ b/usr.sbin/config/main.c
-@@ -41,12 +41,18 @@
+@@ -41,12 +41,17 @@
    "$FreeBSD$";
  #endif /* not lint */
  
@@ -37,12 +37,11 @@
 +
 +#ifndef BSD
 +#include <bsd/string.h> /* strlcpy, strlcat */
-+#include "sbuf.c"
 +#endif
  
  #include <assert.h>
  #include <ctype.h>
-@@ -605,7 +611,11 @@
+@@ -605,7 +610,11 @@
  	if ((dirp = opendir(p)) == NULL)
  		err(EX_OSERR, "opendir %s", p);
  	while ((dp = readdir(dirp)) != NULL) {

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2010-01-29 11:14:03 UTC (rev 2969)
+++ trunk/kfreebsd-8/debian/rules	2010-01-29 13:35:15 UTC (rev 2970)
@@ -89,7 +89,6 @@
 	; done)
 
 	install debian/gen-ld-u-options src/usr.sbin/config
-	grep -v ^__FBSDID src/sys/kern/subr_sbuf.c > src/usr.sbin/config/sbuf.c
 
 	touch src-stamp