Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Sep 2020 14:55:54 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547894 - head/print/hplip
Message-ID:  <202009071455.087EtsRa045662@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009071455.087EtsRa045662>