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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-30 16:53:04 +0000 (Mon, 30 Dec 2013)
New Revision: 5276

Added:
   trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/dirs
   trunk/freebsd-buildutils/debian/patches/series
Log:
Move /usr/share/mk to /usr/share/mk-freebsd. This allows freebsd-buildutils to be installed alongside bmake.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-12-30 16:32:48 UTC (rev 5275)
+++ trunk/freebsd-buildutils/debian/changelog	2013-12-30 16:53:04 UTC (rev 5276)
@@ -4,6 +4,8 @@
   * Install make and mtree by their upstream names (fmake and fmtree).
     Remove the legacy symlinks (leave them to freebsd-glue).
   * Install file2c and brandelf directly to /usr/bin.
+  * Move /usr/share/mk to /usr/share/mk-freebsd. This allows
+    freebsd-buildutils to be installed alongside bmake.
 
  -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 20:38:18 +0100
 

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2013-12-30 16:32:48 UTC (rev 5275)
+++ trunk/freebsd-buildutils/debian/control	2013-12-30 16:53:04 UTC (rev 5276)
@@ -20,7 +20,7 @@
  freebsd-glue (>= 0.2.8~),
 # Required by lex
  m4,
-Conflicts: freebsd5-buildutils, freebsd6-buildutils, pmake
+Conflicts: freebsd5-buildutils, freebsd6-buildutils
 Provides: freebsd6-buildutils, freebsd7-buildutils
 Description: Utilities for building FreeBSD sources
  This package contains the FreeBSD counterparts of some standard build

Modified: trunk/freebsd-buildutils/debian/dirs
===================================================================
--- trunk/freebsd-buildutils/debian/dirs	2013-12-30 16:32:48 UTC (rev 5275)
+++ trunk/freebsd-buildutils/debian/dirs	2013-12-30 16:53:04 UTC (rev 5276)
@@ -6,5 +6,5 @@
 usr/share/man/man8
 usr/lib
 var/db
-usr/share/mk
+usr/share/mk-freebsd
 usr/lib/freebsd

Added: trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff	2013-12-30 16:53:04 UTC (rev 5276)
@@ -0,0 +1,56 @@
+
+This allows freebsd-buildutils to be installed alongside bmake.
+
+--- a/src/share/mk/Makefile
++++ b/src/share/mk/Makefile
+@@ -41,7 +41,7 @@
+ 	version_gen.awk
+ 
+ NO_OBJ=
+-FILESDIR=	${BINDIR}/mk
++FILESDIR=	${BINDIR}/mk-freebsd
+ 
+ .if ${MK_ATF} != "no"
+ FILES+=	atf.test.mk
+--- a/src/share/mk/bsd.symver.mk
++++ b/src/share/mk/bsd.symver.mk
+@@ -23,7 +23,7 @@
+ .endif
+ _oarg=  ${_arg}
+ .endfor
+-_mpath+= /usr/share/mk
++_mpath+= /usr/share/mk-freebsd
+ 
+ # Look up ${VERSION_GEN} in ${_mpath}.
+ _vgen=
+--- a/src/usr.bin/make/make.1
++++ b/src/usr.bin/make/make.1
+@@ -235,7 +235,7 @@
+ .Fl m
+ options can be specified to form a search path.
+ This path will override the default system include path,
+-.Pa /usr/share/mk .
++.Pa /usr/share/mk-freebsd .
+ The system include path will always be appended to the search path used
+ for "..."-style inclusions and makefile searches (see the
+ .Fl I
+@@ -1721,7 +1721,7 @@
+ object directory
+ .It Pa sys.mk
+ system makefile
+-.It Pa /usr/share/mk
++.It Pa /usr/share/mk-freebsd
+ default system makefile directory
+ .It Pa /usr/share/doc/psd/12.make
+ PMake tutorial
+--- a/src/usr.bin/make/pathnames.h
++++ b/src/usr.bin/make/pathnames.h
+@@ -50,7 +50,7 @@
+ #endif /* ! PATH_DEFSYSMK */
+ 
+ #ifndef PATH_DEFSYSPATH
+-#define	PATH_DEFSYSPATH	"/usr/share/mk"
++#define	PATH_DEFSYSPATH	"/usr/share/mk-freebsd"
+ #endif /* ! PATH_DEFSYSPATH */
+ 
+ #endif /* pathnames_h_235b888a */

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2013-12-30 16:32:48 UTC (rev 5275)
+++ trunk/freebsd-buildutils/debian/patches/series	2013-12-30 16:53:04 UTC (rev 5276)
@@ -22,5 +22,6 @@
 config_ldflags.diff
 
 # Patches that are likely to be Debian-specific
+avoid_defsyspath_collision.diff
 aicasm.diff
 makefiles.diff