Rafael Sadowski <raf...@sizeofvoid.org> wrote:
> I think if you do this in post-configure your are to late and the party
> is over but I'm not very familiar with the GNU autotools.
Ugh, meant to say post-patch in there. Anyway, find an updated patch
incorporating the fixes below.
I opted to stick to CONFIGURE_STYLE=autoconf to have working python
support: current ports' profanity can't load python plugins and isn't
linked against python because I assume that the build machines doesn't
have such symbolic links. Patching the generated configure seemed more
difficult.
While there, I removed
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
as CONFIGURE_STYLE=autoconf does add ${MODGNU_AUTOCONF_DEPENDS} to
BUILD_DEPENDS, and it builds and works fine without
${MODGNU_AUTOMAKE_DEPENDS}. Still, let me know if doing so is a mistake
for other reasons.
Also I changed the non-default localbase install fix to substitute
/usr/local instead of ${TRUEPREFIX}, as /usr/local is hard-coded in
configure.ac.
Changes list:
* Change HOMEPAGE to GitHub's site, as it's updated more frequently (old
HOMEPAGE still show 0.6.0 as latest version, despite 0.7.0 being
released more than a month ago) and the repo description points to it.
* Enable OMEMO support by default
* Remove the deletion of #include "ui/stub_ui.h" from test files.
* Synchronize feature list with the one in the site.
* Fix non-default localbase correction.
* Fix python detection, actually enabling support for python plugins.
* No PLIST changes.
-Lucas
Index: net/profanity/Makefile
===================================================================
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- net/profanity/Makefile 12 Jul 2019 20:48:44 -0000 1.10
+++ net/profanity/Makefile 6 Sep 2019 01:09:10 -0000
@@ -1,34 +1,31 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:44 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.6.0
+DISTNAME = profanity-0.7.0
CATEGORIES = net
-REVISION = 0
-HOMEPAGE = http://www.profanity.im/
+HOMEPAGE = https://profanity-im.github.io/
MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
# GPLv3+
PERMIT_PACKAGE = Yes
-MASTER_SITES = http://www.profanity.im/
+MASTER_SITES = ${HOMEPAGE}
WANTLIB += assuan c crypto curl curses ereadline expat ffi gcrypt
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
WANTLIB += gpgme iconv intl m mesode nghttp2 otr pcre pthread
-WANTLIB += ${MODPY_WANTLIB} ssl util z
+WANTLIB += signal-protocol-c ssl util z ${MODPY_WANTLIB}
MODULES += lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
LIB_DEPENDS += devel/glib2 \
devel/readline \
net/curl \
net/libmesode \
+ net/libsignal-protocol-c \
security/gpgme \
security/libotr
@@ -44,6 +41,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
CONFIGURE_ARGS += --with-xscreensaver=no \
--enable-icons=no \
--enable-plugins=yes \
+ --enable-omemo=yes \
--enable-otr=yes
MAKE_FLAGS = CC="${CC}" \
@@ -54,11 +52,13 @@ AUTOMAKE_VERSION = 1.11
SEPARATE_BUILD = Yes
-# there is no stub_ui.h and is not needed
+# * Assumes that devel/readline is installed in the default LOCALBASE.
+# * Assumes there is a python-config, while we usually have
+# python$VERSION-config
post-patch:
- find ${WRKSRC} -type f -name "*.c" \
- -exec sed -i '/stub\_ui.h/d' "{}" \;
- sed -i s,${TRUEPREFIX},${LOCALBASE}, ${WRKSRC}/configure.ac
+ sed -i -e s,/usr/local,${LOCALBASE}, \
+ -e s,python-config,python${MODPY_VERSION}-config, \
+ ${WRKSRC}/configure.ac
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/profanity/
Index: net/profanity/distinfo
===================================================================
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- net/profanity/distinfo 3 Mar 2019 19:40:04 -0000 1.4
+++ net/profanity/distinfo 6 Sep 2019 01:09:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.6.0.tar.gz) = 8bJ3O3nrKUKXaG85E+lInCDv+uXjozXIlW2xj27i9mA=
-SIZE (profanity-0.6.0.tar.gz) = 741812
+SHA256 (profanity-0.7.0.tar.gz) = 8euZvgFoPUG4kbD5l/TIc8m7h7C2uEALf8y45VPVFLs=
+SIZE (profanity-0.7.0.tar.gz) = 789373
Index: net/profanity/pkg/DESCR
===================================================================
RCS file: /cvs/ports/net/profanity/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- net/profanity/pkg/DESCR 25 Apr 2016 17:46:38 -0000 1.1.1.1
+++ net/profanity/pkg/DESCR 6 Sep 2019 01:09:10 -0000
@@ -3,14 +3,10 @@ libstrophe, inspired by irssi.
Features:
-* Supports XMPP chat services.
-* Command driven user interface.
-* Customizable functionality and user interface.
-* OTR (Off The Record) message encryption.
-* Chat room support.
-* Roster management.
-* Flexible resource and priority settings.
-* Desktop notifications.
-* Unicode support.
-* Integrated DuckDuckGo searching.
-* Send tiny URLs.
+* Supports XMPP chat services
+* MUC chat room support
+* OTR, PGP and OMEMO message encryption
+* Roster management
+* Flexible resource and priority settings
+* Desktop notifications
+* Plugins in Python and C
