From owner-svn-ports-head@freebsd.org Mon Feb 11 16:40:08 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E091514DCA5E; Mon, 11 Feb 2019 16:40:07 +0000 (UTC) (envelope-from meta@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 851F0767B4; Mon, 11 Feb 2019 16:40:07 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A40B27EE; Mon, 11 Feb 2019 16:40:07 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1BGe7r1072862; Mon, 11 Feb 2019 16:40:07 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1BGe7vj072861; Mon, 11 Feb 2019 16:40:07 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201902111640.x1BGe7vj072861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Mon, 11 Feb 2019 16:40:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492699 - head/irc/hexchat X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/irc/hexchat X-SVN-Commit-Revision: 492699 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 851F0767B4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2019 16:40:08 -0000 Author: meta Date: Mon Feb 11 16:40:06 2019 New Revision: 492699 URL: https://svnweb.freebsd.org/changeset/ports/492699 Log: irc/hexchat: fix build when PYTHON option is off - hexchat requires Python 3 - Specify PYTHON_VER in MESON_ARGS since each ports might be built with different Python versions PR: 235644 Submitted by: w.schwarzenfeld@utanet.at Reported by: Philipp Engel Approved by: Piotr Kubaj (maintainer) Modified: head/irc/hexchat/Makefile head/irc/hexchat/pkg-plist Modified: head/irc/hexchat/Makefile ============================================================================== --- head/irc/hexchat/Makefile Mon Feb 11 16:05:56 2019 (r492698) +++ head/irc/hexchat/Makefile Mon Feb 11 16:40:06 2019 (r492699) @@ -3,8 +3,8 @@ PORTNAME= hexchat PORTVERSION= 2.14.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= irc gnome ipv6 MAINTAINER= pkubaj@anongoth.pl @@ -21,11 +21,12 @@ LIB_DEPENDS= libproxy.so:net/libproxy \ RUN_DEPENDS= ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes USES= compiler:c++11-lang desktop-file-utils gettext-tools gnome \ - libtool meson ninja pkgconfig shebangfix ssl + libtool meson ninja pkgconfig python:3.5+ shebangfix ssl USE_GNOME= cairo gtk20 intltool libxml2 USE_XORG= x11 USE_GITHUB= yes -MESON_ARGS= -Dwith-ssl=true -Dwith-gtk=true + +MESON_ARGS= -Dwith-ssl=true -Dwith-gtk=true -Dwith-python=python-${PYTHON_VER} INSTALLS_ICONS= yes INSTALL_TARGET= install-strip @@ -37,9 +38,9 @@ SUB_FILES= pkg-message PORTDOCS= * OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA NOTIFY \ - PERL PYTHON TEXTFE SYSINFO + PERL TEXTFE SYSINFO -OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL PYTHON +OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL OPTIONS_SUB= yes @@ -66,14 +67,12 @@ NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_MESON_TRUE= with-libnotify PERL_MESON_TRUE= with-perl PERL_USES= perl5 -PYTHON_MESON_ON= -Dwith-python=python-${PYTHON_VER} -PYTHON_MESON_OFF= -Dwith-python=false -PYTHON_USES= python:3.4+ shebangfix -PYTHON_VARS= SHEBANG_FILES=meson_post_install.py -PYTHON_VARS+= SHEBANG_FILES=plugins/perl/generate_header.py -PYTHON_VARS+= SHEBANG_FILES=src/common/make-te.py TEXTFE_MESON_TRUE= with-text SYSINFO_MESON_TRUE= with-sysinfo + +SHEBANG_FILES= meson_post_install.py \ + plugins/perl/generate_header.py \ + src/common/make-te.py post-patch: @${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \ Modified: head/irc/hexchat/pkg-plist ============================================================================== --- head/irc/hexchat/pkg-plist Mon Feb 11 16:05:56 2019 (r492698) +++ head/irc/hexchat/pkg-plist Mon Feb 11 16:40:06 2019 (r492699) @@ -4,7 +4,7 @@ include/hexchat-plugin.h lib/hexchat/plugins/checksum.so %%FISHLIM%%lib/hexchat/plugins/fishlim.so %%PERL%%lib/hexchat/plugins/perl.so -%%PYTHON%%lib/hexchat/plugins/python.so +lib/hexchat/plugins/python.so %%LUA%%%%LUA_LIBDIR%%/hexchat/plugins/lua.so %%SYSINFO%%lib/hexchat/plugins/sysinfo.so libdata/pkgconfig/hexchat-plugin.pc