From nobody Wed Jul 23 15:08:11 2025 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 4bnHZN0GQSz62RR2; Wed, 23 Jul 2025 15:08:12 +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 4bnHZM3qwdz4Fd5; Wed, 23 Jul 2025 15:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753283291; 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=Ke24ZeHmvu5b4MAZXTUOoFl1sPXjbQVONoe19aDmrBc=; b=URpid1z3YgFC4PCIvzC4VW8znRLc+IM54MXFgDrw0KSBoXJ6UMtcY1dQQIBvfRLeUe3A1N YBoZ+UxsF1Ys24cFX+pCq6iCDBgaS6hFufCd+Lp4XXBg18RtOYWpzBkaS90c3DUcbhfTsw GxivEC03Zo9dn79j7FFtjYprzro8kfiDZ7Y/VVoVf3z0QvA4YI/uA/GJGUH7OVXOXEwnU6 fNJKlCSF0wpc2MWBFnaKr9gtqbAf/39cWveGsENjuSjnr+sSRP8MVa+Qg6OYl/0FjMjVq6 /9n4q0w0MPufeAPYXd3fgi5syGd+o1gQPAj7Rn7pOcnoFRFRfjo2aThLXqlOtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753283291; 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=Ke24ZeHmvu5b4MAZXTUOoFl1sPXjbQVONoe19aDmrBc=; b=boA4tmF6hb7G3ksJyXN0nTBbVHYkCr3fkk4pDp7yjXe2mNl8vWSxfp+WykvRFrhLW401vk 91IaDKIVwLoab4JJYMzH4vEuSlCStQIJjySPNLy9ddLmHiBEdhzdPtXNh+We7/OGJD8MfB o5yA/w+sCQNXJg269h61PtdoVVMz8i0BR2pACs4f033QiRE+ZzkKFmEb7W16ysQ4P7yMDq KNfP2UPJTRwoWLDD3RCo9PcttINuP1AMvWwSfMlRsyJ32Eb05HKnRwvdrPU7doX+zFS5sh zCayayvLm9R+EW9qDw6DHYsq77zmkbQZVMN1UbhN4FA/ShGkgZEcfecbH2kLIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753283291; a=rsa-sha256; cv=none; b=M5jytJpra61bvYc6SbsAmN3PlsQ/FxkVatoZnJXKn3/L9dPLPQiBZNfcKG5eRIALLSUBt5 LNP/YmGu5vYl9nkHrczPTAkHHYBwR+fo7Bh1ldg5Qvxcunxa8mO69Unb6lR9PMH7FOj+q5 5vAn7cNtukl6//2CVVscKiCNlALRHA6Crrga7IALxJGl5cooosifJR4tWSRBCwSm/Zqu1x AgYy/YIaYZ7qb+9f10RuP6AcsKAzHrvBy/oyxaA5lrrjfF+/+AVNx0aIBwIdxHvWvG/TOh oHg86tQKXv9KooQ+1meKQ04Ki47/aes2vIw0du8FrSAtI2ahiNyMMGjYjaRYrQ== 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 4bnHZM33yVz2rf; Wed, 23 Jul 2025 15:08:11 +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 56NF8BPT008813; Wed, 23 Jul 2025 15:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NF8BSO008810; Wed, 23 Jul 2025 15:08:11 GMT (envelope-from git) Date: Wed, 23 Jul 2025 15:08:11 GMT Message-Id: <202507231508.56NF8BSO008810@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 04af7671642d - main - Uses=xorg-cat: remove proto category 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04af7671642d66da7c3603cbde8c1c6b4da18adf Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=04af7671642d66da7c3603cbde8c1c6b4da18adf commit 04af7671642d66da7c3603cbde8c1c6b4da18adf Author: Baptiste Daroussin AuthorDate: 2025-07-23 11:22:10 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-23 15:07:48 +0000 Uses=xorg-cat: remove proto category This category is only used by 2 ports and its main purpose it to include pathfix which is actually not needed. Install the .pc files in share/pkgconfig which is valid for .pc files refering to platform independant data which is the case here. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51472 --- Mk/Uses/xorg-cat.mk | 7 +----- x11/xcb-proto/Makefile | 5 +++-- x11/xcb-proto/distinfo | 6 ++--- x11/xcb-proto/pkg-plist | 2 +- x11/xorgproto/Makefile | 4 +++- x11/xorgproto/distinfo | 6 ++--- x11/xorgproto/pkg-plist | 58 ++++++++++++++++++++++++------------------------- 7 files changed, 43 insertions(+), 45 deletions(-) diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk index 0853fd6b3e3c..b81972b4ae5f 100644 --- a/Mk/Uses/xorg-cat.mk +++ b/Mk/Uses/xorg-cat.mk @@ -14,8 +14,6 @@ # * font don't install .pc file # * lib various dependencies, install .pc file, needs # pathfix -# * proto install .pc file, needs pathfix, most only needed at -# build time. # * util no particular notes # # These categories has to match upstream categories. Don't invent @@ -34,7 +32,7 @@ .if !defined(_INCLUDE_USES_XORG_CAT_MK) _INCLUDE_USES_XORG_CAT_MK=yes -_XORG_CATEGORIES= app data doc driver font lib proto util +_XORG_CATEGORIES= app data doc driver font lib util _XORG_BUILDSYSTEMS= autotools meson _XORG_CAT= # empty @@ -158,9 +156,6 @@ USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif -. elif ${_XORG_CAT} == proto -.include "${USESDIR}/pathfix.mk" - . endif # ${_XORG_CAT} == # We only need to include xorg.mk if we want USE_XORG modules diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 8a03571772e2..6e232b2d3703 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -1,6 +1,7 @@ PORTNAME= xcb-proto PORTVERSION= 1.17.0 CATEGORIES= x11 python +MASTER_SITES= XORG/individual/proto MAINTAINER= x11@FreeBSD.org COMMENT= The X protocol C-language Binding (XCB) protocol @@ -9,10 +10,10 @@ WWW= https://xcb.freedesktop.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gnome python tar:xz xorg-cat:proto +GNU_CONFIGURE= yes +USES= gnome python tar:xz USE_GNOME= libxml2:build NO_ARCH= yes -MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig DATADIR= ${PREFIX}/share/xcb diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo index 0a6e99c81a30..e75a3f68397f 100644 --- a/x11/xcb-proto/distinfo +++ b/x11/xcb-proto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713255468 -SHA256 (xorg/proto/xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c -SIZE (xorg/proto/xcb-proto-1.17.0.tar.xz) = 151748 +TIMESTAMP = 1753269668 +SHA256 (xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c +SIZE (xcb-proto-1.17.0.tar.xz) = 151748 diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist index 10db9e7288d2..de8ab93d2518 100644 --- a/x11/xcb-proto/pkg-plist +++ b/x11/xcb-proto/pkg-plist @@ -1,4 +1,4 @@ -libdata/pkgconfig/xcb-proto.pc +share/pkgconfig/xcb-proto.pc %%DATADIR%%/bigreq.xml %%DATADIR%%/composite.xml %%DATADIR%%/damage.xml diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile index 50ab69358a11..057745dc40d2 100644 --- a/x11/xorgproto/Makefile +++ b/x11/xorgproto/Makefile @@ -1,6 +1,7 @@ PORTNAME= xorgproto DISTVERSION= 2024.1 CATEGORIES= x11 +MASTER_SITES= XORG/individual/proto MAINTAINER= x11@FreeBSD.org COMMENT= X Window System unified protocol definitions @@ -8,10 +9,11 @@ WWW= https://gitlab.freedesktop.org/xorg/proto/xorgproto LICENSE= MIT -USES= tar:xz xorg-cat:proto +USES= tar:xz NO_ARCH= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-fop \ --without-xmlto \ --without-xsltproc \ diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo index fe87b2b0eba8..d965a0e2d162 100644 --- a/x11/xorgproto/distinfo +++ b/x11/xorgproto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711437392 -SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 -SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500 +TIMESTAMP = 1753269244 +SHA256 (xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 +SIZE (xorgproto-2024.1.tar.xz) = 760500 diff --git a/x11/xorgproto/pkg-plist b/x11/xorgproto/pkg-plist index cfe2fdaa2618..c94ee5e6fd55 100644 --- a/x11/xorgproto/pkg-plist +++ b/x11/xorgproto/pkg-plist @@ -127,35 +127,35 @@ include/X11/fonts/fontstruct.h include/X11/fonts/fsmasks.h include/X11/keysym.h include/X11/keysymdef.h -libdata/pkgconfig/applewmproto.pc -libdata/pkgconfig/bigreqsproto.pc -libdata/pkgconfig/compositeproto.pc -libdata/pkgconfig/damageproto.pc -libdata/pkgconfig/dmxproto.pc -libdata/pkgconfig/dpmsproto.pc -libdata/pkgconfig/dri2proto.pc -libdata/pkgconfig/dri3proto.pc -libdata/pkgconfig/fixesproto.pc -libdata/pkgconfig/fontsproto.pc -libdata/pkgconfig/glproto.pc -libdata/pkgconfig/inputproto.pc -libdata/pkgconfig/kbproto.pc -libdata/pkgconfig/presentproto.pc -libdata/pkgconfig/randrproto.pc -libdata/pkgconfig/recordproto.pc -libdata/pkgconfig/renderproto.pc -libdata/pkgconfig/resourceproto.pc -libdata/pkgconfig/scrnsaverproto.pc -libdata/pkgconfig/videoproto.pc -libdata/pkgconfig/xcmiscproto.pc -libdata/pkgconfig/xextproto.pc -libdata/pkgconfig/xf86bigfontproto.pc -libdata/pkgconfig/xf86dgaproto.pc -libdata/pkgconfig/xf86driproto.pc -libdata/pkgconfig/xf86vidmodeproto.pc -libdata/pkgconfig/xineramaproto.pc -libdata/pkgconfig/xproto.pc -libdata/pkgconfig/xwaylandproto.pc +share/pkgconfig/applewmproto.pc +share/pkgconfig/bigreqsproto.pc +share/pkgconfig/compositeproto.pc +share/pkgconfig/damageproto.pc +share/pkgconfig/dmxproto.pc +share/pkgconfig/dpmsproto.pc +share/pkgconfig/dri2proto.pc +share/pkgconfig/dri3proto.pc +share/pkgconfig/fixesproto.pc +share/pkgconfig/fontsproto.pc +share/pkgconfig/glproto.pc +share/pkgconfig/inputproto.pc +share/pkgconfig/kbproto.pc +share/pkgconfig/presentproto.pc +share/pkgconfig/randrproto.pc +share/pkgconfig/recordproto.pc +share/pkgconfig/renderproto.pc +share/pkgconfig/resourceproto.pc +share/pkgconfig/scrnsaverproto.pc +share/pkgconfig/videoproto.pc +share/pkgconfig/xcmiscproto.pc +share/pkgconfig/xextproto.pc +share/pkgconfig/xf86bigfontproto.pc +share/pkgconfig/xf86dgaproto.pc +share/pkgconfig/xf86driproto.pc +share/pkgconfig/xf86vidmodeproto.pc +share/pkgconfig/xineramaproto.pc +share/pkgconfig/xproto.pc +share/pkgconfig/xwaylandproto.pc %%PORTDOCS%%%%DOCSDIR%%/compositeproto.txt %%PORTDOCS%%%%DOCSDIR%%/damageproto.txt %%PORTDOCS%%%%DOCSDIR%%/dri2proto.txt