[Midnightbsd-cvs] mports [21093] trunk/x11/gnome-desktop/Makefile: workaround a strange problem with how dependencies are calculated.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 11 08:25:45 EST 2016
Revision: 21093
http://svnweb.midnightbsd.org/mports/?rev=21093
Author: laffer1
Date: 2016-03-11 08:25:44 -0500 (Fri, 11 Mar 2016)
Log Message:
-----------
workaround a strange problem with how dependencies are calculated. We want the python 2 depends here for py-libxml2 but because gnome requires python 3, it assumes the py3 version. Just depend on both to make magus happy for now.
Modified Paths:
--------------
trunk/x11/gnome-desktop/Makefile
Modified: trunk/x11/gnome-desktop/Makefile
===================================================================
--- trunk/x11/gnome-desktop/Makefile 2016-03-11 12:52:46 UTC (rev 21092)
+++ trunk/x11/gnome-desktop/Makefile 2016-03-11 13:25:44 UTC (rev 21093)
@@ -24,12 +24,16 @@
xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
libxkbfile>=0:${PORTSDIR}/x11/libxkbfile \
itstool:${PORTSDIR}/textproc/itstool \
- python2:${PORTSDIR}/lang/python2
+ python2:${PORTSDIR}/lang/python2 \
+ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py3-libxml2 \
+ ${LOCALBASE}/lib/python2.7/site-packages/libxml2.py:${PORTSDIR}/textproc/py-libxml2
RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
libxkbfile>=0:${PORTSDIR}/x11/libxkbfile \
- python2:${PORTSDIR}/lang/python2
+ python2:${PORTSDIR}/lang/python2 \
+ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py3-libxml2 \
+ ${LOCALBASE}/lib/python2.7/site-packages/libxml2.py:${PORTSDIR}/textproc/py-libxml2
USES+= bison gettext gmake libtool pathfix pkgconfig python:3
USE_GNOME= gtk30 intlhack introspection:build referencehack
More information about the Midnightbsd-cvs
mailing list