[Glibc-bsd-commits] r3966 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-01-08 01:11:44 +0000 (Sun, 08 Jan 2012)
New Revision: 3966

Removed:
   trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/control.in
   trunk/kfreebsd-9/debian/patches/series
Log:
Remove 951_disable_mk_magic.diff, build-depend on freebsd-buildutils >= 9 instead

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2012-01-08 01:10:39 UTC (rev 3965)
+++ trunk/kfreebsd-9/debian/changelog	2012-01-08 01:11:44 UTC (rev 3966)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0-2) UNRELEASED; urgency=low
+
+  * Remove 951_disable_mk_magic.diff, build-depend on freebsd-buildutils
+    >= 9 instead.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 00:40:31 +0100
+
 kfreebsd-9 (9.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/kfreebsd-9/debian/control.in
===================================================================
--- trunk/kfreebsd-9/debian/control.in	2012-01-08 01:10:39 UTC (rev 3965)
+++ trunk/kfreebsd-9/debian/control.in	2012-01-08 01:11:44 UTC (rev 3966)
@@ -6,7 +6,7 @@
 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, sharutils, flex-old | flex,
- freebsd-buildutils (>= 8.2-7) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
+ freebsd-buildutils (>= 9),
  gcc- at gcc_version@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,
  libsbuf-dev, libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),

Deleted: trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff	2012-01-08 01:10:39 UTC (rev 3965)
+++ trunk/kfreebsd-9/debian/patches/951_disable_mk_magic.diff	2012-01-08 01:11:44 UTC (rev 3966)
@@ -1,127 +0,0 @@
-
-freebsd-buildutils 8.2 doesn't support MK_INET_SUPPORT nor MK_OFED.
-
---- a/sys/modules/Makefile
-+++ b/sys/modules/Makefile
-@@ -362,12 +362,11 @@
- .endif
- .endif
- 
--.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
-+.if 1
- _if_gre=	if_gre
- .endif
- 
--.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
--	defined(ALL_MODULES)
-+.if 1
- _if_carp=	if_carp
- .endif
- 
-@@ -375,7 +374,7 @@
- _ipfilter=	ipfilter
- .endif
- 
--.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
-+.if 1
- _ipfw=		ipfw
- .endif
- 
-@@ -383,11 +382,10 @@
- _netgraph=	netgraph
- .endif
- 
--.if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
--	${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
-+.if 1
- _pf=		pf
- _pflog=		pflog
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- _pfsync=	pfsync
- .endif
- .endif
-@@ -443,7 +441,7 @@
- _linsysfs=	linsysfs
- _linux=		linux
- _mse=		mse
--.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-+.if 1
- _mlx4=		mlx4
- _mlx4ib=	mlx4ib
- _mlxen=		mlxen
-@@ -595,7 +593,7 @@
- _linsysfs=	linsysfs
- _linux=		linux
- _mly=		mly
--.if ${MK_OFED} != "no" || defined(ALL_MODULES)
-+.if 1
- _mlx4=		mlx4
- _mlx4ib=	mlx4ib
- _mlxen=		mlxen
---- a/sys/modules/if_carp/Makefile
-+++ b/sys/modules/if_carp/Makefile
-@@ -9,7 +9,7 @@
- SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
- 
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	@echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/ipfw/Makefile
-+++ b/sys/modules/ipfw/Makefile
-@@ -22,7 +22,7 @@
- #
- 
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/netgraph/ipfw/Makefile
-+++ b/sys/modules/netgraph/ipfw/Makefile
-@@ -7,7 +7,7 @@
- 
- .if !defined(KERNBUILDDIR)
- 
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/pf/Makefile
-+++ b/sys/modules/pf/Makefile
-@@ -14,7 +14,7 @@
- CFLAGS+= -I${.CURDIR}/../../contrib/pf
- 
- .if !defined(KERNBUILDDIR)
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/pflog/Makefile
-+++ b/sys/modules/pflog/Makefile
-@@ -14,7 +14,7 @@
- .if defined(KERNBUILDDIR)
- MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
- .else
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif
---- a/sys/modules/pfsync/Makefile
-+++ b/sys/modules/pfsync/Makefile
-@@ -14,7 +14,7 @@
- .if defined(KERNBUILDDIR)
- MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
- .else
--.if ${MK_INET_SUPPORT} != "no"
-+.if 1
- opt_inet.h:
- 	echo "#define INET 1" > ${.TARGET}
- .endif

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2012-01-08 01:10:39 UTC (rev 3965)
+++ trunk/kfreebsd-9/debian/patches/series	2012-01-08 01:11:44 UTC (rev 3966)
@@ -27,6 +27,5 @@
 918_unix_socket_overflow.diff
 919_delete_key.diff
 950_no_stack_protector.diff
-951_disable_mk_magic.diff
 999_config.diff
 999_firmware.diff