From owner-svn-ports-head@freebsd.org Mon Sep 7 14:55:54 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C35DB3CC31E; Mon, 7 Sep 2020 14:55:54 +0000 (UTC) (envelope-from tijl@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BlWYk4rSlz4DbS; Mon, 7 Sep 2020 14:55:54 +0000 (UTC) (envelope-from tijl@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 8B162211A4; Mon, 7 Sep 2020 14:55:54 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 087Etsgg045663; Mon, 7 Sep 2020 14:55:54 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 087EtsRa045662; Mon, 7 Sep 2020 14:55:54 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202009071455.087EtsRa045662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 7 Sep 2020 14:55:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547894 - head/print/hplip X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/print/hplip X-SVN-Commit-Revision: 547894 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 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, 07 Sep 2020 14:55:54 -0000 Author: tijl Date: Mon Sep 7 14:55:54 2020 New Revision: 547894 URL: https://svnweb.freebsd.org/changeset/ports/547894 Log: The Python 2 support in HPLIP depends on devel/py-gobject, not py-gobject3. PR: 225724 Modified: head/print/hplip/Makefile Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Mon Sep 7 14:27:25 2020 (r547893) +++ head/print/hplip/Makefile Mon Sep 7 14:55:54 2020 (r547894) @@ -21,8 +21,7 @@ RUN_DEPENDS= cups-filters>=0:print/cups-filters \ CONFLICTS_INSTALL= hpijs-[0-9]* INSTALL_TARGET= install-strip -USES= dos2unix gnome jpeg libtool pkgconfig python shebangfix -USE_GNOME= pygobject3 +USES= dos2unix jpeg libtool pkgconfig python shebangfix USE_LDCONFIG= yes SHEBANG_GLOB= *.py hpps pstotiff DOS2UNIX_FILES= scan/sane/orblite.c @@ -70,6 +69,14 @@ XSANE_DESC= Install XSane for scanning (implies SCAN) XSANE_IMPLIES= SCAN XSANE_RUN_DEPENDS= xsane:graphics/xsane +.include + +.if ${PYTHON_MAJOR_VER} >= 3 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} +.else +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} -e 's|-ldld||g;' \ -e 's|-ldl||g' \ @@ -131,4 +138,4 @@ post-install-SCAN-on: ${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \ ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio -.include +.include