Date: Sun, 2 Jul 2023 10:19:44 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a0c9796c46e2 - main - linux-c7: Merge dbus-glib into dbus-libs to ease maintenance. Message-ID: <202307021019.362AJi0G041985@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0c9796c46e20838fd4b366a8b5ae5d696853e09 commit a0c9796c46e20838fd4b366a8b5ae5d696853e09 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-07-01 07:50:55 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-07-02 10:19:21 +0000 linux-c7: Merge dbus-glib into dbus-libs to ease maintenance. Reviewed by: tijl Differential Revision: https://reviews.freebsd.org/D40827 --- MOVED | 1 + Mk/Uses/linux.mk | 1 - devel/Makefile | 1 - devel/linux-c7-dbus-glib/Makefile | 22 ---------------------- devel/linux-c7-dbus-glib/distinfo | 9 --------- devel/linux-c7-dbus-glib/pkg-plist.aarch64 | 5 ----- devel/linux-c7-dbus-glib/pkg-plist.amd64 | 7 ------- devel/linux-c7-dbus-glib/pkg-plist.i386 | 5 ----- devel/linux-c7-dbus-libs/Makefile | 12 +++++++++--- devel/linux-c7-dbus-libs/distinfo | 10 +++++++++- devel/linux-c7-dbus-libs/pkg-plist.aarch64 | 5 +++++ devel/linux-c7-dbus-libs/pkg-plist.amd64 | 7 +++++++ devel/linux-c7-dbus-libs/pkg-plist.i386 | 5 +++++ editors/komodo-edit/Makefile | 2 +- science/linux-zotero/Makefile | 2 +- 15 files changed, 38 insertions(+), 56 deletions(-) diff --git a/MOVED b/MOVED index c02eb08de19e..f66feb183f2e 100644 --- a/MOVED +++ b/MOVED @@ -7761,3 +7761,4 @@ security/openssl_tpm_engine||2023-07-02|Has expired: Requires older openssl and www/kristall||2023-07-02|Has expired: Requires older openssl sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released +devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index a8db1eaa7831..0ba5c1914632 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -57,7 +57,6 @@ _linux_c7_cairo-gobject= linux-c7-cairo-gobject>0:graphics/linux-c7-cairo-gobje _linux_${linux_ARGS}_cups-libs= linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs _linux_${linux_ARGS}_curl= linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl _linux_${linux_ARGS}_cyrus-sasl2= linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2 -_linux_${linux_ARGS}_dbusglib= linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib _linux_${linux_ARGS}_dbuslibs= linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs _linux_${linux_ARGS}_devtools= linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools _linux_c7_dosfstools= linux-c7-dosfstools>0:sysutils/linux-c7-dosfstools diff --git a/devel/Makefile b/devel/Makefile index 234f059d375b..c1d45a386bc6 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1450,7 +1450,6 @@ SUBDIR += libzvbi SUBDIR += lightning SUBDIR += linenoise-ng - SUBDIR += linux-c7-dbus-glib SUBDIR += linux-c7-dbus-libs SUBDIR += linux-c7-devtools SUBDIR += linux-c7-elfutils-libelf diff --git a/devel/linux-c7-dbus-glib/Makefile b/devel/linux-c7-dbus-glib/Makefile deleted file mode 100644 index e57243460eb0..000000000000 --- a/devel/linux-c7-dbus-glib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -PORTNAME= dbus-glib -PORTVERSION= 0.100 -DISTVERSIONSUFFIX= -7.el7 -PORTREVISION= 1 -CATEGORIES= devel linux - -MAINTAINER= emulation@FreeBSD.org -COMMENT= GLib bindings for D-Bus (Linux CentOS ${LINUX_DIST_VER}) -WWW= https://www.freedesktop.org/wiki/Software/DBusBindings/ - -USES= cpe linux:c7 -CPE_VENDOR= freedesktop -USE_LDCONFIG= yes -USE_LINUX= dbuslibs expat -USE_LINUX_RPM= yes - -CONFLICTS= linux-c6-${PORTNAME} -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.mk> diff --git a/devel/linux-c7-dbus-glib/distinfo b/devel/linux-c7-dbus-glib/distinfo deleted file mode 100644 index 0e04d1c6e186..000000000000 --- a/devel/linux-c7-dbus-glib/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -TIMESTAMP = 1627157546 -SHA256 (centos/dbus-glib-0.100-7.el7.aarch64.rpm) = adf2ea808f0cdef64ee1e5bdfb944f85db6e62c05cca1b139954a98fb54c5aa4 -SIZE (centos/dbus-glib-0.100-7.el7.aarch64.rpm) = 101588 -SHA256 (centos/dbus-glib-0.100-7.el7.i686.rpm) = 5601fe96c5ab00b81d99213513933988fe846e85d4ce2625be81de2269151e5d -SIZE (centos/dbus-glib-0.100-7.el7.i686.rpm) = 105804 -SHA256 (centos/dbus-glib-0.100-7.el7.x86_64.rpm) = de7cada14fbbfbf5db29a401e275fd143ddfc97a30c818cb639278831c88fdc5 -SIZE (centos/dbus-glib-0.100-7.el7.x86_64.rpm) = 104756 -SHA256 (centos/dbus-glib-0.100-7.el7.src.rpm) = 4b89825083866dc17c6ef8a44a886b206409cba9340bbb221ec237267ae09ec1 -SIZE (centos/dbus-glib-0.100-7.el7.src.rpm) = 744517 diff --git a/devel/linux-c7-dbus-glib/pkg-plist.aarch64 b/devel/linux-c7-dbus-glib/pkg-plist.aarch64 deleted file mode 100644 index c497c003fa2e..000000000000 --- a/devel/linux-c7-dbus-glib/pkg-plist.aarch64 +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/dbus-binding-tool -usr/lib64/libdbus-glib-1.so.2 -usr/lib64/libdbus-glib-1.so.2.2.2 -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS diff --git a/devel/linux-c7-dbus-glib/pkg-plist.amd64 b/devel/linux-c7-dbus-glib/pkg-plist.amd64 deleted file mode 100644 index afdea0b60224..000000000000 --- a/devel/linux-c7-dbus-glib/pkg-plist.amd64 +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/dbus-binding-tool -usr/lib/libdbus-glib-1.so.2 -usr/lib/libdbus-glib-1.so.2.2.2 -usr/lib64/libdbus-glib-1.so.2 -usr/lib64/libdbus-glib-1.so.2.2.2 -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS diff --git a/devel/linux-c7-dbus-glib/pkg-plist.i386 b/devel/linux-c7-dbus-glib/pkg-plist.i386 deleted file mode 100644 index ef8b21d2d9f3..000000000000 --- a/devel/linux-c7-dbus-glib/pkg-plist.i386 +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/dbus-binding-tool -usr/lib/libdbus-glib-1.so.2 -usr/lib/libdbus-glib-1.so.2.2.2 -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS diff --git a/devel/linux-c7-dbus-libs/Makefile b/devel/linux-c7-dbus-libs/Makefile index b3926022bc95..ad7fed610e2c 100644 --- a/devel/linux-c7-dbus-libs/Makefile +++ b/devel/linux-c7-dbus-libs/Makefile @@ -1,7 +1,7 @@ PORTNAME= dbus PORTVERSION= 1.10.24 DISTVERSIONSUFFIX= -15.el7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel linux PKGNAMESUFFIX= -libs @@ -13,14 +13,20 @@ LICENSE= GPLv2+ USES= cpe linux:c7 USE_LDCONFIG= yes -USE_LINUX= systemd-libs +USE_LINUX= expat systemd-libs USE_LINUX_RPM= yes CPE_VENDOR= freedesktop -LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} +LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \ + dbus-glib-0.100-7.el7 + +SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \ + dbus-glib-0.100-7.el7${SRC_SUFX}:SOURCE CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +OPTIONS_DEFINE= DOCS + .include <bsd.port.mk> diff --git a/devel/linux-c7-dbus-libs/distinfo b/devel/linux-c7-dbus-libs/distinfo index 4a8a878dd1a3..b8004b843fc6 100644 --- a/devel/linux-c7-dbus-libs/distinfo +++ b/devel/linux-c7-dbus-libs/distinfo @@ -1,4 +1,10 @@ -TIMESTAMP = 1626543060 +TIMESTAMP = 1688280013 +SHA256 (centos/dbus-glib-0.100-7.el7.aarch64.rpm) = adf2ea808f0cdef64ee1e5bdfb944f85db6e62c05cca1b139954a98fb54c5aa4 +SIZE (centos/dbus-glib-0.100-7.el7.aarch64.rpm) = 101588 +SHA256 (centos/dbus-glib-0.100-7.el7.i686.rpm) = 5601fe96c5ab00b81d99213513933988fe846e85d4ce2625be81de2269151e5d +SIZE (centos/dbus-glib-0.100-7.el7.i686.rpm) = 105804 +SHA256 (centos/dbus-glib-0.100-7.el7.x86_64.rpm) = de7cada14fbbfbf5db29a401e275fd143ddfc97a30c818cb639278831c88fdc5 +SIZE (centos/dbus-glib-0.100-7.el7.x86_64.rpm) = 104756 SHA256 (centos/dbus-libs-1.10.24-15.el7.aarch64.rpm) = 8c6fbb57adad9a5ebdfd48dbf271114a9904e38927e79ed5047edf23b39170c2 SIZE (centos/dbus-libs-1.10.24-15.el7.aarch64.rpm) = 162892 SHA256 (centos/dbus-libs-1.10.24-15.el7.i686.rpm) = 07d13d0034a045d198fd58e94c83721dffa12a543023310e7d8a5cc1a5f97cb2 @@ -7,3 +13,5 @@ SHA256 (centos/dbus-libs-1.10.24-15.el7.x86_64.rpm) = 1dd6ceb75ebf29acc52c889d4d SIZE (centos/dbus-libs-1.10.24-15.el7.x86_64.rpm) = 173428 SHA256 (centos/dbus-1.10.24-15.el7.src.rpm) = 446a9ff51333711a05c633e45a760e6cc3a1fcdd69c8a0177da946fc83de5dee SIZE (centos/dbus-1.10.24-15.el7.src.rpm) = 2054457 +SHA256 (centos/dbus-glib-0.100-7.el7.src.rpm) = 4b89825083866dc17c6ef8a44a886b206409cba9340bbb221ec237267ae09ec1 +SIZE (centos/dbus-glib-0.100-7.el7.src.rpm) = 744517 diff --git a/devel/linux-c7-dbus-libs/pkg-plist.aarch64 b/devel/linux-c7-dbus-libs/pkg-plist.aarch64 index 0ef26ba7583f..f726b1e70929 100644 --- a/devel/linux-c7-dbus-libs/pkg-plist.aarch64 +++ b/devel/linux-c7-dbus-libs/pkg-plist.aarch64 @@ -1,3 +1,8 @@ +usr/bin/dbus-binding-tool usr/lib64/libdbus-1.so.3 usr/lib64/libdbus-1.so.3.14.14 +usr/lib64/libdbus-glib-1.so.2 +usr/lib64/libdbus-glib-1.so.2.2.2 +%%PORTDOCS%%usr/share/doc/dbus-glib-0.100/COPYING +%%PORTDOCS%%usr/share/doc/dbus-glib-0.100/NEWS usr/share/licenses/dbus-libs-1.10.24/COPYING diff --git a/devel/linux-c7-dbus-libs/pkg-plist.amd64 b/devel/linux-c7-dbus-libs/pkg-plist.amd64 index b9c07e09d263..aa75e6899745 100644 --- a/devel/linux-c7-dbus-libs/pkg-plist.amd64 +++ b/devel/linux-c7-dbus-libs/pkg-plist.amd64 @@ -1,5 +1,12 @@ +usr/bin/dbus-binding-tool usr/lib/libdbus-1.so.3 usr/lib/libdbus-1.so.3.14.14 +usr/lib/libdbus-glib-1.so.2 +usr/lib/libdbus-glib-1.so.2.2.2 usr/lib64/libdbus-1.so.3 usr/lib64/libdbus-1.so.3.14.14 +usr/lib64/libdbus-glib-1.so.2 +usr/lib64/libdbus-glib-1.so.2.2.2 +%%PORTDOCS%%usr/share/doc/dbus-glib-0.100/COPYING +%%PORTDOCS%%usr/share/doc/dbus-glib-0.100/NEWS usr/share/licenses/dbus-libs-1.10.24/COPYING diff --git a/devel/linux-c7-dbus-libs/pkg-plist.i386 b/devel/linux-c7-dbus-libs/pkg-plist.i386 index b56d6695adff..a6ce52b84c7f 100644 --- a/devel/linux-c7-dbus-libs/pkg-plist.i386 +++ b/devel/linux-c7-dbus-libs/pkg-plist.i386 @@ -1,3 +1,8 @@ +usr/bin/dbus-binding-tool usr/lib/libdbus-1.so.3 usr/lib/libdbus-1.so.3.14.14 +usr/lib/libdbus-glib-1.so.2 +usr/lib/libdbus-glib-1.so.2.2.2 +%%PORTDOCS%%usr/share/doc/dbus-glib-0.100/COPYING +%%PORTDOCS%%usr/share/doc/dbus-glib-0.100/NEWS usr/share/licenses/dbus-libs-1.10.24/COPYING diff --git a/editors/komodo-edit/Makefile b/editors/komodo-edit/Makefile index 7a042989e7f8..0ca8e5e121eb 100644 --- a/editors/komodo-edit/Makefile +++ b/editors/komodo-edit/Makefile @@ -19,7 +19,7 @@ LICENSE_PERMS_KEL11= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= amd64 i386 USES= linux -USE_LINUX= alsalib dbusglib gtk2 jpeg xorglibs +USE_LINUX= alsalib dbuslibs gtk2 jpeg xorglibs DESKTOP_ENTRIES="Komodo Edit" \ "Free multi-platform editor that makes it easy to write quality code." \ diff --git a/science/linux-zotero/Makefile b/science/linux-zotero/Makefile index d87e0c23bd9a..8a1d658f6fcd 100644 --- a/science/linux-zotero/Makefile +++ b/science/linux-zotero/Makefile @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= amd64 RUN_DEPENDS= bash:shells/bash USES= desktop-file-utils linux tar:bz2 -USE_LINUX= dbusglib gtk3 +USE_LINUX= dbuslibs gtk3 NO_BUILD= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307021019.362AJi0G041985>