Module Name: src
Committed By: christos
Date: Sun Dec 1 20:15:42 UTC 2013
Modified Files:
src/external/bsd/file: Makefile.inc
src/external/bsd/file/include: config.h
src/external/bsd/file/lib: Makefile
Log Message:
Finish version auto-setting.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/include/config.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.3 src/external/bsd/file/Makefile.inc:1.4
--- src/external/bsd/file/Makefile.inc:1.3 Fri May 8 19:36:42 2009
+++ src/external/bsd/file/Makefile.inc Sun Dec 1 15:15:42 2013
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/05/08 23:36:42 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2013/12/01 20:15:42 christos Exp $
-DIST=${.CURDIR}/../dist
WARNS=4
+DIST=${NETBSDSRCDIR}/external/bsd/file/dist
+
+.include <bsd.own.mk>
BINDIR?= /usr/bin
USE_FORT?= yes # data-driven bugs?
@@ -12,8 +14,10 @@ MFILESDIR?= /usr/share/misc
MFILES?= magic.mgc
MAGIC?= ${MFILESDIR}/magic
+VERSION != ${TOOL_SED} -ne "s/^PACKAGE_VERSION='\([^']*\)'/\1/p" ${DIST}/configure
+
CPPFLAGS+= -DMAGIC='"${MAGIC}"' -DHAVE_CONFIG_H -DQUICK -DBUILTIN_ELF \
- -DELFCORE
+ -DELFCORE -DVERSION='"${VERSION}"'
CPPFLAGS+= -I${.CURDIR}/../include -I${DIST}/src
.PATH: ${DIST}/src ${DIST}/doc
Index: src/external/bsd/file/include/config.h
diff -u src/external/bsd/file/include/config.h:1.5 src/external/bsd/file/include/config.h:1.6
--- src/external/bsd/file/include/config.h:1.5 Sat Mar 23 12:15:59 2013
+++ src/external/bsd/file/include/config.h Sun Dec 1 15:15:42 2013
@@ -245,7 +245,9 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
+#if 0
#define PACKAGE_VERSION "5.14"
+#endif
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -275,8 +277,10 @@
#endif
+#if 0
/* Version number of package */
#define VERSION "5.14"
+#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
Index: src/external/bsd/file/lib/Makefile
diff -u src/external/bsd/file/lib/Makefile:1.5 src/external/bsd/file/lib/Makefile:1.6
--- src/external/bsd/file/lib/Makefile:1.5 Sun Dec 1 15:01:14 2013
+++ src/external/bsd/file/lib/Makefile Sun Dec 1 15:15:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/12/01 20:01:14 christos Exp $
+# $NetBSD: Makefile,v 1.6 2013/12/01 20:15:42 christos Exp $
#
USE_FORT?= yes # data driven bugs?
@@ -33,13 +33,11 @@ MLINKS+= libmagic.3 magic_open.3 \
INCS= magic.h
INCSDIR= /usr/include
-VERSION != ${TOOL_SED} -ne "s/^PACKAGE_VERSION='\([0-9]*\)\.\([0-9]*\)'/\1\2/p" ${DIST}/configure
-
COPTS.softmagic.c = -Wno-format-nonliteral
magic.c: magic.h
magic.h: magic.h.in
- ${TOOL_SED} -e "s/X.YY/${VERSION}/" < ${.ALLSRC} > ${.TARGET}
+ ${TOOL_SED} -e "s/X.YY/${VERSION:S/.//g}/" < ${.ALLSRC} > ${.TARGET}
CLEANFILES+= magic.h
.include <bsd.lib.mk>
