Change the way the version strings are handled.

7 files changed, 12 insertions, 9 deletions

diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index c732d29..fd94d06 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -4,10 +4,11 @@
 # use the normal "Makefile.inc" mechanism, because we need some of these
 # definitions before the sub-Makefile is processed.
 
-VERSION=	"2.12.0 pre-release snap 20020127 [FreeBSD]"
+VERSION=	"2.12.0 pre-release snap [FreeBSD] 20020127"
+VERSION_DATE=	20020127
 
 TARGET_ARCH?=	${MACHINE_ARCH}
-BINUTIL_ARCH= ${TARGET_ARCH}
+BINUTIL_ARCH=	${TARGET_ARCH}
 
 # RELTOP is the relative path to this point in the source or object
 # tree, from any subdirectory of same.  It gets extra "../" prefixes
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index 2acd1ca..73bae86 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -14,7 +14,8 @@ SRCS+=	app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
 	output-file.c read.c sb.c stabs.c \
 	subsegs.c symbols.c write.c depend.c ehopt.c
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
-CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\"
+CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" 
+CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 NOSHARED?=	yes
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index f97fcc4..3f68923 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -19,7 +19,7 @@ elf-hints.h:
 .endif
 
 CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
-CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\"
+CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
 NOSHARED?= yes
 DPADD=	${RELTOP}/libbfd/libbfd.a
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 7575f97..874e98b 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -11,7 +11,8 @@ SRCS+=	archive.c archures.c bfd.c binary.c cache.c \
 	section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
 	targmatch.h dwarf1.c dwarf2.c config.h
 CFLAGS+= -I${SRCDIR}/bfd
-CFLAGS+= -DBFD_VERSION=\"${VERSION}\"
+CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE}
+CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 NOPROFILE=	true
 NOPIC=		true
 INTERNALLIB=	true
diff --git a/gnu/usr.bin/binutils/libbfd/i386/bfd.h b/gnu/usr.bin/binutils/libbfd/i386/bfd.h
index 99d7996..e07887b 100644
--- a/gnu/usr.bin/binutils/libbfd/i386/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/i386/bfd.h
@@ -53,8 +53,8 @@ extern "C" {
 #endif
 
 /* #define BFD_VERSION 211930000 */
-#define BFD_VERSION_DATE 20020126
-#define BFD_VERSION_STRING "2.11.93 20020126"
+/* #define BFD_VERSION_DATE 20020126 */
+/* #define BFD_VERSION_STRING "2.11.93 20020126" */
 
 /* The word size used by BFD on the host.  This may be 64 with a 32
    bit target if the host is 64 bit, or if other 64 bit targets have
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index beb9432..a5dbedf 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -9,7 +9,7 @@ SRCS+=	arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
 	ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \
 	wrstabs.c version.c
 CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
-CFLAGS+= -DVERSION=\"${VERSION}\"
+CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
 NOPROFILE=	true
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index ec5b8be..9d594ce 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -8,7 +8,7 @@ PROG=	objdump
 SRCS=	objdump.c prdbg.c
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
-CFLAGS+= -DBFD_VERSION=\"${VERSION}\"
+CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libopcodes/libopcodes.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a