From owner-svn-ports-all@freebsd.org Tue Jan 23 19:45:54 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08D64EC3036; Tue, 23 Jan 2018 19:45:54 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D739A6B938; Tue, 23 Jan 2018 19:45:53 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 077B712F72; Tue, 23 Jan 2018 19:45:53 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0NJjq0U026625; Tue, 23 Jan 2018 19:45:52 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0NJjqZe026623; Tue, 23 Jan 2018 19:45:52 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201801231945.w0NJjqZe026623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 23 Jan 2018 19:45:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459792 - head/sysutils/dtc/files X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sysutils/dtc/files X-SVN-Commit-Revision: 459792 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 19:45:54 -0000 Author: kevans (src committer) Date: Tue Jan 23 19:45:52 2018 New Revision: 459792 URL: https://svnweb.freebsd.org/changeset/ports/459792 Log: sysutils/dtc: Unbreak `make patch` The added patches from the 1.4.6 update broke `make patch` as their contents got duplicated somewhere in the pipeline. Remove the duplicated contents. Reported by: antoine Approved by: imp Modified: head/sysutils/dtc/files/patch-Makefile head/sysutils/dtc/files/patch-tests_Makefile.tests Modified: head/sysutils/dtc/files/patch-Makefile ============================================================================== --- head/sysutils/dtc/files/patch-Makefile Tue Jan 23 18:43:33 2018 (r459791) +++ head/sysutils/dtc/files/patch-Makefile Tue Jan 23 19:45:52 2018 (r459792) @@ -37,42 +37,3 @@ 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 - Modified: head/sysutils/dtc/files/patch-tests_Makefile.tests ============================================================================== --- head/sysutils/dtc/files/patch-tests_Makefile.tests Tue Jan 23 18:43:33 2018 (r459791) +++ head/sysutils/dtc/files/patch-tests_Makefile.tests Tue Jan 23 19:45:52 2018 (r459792) @@ -9,14 +9,3 @@ $(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)