Index: Mk/Uses/xfce.mk =================================================================== --- Mk/Uses/xfce.mk +++ Mk/Uses/xfce.mk @@ -20,8 +20,6 @@ _USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf -XFCE_MASTER_SITE_VER= 4.12 - xfce_ARGS?= # empty CPPFLAGS+= -I${LOCALBASE}/include Index: Mk/bsd.sites.mk =================================================================== --- Mk/bsd.sites.mk +++ Mk/bsd.sites.mk @@ -1237,15 +1237,23 @@ .endif .if !defined(IGNORE_MASTER_SITE_XFCE) +_XFCE_PROJECT= ${DISTNAME:S/-${DISTVERSION}//} + +. if ${_XFCE_PROJECT:M${PORTNAME}} +_PATH= ${PORTNAME:tl}/${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +. else +_PATH= ${DISTNAME:S/-${DISTVERSION}//}/${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +. endif + MASTER_SITE_XFCE+= \ - http://mirror.netcologne.de/xfce/%SUBDIR%/ \ - http://ftp.udc.es/xfce/%SUBDIR%/ \ - http://xfce.mirror.uber.com.au/%SUBDIR%/ \ - http://archive.be.xfce.org/%SUBDIR%/ \ - http://archive.be2.xfce.org/%SUBDIR%/ \ - http://archive.al-us.xfce.org/%SUBDIR%/ \ - http://mirrors.tummy.com/pub/archive.xfce.org/%SUBDIR%/ \ - http://mirror.perldude.de/archive.xfce.org/%SUBDIR%/ + http://archive.xfce.org/src/%SUBDIR%/${_PATH}/ \ + http://mirror.netcologne.de/xfce/src/%SUBDIR%/${_PATH}/ \ + http://ftp.udc.es/xfce/src/%SUBDIR%/${_PATH}/ \ + http://archive.be.xfce.org/src/%SUBDIR%/${_PATH}/ \ + http://archive.be2.xfce.org/src/%SUBDIR%/${_PATH}/ \ + http://archive.al-us.xfce.org/src/%SUBDIR%/${_PATH}/ \ + http://mirrors.tummy.com/pub/archive.xfce.org/src/%SUBDIR%/${_PATH}/ \ + http://mirror.perldude.de/archive.xfce.org/src/%SUBDIR%/${_PATH}/ .endif .if !defined(IGNORE_MASTER_SITE_XORG) @@ -1319,7 +1327,7 @@ SAMBA:${PORTNAME} \ SAVANNAH:${PORTNAME:tl} \ SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \ - XFCE:xfce/${XFCE_MASTER_SITE_VER}/src + XFCE:xfce .if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*} Index: archivers/squeeze/Makefile =================================================================== --- archivers/squeeze/Makefile +++ archivers/squeeze/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.2.3 PORTREVISION= 10 CATEGORIES= archivers xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: archivers/thunar-archive-plugin/Makefile =================================================================== --- archivers/thunar-archive-plugin/Makefile +++ archivers/thunar-archive-plugin/Makefile @@ -5,12 +5,15 @@ PORTVERSION= 0.3.1 PORTREVISION= 4 CATEGORIES= archivers xfce -MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Archive plugin for the Thunar File Manager +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + GNU_CONFIGURE= yes USE_XFCE= thunar USES= gettext gmake libtool pkgconfig xfce tar:bzip2 Index: audio/thunar-media-tags-plugin/Makefile =================================================================== --- audio/thunar-media-tags-plugin/Makefile +++ audio/thunar-media-tags-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.2.1 PORTREVISION= 4 CATEGORIES= audio xfce -MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: audio/xfce4-mixer/Makefile =================================================================== --- audio/xfce4-mixer/Makefile +++ audio/xfce4-mixer/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.11.0 PORTREVISION= 3 CATEGORIES= audio xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: audio/xfce4-mpc-plugin/Makefile =================================================================== --- audio/xfce4-mpc-plugin/Makefile +++ audio/xfce4-mpc-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.4.5 PORTREVISION= 1 CATEGORIES= audio xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: audio/xfce4-pulseaudio-plugin/Makefile =================================================================== --- audio/xfce4-pulseaudio-plugin/Makefile +++ audio/xfce4-pulseaudio-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-pulseaudio-plugin PORTVERSION= 0.2.4 CATEGORIES= audio xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: audio/xfmpc/Makefile =================================================================== --- audio/xfmpc/Makefile +++ audio/xfmpc/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfmpc PORTVERSION= 0.2.3 CATEGORIES= audio xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: deskutils/orage/Makefile =================================================================== --- deskutils/orage/Makefile +++ deskutils/orage/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.12.1 PORTREVISION= 1 CATEGORIES= deskutils xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/ +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: deskutils/xfce4-notes-plugin/Makefile =================================================================== --- deskutils/xfce4-notes-plugin/Makefile +++ deskutils/xfce4-notes-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-notes-plugin PORTVERSION= 1.8.1 CATEGORIES= deskutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: deskutils/xfce4-notifyd/Makefile =================================================================== --- deskutils/xfce4-notifyd/Makefile +++ deskutils/xfce4-notifyd/Makefile @@ -8,7 +8,7 @@ PORTNAME= xfce4-notifyd PORTVERSION= 0.3.3 CATEGORIES= deskutils xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= ehaupt@FreeBSD.org Index: deskutils/xfce4-volumed-pulse/Makefile =================================================================== --- deskutils/xfce4-volumed-pulse/Makefile +++ deskutils/xfce4-volumed-pulse/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-volumed-pulse PORTVERSION= 0.2.2 CATEGORIES= deskutils xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: deskutils/xfce4-volumed/Makefile =================================================================== --- deskutils/xfce4-volumed/Makefile +++ deskutils/xfce4-volumed/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.1.13 PORTREVISION= 2 CATEGORIES= deskutils xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= sergey.dyatko@gmail.com Index: deskutils/xfce4-xkb-plugin/Makefile =================================================================== --- deskutils/xfce4-xkb-plugin/Makefile +++ deskutils/xfce4-xkb-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-xkb-plugin PORTVERSION= 0.7.1 CATEGORIES= deskutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins MAINTAINER= xfce@FreeBSD.org COMMENT= Keyboard layout switching plugin for the Xfce panel Index: devel/thunar-vcs-plugin/Makefile =================================================================== --- devel/thunar-vcs-plugin/Makefile +++ devel/thunar-vcs-plugin/Makefile @@ -4,12 +4,15 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.1.5 CATEGORIES= devel xfce -MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 MAINTAINER= sergey.dyatko@gmail.com COMMENT= Version Control System plugin for Thunar +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + GNU_CONFIGURE= yes USE_GNOME= gtk20 glib20 intltool intlhack USE_XFCE= thunar Index: devel/xfce4-vala/Makefile =================================================================== --- devel/xfce4-vala/Makefile +++ devel/xfce4-vala/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.10.3 PORTREVISION= 3 CATEGORIES= devel xfce -MASTER_SITES= XFCE/src/bindings/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/bindings DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: editors/mousepad/Makefile =================================================================== --- editors/mousepad/Makefile +++ editors/mousepad/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.4.0 PORTREVISION= 2 CATEGORIES= editors xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: graphics/ristretto/Makefile =================================================================== --- graphics/ristretto/Makefile +++ graphics/ristretto/Makefile @@ -4,7 +4,7 @@ PORTNAME= ristretto PORTVERSION= 0.8.1 CATEGORIES= graphics xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: mail/xfce4-mailwatch-plugin/Makefile =================================================================== --- mail/xfce4-mailwatch-plugin/Makefile +++ mail/xfce4-mailwatch-plugin/Makefile @@ -5,12 +5,15 @@ PORTVERSION= 1.2.0 PORTREVISION= 8 CATEGORIES= mail xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Mail notification applet for the Xfce panel +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt Index: math/xfce4-calculator-plugin/Makefile =================================================================== --- math/xfce4-calculator-plugin/Makefile +++ math/xfce4-calculator-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-calculator-plugin PORTVERSION= 0.6.0 CATEGORIES= math xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: misc/xfce4-weather-plugin/Makefile =================================================================== --- misc/xfce4-weather-plugin/Makefile +++ misc/xfce4-weather-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-weather-plugin PORTVERSION= 0.8.8 CATEGORIES= misc xfce geography -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: misc/xfce4-wm-themes/Makefile =================================================================== --- misc/xfce4-wm-themes/Makefile +++ misc/xfce4-wm-themes/Makefile @@ -5,13 +5,15 @@ PORTVERSION= 4.10.0 PORTREVISION= 1 CATEGORIES= misc xfce -MASTER_SITES= XFCE/src/art/xfwm4-themes/${PORTVERSION:R} +MASTER_SITES= XFCE/art DISTNAME= xfwm4-themes-${PORTVERSION} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Additional themes for xfwm4 +LICENSE= NONE + GNU_CONFIGURE= yes INSTALLS_ICONS= yes USES= gmake tar:bzip2 Index: multimedia/xfce4-parole/Makefile =================================================================== --- multimedia/xfce4-parole/Makefile +++ multimedia/xfce4-parole/Makefile @@ -4,7 +4,7 @@ PORTNAME= parole PORTVERSION= 0.8.1 CATEGORIES= multimedia xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/ +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: print/xfce4-print/Makefile =================================================================== --- print/xfce4-print/Makefile +++ print/xfce4-print/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.6.1 PORTREVISION= 14 CATEGORIES= print xfce -MASTER_SITES= XFCE/src/archive/xfprint/${PORTVERSION:R} +MASTER_SITES= XFCE/archive DISTNAME= xfprint-${PORTVERSION} DIST_SUBDIR= xfce4 Index: science/xfce4-equake-plugin/Makefile =================================================================== --- science/xfce4-equake-plugin/Makefile +++ science/xfce4-equake-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-equake-plugin PORTVERSION= 1.3.8 CATEGORIES= science xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/gigolo/Makefile =================================================================== --- sysutils/gigolo/Makefile +++ sysutils/gigolo/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.4.2 PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps MAINTAINER= koalative@gmail.com COMMENT= Frontend to easily manage filesystem connections Index: sysutils/xfburn/Makefile =================================================================== --- sysutils/xfburn/Makefile +++ sysutils/xfburn/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.5.4 PORTREVISION= 4 CATEGORIES= sysutils -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-battery-plugin/Makefile =================================================================== --- sysutils/xfce4-battery-plugin/Makefile +++ sysutils/xfce4-battery-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0.5 PORTREVISION= 4 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-cpugraph-plugin/Makefile =================================================================== --- sysutils/xfce4-cpugraph-plugin/Makefile +++ sysutils/xfce4-cpugraph-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0.5 PORTREVISION= 4 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-diskperf-plugin/Makefile =================================================================== --- sysutils/xfce4-diskperf-plugin/Makefile +++ sysutils/xfce4-diskperf-plugin/Makefile @@ -5,12 +5,15 @@ PORTVERSION= 2.5.5 PORTREVISION= 1 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= danilo@FreeBSD.org COMMENT= Graphical representation of the disk IO +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip Index: sysutils/xfce4-fsguard-plugin/Makefile =================================================================== --- sysutils/xfce4-fsguard-plugin/Makefile +++ sysutils/xfce4-fsguard-plugin/Makefile @@ -5,12 +5,14 @@ PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Panel plugin which displays free space of mountpoint +LICENSE= BSD2CLAUSE + GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip Index: sysutils/xfce4-genmon-plugin/Makefile =================================================================== --- sysutils/xfce4-genmon-plugin/Makefile +++ sysutils/xfce4-genmon-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 3.4.0 PORTREVISION= 5 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-mount-plugin/Makefile =================================================================== --- sysutils/xfce4-mount-plugin/Makefile +++ sysutils/xfce4-mount-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.6.7 PORTREVISION= 3 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-netload-plugin/Makefile =================================================================== --- sysutils/xfce4-netload-plugin/Makefile +++ sysutils/xfce4-netload-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.2.4 PORTREVISION= 1 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-power-manager/Makefile =================================================================== --- sysutils/xfce4-power-manager/Makefile +++ sysutils/xfce4-power-manager/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-power-manager PORTVERSION= 1.6.0 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/ +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-settings/Makefile =================================================================== --- sysutils/xfce4-settings/Makefile +++ sysutils/xfce4-settings/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.12.1 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-systemload-plugin/Makefile =================================================================== --- sysutils/xfce4-systemload-plugin/Makefile +++ sysutils/xfce4-systemload-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.1.2 PORTREVISION= 3 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: sysutils/xfce4-wavelan-plugin/Makefile =================================================================== --- sysutils/xfce4-wavelan-plugin/Makefile +++ sysutils/xfce4-wavelan-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.5.12 PORTREVISION= 1 CATEGORIES= sysutils xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: textproc/xfce4-dict-plugin/Makefile =================================================================== --- textproc/xfce4-dict-plugin/Makefile +++ textproc/xfce4-dict-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-dict PORTVERSION= 0.7.2 CATEGORIES= textproc xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps PKGNAMESUFFIX= -plugin DIST_SUBDIR= xfce4 Index: www/xfce4-smartbookmark-plugin/Makefile =================================================================== --- www/xfce4-smartbookmark-plugin/Makefile +++ www/xfce4-smartbookmark-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.4.6 PORTREVISION= 1 CATEGORIES= www xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-clocks/xfce4-datetime-plugin/Makefile =================================================================== --- x11-clocks/xfce4-datetime-plugin/Makefile +++ x11-clocks/xfce4-datetime-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.6.2 PORTREVISION= 4 CATEGORIES= x11-clocks xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-clocks/xfce4-timer-out-plugin/Makefile =================================================================== --- x11-clocks/xfce4-timer-out-plugin/Makefile +++ x11-clocks/xfce4-timer-out-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= x11-clocks xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-clocks/xfce4-timer-plugin/Makefile =================================================================== --- x11-clocks/xfce4-timer-plugin/Makefile +++ x11-clocks/xfce4-timer-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.6.0 PORTREVISION= 1 CATEGORIES= x11-clocks xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-fm/thunar-vfs/Makefile =================================================================== --- x11-fm/thunar-vfs/Makefile +++ x11-fm/thunar-vfs/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.2.0 PORTREVISION= 11 CATEGORIES= x11-fm xfce -MASTER_SITES= XFCE/src/archive/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/archive DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-fm/thunar/Makefile =================================================================== --- x11-fm/thunar/Makefile +++ x11-fm/thunar/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.6.10 PORTREVISION= 2 CATEGORIES= x11-fm xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-themes/gtk-xfce-engine/Makefile =================================================================== --- x11-themes/gtk-xfce-engine/Makefile +++ x11-themes/gtk-xfce-engine/Makefile @@ -4,7 +4,7 @@ PORTNAME= gtk-xfce-engine PORTVERSION= 3.2.0 CATEGORIES= x11-themes xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-toolkits/libxfce4gui/Makefile =================================================================== --- x11-toolkits/libxfce4gui/Makefile +++ x11-toolkits/libxfce4gui/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.10.0 PORTREVISION= 5 CATEGORIES= x11-toolkits xfce -MASTER_SITES= XFCE/src/archive/libxfcegui4/${PORTVERSION:R} +MASTER_SITES= XFCE/archive DISTNAME= libxfcegui4-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11-wm/xfce4-desktop/Makefile =================================================================== --- x11-wm/xfce4-desktop/Makefile +++ x11-wm/xfce4-desktop/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-desktop PORTVERSION= 4.12.3 CATEGORIES= x11-wm xfce -MASTER_SITES= XFCE/src/xfce/xfdesktop/${PORTVERSION:R}/ +MASTER_SITES= XFCE DISTNAME= xfdesktop-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11-wm/xfce4-panel/Makefile =================================================================== --- x11-wm/xfce4-panel/Makefile +++ x11-wm/xfce4-panel/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-panel PORTVERSION= 4.12.1 CATEGORIES= x11-wm xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-wm/xfce4-session/Makefile =================================================================== --- x11-wm/xfce4-session/Makefile +++ x11-wm/xfce4-session/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.12.1 PORTREVISION= 3 CATEGORIES= x11-wm xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11-wm/xfce4-wm/Makefile =================================================================== --- x11-wm/xfce4-wm/Makefile +++ x11-wm/xfce4-wm/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-wm PORTVERSION= 4.12.3 CATEGORIES= x11-wm xfce -MASTER_SITES= XFCE/src/xfce/xfwm4/${PORTVERSION:R} +MASTER_SITES= XFCE DISTNAME= xfwm4-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/libexo/Makefile =================================================================== --- x11/libexo/Makefile +++ x11/libexo/Makefile @@ -4,7 +4,7 @@ PORTNAME= libexo PORTVERSION= 0.10.7 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/xfce/${PORTNAME:C/lib//}/${PORTVERSION:R} +MASTER_SITES= XFCE DISTNAME= exo-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/libxfce4menu/Makefile =================================================================== --- x11/libxfce4menu/Makefile +++ x11/libxfce4menu/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 4.12.1 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/xfce/libxfce4ui/${PORTVERSION:R} +MASTER_SITES= XFCE DISTNAME= libxfce4ui-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/xfce4-clipman-plugin/Makefile =================================================================== --- x11/xfce4-clipman-plugin/Makefile +++ x11/xfce4-clipman-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-clipman-plugin PORTVERSION= 1.4.0 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-conf/Makefile =================================================================== --- x11/xfce4-conf/Makefile +++ x11/xfce4-conf/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-conf PORTVERSION= 4.12.1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/xfce/xfconf/${PORTVERSION:R} +MASTER_SITES= XFCE DISTNAME= xfconf-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/xfce4-dashboard/Makefile =================================================================== --- x11/xfce4-dashboard/Makefile +++ x11/xfce4-dashboard/Makefile @@ -4,7 +4,7 @@ PORTNAME= dashboard PORTVERSION= 0.6.0 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/apps/xfdashboard/${PORTVERSION:R}/ +MASTER_SITES= XFCE/apps PKGNAMEPREFIX= xfce4- DISTNAME= xfdashboard-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/xfce4-embed-plugin/Makefile =================================================================== --- x11/xfce4-embed-plugin/Makefile +++ x11/xfce4-embed-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-embed-plugin PORTVERSION= 1.6.0 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-quicklauncher-plugin/Makefile =================================================================== --- x11/xfce4-quicklauncher-plugin/Makefile +++ x11/xfce4-quicklauncher-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.9.4 PORTREVISION= 17 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-screenshooter-plugin/Makefile =================================================================== --- x11/xfce4-screenshooter-plugin/Makefile +++ x11/xfce4-screenshooter-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.8.2 PORTREVISION= 2 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/apps/xfce4-screenshooter/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DISTNAME= xfce4-screenshooter-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/xfce4-taskmanager/Makefile =================================================================== --- x11/xfce4-taskmanager/Makefile +++ x11/xfce4-taskmanager/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.1.0 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-terminal/Makefile =================================================================== --- x11/xfce4-terminal/Makefile +++ x11/xfce4-terminal/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-terminal PORTVERSION= 0.8.1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-verve-plugin/Makefile =================================================================== --- x11/xfce4-verve-plugin/Makefile +++ x11/xfce4-verve-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.1.0 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins PKGNAMEPREFIX= xfce4- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} DIST_SUBDIR= xfce4 Index: x11/xfce4-whiskermenu-plugin/Makefile =================================================================== --- x11/xfce4-whiskermenu-plugin/Makefile +++ x11/xfce4-whiskermenu-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-whiskermenu-plugin PORTVERSION= 1.6.1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-wmdock-plugin/Makefile =================================================================== --- x11/xfce4-wmdock-plugin/Makefile +++ x11/xfce4-wmdock-plugin/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.6.0 PORTREVISION= 2 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/panel-plugins/xfce4-wmdock-plugin/0.6 +MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org