cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split databases/tdb into -main and -python package

Browse Source 
net/samba is the only consumer requiring Python bindings, so this split
enables all other consumers (netatalk3, neomutt, fdm, rhythmbox, pulseaudio)
to avoid the dependency on Python 2.

Bump all consumers due to tdb's PKGPATH change.

Wanted by many
Feedback OK jca sthen
This commit is contained in:
kn 2021-01-23 23:17:47 +00:00
parent e79efa7488
commit 076d29f16b
11 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/pulseaudio/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.112 2021/01/17 10:39:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.113 2021/01/23 23:17:48 kn Exp $
# XXX sndio: what to do with (channel) map
# XXX sndio: check sample format
@ -9,6 +9,7 @@ COMMENT= cross-platform networked sound server
VERSION= 14.2
DISTNAME= pulseaudio-${VERSION}
EXTRACT_SUFX= .tar.xz
REVISION= 0
SHARED_LIBS += pulse 7.1 # .23.0
SHARED_LIBS += pulse-simple 1.2 # .1.1

4
audio/rhythmbox/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.178 2020/10/03 15:39:58 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.179 2021/01/23 23:17:48 kn Exp $
COMMENT= integrated music management application for GNOME
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 3.4.4
REVISION= 1
REVISION= 2
SHARED_LIBS += rhythmbox-core 0.0 # 7.0

4
audio/rhythmbox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.57 2020/01/05 13:23:18 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.58 2021/01/23 23:17:48 kn Exp $
@bin bin/rhythmbox
@bin bin/rhythmbox-client
include/rhythmbox/
@ -437,7 +437,6 @@ share/help/cs/rhythmbox/figures/rb-volume-changer.png
share/help/cs/rhythmbox/figures/rb-window.png
share/help/cs/rhythmbox/index.docbook
share/help/cs/rhythmbox/legal.xml
share/help/da/
share/help/da/rhythmbox/
share/help/da/rhythmbox/figures/
share/help/da/rhythmbox/figures/rb-iradio-main.png
@ -641,7 +640,6 @@ share/help/sv/rhythmbox/figures/rb-volume-changer.png
share/help/sv/rhythmbox/figures/rb-window.png
share/help/sv/rhythmbox/index.docbook
share/help/sv/rhythmbox/legal.xml
share/help/uk/
share/help/uk/rhythmbox/
share/help/uk/rhythmbox/figures/
share/help/uk/rhythmbox/figures/rb-iradio-main.png

15
databases/tdb/Makefile
View File

@ -1,9 +1,14 @@
# $OpenBSD: Makefile,v 1.32 2020/03/14 15:35:29 kn Exp $
# $OpenBSD: Makefile,v 1.33 2021/01/23 23:17:47 kn Exp $
COMMENT= trivial database library
COMMENT-main= trivial database library
COMMENT-python= Python ${MODPY_VERSION} bindings for tdb
# Keep in sync with the version bundled in net/samba
DISTNAME= tdb-1.3.18
PKGNAME-main= ${DISTNAME}
REVISION-main= 0
PKGNAME-python= py-${DISTNAME}
MULTI_PACKAGES= -main -python
# 0750 on Makefile and other files breaks update-patches with PORTS_PRIVSEP=Yes
FIX_EXTRACT_PERMISSIONS= Yes
@ -19,7 +24,8 @@ MAINTAINER= Jeremie Courreges-Anglas <jca@wxcvbn.org>
# LGPLv3+
PERMIT_PACKAGE= Yes
WANTLIB += c intl m pthread util ${MODPY_WANTLIB}
WANTLIB-main= c pthread
WANTLIB-python= intl m pthread tdb util ${MODPY_WANTLIB}
MASTER_SITES= https://download.samba.org/pub/tdb/
@ -32,7 +38,8 @@ MODPY_ADJ_FILES= buildtools/bin/waf
BUILD_DEPENDS= textproc/docbook-xsl \
textproc/libxslt
LIB_DEPENDS= ${MODPY_LIB_DEPENDS}
LIB_DEPENDS-python= ${BUILD_PKGPATH} \
${MODPY_LIB_DEPENDS}
WAF_ARGS= -v -j ${MAKE_JOBS}
MAKE_FLAGS= WAF_ARGS="${WAF_ARGS}"

0
databases/tdb/pkg/DESCR → databases/tdb/pkg/DESCR-main
View File

1
databases/tdb/pkg/DESCR-python Normal file
View File

@ -0,0 +1 @@
Python ${MODPY_VERSION} bindings for tdb.

7
databases/tdb/pkg/PLIST → databases/tdb/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.10 2019/12/04 00:14:45 jca Exp $
@conflict samba-<3.5.0
@comment $OpenBSD: PLIST-main,v 1.1 2021/01/23 23:17:47 kn Exp $
@pkgpath databases/tdb
@bin bin/tdbbackup
@bin bin/tdbdump
@bin bin/tdbrestore
@ -7,9 +7,6 @@
include/tdb.h
@lib lib/libtdb.so.${LIBtdb_VERSION}
lib/pkgconfig/tdb.pc
lib/python${MODPY_VERSION}/site-packages/_tdb_text.py
lib/python${MODPY_VERSION}/site-packages/_tdb_text.pyc
@so lib/python${MODPY_VERSION}/site-packages/tdb.so
@man man/man8/tdbbackup.8
@man man/man8/tdbdump.8
@man man/man8/tdbrestore.8

7
databases/tdb/pkg/PLIST-python Normal file
View File

@ -0,0 +1,7 @@
@comment $OpenBSD: PLIST-python,v 1.1 2021/01/23 23:17:47 kn Exp $
@conflict tdb-<1.3.18p0
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/_tdb_text.py
lib/python${MODPY_VERSION}/site-packages/_tdb_text.pyc
@so lib/python${MODPY_VERSION}/site-packages/tdb.so

4
mail/fdm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2020/01/28 09:21:24 stsp Exp $
# $OpenBSD: Makefile,v 1.25 2021/01/23 23:17:48 kn Exp $
COMMENT= fetch, filter and deliver mail
V= 2.0
DISTNAME= fdm-$V
CATEGORIES= mail
REVISION= 0
REVISION= 1
MAINTAINER= Nicholas Marriott <nicm@openbsd.org>

3
mail/neomutt/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.64 2020/11/27 14:33:54 sthen Exp $
# $OpenBSD: Makefile,v 1.65 2021/01/23 23:17:48 kn Exp $
COMMENT= tty-based e-mail client, Mutt with patches
GH_ACCOUNT= neomutt
GH_PROJECT= neomutt
GH_TAGNAME= 20201127
REVISION= 0
CATEGORIES= mail
HOMEPAGE= https://neomutt.org/

4
net/netatalk3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2020/07/03 21:13:00 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2021/01/23 23:17:48 kn Exp $
COMMENT= AFP file and print services for IP networks
@ -6,7 +6,7 @@ V= 3.1.12
DISTNAME= netatalk-${V}
EXTRACT_SUFX= .tar.bz2
PKGSPEC= netatalk->=3,<4
REVISION= 1
REVISION= 2
SHARED_LIBS += atalk 16.0 # 16.0