Klemens Nanni <k...@openbsd.org> wrote: > https://github.com/profanity-im/profanity/releases/tag/0.10.0 > > Version requirements taken from the changelog. > > One could also emit the first python3 hunk now from the configure.ac > patch but 3.8 is more explicit so best leave it there in case multiple > python 3 versions are a problem. > > Tested on amd64 with OMEMO. > Feedback? OK?
Hey Klemens, thanks a lot for taking care of the update. Patch looks fine and I also successfully tried it with OMEMO. I'm unsure about adding versions to the deps, especially given that all the versions added are already in -current tree, and only libmesode is behind 0.10.0 in -stable. I feel more inclined to add the version constraint just for libmesode, in case someone like me wants to build it a -stable machine. While there, I'll drop maintainership for the port. It hasn't been too useful for me lately, part of the reason I delayed starting working in an update until yesterday, despite knowing about the release since the moment it was released. As such, I propose the following patch, dropping MAINTAINER and removing version constraint for glib2 and sqlite3. -Lucas
Index: Makefile =================================================================== RCS file: /home/cvs/ports/net/profanity/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 12 Jul 2020 07:18:03 -0000 1.17 +++ Makefile 17 Jan 2021 14:08:05 -0000 @@ -1,13 +1,11 @@ # $OpenBSD: Makefile,v 1.17 2020/07/12 07:18:03 rsadowski Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.9.5 +DISTNAME = profanity-0.10.0 CATEGORIES = net HOMEPAGE = https://profanity-im.github.io/ -MAINTAINER = Lucas <lu...@sexy.is> - SHARED_LIBS += profanity 0.0 # 0.0 # GPLv3+ @@ -28,7 +26,7 @@ LIB_DEPENDS += databases/sqlite3 \ devel/glib2 \ devel/readline \ net/curl \ - net/libmesode \ + net/libmesode>=0.10.0 \ net/libsignal-protocol-c \ security/gpgme \ security/libotr Index: distinfo =================================================================== RCS file: /home/cvs/ports/net/profanity/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 12 Jul 2020 07:18:03 -0000 1.10 +++ distinfo 17 Jan 2021 13:01:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (profanity-0.9.5.tar.gz) = I/ey5cbPhZE7nnoiiAK8qeyx0c87+PjyhelnYXaiSQI= -SIZE (profanity-0.9.5.tar.gz) = 830966 +SHA256 (profanity-0.10.0.tar.gz) = SgXjJZD57DhDDjNzW9As+hmbJXkitBFmE/I5Eso5/4w= +SIZE (profanity-0.10.0.tar.gz) = 868180 Index: patches/patch-configure_ac =================================================================== RCS file: /home/cvs/ports/net/profanity/patches/patch-configure_ac,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure_ac --- patches/patch-configure_ac 29 Jun 2020 04:54:59 -0000 1.6 +++ patches/patch-configure_ac 17 Jan 2021 13:01:06 -0000 @@ -6,16 +6,16 @@ Use ${MODPY_VERSION} to pick up our pyth Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -80,7 +80,7 @@ elif test "x$enable_python_plugins" != xno; then - AC_MSG_NOTICE([Symlinking Python.framework to $PYTHON_FRAMEWORK]) +@@ -82,7 +82,7 @@ elif test "x$enable_python_plugins" != xno; then rm -f Python.framework ln -s $PYTHON_FRAMEWORK Python.framework ]) -- AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no) -+ AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python${MODPY_VERSION}-config, yes, no) - if test "$PYTHON_CONFIG_EXISTS" == "yes"; then + AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no) +- AC_CHECK_PROG(PYTHON3_CONFIG_EXISTS, python3-config, yes, no) ++ AC_CHECK_PROG(PYTHON3_CONFIG_EXISTS, python${MODPY_VERSION}-config, yes, no) + if test "$PYTHON_CONFIG_EXISTS" = "yes" || test "$PYTHON3_CONFIG_EXISTS" = "yes"; then AX_PYTHON_DEVEL AM_CONDITIONAL([BUILD_PYTHON_API], [true]) -@@ -223,10 +223,10 @@ AS_IF([test "x$PLATFORM" = xosx], +@@ -221,10 +221,10 @@ AS_IF([test "x$PLATFORM" = xosx], [AC_MSG_ERROR([libreadline is required for profanity])])], [test "x$PLATFORM" = xopenbsd], Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/net/profanity/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 18 Jun 2020 20:44:16 -0000 1.5 +++ pkg/PLIST 17 Jan 2021 13:01:06 -0000 @@ -4,6 +4,100 @@ include/profapi.h @static-lib lib/libprofanity.a lib/libprofanity.la @lib lib/libprofanity.so.${LIBprofanity_VERSION} +@man man/man1/profanity-about.1 +@man man/man1/profanity-account.1 +@man man/man1/profanity-affiliation.1 +@man man/man1/profanity-alias.1 +@man man/man1/profanity-autoaway.1 +@man man/man1/profanity-autoconnect.1 +@man man/man1/profanity-autoping.1 +@man man/man1/profanity-avatar.1 +@man man/man1/profanity-ban.1 +@man man/man1/profanity-beep.1 +@man man/man1/profanity-blocked.1 +@man man/man1/profanity-bookmark.1 +@man man/man1/profanity-caps.1 +@man man/man1/profanity-carbons.1 +@man man/man1/profanity-charset.1 +@man man/man1/profanity-clear.1 +@man man/man1/profanity-close.1 +@man man/man1/profanity-cmd.1 +@man man/man1/profanity-color.1 +@man man/man1/profanity-connect.1 +@man man/man1/profanity-console.1 +@man man/man1/profanity-correct.1 +@man man/man1/profanity-correction.1 +@man man/man1/profanity-disco.1 +@man man/man1/profanity-disconnect.1 +@man man/man1/profanity-executable.1 +@man man/man1/profanity-export.1 +@man man/man1/profanity-flash.1 +@man man/man1/profanity-form.1 +@man man/man1/profanity-gone.1 +@man man/man1/profanity-help.1 +@man man/man1/profanity-history.1 +@man man/man1/profanity-info.1 +@man man/man1/profanity-inpblock.1 +@man man/man1/profanity-inputwin.1 +@man man/man1/profanity-intype.1 +@man man/man1/profanity-invite.1 +@man man/man1/profanity-join.1 +@man man/man1/profanity-kick.1 +@man man/man1/profanity-lastactivity.1 +@man man/man1/profanity-log.1 +@man man/man1/profanity-logging.1 +@man man/man1/profanity-mainwin.1 +@man man/man1/profanity-msg.1 +@man man/man1/profanity-nick.1 +@man man/man1/profanity-notify.1 +@man man/man1/profanity-occupants.1 +@man man/man1/profanity-omemo.1 +@man man/man1/profanity-os.1 +@man man/man1/profanity-otr.1 +@man man/man1/profanity-outtype.1 +@man man/man1/profanity-ox.1 +@man man/man1/profanity-paste.1 +@man man/man1/profanity-pgp.1 +@man man/man1/profanity-ping.1 +@man man/man1/profanity-plugins.1 +@man man/man1/profanity-prefs.1 +@man man/man1/profanity-presence.1 +@man man/man1/profanity-priority.1 +@man man/man1/profanity-privileges.1 +@man man/man1/profanity-quit.1 +@man man/man1/profanity-receipts.1 +@man man/man1/profanity-reconnect.1 +@man man/man1/profanity-reload.1 +@man man/man1/profanity-resource.1 +@man man/man1/profanity-role.1 +@man man/man1/profanity-room.1 +@man man/man1/profanity-rooms.1 +@man man/man1/profanity-roster.1 +@man man/man1/profanity-save.1 +@man man/man1/profanity-script.1 +@man man/man1/profanity-sendfile.1 +@man man/man1/profanity-serversoftware.1 +@man man/man1/profanity-slashguard.1 +@man man/man1/profanity-software.1 +@man man/man1/profanity-splash.1 +@man man/man1/profanity-states.1 +@man man/man1/profanity-status.1 +@man man/man1/profanity-statusbar.1 +@man man/man1/profanity-sub.1 +@man man/man1/profanity-subject.1 +@man man/man1/profanity-theme.1 +@man man/man1/profanity-time.1 +@man man/man1/profanity-titlebar.1 +@man man/man1/profanity-tls.1 +@man man/man1/profanity-tray.1 +@man man/man1/profanity-url.1 +@man man/man1/profanity-vercheck.1 +@man man/man1/profanity-who.1 +@man man/man1/profanity-win.1 +@man man/man1/profanity-wins.1 +@man man/man1/profanity-wintitle.1 +@man man/man1/profanity-wrap.1 +@man man/man1/profanity-xmlconsole.1 @man man/man1/profanity.1 share/examples/profanity/ share/examples/profanity/profrc.example
