Index: head/sysutils/dtc/Makefile =================================================================== --- head/sysutils/dtc/Makefile +++ head/sysutils/dtc/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= dtc -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.4.6 DISTVERSIONPREFIX= v CATEGORIES= sysutils -MAINTAINER= imp@FreeBSD.org +MAINTAINER= uboot@FreeBSD.org COMMENT= Device Tree Compiler LICENSE= GPLv2 @@ -15,10 +14,15 @@ USE_LDCONFIG= yes SHEBANG_FILES= dtdiff +TEST_TARGET= check +TEST_ENV= STATSZ="stat -f %Uz" + USE_GITHUB= yes GH_ACCOUNT= dgibson GH_PROJECT= dtc -MAKE_ARGS+= PREFIX=${PREFIX} NO_PYTHON=yes +MAKE_ARGS+= PREFIX=${PREFIX} NO_PYTHON=yes \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_LIB="${INSTALL_LIB}" .include Index: head/sysutils/dtc/distinfo =================================================================== --- head/sysutils/dtc/distinfo +++ head/sysutils/dtc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511715245 -SHA256 (dgibson-dtc-v1.4.5_GH0.tar.gz) = d13df67f5402c1905d2c24603471fe783965112ab5004025a50f7f852cd89bc8 -SIZE (dgibson-dtc-v1.4.5_GH0.tar.gz) = 174933 +TIMESTAMP = 1515034018 +SHA256 (dgibson-dtc-v1.4.6_GH0.tar.gz) = 394d2fb852c326b070e9d7732b396f5d57da86cac728fe58a519a505cfb01837 +SIZE (dgibson-dtc-v1.4.6_GH0.tar.gz) = 176882 Index: head/sysutils/dtc/files/patch-Makefile =================================================================== --- head/sysutils/dtc/files/patch-Makefile +++ head/sysutils/dtc/files/patch-Makefile @@ -0,0 +1,78 @@ +--- Makefile.orig 2018-01-04 03:37:52 UTC ++++ Makefile +@@ -26,6 +26,10 @@ SWIG = swig + PKG_CONFIG ?= pkg-config + + INSTALL = /usr/bin/install ++INSTALL_PROGRAM = $(INSTALL) ++INSTALL_LIB = $(INSTALL) ++INSTALL_DATA = $(INSTALL) -m 644 ++INSTALL_SCRIPT = $(INSTALL) + DESTDIR = + PREFIX = $(HOME) + BINDIR = $(PREFIX)/bin +@@ -191,20 +195,21 @@ endif + install-bin: all $(SCRIPTS) + @$(VECHO) INSTALL-BIN + $(INSTALL) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR) ++ $(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(BINDIR) + + install-lib: all + @$(VECHO) INSTALL-LIB + $(INSTALL) -d $(DESTDIR)$(LIBDIR) +- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(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_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) + + install-includes: + @$(VECHO) INSTALL-INC + $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) +- $(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_DATA) $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) + + install: install-bin install-lib install-includes + +--- Makefile.orig 2018-01-04 03:37:52 UTC ++++ Makefile +@@ -26,6 +26,10 @@ SWIG = swig + PKG_CONFIG ?= pkg-config + + INSTALL = /usr/bin/install ++INSTALL_PROGRAM = $(INSTALL) ++INSTALL_LIB = $(INSTALL) ++INSTALL_DATA = $(INSTALL) -m 644 ++INSTALL_SCRIPT = $(INSTALL) + DESTDIR = + PREFIX = $(HOME) + BINDIR = $(PREFIX)/bin +@@ -191,20 +195,21 @@ endif + install-bin: all $(SCRIPTS) + @$(VECHO) INSTALL-BIN + $(INSTALL) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR) ++ $(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(BINDIR) + + install-lib: all + @$(VECHO) INSTALL-LIB + $(INSTALL) -d $(DESTDIR)$(LIBDIR) +- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(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_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) + + install-includes: + @$(VECHO) INSTALL-INC + $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) +- $(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_DATA) $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) + + install: install-bin install-lib install-includes + Index: head/sysutils/dtc/files/patch-checks.c =================================================================== --- head/sysutils/dtc/files/patch-checks.c +++ head/sysutils/dtc/files/patch-checks.c @@ -1,20 +0,0 @@ ---- checks.c.orig 2017-12-05 20:24:45 UTC -+++ checks.c -@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check * - int cell, cellsize = 0; - - if (prop->val.len % sizeof(cell_t)) { -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - prop->name, prop->val.len, sizeof(cell_t), node->fullpath); - return; - } -@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c, - return; - - if (irq_prop->val.len % sizeof(cell_t)) -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - irq_prop->name, irq_prop->val.len, sizeof(cell_t), - node->fullpath); - Index: head/sysutils/dtc/files/patch-fdtoverlay.c =================================================================== --- head/sysutils/dtc/files/patch-fdtoverlay.c +++ head/sysutils/dtc/files/patch-fdtoverlay.c @@ -1,12 +0,0 @@ ---- fdtoverlay.c.orig 2017-09-27 10:00:10 UTC -+++ fdtoverlay.c -@@ -26,7 +26,9 @@ - #include - #include - #include -+#ifndef __FreeBSD__ - #include -+#endif - #include - - #include Index: head/sysutils/dtc/files/patch-tests_Makefile.tests =================================================================== --- head/sysutils/dtc/files/patch-tests_Makefile.tests +++ head/sysutils/dtc/files/patch-tests_Makefile.tests @@ -0,0 +1,22 @@ +--- tests/Makefile.tests.orig 2018-01-03 06:04:32 UTC ++++ tests/Makefile.tests +@@ -56,7 +56,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(L + + $(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 \ + util.o $(LIBFDT_archive) +--- tests/Makefile.tests.orig 2018-01-03 06:04:32 UTC ++++ tests/Makefile.tests +@@ -56,7 +56,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(L + + $(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 \ + util.o $(LIBFDT_archive) Index: head/sysutils/dtc/pkg-plist =================================================================== --- head/sysutils/dtc/pkg-plist +++ head/sysutils/dtc/pkg-plist @@ -3,8 +3,9 @@ bin/dtdiff bin/fdtdump bin/fdtget +bin/fdtoverlay bin/fdtput -lib/libfdt-1.4.5.so +lib/libfdt-1.4.6.so lib/libfdt.a lib/libfdt.so lib/libfdt.so.1