svn commit: r459792 - head/sysutils/dtc/files

[Kyle Evans]

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)