From owner-svn-ports-all@FreeBSD.ORG Tue Apr 28 17:02:01 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2FE10E60; Tue, 28 Apr 2015 17:02:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BE3C1994; Tue, 28 Apr 2015 17:02:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SH21Zc091613; Tue, 28 Apr 2015 17:02:01 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SH1lnj090983; Tue, 28 Apr 2015 17:01:47 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504281701.t3SH1lnj090983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 28 Apr 2015 17:01:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384919 - in head: Mk Mk/Uses archivers/squeeze archivers/thunar-archive-plugin audio/thunar-media-tags-plugin audio/xfce4-mixer audio/xfce4-mpc-plugin audio/xfmpc deskutils/xfce4-tumbl... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 17:02:01 -0000 Author: bdrewery Date: Tue Apr 28 17:01:46 2015 New Revision: 384919 URL: https://svnweb.freebsd.org/changeset/ports/384919 Log: 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 Modified: head/Mk/Uses/xfce.mk head/Mk/bsd.sites.mk head/archivers/squeeze/Makefile head/archivers/thunar-archive-plugin/Makefile head/audio/thunar-media-tags-plugin/Makefile head/audio/xfce4-mixer/Makefile head/audio/xfce4-mpc-plugin/Makefile head/audio/xfmpc/Makefile head/deskutils/xfce4-tumbler/Makefile head/deskutils/xfce4-xkb-plugin/Makefile head/devel/thunar-vcs-plugin/Makefile head/devel/xfce4-dev-tools/Makefile head/devel/xfce4-vala/Makefile head/editors/mousepad/Makefile head/graphics/ristretto/Makefile head/mail/xfce4-mailwatch-plugin/Makefile head/misc/xfce4-appfinder/Makefile head/misc/xfce4-weather-plugin/Makefile head/misc/xfce4-wm-themes/Makefile head/print/xfce4-print/Makefile head/sysutils/garcon/Makefile head/sysutils/xfburn/Makefile head/sysutils/xfce4-battery-plugin/Makefile head/sysutils/xfce4-cpugraph-plugin/Makefile head/sysutils/xfce4-diskperf-plugin/Makefile head/sysutils/xfce4-fsguard-plugin/Makefile head/sysutils/xfce4-genmon-plugin/Makefile head/sysutils/xfce4-mount-plugin/Makefile head/sysutils/xfce4-netload-plugin/Makefile head/sysutils/xfce4-settings/Makefile head/sysutils/xfce4-systemload-plugin/Makefile head/sysutils/xfce4-wavelan-plugin/Makefile head/www/xfce4-smartbookmark-plugin/Makefile head/x11-clocks/xfce4-datetime-plugin/Makefile head/x11-clocks/xfce4-timer-out-plugin/Makefile head/x11-clocks/xfce4-timer-plugin/Makefile head/x11-fm/thunar-vfs/Makefile head/x11-themes/gtk-xfce-engine/Makefile head/x11-toolkits/libxfce4gui/Makefile head/x11-wm/xfce4-panel/Makefile head/x11/libxfce4util/Makefile head/x11/xfce4-clipman-plugin/Makefile head/x11/xfce4-conf/Makefile head/x11/xfce4-embed-plugin/Makefile head/x11/xfce4-quicklauncher-plugin/Makefile head/x11/xfce4-screenshooter-plugin/Makefile head/x11/xfce4-taskmanager/Makefile head/x11/xfce4-terminal/Makefile head/x11/xfce4-verve-plugin/Makefile Modified: head/Mk/Uses/xfce.mk ============================================================================== --- head/Mk/Uses/xfce.mk Tue Apr 28 16:57:11 2015 (r384918) +++ head/Mk/Uses/xfce.mk Tue Apr 28 17:01:46 2015 (r384919) @@ -20,7 +20,7 @@ _USES_POST+= xfce _USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf -MASTER_SITE_SUBDIR?= xfce/4.12/src +XFCE_MASTER_SITE_VER= 4.12 xfce_ARGS?= # empty Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Tue Apr 28 16:57:11 2015 (r384918) +++ head/Mk/bsd.sites.mk Tue Apr 28 17:01:46 2015 (r384919) @@ -1358,7 +1358,8 @@ MASTER_SITES_SUBDIRS= APACHE_JAKARTA:${P NETLIB:${PORTNAME} \ PERL_CPAN:${PORTNAME:C/-.*//} \ SAVANNAH:${PORTNAME:tl} \ - SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} + SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \ + XFCE:xfce/${XFCE_MASTER_SITE_VER}/src .if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*} Modified: head/archivers/squeeze/Makefile ============================================================================== --- head/archivers/squeeze/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/archivers/squeeze/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= squeeze PORTVERSION= 0.2.3 PORTREVISION= 10 CATEGORIES= archivers 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 Modified: head/archivers/thunar-archive-plugin/Makefile ============================================================================== --- head/archivers/thunar-archive-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/archivers/thunar-archive-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= thunar-archive-plugin PORTVERSION= 0.3.1 PORTREVISION= 4 CATEGORIES= archivers xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/audio/thunar-media-tags-plugin/Makefile ============================================================================== --- head/audio/thunar-media-tags-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/audio/thunar-media-tags-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= thunar-media-tags-plugin PORTVERSION= 0.2.1 PORTREVISION= 4 CATEGORIES= audio xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/audio/xfce4-mixer/Makefile ============================================================================== --- head/audio/xfce4-mixer/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/audio/xfce4-mixer/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-mixer PORTVERSION= 4.11.0 PORTREVISION= 2 CATEGORIES= audio 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 Modified: head/audio/xfce4-mpc-plugin/Makefile ============================================================================== --- head/audio/xfce4-mpc-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/audio/xfce4-mpc-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= xfce4-mpc-plugin PORTVERSION= 0.4.5 CATEGORIES= audio 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 Modified: head/audio/xfmpc/Makefile ============================================================================== --- head/audio/xfmpc/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/audio/xfmpc/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfmpc PORTVERSION= 0.2.2 PORTREVISION= 6 CATEGORIES= audio 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 Modified: head/deskutils/xfce4-tumbler/Makefile ============================================================================== --- head/deskutils/xfce4-tumbler/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/deskutils/xfce4-tumbler/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,7 +4,7 @@ PORTNAME= tumbler PORTVERSION= 0.1.31 CATEGORIES= deskutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE PKGNAMEPREFIX= xfce4- DIST_SUBDIR= xfce4 Modified: head/deskutils/xfce4-xkb-plugin/Makefile ============================================================================== --- head/deskutils/xfce4-xkb-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/deskutils/xfce4-xkb-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -3,8 +3,7 @@ PORTNAME= xfce4-xkb-plugin PORTVERSION= 0.7.1 CATEGORIES= deskutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} MAINTAINER= xfce@FreeBSD.org COMMENT= Keyboard layout switching plugin for the Xfce panel Modified: head/devel/thunar-vcs-plugin/Makefile ============================================================================== --- head/devel/thunar-vcs-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/devel/thunar-vcs-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.1.4 PORTREVISION= 13 CATEGORIES= devel xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= sergey.dyatko@gmail.com Modified: head/devel/xfce4-dev-tools/Makefile ============================================================================== --- head/devel/xfce4-dev-tools/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/devel/xfce4-dev-tools/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,7 +4,7 @@ PORTNAME= xfce4-dev-tools PORTVERSION= 4.12.0 CATEGORIES= devel xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/devel/xfce4-vala/Makefile ============================================================================== --- head/devel/xfce4-vala/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/devel/xfce4-vala/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-vala PORTVERSION= 4.10.3 PORTREVISION= 1 CATEGORIES= devel xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/bindings/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/bindings/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/editors/mousepad/Makefile ============================================================================== --- head/editors/mousepad/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/editors/mousepad/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= mousepad PORTVERSION= 0.4.0 PORTREVISION= 1 CATEGORIES= editors 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 Modified: head/graphics/ristretto/Makefile ============================================================================== --- head/graphics/ristretto/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/graphics/ristretto/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= ristretto PORTVERSION= 0.8.0 CATEGORIES= graphics 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 Modified: head/mail/xfce4-mailwatch-plugin/Makefile ============================================================================== --- head/mail/xfce4-mailwatch-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/mail/xfce4-mailwatch-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.2.0 PORTREVISION= 7 CATEGORIES= mail 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 Modified: head/misc/xfce4-appfinder/Makefile ============================================================================== --- head/misc/xfce4-appfinder/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/misc/xfce4-appfinder/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,7 +4,7 @@ PORTNAME= xfce4-appfinder PORTVERSION= 4.12.0 CATEGORIES= misc xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/misc/xfce4-weather-plugin/Makefile ============================================================================== --- head/misc/xfce4-weather-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/misc/xfce4-weather-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-weather-plugin PORTVERSION= 0.8.5 PORTREVISION= 1 CATEGORIES= misc xfce geography -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 Modified: head/misc/xfce4-wm-themes/Makefile ============================================================================== --- head/misc/xfce4-wm-themes/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/misc/xfce4-wm-themes/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-wm-themes PORTVERSION= 4.10.0 PORTREVISION= 1 CATEGORIES= misc xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/art/xfwm4-themes/${PORTVERSION:R} +MASTER_SITES= XFCE/src/art/xfwm4-themes/${PORTVERSION:R} DISTNAME= xfwm4-themes-${PORTVERSION} DIST_SUBDIR= xfce4 @@ -15,7 +14,6 @@ COMMENT= Additional themes for xfwm4 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined USES= gmake tar:bzip2 .include Modified: head/print/xfce4-print/Makefile ============================================================================== --- head/print/xfce4-print/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/print/xfce4-print/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-print PORTVERSION= 4.6.1 PORTREVISION= 13 CATEGORIES= print xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/archive/xfprint/${PORTVERSION:R} +MASTER_SITES= XFCE/src/archive/xfprint/${PORTVERSION:R} DISTNAME= xfprint-${PORTVERSION} DIST_SUBDIR= xfce4 Modified: head/sysutils/garcon/Makefile ============================================================================== --- head/sysutils/garcon/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/garcon/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,7 +4,7 @@ PORTNAME= garcon PORTVERSION= 0.4.0 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/sysutils/xfburn/Makefile ============================================================================== --- head/sysutils/xfburn/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfburn/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.2 PORTREVISION= 2 CATEGORIES= sysutils -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 Modified: head/sysutils/xfce4-battery-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-battery-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-battery-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-battery-plugin PORTVERSION= 1.0.5 PORTREVISION= 3 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-cpugraph-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-cpugraph-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-cpugraph-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-cpugraph-plugin PORTVERSION= 1.0.5 PORTREVISION= 3 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-diskperf-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-diskperf-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-diskperf-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= xfce4-diskperf-plugin PORTVERSION= 2.5.5 CATEGORIES= sysutils 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= danilo@FreeBSD.org Modified: head/sysutils/xfce4-fsguard-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-fsguard-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-fsguard-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= xfce4-fsguard-plugin PORTVERSION= 1.0.2 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-genmon-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-genmon-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-genmon-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-genmon-plugin PORTVERSION= 3.4.0 PORTREVISION= 4 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-mount-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-mount-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-mount-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-mount-plugin PORTVERSION= 0.6.7 PORTREVISION= 2 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-netload-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-netload-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-netload-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-netload-plugin PORTVERSION= 1.2.4 PORTREVISION= 1 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-settings/Makefile ============================================================================== --- head/sysutils/xfce4-settings/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-settings/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,7 +4,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.12.0 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/sysutils/xfce4-systemload-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-systemload-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-systemload-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-systemload-plugin PORTVERSION= 1.1.2 PORTREVISION= 1 CATEGORIES= sysutils 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 Modified: head/sysutils/xfce4-wavelan-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-wavelan-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/sysutils/xfce4-wavelan-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= xfce4-wavelan-plugin PORTVERSION= 0.5.12 CATEGORIES= sysutils 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 Modified: head/www/xfce4-smartbookmark-plugin/Makefile ============================================================================== --- head/www/xfce4-smartbookmark-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/www/xfce4-smartbookmark-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= xfce4-smartbookmark-plugin PORTVERSION= 0.4.6 CATEGORIES= www 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 Modified: head/x11-clocks/xfce4-datetime-plugin/Makefile ============================================================================== --- head/x11-clocks/xfce4-datetime-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-clocks/xfce4-datetime-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-datetime-plugin PORTVERSION= 0.6.2 PORTREVISION= 3 CATEGORIES= x11-clocks 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 Modified: head/x11-clocks/xfce4-timer-out-plugin/Makefile ============================================================================== --- head/x11-clocks/xfce4-timer-out-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-clocks/xfce4-timer-out-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= xfce4-time-out-plugin PORTVERSION= 1.0.2 CATEGORIES= x11-clocks 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 Modified: head/x11-clocks/xfce4-timer-plugin/Makefile ============================================================================== --- head/x11-clocks/xfce4-timer-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-clocks/xfce4-timer-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= xfce4-timer-plugin PORTVERSION= 1.6.0 PORTREVISION= 1 CATEGORIES= x11-clocks 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 Modified: head/x11-fm/thunar-vfs/Makefile ============================================================================== --- head/x11-fm/thunar-vfs/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-fm/thunar-vfs/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= thunar-vfs PORTVERSION= 1.2.0 PORTREVISION= 11 CATEGORIES= x11-fm xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/archive/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/archive/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/x11-themes/gtk-xfce-engine/Makefile ============================================================================== --- head/x11-themes/gtk-xfce-engine/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-themes/gtk-xfce-engine/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,8 +4,7 @@ PORTNAME= gtk-xfce-engine PORTVERSION= 3.2.0 CATEGORIES= x11-themes xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/x11-toolkits/libxfce4gui/Makefile ============================================================================== --- head/x11-toolkits/libxfce4gui/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-toolkits/libxfce4gui/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -5,8 +5,7 @@ PORTNAME= libxfce4gui PORTVERSION= 4.10.0 PORTREVISION= 5 CATEGORIES= x11-toolkits xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/archive/libxfcegui4/${PORTVERSION:R} +MASTER_SITES= XFCE/src/archive/libxfcegui4/${PORTVERSION:R} DISTNAME= libxfcegui4-${PORTVERSION} DIST_SUBDIR= xfce4 Modified: head/x11-wm/xfce4-panel/Makefile ============================================================================== --- head/x11-wm/xfce4-panel/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11-wm/xfce4-panel/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -4,7 +4,7 @@ PORTNAME= xfce4-panel PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Modified: head/x11/libxfce4util/Makefile ============================================================================== --- head/x11/libxfce4util/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/libxfce4util/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-clipman-plugin/Makefile ============================================================================== --- head/x11/xfce4-clipman-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-clipman-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-conf/Makefile ============================================================================== --- head/x11/xfce4-conf/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-conf/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-embed-plugin/Makefile ============================================================================== --- head/x11/xfce4-embed-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-embed-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-quicklauncher-plugin/Makefile ============================================================================== --- head/x11/xfce4-quicklauncher-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-quicklauncher-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-screenshooter-plugin/Makefile ============================================================================== --- head/x11/xfce4-screenshooter-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-screenshooter-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-taskmanager/Makefile ============================================================================== --- head/x11/xfce4-taskmanager/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-taskmanager/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-terminal/Makefile ============================================================================== --- head/x11/xfce4-terminal/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-terminal/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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 Modified: head/x11/xfce4-verve-plugin/Makefile ============================================================================== --- head/x11/xfce4-verve-plugin/Makefile Tue Apr 28 16:57:11 2015 (r384918) +++ head/x11/xfce4-verve-plugin/Makefile Tue Apr 28 17:01:46 2015 (r384919) @@ -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