summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-04-28 17:01:46 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-04-28 17:01:46 +0000
commit63408327b0590b294ec0cec50460fbc83402d5af (patch)
treef4ebe2a8ffa9fe0c4502317cb84dc88a13aa3513 /x11
parent- Update to 0.017 (diff)
USES=xfce: Stop overriding MASTER_SITE_SUBDIR.
Add an XFCE SITE_SUBDIR abbreviation and use it forf or the xfce ports, which removes the need to set MASTER_SITE_SUBDIR in any of them. This fixes ports that have USES=xfce but do not use the XFCE MASTER_SITE, namely sysutils/xfce4-bsdcpufreq-plugin. With hat: portmgr
Notes
Notes: svn path=/head/; revision=384919
Diffstat (limited to 'x11')
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/xfce4-clipman-plugin/Makefile3
-rw-r--r--x11/xfce4-conf/Makefile2
-rw-r--r--x11/xfce4-embed-plugin/Makefile3
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile3
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile3
-rw-r--r--x11/xfce4-taskmanager/Makefile3
-rw-r--r--x11/xfce4-terminal/Makefile3
-rw-r--r--x11/xfce4-verve-plugin/Makefile3
9 files changed, 9 insertions, 16 deletions
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 311bad627ff0..5cf4c72abbbf 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libxfce4util
PORTVERSION= 4.12.1
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITES= XFCE
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 387c621968cf..94f24e501631 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.2.6
PORTREVISION= 2
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 7a478268a1c9..89354214a102 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -4,7 +4,7 @@
PORTNAME= xfce4-conf
PORTVERSION= 4.12.0
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITES= XFCE
DISTNAME= xfconf-${PORTVERSION}
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index 400d2a799397..704b590da4bf 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-embed-plugin
PORTVERSION= 1.4.1
PORTREVISION= 2
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 7dde7d01774e..c98af71f546e 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
PORTREVISION= 17
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 636eee34c1d6..0ba287d735f2 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=src/apps/xfce4-screenshooter/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/xfce4-screenshooter/${PORTVERSION:R}
DISTNAME= xfce4-screenshooter-${PORTVERSION}
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 923bc93c5ee6..0d6f9d9ad192 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-taskmanager
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 9c0cdc755e18..1fbaf76bac3a 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xfce4-terminal
PORTVERSION= 0.6.3
PORTREVISION= 2
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index c3e3af8569fc..93767354a25c 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -5,8 +5,7 @@ PORTNAME= verve-plugin
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
PKGNAMEPREFIX= xfce4-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= xfce4