aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.port.mk
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2016-02-07 19:43:56 +0000
committerKoop Mast <kwm@FreeBSD.org>2016-02-07 19:43:56 +0000
commit71d5deb1f423658f8c3e3a0baa54dd883dd5d8d8 (patch)
tree9e818b5d09f2e948238e96c1a5ae1e8212983272 /Mk/bsd.port.mk
parentbca3635bdcc45f8ac6cd82e879aa2679870f2975 (diff)
downloadports-71d5deb1f423658f8c3e3a0baa54dd883dd5d8d8.tar.gz
ports-71d5deb1f423658f8c3e3a0baa54dd883dd5d8d8.zip
Move Mk/bsd.gnome.mk and Mk/bsd.mate.mk to Mk/Uses/.
To use the GNOME or MATE components activate it by adding gnome or mate to USES. The usage of USE_GNOME/INSTALL_ICONS and for example GLIB_SCHEMAS has stayed the same. Like with USES, the use of USE_GNOME and so after bsd.port.pre.mk is now forbidden. And adapt ports that where still doing that. Exp-runs done by: antoine@ PR: 205432 Reviewed by: antoine@, mat@ Approved by: portmgr (antoine@) Differential Revision: https://reviews.freebsd.org/D3653
Notes
Notes: svn path=/head/; revision=408449
Diffstat (limited to 'Mk/bsd.port.mk')
-rw-r--r--Mk/bsd.port.mk22
1 files changed, 2 insertions, 20 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6f199f71e6f3..b934a2113585 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -388,16 +388,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# USE_GECKO - If set, this port uses the Gecko/Mozilla product.
# See bsd.gecko.mk for more details.
##
-# USE_GNOME - A list of the Gnome dependencies the port has (e.g.,
-# glib12, gtk12). Implies that the port needs Gnome.
-# Implies inclusion of bsd.gnome.mk. See bsd.gnome.mk
-# or http://www.FreeBSD.org/gnome/docs/porting.html
-# for more details.
-##
-# USE_MATE - A list of the MATE dependencies the port has. Implies
-# that the port needs MATE. Implies inclusion of
-# bsd.mate.mk. See bsd.mate.mk for more details.
-##
# USE_WX - If set, this port uses the WxWidgets library and related
# components. See bsd.wx.mk for more details.
##
@@ -1398,11 +1388,11 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
.endif
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(INSTALLS_ICONS)
-.include "${PORTSDIR}/Mk/bsd.gnome.mk"
+USES+= gnome
.endif
.if defined(USE_MATE)
-.include "${PORTSDIR}/Mk/bsd.mate.mk"
+USES+= mate
.endif
.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
@@ -1913,14 +1903,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \
.include "${PORTSDIR}/Mk/bsd.gecko.mk"
.endif
-.if defined(WANT_GNOME) || defined(USE_GNOME)
-.include "${PORTSDIR}/Mk/bsd.gnome.mk"
-.endif
-
-.if defined(USE_MATE)
-.include "${PORTSDIR}/Mk/bsd.mate.mk"
-.endif
-
.if defined(USE_KDE4)
.include "${PORTSDIR}/Mk/bsd.kde4.mk"
.endif