From nobody Wed Dec 11 20:40:57 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7nYj5lr1z5gS0w; Wed, 11 Dec 2024 20:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7nYj3kSRz4mQQ; Wed, 11 Dec 2024 20:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733949657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6gZbEc/g2D451gPIpKDNiS7YtgdRN/QQ79YkPtJb+E=; b=LuEQjWRj8wrzq9PV/fn2+UhOFkeX2xu4K1zrus0NwcQmzaosi6SI+jy5+QumOy8HYk55zP BiA8JQ8Cjd7Y1cd/LoJ7FlNqbUKheOJPDtnQO0yqDj8BOLCPmfSqBhmHvoENHHM5N79bHH Fpguqv7pA5p6xSfYcem4JK7sV0YflKKu3/CHuvXg7FT6cQUQW48xt+pUi5nPm9LaeX0zNa hYlpuoHsjAl8rU9m8grJEavBXBa58cVwdEdVmuilJ29E6BDhxUxCqYOVUgfuj/BU9awc3u hgWxzte3q6xWq3As0CKvLLdcrEL1sotzY+ngw9XJDMI034LrVEa2C9VdgqQoEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733949657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6gZbEc/g2D451gPIpKDNiS7YtgdRN/QQ79YkPtJb+E=; b=f15FhPFf1CoqHWYaQqeJCC+Z/7F3QLd9pj95BsUxln0d0RpYZ6gLH9AEnM9PlIl5Do9CLi 9NrChZWAByJ0eeH3S1Q3sxIFscFmjIxKD4y3mm0lBAMBBoDDJ7lvcWTu7QMDgE5lflXs+9 /PvFOgnZPyYzyGei9HvRdZArkq3XFzNXsnUc2L0+kUd8eF4d/CmNbE41ZnsQiy21732e4X ou3jmvIkTM5MlFDqdO5g3I0XP/TPDjUe7jTo0WymYLRDtSsY1MqznMk329e78yq39OPj9O P/2Om8zcPGza1/jpR7Vzik4lOnPhRjzm3CxBDtQPeev2XFfqefsuE1rSVqqeIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733949657; a=rsa-sha256; cv=none; b=ZROfnhxUJ/TVXEwMWq+s+qIL2tnCTN4BhKfzRA2BGtGIGKxwyiVkPAc+9m+2sjdRgAcaAP /EyqAuiqhQoLLiRTQMCNYiEtBiuyU7v6dkNwTo3pfkI1AZfT/hXAqnJpcIBDJmMzgA3kB9 MkgGfyndUySqbAhvmynsQmO2ACHvGuPrOpRsbpOKHZaC6nosEtXEuNrjGa7fT3vE41wEJv 5p00zaOU61FBxssJUjXoXJwy18y4Kf5Ojxz+sd+J1MnTBpkdilYypJ+vhST5Q8jubpGvYG +wimt5Wc4mvcfbJeZUpBZbP8zqrsKP5cp3cFc73jOmxOkpBGOSen7fKzzS8uEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7nYj3L4TzNNC; Wed, 11 Dec 2024 20:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BBKevPV075802; Wed, 11 Dec 2024 20:40:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBKevoM075799; Wed, 11 Dec 2024 20:40:57 GMT (envelope-from git) Date: Wed, 11 Dec 2024 20:40:57 GMT Message-Id: <202412112040.4BBKevoM075799@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joerg Wunsch Subject: git: 506e265d16c4 - main - devel/mspdebug: fix include order List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joerg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 506e265d16c472b3e691fc789734d25aef8e1ebc Auto-Submitted: auto-generated The branch main has been updated by joerg: URL: https://cgit.FreeBSD.org/ports/commit/?id=506e265d16c472b3e691fc789734d25aef8e1ebc commit 506e265d16c472b3e691fc789734d25aef8e1ebc Author: Joerg Wunsch AuthorDate: 2024-12-11 20:35:45 +0000 Commit: Joerg Wunsch CommitDate: 2024-12-11 20:40:51 +0000 devel/mspdebug: fix include order The default include order in the Makefile preferred global directories over local ones. Thus, ftdi.h from an installed libftdi was considered instead of the internal ftdi.h, leading to compilation errors in this situation. Reported by: holm@freibergnet.de Approved by: (maintainer timeout) Differential Revision: https://reviews.freebsd.org/D47975 --- devel/mspdebug/files/patch-Makefile | 46 +++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/devel/mspdebug/files/patch-Makefile b/devel/mspdebug/files/patch-Makefile index b16841be02e2..9a040900f992 100644 --- a/devel/mspdebug/files/patch-Makefile +++ b/devel/mspdebug/files/patch-Makefile @@ -1,28 +1,37 @@ ---- Makefile.orig 2015-10-16 19:45:43 UTC -+++ Makefile -@@ -22,8 +22,9 @@ PREFIX ?= /usr/local - LDFLAGS ?= -s +--- Makefile.orig 2020-04-01 23:27:59.000000000 +0200 ++++ Makefile 2024-12-06 23:27:08.863198000 +0100 +@@ -23,7 +23,8 @@ LDFLAGS ?= -s BINDIR = ${PREFIX}/bin/ --MANDIR = ${PREFIX}/share/man/man1 + MANDIR = ${PREFIX}/share/man/man1 -LIBDIR = ${PREFIX}/lib/ -+MANDIR = ${PREFIX}/share/man/man1 +DATDIR = ${PREFIX}/share +DOCDIR = ${PREFIX}/share/doc/mspdebug - ifdef WITHOUT_READLINE - READLINE_CFLAGS = -@@ -70,6 +71,9 @@ else + UNAME_S := $(shell sh -c 'uname -s') + UNAME_O := $(shell sh -c 'uname -o 2> /dev/null') +@@ -73,7 +74,7 @@ else + ifeq ($(UNAME_S),Darwin) # Mac OS X/MacPorts stuff + ifeq ($(shell fink -V > /dev/null 2>&1 && echo ok),ok) + PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb) +- PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -ltermcap -pthread ++ PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -pthread + else ifeq ($(shell brew --version > /dev/null 2>&1 && echo ok),ok) + PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb) + PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -framework IOKit -framework CoreFoundation +@@ -89,7 +90,10 @@ else + LDFLAGS = else ifneq ($(filter $(UNAME_S),OpenBSD NetBSD DragonFly),) PORTS_CFLAGS := $(shell pkg-config --cflags libusb) - PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -ltermcap -pthread +- PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -ltermcap -pthread ++ PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -pthread + else ifeq ($(UNAME_S),FreeBSD) + PORTS_CFLAGS := -I${PREFIX}/include + PORTS_LDFLAGS := -L${PREFIX}/lib else PORTS_CFLAGS := PORTS_LDFLAGS := -@@ -78,7 +82,7 @@ endif +@@ -98,12 +102,12 @@ endif INCLUDES = -I. -Isimio -Iformats -Itransport -Idrivers -Iutil -Iui GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb @@ -30,8 +39,15 @@ +CONFIG_CFLAGS = -DLIB_DIR=\"$(DATDIR)\" MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS) - MSPDEBUG_LIBS = -lusb $(READLINE_LIBS) $(OS_LIBS) -@@ -108,9 +112,12 @@ install: $(BINARY) mspdebug.man + MSPDEBUG_LIBS = -L. -lusb $(READLINE_LIBS) $(OS_LIBS) +-MSPDEBUG_CFLAGS = $(CFLAGS) $(READLINE_CFLAGS) $(PORTS_CFLAGS)\ +- $(GCC_CFLAGS) $(INCLUDES) $(CONFIG_CFLAGS) $(OS_CFLAGS) ++MSPDEBUG_CFLAGS = $(CFLAGS) $(INCLUDES) $(READLINE_CFLAGS) $(PORTS_CFLAGS)\ ++ $(GCC_CFLAGS) $(CONFIG_CFLAGS) $(OS_CFLAGS) + + all: $(BINARY) + +@@ -136,9 +140,12 @@ install: $(BINARY) mspdebug.man $(INSTALL) -m 0755 $(BINARY) $(DESTDIR)$(BINDIR) mkdir -p $(DESTDIR)$(MANDIR) $(INSTALL) -m 0644 mspdebug.man $(DESTDIR)$(MANDIR)/mspdebug.1 @@ -45,5 +61,5 @@ + $(INSTALL) -m 0644 README EmbeddedMode.txt \ + $(DESTDIR)$(DOCDIR)/ - .SUFFIXES: .c .o - + uninstall: + $(RM) $(DESTDIR)$(BINDIR)$(BINARY) $(DESTDIR)$(MANDIR)/mspdebug.1\