[Glibc-bsd-commits] r1342 - trunk/freebsd-utils/debian

[Robert Millan]

Author: rmh
Date: 2006-03-18 12:42:05 +0000 (Sat, 18 Mar 2006)
New Revision: 1342

Modified:
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/rules
Log:
Add regexp hacks, and link with libedit (for strvis/strunvis/etc).

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-03-18 11:19:47 UTC (rev 1341)
+++ trunk/freebsd-utils/debian/control	2006-03-18 12:42:05 UTC (rev 1342)
@@ -3,7 +3,7 @@
 Priority: required
 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: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libedit-dev
 Standards-Version: 3.6.0
 
 Package: freebsd-utils

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-18 11:19:47 UTC (rev 1341)
+++ trunk/freebsd-utils/debian/rules	2006-03-18 12:42:05 UTC (rev 1342)
@@ -12,10 +12,16 @@
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/$(package)
 PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR)
+export LDADD=-ledit
 
 dirs=dmesg mount umount swapon sysctl
 
 build/$(package):: apply-patches
+	find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \
+		-e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
+		-e "/[ \t]*__dead2[ \t]*/d" \
+		-e "s/getline/bsd_&/g" \
+	; done)
 	set -e ; for i in $(dirs) ; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/sbin/$$i ; \
 	done