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

[Robert Millan]

Author: rmh
Date: 2012-01-28 22:05:26 +0000 (Sat, 28 Jan 2012)
New Revision: 4027

Modified:
   trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
   trunk/freebsd-buildutils/debian/patches/21_endian.diff
   trunk/freebsd-buildutils/debian/patches/make_foreign.diff
   trunk/freebsd-buildutils/debian/rules
Log:
Resync debian/rules variable declarations with version from freebsd-utils

Modified: trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2012-01-28 22:04:37 UTC (rev 4026)
+++ trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2012-01-28 22:05:26 UTC (rev 4027)
@@ -23,7 +23,7 @@
   * Arch_ParseArchive --
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -247,6 +247,9 @@
+@@ -255,6 +255,9 @@
  {
  	char *fname, *fnamesave;	/* makefile to read */
  	FILE *stream;

Modified: trunk/freebsd-buildutils/debian/patches/21_endian.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/21_endian.diff	2012-01-28 22:04:37 UTC (rev 4026)
+++ trunk/freebsd-buildutils/debian/patches/21_endian.diff	2012-01-28 22:05:26 UTC (rev 4027)
@@ -7,7 +7,7 @@
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -873,6 +873,7 @@
+@@ -881,6 +881,7 @@
  	const char *machine;
  	const char *machine_arch;
  	const char *machine_cpu;
@@ -15,7 +15,7 @@
  	Boolean outOfDate = TRUE;	/* FALSE if all targets up to date */
  	const char *p;
  	const char *pathp;
-@@ -1002,6 +1003,16 @@
+@@ -1014,6 +1015,16 @@
  	Var_SetGlobal("MACHINE", machine);
  	Var_SetGlobal("MACHINE_ARCH", machine_arch);
  	Var_SetGlobal("MACHINE_CPU", machine_cpu);

Modified: trunk/freebsd-buildutils/debian/patches/make_foreign.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/make_foreign.diff	2012-01-28 22:04:37 UTC (rev 4026)
+++ trunk/freebsd-buildutils/debian/patches/make_foreign.diff	2012-01-28 22:05:26 UTC (rev 4027)
@@ -20,7 +20,7 @@
  /**
   * Exit with usage message.
   */
-@@ -942,10 +950,19 @@
+@@ -939,10 +947,19 @@
  	 */
  	if ((machine = getenv("MACHINE")) == NULL) {
  		static struct utsname utsname;

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2012-01-28 22:04:37 UTC (rev 4026)
+++ trunk/freebsd-buildutils/debian/rules	2012-01-28 22:05:26 UTC (rev 4027)
@@ -28,17 +28,26 @@
     export STRIPFLAG=
 endif
 
+full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
+version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
+pversion	:= $(shell echo $(version) | sed -e 's/\./_/g')
+major           := $(shell echo $(version) | sed -e 's/\..*//g')
+revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+
+SVN		:= http://svn.freebsd.org/base/release/$(version).0
+#SVN		:= http://svn.freebsd.org/base/releng/$(version)
+#SVN		:= http://svn.freebsd.org/base/stable/$(major)
+#SVN		:= http://svn.freebsd.org/base/head
+
 SOURCE = freebsd-buildutils
-VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN = http://svn.freebsd.org/base/release/$(VERSION).0
+ORIGDIR = $(SOURCE)-$(tar_version)
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
 
-PVERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g' -e 's/\./_/g')
 PCVS = anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-PTAG = RELEASE_$(PVERSION)_0
+PTAG = RELEASE_$(pversion)_0
 
-ORIGDIR = $(SOURCE)-$(VERSION)
-TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
-
 export CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
          -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
          -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \