[Glibc-bsd-commits] r5274 - in trunk: freebsd-buildutils/debian freebsd-glue/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-30 16:27:51 +0000 (Mon, 30 Dec 2013)
New Revision: 5274

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/rules
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/control
   trunk/freebsd-glue/debian/links
Log:
Install make and mtree by their upstream names (fmake and fmtree). Remove the legacy symlinks (leave them to freebsd-glue).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-12-29 21:30:09 UTC (rev 5273)
+++ trunk/freebsd-buildutils/debian/changelog	2013-12-30 16:27:51 UTC (rev 5274)
@@ -1,6 +1,8 @@
 freebsd-buildutils (10.0~svn259404-4) UNRELEASED; urgency=low
 
   * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
+  * Install make and mtree by their upstream names (fmake and fmtree).
+    Remove the legacy symlinks (leave them to freebsd-glue).
 
  -- 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-29 21:30:09 UTC (rev 5273)
+++ trunk/freebsd-buildutils/debian/control	2013-12-30 16:27:51 UTC (rev 5274)
@@ -17,7 +17,7 @@
 Package: freebsd-buildutils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, bsdmainutils, unzip, patchutils,
- freebsd-glue,
+ freebsd-glue (>= 0.2.8~),
 # Required by lex
  m4,
 Conflicts: freebsd5-buildutils, freebsd6-buildutils, pmake

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2013-12-29 21:30:09 UTC (rev 5273)
+++ trunk/freebsd-buildutils/debian/rules	2013-12-30 16:27:51 UTC (rev 5274)
@@ -141,11 +141,11 @@
 	dh_prep
 	dh_installdirs
 
-	for i in cksum lex make mkdep file2c brandelf ; do \
+	for i in cksum lex mkdep file2c brandelf ; do \
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
-	for i in mtree config ; do \
+	for i in config ; do \
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
@@ -160,9 +160,11 @@
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
 endif
 
-	# Legacy make is now called "fmake". FIXME: I guess we'll need to point this
-	# symlink to "bmake" at some point?
-	ln -s fmake $(CURDIR)/debian/$(package)/usr/lib/freebsd/make
+	# Legacy make (aka fmake / fmtree)
+	$(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/make install \
+		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+	$(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/mtree install \
+		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
 
 	# remove trash
 	rm -rf 	$(CURDIR)/debian/$(package)/usr/include \
@@ -170,14 +172,15 @@
 	for i in `find $(CURDIR)/debian/$(package)/usr/share/man -type l` ; do \
 		rm $$i ; \
 	done
+	rm -f $(CURDIR)/debian/$(package)/usr/share/man/man5/mtree.5.gz
 
 	# relocate files
-	for m in `find $(CURDIR)/debian/$(package)/usr/share/man -type f`; do \
-		mv $$m `echo $$m | sed -e 's:\(man[0-9]/\):\1freebsd-:'` ; \
-	done
 	for i in `cd $(CURDIR)/debian/$(package)/usr/lib/freebsd && ls` ; do \
 		ln -s ../lib/freebsd/$$i \
-		$(CURDIR)/debian/$(package)/usr/bin/freebsd-$$i ; \
+			$(CURDIR)/debian/$(package)/usr/bin/freebsd-$$i ; \
+		for m in $(CURDIR)/debian/$(package)/usr/share/man/man[0-9]/$$i.* ; do \
+			mv $$m `echo $$m | sed -e 's:\(man[0-9]/\):\1freebsd-:'` ; \
+		done ; \
 	done
 	rmdir $(CURDIR)/debian/$(package)/usr/sbin
 

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-29 21:30:09 UTC (rev 5273)
+++ trunk/freebsd-glue/debian/changelog	2013-12-30 16:27:51 UTC (rev 5274)
@@ -1,6 +1,8 @@
 freebsd-glue (0.2.8) UNRELEASED; urgency=low
 
   * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
+  * Provide legacy symlinks for make and mtree (for now, fmake and
+    fmtree).
 
  -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 20:44:42 +0100
 

Modified: trunk/freebsd-glue/debian/control
===================================================================
--- trunk/freebsd-glue/debian/control	2013-12-29 21:30:09 UTC (rev 5273)
+++ trunk/freebsd-glue/debian/control	2013-12-30 16:27:51 UTC (rev 5274)
@@ -32,7 +32,7 @@
  freebsd-buildutils,
 Conflicts: kfreebsd-kernel-headers (<< 0.80)
 Replaces:
- freebsd-buildutils (<< 10~svn237137-1~),
+ freebsd-buildutils (<< 10.0~svn259404-4~),
 Breaks: freebsd-buildutils (<< 9.0-10)
 Description: Emulate a FreeBSD build environment
  This package provides a set of glue headers and symbolic links to emulate

Modified: trunk/freebsd-glue/debian/links
===================================================================
--- trunk/freebsd-glue/debian/links	2013-12-29 21:30:09 UTC (rev 5273)
+++ trunk/freebsd-glue/debian/links	2013-12-30 16:27:51 UTC (rev 5274)
@@ -1,4 +1,6 @@
 bin/dash		usr/lib/freebsd/sh
 usr/bin/original-awk	usr/lib/freebsd/awk
 usr/bin/make		usr/lib/freebsd/gmake
+usr/bin/fmake		usr/lib/freebsd/make
+usr/bin/fmtree		usr/lib/freebsd/mtree
 usr/bin/byacc		usr/lib/freebsd/yacc