From nobody Mon Apr 6 01:58:41 2026 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 4fpstn5fl0z6YNx8 for ; Mon, 06 Apr 2026 01:58:41 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fpstn56qnz3Xgt for ; Mon, 06 Apr 2026 01:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775440721; 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=EXFIW/Z1Kv6bRRvNwH+LAvibxAyP/Z1pUBtCIDFjCT8=; b=CNGh43JpzzQqLCzHUWYb/D73fqvFg2wpo1iTf3b1wtLH2rRXIhNaIc//g3wbNzCgiWtwet O8LSA2B+n096w1FkBdr3mRx0UD9NkCkA8J8vvNSISNIzhxe6wWHymSt9Ou+h5YQ3h28fT8 wXH8ucxE0NaBZI525CX32ru8AL64T1oQPNK3zP7XQlaGAfvGDPZaq6G8qgfZhm33FV9i2w Uhq6yyoNajIg0n3H3cenChHgfgegTqbrCCe57b6Vc2ylGoWG1G277NKmFZ01N5zIQ9bCjC VKtc+cfryGnQOn82pesYghC8Md4kzTCEoFB8Gyu963r4Srh7adVZ6jnmpgagAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775440721; a=rsa-sha256; cv=none; b=PTFfuO9UIFP3aBMQZOtk9PmtCWOmBxfAP9slXzeZTL1yoWIbPUBAkbaTk6hv8cAjZ9/QLw 0EF6PpKSx+zT2FyAI51iUR+wjMCL3XfELuEq5R448ZtPOuaVpCKnTw9c6OpzfgRuZ+4Dbj AkRX9+M5ZVAce4E34Ni5hcqDJ5oR2csFe4OKXuvW0408Z7PPXKXbbivDymEBEhJNSHzoUL gZNBC0vL0Cv0ivTcs10o7v/vZer9NN8sO0kQxjEIIdrkCY86s59uOSwLDSFp/YnnY6DG5u bn7sJW+CCNxoWIRMGRtAtp2SaXbarWtxjG8vasTRiFiifWGd6/dfps22GaS0ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775440721; 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=EXFIW/Z1Kv6bRRvNwH+LAvibxAyP/Z1pUBtCIDFjCT8=; b=PcVv4oI2u2bB6p5msREbRMWKJzCwp4Vs/UiznsnVcETHYQ7YVx07IzGFvoTfXwT/gcNOTF 3CUF1UdLM8g1ESt71dzR1Lt/YgqjqBKozL3iu/4C4uQwJT5tyTbCx813abo8bRlwzCg3Gq NYmcYcidJSGFXQOOx3HzDHjtUXRpPQNrRJUAqseuHTVJC2RkO2ShuIVpxEadR6cDABqjoq n1At7yOTBKdqlHkTU/YaXA0XBy0pd03mudCGPdffy9jCC5dNPmexKrOirU4OwKlp7BinF1 sw2SpbE8qad5+ght8hCvi+UUCQX0gEzjPjtp4hrZvX2rQ63gXVKcy3a7tLwdDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fpstn4BGLzX7D for ; Mon, 06 Apr 2026 01:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 319c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 01:58:41 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: d4f2b679758b - main - lang/python313: fix pkg-config link logic for suffixed 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4f2b679758bc0932507ac9fff1b0b589190291f Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 01:58:41 +0000 Message-Id: <69d31351.319c9.44b67747@gitrepo.freebsd.org> The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4f2b679758bc0932507ac9fff1b0b589190291f commit d4f2b679758bc0932507ac9fff1b0b589190291f Author: Charlie Li AuthorDate: 2026-04-06 01:55:57 +0000 Commit: Charlie Li CommitDate: 2026-04-06 01:55:57 +0000 lang/python313: fix pkg-config link logic for suffixed --- lang/python313/Makefile | 6 ++++-- lang/python313/files/patch-Makefile.pre.in | 22 +++++++++++----------- lang/python313/pkg-plist | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lang/python313/Makefile b/lang/python313/Makefile index 2a8b4f29b44c..32566cc90ab7 100644 --- a/lang/python313/Makefile +++ b/lang/python313/Makefile @@ -1,6 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} PKGNAMESUFFIX= ${PYTHON_BASESUFFIX}${THREADFLAG} @@ -114,7 +114,9 @@ BUILD_DEPENDS+= python${PYTHON_DEFAULT}:lang/python${PYTHON_DEFAULT:S/.//g} .if !empty(ABIFLAGS) || !empty(THREADFLAG) PLIST_FILES+= bin/python${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS} \ - bin/python${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}-config + bin/python${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}-config \ + libdata/pkgconfig/python-${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}-embed.pc \ + libdata/pkgconfig/python-${PYTHON_BASEVER}${THREADFLAG}${ABIFLAGS}.pc .endif # See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650 diff --git a/lang/python313/files/patch-Makefile.pre.in b/lang/python313/files/patch-Makefile.pre.in index 74d5e79020ef..de01c0d725c1 100644 --- a/lang/python313/files/patch-Makefile.pre.in +++ b/lang/python313/files/patch-Makefile.pre.in @@ -1,6 +1,6 @@ ---- Makefile.pre.in.orig 2024-06-07 03:15:55 UTC +--- Makefile.pre.in.orig 2026-02-03 17:53:27 UTC +++ Makefile.pre.in -@@ -83,7 +83,6 @@ BASECPPFLAGS= @BASECPPFLAGS@ +@@ -84,7 +84,6 @@ BASECPPFLAGS= @BASECPPFLAGS@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ BASECPPFLAGS= @BASECPPFLAGS@ @@ -8,7 +8,7 @@ # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. # Use it when a compiler flag should _not_ be part of the distutils CFLAGS # once Python is installed (Issue #21121). -@@ -95,18 +94,16 @@ CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@ +@@ -96,18 +95,16 @@ CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@ # LDFLAGS_NOLTO is an extra flag to disable lto. It is used to speed up building # of _bootstrap_python and _freeze_module tools, which don't need LTO. CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@ @@ -30,7 +30,7 @@ PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST) PY_LDFLAGS_NOLTO=$(PY_LDFLAGS) $(CONFIGURE_LDFLAGS_NOLTO) $(LDFLAGS_NODIST) NO_AS_NEEDED= @NO_AS_NEEDED@ -@@ -2258,14 +2255,6 @@ bininstall: commoninstall altbininstall +@@ -2264,14 +2261,6 @@ bininstall: commoninstall altbininstall else true; \ fi (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) @@ -45,17 +45,17 @@ -rm -f $(DESTDIR)$(BINDIR)/python3-config (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) -rm -f $(DESTDIR)$(LIBPC)/python3.pc -@@ -2708,6 +2697,14 @@ libainstall: all scripts +@@ -2714,6 +2703,14 @@ libainstall: all scripts $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config + -if test "$(VERSION)" != "$(LDVERSION)"; then \ -+ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ -+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ -+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ -+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ -+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \ -+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \ ++ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ ++ rm -f $(DESTDIR)$(LIBPC)/python-$(VERSION).pc; \ ++ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION).pc python-$(VERSION).pc); \ ++ rm -f $(DESTDIR)$(LIBPC)/python-$(VERSION)-embed.pc; \ ++ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION)-embed.pc python-$(VERSION)-embed.pc); \ + fi $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) diff --git a/lang/python313/pkg-plist b/lang/python313/pkg-plist index c9ed2ecf15aa..bff9a1622557 100644 --- a/lang/python313/pkg-plist +++ b/lang/python313/pkg-plist @@ -7929,6 +7929,6 @@ lib/libpython%%PYTHON_BASEVER%%%%THREAD%%%%ABI%%.so.1.0-gdb.py %%PYTHON_BASELIBDIR%%%%THREAD%%/zoneinfo/_common.py %%PYTHON_BASELIBDIR%%%%THREAD%%/zoneinfo/_tzpath.py %%PYTHON_BASELIBDIR%%%%THREAD%%/zoneinfo/_zoneinfo.py -libdata/pkgconfig/python-%%PYTHON_BASEVER%%%%THREAD%%%%ABI%%-embed.pc -libdata/pkgconfig/python-%%PYTHON_BASEVER%%%%THREAD%%%%ABI%%.pc +libdata/pkgconfig/python-%%PYTHON_BASEVER%%-embed.pc +libdata/pkgconfig/python-%%PYTHON_BASEVER%%.pc share/man/man1/python%%PYTHON_BASEVER%%.1.gz