From nobody Sun Sep 25 22:49:44 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MbLgD3sfPz4d8VP; Sun, 25 Sep 2022 22:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MbLgD2gYbz3qYR; Sun, 25 Sep 2022 22:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664146184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=171K8f37x9ulul8GpV+UoyHVZcDAyco0/1RQOMFVMhA=; b=P6Iz9+sR9qN97Zmz4lsIBiYxL+fQGknqabBgFIdY+3t3Z3oV+ruCzMSChuZ4zvRr8MVT6q UrfyM2xZ8KcPfQTc2ZSfpwKpxoHPJoeDvJ8BCP9xKuWfx78Mgpoj7iH/VQek9OZt4GOg0M gQIupdpmERF/OJTeu/JuPlxG2XCupKN56HAWYmeNWCn71i6vknIN33NFtc0caqJK87K6FW xd77lZZB3nekLWqd1TEBjJMWEpLzuLegrjLkDpbR3Ksz2UHvUb7+iO2oUYm8g0hN8YJOLt btOAmdJ6KPQOTFqqgl2Sk+w8Vx4Z+9Ml4qrix1M464zQAS0pDcYoupHDC/EKPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MbLgD1lLbzZFL; Sun, 25 Sep 2022 22:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28PMnits092011; Sun, 25 Sep 2022 22:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PMninl092010; Sun, 25 Sep 2022 22:49:44 GMT (envelope-from git) Date: Sun, 25 Sep 2022 22:49:44 GMT Message-Id: <202209252249.28PMninl092010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 15b2c42e96fa - main - net-im/profanity: Use upstream release archive and some other fixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15b2c42e96fa6562ec63def52ae97ebd937276b7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664146184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=171K8f37x9ulul8GpV+UoyHVZcDAyco0/1RQOMFVMhA=; b=OWiuOd3UzoQbsE696nVEGIgLOZNfilUP8GZV75ivdPB1gJwuvEp6pnzmOTZudvdsT2gvHQ voa8/5lEEgy+fDr3hRbyZSco08s7/orNv94qJnvENqnLU6X8Ym7EkG55JELpu7Jj0kYqzC eaYnJNTB+InpY54hm6KugzNl2KtcVkgRUkwlDcqt2nN4ZqR0flQ56/P7liTCGQcOYHwo1W rbzJeWVqdzMJ+LQUfRHAVV0w8hNZU6lVHs50qBNU9fRWRRElClIg5GG5VHU/xvAlSxPMpS Dy9KiiCo9Ngv3YVtt3jtkj0f3bn28mnMWKkDBs/8FOFfz7yID0JnVPLVJWw3uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664146184; a=rsa-sha256; cv=none; b=nIUGR9DrnZs+83lPeEPMa7JKwqQ1G+6ADW/Q3m4vea+eu7S6shq3ti6HT0/KpkVJcLxW3l r7gTVkMZcBYk7t/oScjU9nms0n04TEKLKCGPcr9+0UJ/QLIeRHaMLvRD5ncIK/ev2P3so7 pGbP7ddcFcLorLZiGEuwD4cm9TYoW2c07qU8Wy6n/Bws1jBkgN86KYKWe9mNqgd7IytVQ3 oxuWwB2xj7zHmZu9h8QUC9vB0Atrx5b8fmVW1OBH0jTXlFFDxln1zo2o41Z8B+PyPfReT7 7RhdClkyUgk3strv7fZ+WCkaEyP2WmWkpo8Mcd7PvtRL/af0U/U892is3ZhiwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=15b2c42e96fa6562ec63def52ae97ebd937276b7 commit 15b2c42e96fa6562ec63def52ae97ebd937276b7 Author: Daniel Engberg AuthorDate: 2022-09-25 17:48:31 +0000 Commit: Daniel Engberg CommitDate: 2022-09-25 22:46:47 +0000 net-im/profanity: Use upstream release archive and some other fixes - Use upstream release archive as recommended in USE_GITHUB section in Porters Handbook - Remove OpenSSL dependency - Add USE_LDCONFIG - Rearrange Makefile to follow Porters Handbook more closely - Fix Python detection (patch provided by maintainer) PR: 266430 Reviewed by: ashish (maintainer) --- net-im/profanity/Makefile | 21 ++++++++++----------- net-im/profanity/distinfo | 6 +++--- net-im/profanity/files/patch-configure.ac | 9 --------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile index a4991c631310..34e895c11182 100644 --- a/net-im/profanity/Makefile +++ b/net-im/profanity/Makefile @@ -1,6 +1,7 @@ PORTNAME= profanity -PORTVERSION= 0.13.0 +DISTVERSION= 0.13.0 CATEGORIES= net-im +MASTER_SITES= https://github.com/${PORTNAME}-im/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= ashish@FreeBSD.org COMMENT= Console based XMPP client @@ -21,27 +22,25 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libstrophe.so:net-im/libstrophe \ libqrencode.so:graphics/libqrencode -USES= cpe ncurses pkgconfig ssl python:3.8+ readline autoreconf libtool gnome \ - sqlite:3 +USES= autoreconf cpe gnome libtool ncurses pkgconfig python:3.8+ \ + readline sqlite:3 tar:xz CPE_VENDOR= ${PORTNAME}_project +GNU_CONFIGURE= yes USE_GNOME= glib20 -USE_GITHUB= yes -GH_ACCOUNT= profanity-im +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip -GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-otr --enable-python-plugins --enable-c-plugins \ --enable-pgp --disable-icons-and-clipboard \ --without-xscreensaver --disable-gdk-pixbuf \ --enable-omemo --enable-omemo-qrcode -CONFIGURE_ENV= LIBS="${CFLAGS} -lcrypto" -INSTALL_TARGET= install-strip + OPTIONS_DEFINE= NOTIFY NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE=notifications -.include - post-patch: ${REINPLACE_CMD} "s,python3-embed,python-${PYTHON_VER}-embed,g" \ ${WRKSRC}/configure.ac @@ -49,4 +48,4 @@ post-patch: post-install: cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man1 "-name *\.1" -.include +.include diff --git a/net-im/profanity/distinfo b/net-im/profanity/distinfo index e7548db0e9ec..9567f9723ef7 100644 --- a/net-im/profanity/distinfo +++ b/net-im/profanity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663179502 -SHA256 (profanity-im-profanity-0.13.0_GH0.tar.gz) = ee38119ed3bd3995675d7da787f52c7576403be678bc9a8f5170812597547d7b -SIZE (profanity-im-profanity-0.13.0_GH0.tar.gz) = 566611 +TIMESTAMP = 1663273219 +SHA256 (profanity-0.13.0.tar.xz) = dbf43e02a8ef2a0ffc48a02c635f14f0c247ac7fd1683d009b9c1f91c250a559 +SIZE (profanity-0.13.0.tar.xz) = 621344 diff --git a/net-im/profanity/files/patch-configure.ac b/net-im/profanity/files/patch-configure.ac index fc5a6b1f631c..8081e0af6d86 100644 --- a/net-im/profanity/files/patch-configure.ac +++ b/net-im/profanity/files/patch-configure.ac @@ -1,14 +1,5 @@ --- configure.ac.orig 2022-09-13 09:50:49 UTC +++ configure.ac -@@ -104,7 +104,7 @@ elif test "x$enable_python_plugins" != xno; then - rm -f Python.framework - ln -s $PYTHON_FRAMEWORK Python.framework ]) - PKG_CHECK_MODULES([python], [python-embed], [PYTHON_CONFIG_EXISTS=yes], [PYTHON_CONFIG_EXISTS=no]) -- PKG_CHECK_MODULES([python], [python3-embed], [PYTHON3_CONFIG_EXISTS=yes; AC_DEFINE(PY_IS_PYTHON3, [1], [Is Python version 3])], [PYTHON3_CONFIG_EXISTS=no]) -+ PKG_CHECK_MODULES([python], [python-3.9-embed], [PYTHON3_CONFIG_EXISTS=yes; AC_DEFINE(PY_IS_PYTHON3, [1], [Is Python version 3])], [PYTHON3_CONFIG_EXISTS=no]) - if test "$PYTHON_CONFIG_EXISTS" = "yes" || test "$PYTHON3_CONFIG_EXISTS" = "yes"; then - AM_CONDITIONAL([BUILD_PYTHON_API], [true]) - AC_DEFINE([HAVE_PYTHON], [1], [Python support]) @@ -272,11 +272,11 @@ AS_IF([test "x$PLATFORM" = xosx], [AC_MSG_NOTICE([libnotify support will be disabled])])])])])