On Sat, Jan 23, 2021 at 05:58:14PM +0100, Jeremie Courreges-Anglas wrote:
> > net/netatalk3
> > mail/neomutt
> > mail/fdm
> > audio/rhythmbox
> > audio/pulseaudio
>
> Do those ports build and package without py-tdb installed? That's the
> main thing to check.
Yes, `make update-plist package' gave me packages for all of them
without any PLIST changes when I had tdb-1.3.18p0 installed without
having tdb-python-1.3.18 installed.
> LGTM so far, but consumers need a REVISION bump because of the pkgpath
> change.
Right, thanks.
I've also added a `@conflict tdb-<1.3.18p0' marker to PLIST-python since
old tdb and new tdb-python contain the same files.
Strangely enough, this doesn't seem to make a difference since with and
without the conflict marker, pkg_add always displays the same warning
(as if duplicate files are checked before conflict markers or so...):
$ pkg_info -m | grep tdb
tdb-1.3.18 trivial database library
$ doas pkg_add -Dunsigned ./tdb-python-1.3.18.tgz
Collision in tdb-python-1.3.18: the following files already exist
...
Feedback? OK?
Index: databases/tdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- databases/tdb/Makefile 14 Mar 2020 15:35:29 -0000 1.32
+++ databases/tdb/Makefile 23 Jan 2021 13:46:25 -0000
@@ -1,9 +1,15 @@
# $OpenBSD: Makefile,v 1.32 2020/03/14 15:35:29 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
+V= 1.3.18
+DISTNAME= tdb-${V}
+PKGNAME-main= tdb-${V}
+REVISION-main= 0
+PKGNAME-python= tdb-python-${V}
+MULTI_PACKAGES= -main -python
# 0750 on Makefile and other files breaks update-patches with PORTS_PRIVSEP=Yes
FIX_EXTRACT_PERMISSIONS= Yes
@@ -19,7 +25,8 @@ MAINTAINER= Jeremie Courreges-Anglas <jc
# 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 +39,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}"
Index: databases/tdb/pkg/DESCR
===================================================================
RCS file: databases/tdb/pkg/DESCR
diff -N databases/tdb/pkg/DESCR
--- databases/tdb/pkg/DESCR 28 Jul 2007 21:37:26 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-TDB is a Trivial Database. In concept, it is very much like GDBM, and
-BSD's DB except that it allows multiple simultaneous writers and uses
-locking internally to keep writers from trampling on each other. TDB is
-also extremely small.
Index: databases/tdb/pkg/DESCR-main
===================================================================
RCS file: databases/tdb/pkg/DESCR-main
diff -N databases/tdb/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/tdb/pkg/DESCR-main 28 Jul 2007 21:37:26 -0000
@@ -0,0 +1,4 @@
+TDB is a Trivial Database. In concept, it is very much like GDBM, and
+BSD's DB except that it allows multiple simultaneous writers and uses
+locking internally to keep writers from trampling on each other. TDB is
+also extremely small.
Index: databases/tdb/pkg/DESCR-python
===================================================================
RCS file: databases/tdb/pkg/DESCR-python
diff -N databases/tdb/pkg/DESCR-python
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/tdb/pkg/DESCR-python 23 Jan 2021 13:47:51 -0000
@@ -0,0 +1 @@
+Python ${MODPY_VERSION} bindings for tdb.
Index: databases/tdb/pkg/PLIST
===================================================================
RCS file: databases/tdb/pkg/PLIST
diff -N databases/tdb/pkg/PLIST
--- databases/tdb/pkg/PLIST 4 Dec 2019 00:14:45 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.10 2019/12/04 00:14:45 jca Exp $
-@conflict samba-<3.5.0
-@bin bin/tdbbackup
-@bin bin/tdbdump
-@bin bin/tdbrestore
-@bin bin/tdbtool
-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
-@man man/man8/tdbtool.8
Index: databases/tdb/pkg/PLIST-main
===================================================================
RCS file: databases/tdb/pkg/PLIST-main
diff -N databases/tdb/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/tdb/pkg/PLIST-main 23 Jan 2021 13:44:01 -0000
@@ -0,0 +1,13 @@
+@comment $OpenBSD: PLIST-main,v$
+@pkgpath databases/tdb
+@bin bin/tdbbackup
+@bin bin/tdbdump
+@bin bin/tdbrestore
+@bin bin/tdbtool
+include/tdb.h
+@lib lib/libtdb.so.${LIBtdb_VERSION}
+lib/pkgconfig/tdb.pc
+@man man/man8/tdbbackup.8
+@man man/man8/tdbdump.8
+@man man/man8/tdbrestore.8
+@man man/man8/tdbtool.8
Index: databases/tdb/pkg/PLIST-python
===================================================================
RCS file: databases/tdb/pkg/PLIST-python
diff -N databases/tdb/pkg/PLIST-python
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/tdb/pkg/PLIST-python 23 Jan 2021 19:40:36 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-python,v$
+@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
Index: net/netatalk3/Makefile
===================================================================
RCS file: /cvs/ports/net/netatalk3/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- net/netatalk3/Makefile 3 Jul 2020 21:13:00 -0000 1.17
+++ net/netatalk3/Makefile 23 Jan 2021 19:07:32 -0000
@@ -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
Index: mail/neomutt/Makefile
===================================================================
RCS file: /cvs/ports/mail/neomutt/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- mail/neomutt/Makefile 27 Nov 2020 14:33:54 -0000 1.64
+++ mail/neomutt/Makefile 23 Jan 2021 19:10:46 -0000
@@ -5,6 +5,7 @@ COMMENT= tty-based e-mail client, Mutt w
GH_ACCOUNT= neomutt
GH_PROJECT= neomutt
GH_TAGNAME= 20201127
+REVISION= 0
CATEGORIES= mail
HOMEPAGE= https://neomutt.org/
Index: mail/fdm/Makefile
===================================================================
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- mail/fdm/Makefile 28 Jan 2020 09:21:24 -0000 1.24
+++ mail/fdm/Makefile 23 Jan 2021 19:07:08 -0000
@@ -5,7 +5,7 @@ COMMENT= fetch, filter and deliver mail
V= 2.0
DISTNAME= fdm-$V
CATEGORIES= mail
-REVISION= 0
+REVISION= 1
MAINTAINER= Nicholas Marriott <[email protected]>
Index: audio/rhythmbox/Makefile
===================================================================
RCS file: /cvs/ports/audio/rhythmbox/Makefile,v
retrieving revision 1.178
diff -u -p -r1.178 Makefile
--- audio/rhythmbox/Makefile 3 Oct 2020 15:39:58 -0000 1.178
+++ audio/rhythmbox/Makefile 23 Jan 2021 19:21:55 -0000
@@ -4,7 +4,7 @@ COMMENT= integrated music management ap
GNOME_PROJECT= rhythmbox
GNOME_VERSION= 3.4.4
-REVISION= 1
+REVISION= 2
SHARED_LIBS += rhythmbox-core 0.0 # 7.0
Index: audio/rhythmbox/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/rhythmbox/pkg/PLIST,v
retrieving revision 1.57
diff -u -p -r1.57 PLIST
--- audio/rhythmbox/pkg/PLIST 5 Jan 2020 13:23:18 -0000 1.57
+++ audio/rhythmbox/pkg/PLIST 23 Jan 2021 20:05:45 -0000
@@ -437,7 +437,6 @@ share/help/cs/rhythmbox/figures/rb-volum
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-volum
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
Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /cvs/ports/audio/pulseaudio/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- audio/pulseaudio/Makefile 17 Jan 2021 10:39:01 -0000 1.112
+++ audio/pulseaudio/Makefile 23 Jan 2021 19:17:59 -0000
@@ -9,6 +9,7 @@ COMMENT= cross-platform networked sound
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
