linux-c7: Merge dbus-glib into dbus-libs to ease maintenance.

Reviewed by: tijl

Differential Revision: https://reviews.freebsd.org/D40827
This commit is contained in:
Gleb Popov 2023-07-01 10:50:55 +03:00
parent deb4a46338
commit a0c9796c46
15 changed files with 38 additions and 56 deletions

1
MOVED
View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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." \

View file

@ -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