Hello, Here is the diff of dtc-1.3.0 to dtc-1.4.1 at devel/dtc. In 1.4.1, the name of command ftdump has renamed to fdtdump and two utilities (fdtget/fdtput) has added.
ok? -- SASANO Takayoshi <u...@mx5.nisiq.net> Index: Makefile =================================================================== RCS file: /cvs/ports/devel/dtc/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 21 Jun 2013 19:58:28 -0000 1.9 +++ Makefile 30 May 2015 20:30:01 -0000 @@ -2,14 +2,14 @@ COMMENT= Device Tree Compiler -DISTNAME= dtc-1.3.0 +DISTNAME= dtc-1.4.1 CATEGORIES= sysutils devel -MASTER_SITES= http://comstyle.com/source/ +MASTER_SITES= http://www.kernel.org/pub/software/utils/dtc/ EXTRACT_SUFX= .tar.xz SHARED_LIBS= fdt 1.0 -HOMEPAGE= http://www.jdl.com/ +HOMEPAGE= http://devicetree.org/Device_Tree_Compiler # GPLv2 PERMIT_PACKAGE_CDROM= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/devel/dtc/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 21 Jun 2013 19:58:28 -0000 1.2 +++ distinfo 30 May 2015 20:30:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (dtc-1.3.0.tar.xz) = njeOf8Q1oxqT7X7QrnWwJ7NoWOxMmTHvUOXBF5wDCzU= -SIZE (dtc-1.3.0.tar.xz) = 810376 +SHA256 (dtc-1.4.1.tar.xz) = d5kq2OrHto9VPQuljltRYErIA9EmGWyZ4644qq4ou5Q= +SIZE (dtc-1.4.1.tar.xz) = 107920 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile --- patches/patch-Makefile 21 Jun 2013 19:58:28 -0000 1.3 +++ patches/patch-Makefile 30 May 2015 20:30:01 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-Makefile,v 1.3 2013/06/21 19:58:28 brad Exp $ ---- Makefile.orig Wed Jun 19 12:58:46 2013 -+++ Makefile Thu Jun 20 23:06:02 2013 +--- Makefile.orig Wed Nov 12 12:29:16 2014 ++++ Makefile Sun May 31 05:11:18 2015 @@ -16,9 +16,9 @@ LOCAL_VERSION = CONFIG_LOCALVERSION = - CPPFLAGS = -I libfdt + CPPFLAGS = -I libfdt -I . -WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ -- -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls +- -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow -CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) +WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -+CFLAGS += -fPIC $(WARNINGS) ++CFLAGS = -fPIC $(WARNINGS) BISON = bison LEX = flex @@ -23,7 +23,7 @@ $OpenBSD: patch-Makefile,v 1.3 2013/06/2 endif # -@@ -130,7 +130,7 @@ endif +@@ -134,7 +134,7 @@ endif LIBFDT_objdir = libfdt LIBFDT_srcdir = libfdt LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a @@ -32,16 +32,16 @@ $OpenBSD: patch-Makefile,v 1.3 2013/06/2 LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) -@@ -162,8 +162,6 @@ install: all $(SCRIPTS) - $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) +@@ -169,8 +169,6 @@ install-lib: all + @$(VECHO) INSTALL-LIB $(INSTALL) -d $(DESTDIR)$(LIBDIR) $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) - ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) - ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT) $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) - $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) - $(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) -@@ -203,12 +201,12 @@ clean: libfdt_clean tests_clean + + install-includes: +@@ -232,12 +230,12 @@ clean: libfdt_clean tests_clean # Generic compile rules # %: %.o @@ -56,7 +56,7 @@ $OpenBSD: patch-Makefile,v 1.3 2013/06/2 %.o: %.S @$(VECHO) AS $@ -@@ -236,7 +234,7 @@ clean: libfdt_clean tests_clean +@@ -265,7 +263,7 @@ clean: libfdt_clean tests_clean $(LIBFDT_lib): @$(VECHO) LD $@ Index: patches/patch-libfdt_Makefile_libfdt =================================================================== RCS file: patches/patch-libfdt_Makefile_libfdt diff -N patches/patch-libfdt_Makefile_libfdt --- patches/patch-libfdt_Makefile_libfdt 21 Jun 2013 19:58:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-libfdt_Makefile_libfdt,v 1.1 2013/06/21 19:58:28 brad Exp $ ---- libfdt/Makefile.libfdt.orig Wed Jun 19 20:47:13 2013 -+++ libfdt/Makefile.libfdt Wed Jun 19 20:47:25 2013 -@@ -4,7 +4,7 @@ - # be easily embeddable into other systems of Makefiles. - # - LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 --LIBFDT_INCLUDES = fdt.h libfdt.h -+LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h - LIBFDT_VERSION = version.lds - LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c - LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) Index: patches/patch-libfdt_libfdt_env_h =================================================================== RCS file: patches/patch-libfdt_libfdt_env_h diff -N patches/patch-libfdt_libfdt_env_h --- patches/patch-libfdt_libfdt_env_h 21 Jun 2013 19:58:28 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-libfdt_libfdt_env_h,v 1.2 2013/06/21 19:58:28 brad Exp $ - -Rename _B to EXTRACT_BYTE. - ---- libfdt/libfdt_env.h.orig Wed Jun 19 12:58:46 2013 -+++ libfdt/libfdt_env.h Thu Jun 20 19:03:24 2013 -@@ -5,19 +5,19 @@ - #include <stdint.h> - #include <string.h> - --#define _B(n) ((unsigned long long)((uint8_t *)&x)[n]) -+#define EXTRACT_BYTE(n) ((unsigned long long)((uint8_t *)&x)[n]) - static inline uint32_t fdt32_to_cpu(uint32_t x) - { -- return (_B(0) << 24) | (_B(1) << 16) | (_B(2) << 8) | _B(3); -+ return (EXTRACT_BYTE(0) << 24) | (EXTRACT_BYTE(1) << 16) | (EXTRACT_BYTE(2) << 8) | EXTRACT_BYTE(3); - } - #define cpu_to_fdt32(x) fdt32_to_cpu(x) - - static inline uint64_t fdt64_to_cpu(uint64_t x) - { -- return (_B(0) << 56) | (_B(1) << 48) | (_B(2) << 40) | (_B(3) << 32) -- | (_B(4) << 24) | (_B(5) << 16) | (_B(6) << 8) | _B(7); -+ return (EXTRACT_BYTE(0) << 56) | (EXTRACT_BYTE(1) << 48) | (EXTRACT_BYTE(2) << 40) | (EXTRACT_BYTE(3) << 32) -+ | (EXTRACT_BYTE(4) << 24) | (EXTRACT_BYTE(5) << 16) | (EXTRACT_BYTE(6) << 8) | EXTRACT_BYTE(7); - } - #define cpu_to_fdt64(x) fdt64_to_cpu(x) --#undef _B -+#undef EXTRACT_BYTE - - #endif /* _LIBFDT_ENV_H */ Index: patches/patch-tests_Makefile_tests =================================================================== RCS file: /cvs/ports/devel/dtc/patches/patch-tests_Makefile_tests,v retrieving revision 1.2 diff -u -p -r1.2 patch-tests_Makefile_tests --- patches/patch-tests_Makefile_tests 21 Jun 2013 19:58:28 -0000 1.2 +++ patches/patch-tests_Makefile_tests 30 May 2015 20:30:01 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-tests_Makefile_tests,v 1.2 2013/06/21 19:58:28 brad Exp $ ---- tests/Makefile.tests.orig Wed Jun 19 12:58:46 2013 -+++ tests/Makefile.tests Wed Jun 19 20:28:57 2013 -@@ -45,7 +45,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o $(LIBFDT_a +--- tests/Makefile.tests.orig Wed Nov 12 12:29:16 2014 ++++ tests/Makefile.tests Sun May 31 04:25:17 2015 +@@ -52,7 +52,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(L - $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(LIBFDT_archive) + $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) @$(VECHO) LD [libdl] $@ - $(LINK.c) -o $@ $^ -ldl + $(LINK.c) -o $@ $^ - $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o $(LIBFDT_archive) - + $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ + util.o $(LIBFDT_archive) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/dtc/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 21 Jun 2013 19:58:28 -0000 1.2 +++ pkg/PLIST 30 May 2015 20:30:01 -0000 @@ -2,7 +2,9 @@ @bin bin/convert-dtsv0 @bin bin/dtc bin/dtdiff -@bin bin/ftdump +@bin bin/fdtdump +@bin bin/fdtget +@bin bin/fdtput include/fdt.h include/libfdt.h include/libfdt_env.h
