From 0afc8661e4a56c97828d88575c4bf3e7f7d3a768 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Mon, 2 Oct 2023 17:53:42 +0200 Subject: [PATCH] XFCE: Cleanup dependencies - Update xfce.mk to avid forcing too many dependencies on consumers - Change dependency on garcon to reference libgarcon-1.so (main library) - Explicitly add USE_XFCE components to the ports actually needing them. - Cleanup dependencies, adding/removing missing/extra dependencies - Change the referenced library in some LIB_DEPENDS to the actually linked one (avoids false positives in poudriere Q/A tests) - Bump PORTREVISION on all touched ports, even indirectly due to the effect of removing forced dependencies on certain components - Remove USES=fuse from gigolo. I could not find any kind f reference to fuse in the code. - xfce4-bsdcpufreq-plugin: Also remove empty comment at the top of the Makefile --- Mk/Uses/xfce.mk | 5 +---- archivers/thunar-archive-plugin/Makefile | 1 + audio/thunar-media-tags-plugin/Makefile | 2 +- audio/xfce4-mixer/Makefile | 4 ++-- audio/xfce4-mpc-plugin/Makefile | 3 ++- audio/xfce4-pulseaudio-plugin/Makefile | 3 ++- deskutils/orage/Makefile | 7 ++----- deskutils/xfce4-generic-slider/Makefile | 5 ++--- deskutils/xfce4-notes-plugin/Makefile | 8 +++----- deskutils/xfce4-notifyd/Makefile | 3 ++- deskutils/xfce4-tumbler/Makefile | 5 ++--- deskutils/xfce4-volumed-pulse/Makefile | 4 ++-- deskutils/xfce4-xkb-plugin/Makefile | 4 ++-- devel/thunar-vcs-plugin/Makefile | 2 +- editors/mousepad/Makefile | 3 ++- graphics/ristretto/Makefile | 2 +- mail/xfce4-mailwatch-plugin/Makefile | 6 ++---- math/xfce4-calculator-plugin/Makefile | 3 ++- misc/xfce4-appfinder/Makefile | 3 ++- misc/xfce4-weather-plugin/Makefile | 3 ++- multimedia/xfce4-parole/Makefile | 6 +++--- sysutils/garcon/Makefile | 5 ++--- sysutils/gigolo/Makefile | 3 ++- sysutils/xfce4-battery-plugin/Makefile | 3 ++- sysutils/xfce4-bsdcpufreq-plugin/Makefile | 9 +++------ sysutils/xfce4-cpugraph-plugin/Makefile | 3 ++- sysutils/xfce4-diskperf-plugin/Makefile | 8 +++++--- sysutils/xfce4-fsguard-plugin/Makefile | 3 ++- sysutils/xfce4-genmon-plugin/Makefile | 3 ++- sysutils/xfce4-mount-plugin/Makefile | 3 ++- sysutils/xfce4-netload-plugin/Makefile | 3 ++- sysutils/xfce4-places-plugin/Makefile | 4 ++-- sysutils/xfce4-power-manager/Makefile | 3 ++- sysutils/xfce4-settings/Makefile | 2 +- sysutils/xfce4-systemload-plugin/Makefile | 6 ++++-- sysutils/xfce4-wavelan-plugin/Makefile | 4 ++-- textproc/xfce4-dict-plugin/Makefile | 3 ++- www/midori/Makefile | 8 +++----- www/xfce4-smartbookmark-plugin/Makefile | 6 ++++-- x11-clocks/xfce4-datetime-plugin/Makefile | 4 ++-- x11-clocks/xfce4-stopwatch-plugin/Makefile | 8 +++++--- x11-clocks/xfce4-time-out-plugin/Makefile | 3 ++- x11-clocks/xfce4-timer-plugin/Makefile | 3 ++- x11-fm/thunar/Makefile | 4 ++-- x11-wm/xfce4-desktop/Makefile | 4 ++-- x11-wm/xfce4-panel-profiles/Makefile | 3 ++- x11-wm/xfce4-panel/Makefile | 1 + x11-wm/xfce4-session/Makefile | 2 +- x11-wm/xfce4-wm/Makefile | 2 +- x11/libexo/Makefile | 6 ++---- x11/libxfce4menu/Makefile | 7 +++---- x11/workrave/Makefile | 2 +- x11/xfce4-appmenu-plugin/Makefile | 4 ++-- x11/xfce4-clipman-plugin/Makefile | 3 ++- x11/xfce4-dashboard/Makefile | 4 ++-- x11/xfce4-docklike-plugin/Makefile | 4 ++-- x11/xfce4-screensaver/Makefile | 3 ++- x11/xfce4-screenshooter-plugin/Makefile | 3 ++- x11/xfce4-taskmanager/Makefile | 2 +- x11/xfce4-terminal/Makefile | 2 +- x11/xfce4-verve-plugin/Makefile | 3 ++- x11/xfce4-whiskermenu-plugin/Makefile | 3 ++- x11/xfce4-windowck-plugin/Makefile | 4 ++-- 63 files changed, 129 insertions(+), 116 deletions(-) diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk index b23ab076ef76..506c7b1bf753 100644 --- a/Mk/Uses/xfce.mk +++ b/Mk/Uses/xfce.mk @@ -23,7 +23,7 @@ LIBS+= -L${LOCALBASE}/lib libmenu_LIB_DEPENDS= libxfce4ui-2.so:x11/libxfce4menu libmenu_USE_XFCE_REQ= libutil -garcon_LIB_DEPENDS= libgarcon-gtk3-1.so:sysutils/garcon +garcon_LIB_DEPENDS= libgarcon-1.so:sysutils/garcon garcon_USE_XFCE_REQ= libmenu libexo_LIB_DEPENDS= libexo-2.so:x11/libexo @@ -31,16 +31,13 @@ libexo_USE_XFCE_REQ= libmenu panel_LIB_DEPENDS= libxfce4panel-2.0.so:x11-wm/xfce4-panel panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel -panel_USE_XFCE_REQ= garcon libexo xfconf libutil_LIB_DEPENDS= libxfce4util.so:x11/libxfce4util thunar_LIB_DEPENDS= libthunarx-3.so:x11-fm/thunar thunar_RUN_DEPENDS= Thunar:x11-fm/thunar -thunar_USE_XFCE_REQ= xfconf libmenu xfconf_LIB_DEPENDS= libxfconf-0.so:x11/xfce4-conf -xfconf_USE_XFCE_REQ= libutil . if defined(USE_XFCE) # First, expand all USE_XFCE_REQ recursively. diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile index c614abdefb85..c8d9f223219e 100644 --- a/archivers/thunar-archive-plugin/Makefile +++ b/archivers/thunar-archive-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= thunar-archive-plugin PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= archivers xfce MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile index 99e23f5dca60..3714f4f4b687 100644 --- a/audio/thunar-media-tags-plugin/Makefile +++ b/audio/thunar-media-tags-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= thunar-media-tags-plugin PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio xfce MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile index 973251b546b3..5a029b363098 100644 --- a/audio/xfce4-mixer/Makefile +++ b/audio/xfce4-mixer/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-mixer PORTVERSION= 4.18.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -25,7 +25,7 @@ USES= compiler:c11 gettext-tools gmake gnome gstreamer libtool \ pkgconfig tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool USE_GSTREAMER= good -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile index ba3b618ce54e..631b61c774c7 100644 --- a/audio/xfce4-mpc-plugin/Makefile +++ b/audio/xfce4-mpc-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-mpc-plugin PORTVERSION= 0.5.3 +PORTREVISION= 1 CATEGORIES= audio xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -17,7 +18,7 @@ RUN_DEPENDS= musicpd:audio/musicpd USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile index 6871713b1ff6..a610eecd7bf5 100644 --- a/audio/xfce4-pulseaudio-plugin/Makefile +++ b/audio/xfce4-pulseaudio-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-pulseaudio-plugin PORTVERSION= 0.4.8 +PORTREVISION= 1 CATEGORIES= audio xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -18,7 +19,7 @@ RUN_DEPENDS= pavucontrol>=2.0:audio/pavucontrol USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3 -USE_XFCE= panel +USE_XFCE= libexo panel xfconf USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile index 1259d5841ce6..1fdccfebb115 100644 --- a/deskutils/orage/Makefile +++ b/deskutils/orage/Makefile @@ -1,6 +1,6 @@ PORTNAME= orage PORTVERSION= 4.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -12,10 +12,7 @@ WWW= https://git.xfce.org/apps/orage/about/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpopt.so:devel/popt \ - libical.so:devel/libical \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ +LIB_DEPENDS= libical.so:devel/libical \ libharfbuzz.so:print/harfbuzz USES= compiler:c++11-lang desktop-file-utils gettext gmake gnome \ diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile index f77888fc0100..e24fd67305da 100644 --- a/deskutils/xfce4-generic-slider/Makefile +++ b/deskutils/xfce4-generic-slider/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-generic-slider PORTVERSION= 1.0.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/panel-plugins @@ -12,9 +13,7 @@ WWW= https://gitlab.xfce.org/panel-plugins/xfce4-generic-slider LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext gmake gnome libtool pkgconfig tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile index 2709e57c84f6..8aea1d6f44d0 100644 --- a/deskutils/xfce4-notes-plugin/Makefile +++ b/deskutils/xfce4-notes-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-notes-plugin PORTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -10,15 +11,12 @@ WWW= https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin LICENSE= GPLv2 -LIB_DEPENDS= libunique-1.0.so:x11-toolkits/unique \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf USE_XORG= ice sm x11 GNU_CONFIGURE= yes diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile index 0a13a348cbc2..07c06f0ad172 100644 --- a/deskutils/xfce4-notifyd/Makefile +++ b/deskutils/xfce4-notifyd/Makefile @@ -5,6 +5,7 @@ PORTNAME= xfce4-notifyd PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -22,7 +23,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ sqlite tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= libutil panel +USE_XFCE= libmenu panel xfconf USE_XORG= ice sm x11 GNU_CONFIGURE= yes diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 991634d2748c..8bfa6d8dc1cd 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -1,6 +1,6 @@ PORTNAME= tumbler PORTVERSION= 4.18.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils xfce MASTER_SITES= XFCE PKGNAMEPREFIX= xfce4- @@ -18,7 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c11 gettext-tools gmake gnome libtool \ localbase:ldflags pathfix pkgconfig tar:bzip2 xfce -USE_GNOME= cairo gdkpixbuf2 glib20 intltool libgsf librsvg2 +USE_GNOME= cairo gdkpixbuf2 glib20 intltool libgsf USE_XFCE= libutil USE_LDCONFIG= yes @@ -58,7 +58,6 @@ GSTREAMER_CONFIGURE_ENABLE= gstreamer-thumbnailer GSTREAMER_USES= gstreamer JPEG_CONFIGURE_ENABLE= jpeg-thumbnailer -JPEG_LIB_DEPENDS= libexif.so:graphics/libexif JPEG_USES= jpeg NLS_CONFIGURE_ENABLE= nls diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile index fc24b211707b..6ca25e42d16a 100644 --- a/deskutils/xfce4-volumed-pulse/Makefile +++ b/deskutils/xfce4-volumed-pulse/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-volumed-pulse PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -17,7 +17,7 @@ LIB_DEPENDS= libkeybinder-3.0.so:x11/keybinder-gtk3 \ libpulse.so:audio/pulseaudio USES= gmake gnome libtool pkgconfig tar:bz2 xfce -USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 +USE_GNOME= glib20 gtk30 USE_XFCE= xfconf GNU_CONFIGURE= yes diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile index f8c9c89a3517..b1b5bc0d34a6 100644 --- a/deskutils/xfce4-xkb-plugin/Makefile +++ b/deskutils/xfce4-xkb-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-xkb-plugin PORTVERSION= 0.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= XFCE/panel-plugins @@ -16,7 +16,7 @@ LIB_DEPENDS= libxklavier.so:x11/libxklavier \ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gtk30 intltool librsvg2 libwnck3 -USE_XFCE= panel +USE_XFCE= garcon libmenu panel xfconf USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile index 8ba469af332b..fbe55c953773 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel xfce MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile index 8231f6146fd7..62330e4851c6 100644 --- a/editors/mousepad/Makefile +++ b/editors/mousepad/Makefile @@ -1,5 +1,6 @@ PORTNAME= mousepad PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= editors xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= desktop-file-utils gettext-tools gmake gnome libtool perl5 \ pkgconfig tar:bzip2 xfce -USE_GNOME= cairo dconf gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index a9c380b2a915..ffd3545e84fd 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -1,6 +1,6 @@ PORTNAME= ristretto PORTVERSION= 0.13.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index d0b6bfc5c89d..dfc66ae35942 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= mail xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -12,15 +13,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:security/gnutls \ - libgpg-error.so:security/libgpg-error \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libexo panel USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/math/xfce4-calculator-plugin/Makefile b/math/xfce4-calculator-plugin/Makefile index 642f04ae5adf..72d948016ef3 100644 --- a/math/xfce4-calculator-plugin/Makefile +++ b/math/xfce4-calculator-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-calculator-plugin PORTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= math xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bz2 xfce xorg USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile index 7dc1bfad9816..76d2e294b6d2 100644 --- a/misc/xfce4-appfinder/Makefile +++ b/misc/xfce4-appfinder/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-appfinder PORTVERSION= 4.18.1 +PORTREVISION= 1 CATEGORIES= misc xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -12,7 +13,7 @@ LICENSE= GPLv2 USES= compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= garcon xfconf +USE_XFCE= garcon libmenu xfconf GNU_CONFIGURE= yes diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile index 803cf9e32b9b..6b7d73325482 100644 --- a/misc/xfce4-weather-plugin/Makefile +++ b/misc/xfce4-weather-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-weather-plugin PORTVERSION= 0.11.1 +PORTREVISION= 1 CATEGORIES= misc xfce geography MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -17,7 +18,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile index 9e95b8ecf965..cd08aaf6db9a 100644 --- a/multimedia/xfce4-parole/Makefile +++ b/multimedia/xfce4-parole/Makefile @@ -1,6 +1,6 @@ PORTNAME= parole PORTVERSION= 4.18.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libnotify.so:devel/libnotify \ - libtag.so:audio/taglib \ + libtag_c.so:audio/taglib \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= xdg-screensaver:devel/xdg-utils @@ -23,7 +23,7 @@ USES= compiler:c++11-lang desktop-file-utils gettext-tools \ gmake gnome gstreamer libtool pkgconfig tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool USE_GSTREAMER= core faad flac wavpack rtmp x -USE_XFCE= panel +USE_XFCE= libmenu xfconf USE_XORG= ice sm x11 GNU_CONFIGURE= yes diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile index 1a59a29fa6cb..a07b55f72a9f 100644 --- a/sysutils/garcon/Makefile +++ b/sysutils/garcon/Makefile @@ -1,5 +1,6 @@ PORTNAME= garcon PORTVERSION= 4.18.1 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -12,9 +13,7 @@ WWW= https://www.xfce.org/ # documentation is under GFDL 1.1. LICENSE= GPLv2 -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \ pkgconfig tar:bzip2 xfce diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile index e6f9b0365fb1..e252b35517df 100644 --- a/sysutils/gigolo/Makefile +++ b/sysutils/gigolo/Makefile @@ -1,5 +1,6 @@ PORTNAME= gigolo PORTVERSION= 0.5.3 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= XFCE/apps @@ -12,7 +13,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser LIB_DEPENDS= libharfbuzz.so:print/harfbuzz -USES= fuse gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg +USES= gettext-tools gmake gnome pkgconfig tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 gtk30 gvfs intltool USE_XORG= x11 diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile index 62ac76f84f69..820eafe41bcd 100644 --- a/sysutils/xfce4-battery-plugin/Makefile +++ b/sysutils/xfce4-battery-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-battery-plugin PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -17,7 +18,7 @@ ONLY_FOR_ARCHS= amd64 i386 USES= alias gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel USE_LDCONFIG= yes SSP_UNSAFE= yes diff --git a/sysutils/xfce4-bsdcpufreq-plugin/Makefile b/sysutils/xfce4-bsdcpufreq-plugin/Makefile index ae2a3879cf5c..5c477057523a 100644 --- a/sysutils/xfce4-bsdcpufreq-plugin/Makefile +++ b/sysutils/xfce4-bsdcpufreq-plugin/Makefile @@ -1,8 +1,6 @@ -# - PORTNAME= xfce4-bsdcpufreq-plugin PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils xfce MAINTAINER= riggs@FreeBSD.org @@ -11,11 +9,10 @@ COMMENT= Displays the current CPU clock frequency in the panel LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gnome pkgconfig xfce -USE_XFCE= panel +USE_XFCE= libmenu panel USE_GNOME= cairo gdkpixbuf2 gtk30 PLIST_FILES= lib/xfce4/panel/plugins/libbsdcpufreq.so \ diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile index 40bd599da382..c5c9cae7e003 100644 --- a/sysutils/xfce4-cpugraph-plugin/Makefile +++ b/sysutils/xfce4-cpugraph-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-cpugraph-plugin PORTVERSION= 1.2.8 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -16,7 +17,7 @@ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_CSTD= c99 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile index 3a3149f337ab..d4914264f77c 100644 --- a/sysutils/xfce4-diskperf-plugin/Makefile +++ b/sysutils/xfce4-diskperf-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-diskperf-plugin PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -12,10 +12,12 @@ WWW= https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz + USES= compiler:c11 gettext-tools gnome gmake libtool pkgconfig \ tar:bzip2 xfce -USE_GNOME= cairo gtk30 intltool -USE_XFCE= panel +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile index 9a0f0a3cf00a..1fe318711845 100644 --- a/sysutils/xfce4-fsguard-plugin/Makefile +++ b/sysutils/xfce4-fsguard-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-fsguard-plugin PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -16,7 +17,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile index 44f0a58d72e3..3bcf8b1e761d 100644 --- a/sysutils/xfce4-genmon-plugin/Makefile +++ b/sysutils/xfce4-genmon-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-genmon-plugin PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile index 80829dd816bb..e28018ccf817 100644 --- a/sysutils/xfce4-mount-plugin/Makefile +++ b/sysutils/xfce4-mount-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-mount-plugin PORTVERSION= 1.1.6 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -16,7 +17,7 @@ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool USE_LDCONFIG= yes -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile index b5ae4bce5556..314aa037eb7d 100644 --- a/sysutils/xfce4-netload-plugin/Makefile +++ b/sysutils/xfce4-netload-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-netload-plugin PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -16,7 +17,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile index d42632a4c30e..78c52948dd95 100644 --- a/sysutils/xfce4-places-plugin/Makefile +++ b/sysutils/xfce4-places-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-places-plugin PORTVERSION= 1.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -18,7 +18,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel thunar +USE_XFCE= libexo libmenu panel xfconf USE_XORG= ice sm x11 GNU_CONFIGURE= yes diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index e1024af5fc12..fd435483077c 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-power-manager PORTVERSION= 4.18.2 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -17,7 +18,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf USE_XORG= ice sm xrandr x11 xext xtst xscrnsaver GNU_CONFIGURE= yes diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index c36caaf20f0c..d8dabf33c18c 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-settings PORTVERSION= 4.18.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile index 6b4787d51a46..e0003e707187 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-systemload-plugin PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -11,10 +11,12 @@ WWW= https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin LICENSE= BSD2CLAUSE +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz + USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf SSP_UNSAFE= yes GNU_CONFIGURE= yes diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile index 6c74060d0192..def2448561bb 100644 --- a/sysutils/xfce4-wavelan-plugin/Makefile +++ b/sysutils/xfce4-wavelan-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-wavelan-plugin PORTVERSION= 0.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -16,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile index f9ba4190f212..a646475f5b9b 100644 --- a/textproc/xfce4-dict-plugin/Makefile +++ b/textproc/xfce4-dict-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-dict PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= textproc xfce MASTER_SITES= XFCE/apps PKGNAMESUFFIX= -plugin @@ -17,7 +18,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel USE_XORG= x11 USE_LDCONFIG= yes diff --git a/www/midori/Makefile b/www/midori/Makefile index 507cb97101af..90e717f74978 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,7 +1,7 @@ PORTNAME= midori PORTVERSION= 9.0 DISTVERSIONPREFIX= v -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www xfce MAINTAINER= xfce@FreeBSD.org @@ -11,8 +11,7 @@ WWW= https://www.midori-browser.org/ LICENSE= LGPL21 MIT LICENSE_COMB= multi -LIB_DEPENDS= libnotify.so:devel/libnotify \ - libjson-glib-1.0.so:devel/json-glib \ +LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libsoup-2.4.so:devel/libsoup \ libp11-kit.so:security/p11-kit \ libgcr-base-3.so:security/gcr \ @@ -23,8 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext gnome \ libarchive localbase:ldflags pkgconfig sqlite tar:bzip2 vala:build -USE_GNOME= cairo glib20 gtk30 intltool introspection librsvg2:build \ - libxml2 +USE_GNOME= cairo glib20 gtk30 intltool introspection librsvg2:build CPE_VENDOR= midori-browser diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile index 2f6102fab062..61d18f54b8ab 100644 --- a/www/xfce4-smartbookmark-plugin/Makefile +++ b/www/xfce4-smartbookmark-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-smartbookmark-plugin PORTVERSION= 0.5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -12,10 +12,12 @@ WWW= https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz + USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile index 69f3494a13db..e6ccca1700e4 100644 --- a/x11-clocks/xfce4-datetime-plugin/Makefile +++ b/x11-clocks/xfce4-datetime-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-datetime-plugin PORTVERSION= 0.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-clocks xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -16,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/x11-clocks/xfce4-stopwatch-plugin/Makefile b/x11-clocks/xfce4-stopwatch-plugin/Makefile index e773de5a0b8a..eb6b24fc99bc 100644 --- a/x11-clocks/xfce4-stopwatch-plugin/Makefile +++ b/x11-clocks/xfce4-stopwatch-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-stopwatch-plugin PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-clocks xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -12,10 +12,12 @@ WWW= https://goodies.xfce.org/projects/panel-plugins/xfce4-stopwatch-plugin LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz + USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce -USE_GNOME= cairo gtk30 intltool -USE_XFCE= panel +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool +USE_XFCE= libutil panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/x11-clocks/xfce4-time-out-plugin/Makefile b/x11-clocks/xfce4-time-out-plugin/Makefile index c9b7dca43d6b..bcaafc1fd895 100644 --- a/x11-clocks/xfce4-time-out-plugin/Makefile +++ b/x11-clocks/xfce4-time-out-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-time-out-plugin PORTVERSION= 1.1.3 +PORTREVISION= 1 CATEGORIES= x11-clocks xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile index 588f200e814f..3492a84eafe3 100644 --- a/x11-clocks/xfce4-timer-plugin/Makefile +++ b/x11-clocks/xfce4-timer-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-timer-plugin PORTVERSION= 1.7.2 +PORTREVISION= 1 CATEGORIES= x11-clocks xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index cf4e905e5ebc..a71fbb839ee3 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -1,6 +1,6 @@ PORTNAME= thunar DISTVERSION= 4.18.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 @@ -22,7 +22,7 @@ USES= compiler:c11 cpe desktop-file-utils gettext-tools gmake gnome \ libtool pathfix perl5 pkgconfig tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool USE_LDCONFIG= yes -USE_XFCE= libexo xfconf +USE_XFCE= libexo panel xfconf USE_XORG= ice sm x11 CPE_VENDOR= xfce diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index ac8b8f473fd7..e02a737bd675 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-desktop PORTVERSION= 4.18.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DISTNAME= xfdesktop-${DISTVERSIONFULL} @@ -19,7 +19,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \ USES= compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \ xfce xorg USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 intltool libwnck3 -USE_XFCE= garcon libexo +USE_XFCE= garcon libexo xfconf USE_XORG= ice sm x11 GNU_CONFIGURE= yes diff --git a/x11-wm/xfce4-panel-profiles/Makefile b/x11-wm/xfce4-panel-profiles/Makefile index fa56b49926e7..e8fbbf877268 100644 --- a/x11-wm/xfce4-panel-profiles/Makefile +++ b/x11-wm/xfce4-panel-profiles/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-panel-profiles PORTVERSION= 1.0.14 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -12,7 +13,7 @@ LICENSE= GPLv3 USES= gettext-tools gmake gnome python shebangfix tar:bz2 xfce USE_GNOME= gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel NO_ARCH= yes HAS_CONFIGURE= yes diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 5633a30fe0cc..d9d7812d2c34 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-panel PORTVERSION= 4.18.5 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index beed4011f236..e6d1966dc6d3 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-session PORTVERSION= 4.18.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 81b3327df7d7..94193b77ba80 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-wm PORTVERSION= 4.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DISTNAME= xfwm4-${DISTVERSIONFULL} diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile index fe8f7281a4f2..cab24119a044 100644 --- a/x11/libexo/Makefile +++ b/x11/libexo/Makefile @@ -1,6 +1,6 @@ PORTNAME= libexo PORTVERSION= 4.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= XFCE DISTNAME= exo-${DISTVERSIONFULL} @@ -15,9 +15,7 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz BUILD_DEPENDS= p5-URI>=1.70:net/p5-URI RUN_DEPENDS= p5-URI>=1.70:net/p5-URI diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile index 28f0ae3a9146..b10e088523ae 100644 --- a/x11/libxfce4menu/Makefile +++ b/x11/libxfce4menu/Makefile @@ -1,5 +1,6 @@ PORTNAME= libxfce4menu PORTVERSION= 4.18.4 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE DISTNAME= libxfce4ui-${DISTVERSIONFULL} @@ -11,9 +12,7 @@ WWW= https://www.xfce.org/ LICENSE= GPLv2 -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libepoxy.so:graphics/libepoxy \ +LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libgtop-2.0.so:devel/libgtop \ libharfbuzz.so:print/harfbuzz @@ -21,7 +20,7 @@ USES= compiler:c11 gettext-tools gmake gnome libtool pathfix \ pkgconfig tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool USE_LDCONFIG= yes -USE_XFCE= xfconf +USE_XFCE= libutil xfconf USE_XORG= ice sm x11 GNU_CONFIGURE= yes diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 2abd96a6cc2f..3bf8e925bcae 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -1,7 +1,7 @@ PORTNAME= workrave PORTVERSION= 1.10.50 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= https://github.com/rcaelers/workrave/releases/download/v${PORTVERSION:S/./_/g}/ diff --git a/x11/xfce4-appmenu-plugin/Makefile b/x11/xfce4-appmenu-plugin/Makefile index 03f99d578575..7db6a6d4433f 100644 --- a/x11/xfce4-appmenu-plugin/Makefile +++ b/x11/xfce4-appmenu-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-appmenu-plugin DISTVERSION= 0.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ @@ -27,7 +27,7 @@ MESON_ARGS= -Dvalapanel=disabled \ -Dregistrar=disabled \ -Dappmenu-gtk-module=disabled -USE_XFCE= panel +USE_XFCE= panel xfconf USE_GNOME= gtk30 glib20 gtk20 gdkpixbuf2 USE_GITLAB= yes diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index bdebe95e4f04..df9a801cd60a 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-clipman-plugin PORTVERSION= 1.6.5 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -15,7 +16,7 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf USE_XORG= ice sm x11 xorgproto xtst GNU_CONFIGURE= yes diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile index 624e83debefd..d9ef542478b5 100644 --- a/x11/xfce4-dashboard/Makefile +++ b/x11/xfce4-dashboard/Makefile @@ -1,6 +1,6 @@ PORTNAME= dashboard PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps PKGNAMEPREFIX= xfce4- @@ -23,7 +23,7 @@ USES= compiler:c11 gettext-tools gl gmake gnome localbase libtool \ USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3 USE_XFCE= garcon xfconf USE_XORG= x11 xcomposite xdamage xext xfixes xi xinerama xrandr -USE_GL= egl gl +USE_GL= egl USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11/xfce4-docklike-plugin/Makefile b/x11/xfce4-docklike-plugin/Makefile index 4cf7dfbbc58c..e3fdc3824e43 100644 --- a/x11/xfce4-docklike-plugin/Makefile +++ b/x11/xfce4-docklike-plugin/Makefile @@ -1,7 +1,7 @@ PORTNAME= xfce4-docklike-plugin PORTVERSION= 0.4.0 DISTVERSIONPREFIX= ${PORTNAME} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MAINTAINER= bsd@quentb.com @@ -28,7 +28,7 @@ INSTALL_TARGET= install-strip LDFLAGS+= -L${LOCALBASE}/lib -linotify USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libwnck3 -USE_XFCE= panel +USE_XFCE= libmenu panel USE_XORG= x11 OPTIONS_DEFINE= NLS diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile index 5be8e5727f01..e8f21e89ce6e 100644 --- a/x11/xfce4-screensaver/Makefile +++ b/x11/xfce4-screensaver/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-screensaver PORTVERSION= 4.18.2 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 @@ -23,7 +24,7 @@ USES= compiler:c11 gettext-tools gl gmake gnome pkgconfig python \ shebangfix tar:bzip2 xfce xorg USE_GL= gl USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3 -USE_XFCE= garcon libexo xfconf +USE_XFCE= garcon xfconf USE_XORG= ice sm x11 xext xrandr xscrnsaver xxf86vm SHEBANG_FILES= src/xfce4-screensaver-configure diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile index 3ba263f030cf..ead2f3d1c39c 100644 --- a/x11/xfce4-screenshooter-plugin/Makefile +++ b/x11/xfce4-screenshooter-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-screenshooter-plugin PORTVERSION= 1.10.4 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DISTNAME= xfce4-screenshooter-${DISTVERSIONFULL} @@ -19,7 +20,7 @@ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce xorg USE_CSTD= c99 USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 -USE_XFCE= panel +USE_XFCE= libexo libmenu panel xfconf USE_XORG= ice sm x11 xfixes xext GNU_CONFIGURE= yes diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile index ea002358c1e8..b7505278b239 100644 --- a/x11/xfce4-taskmanager/Makefile +++ b/x11/xfce4-taskmanager/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-taskmanager PORTVERSION= 1.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index e3eb017d7585..93209b15b767 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-terminal PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile index 6980a65e0f34..af540844800a 100644 --- a/x11/xfce4-verve-plugin/Makefile +++ b/x11/xfce4-verve-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= verve-plugin PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/panel-plugins PKGNAMEPREFIX= xfce4- @@ -18,7 +19,7 @@ LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ USES= compiler:c11 gettext-tools gmake gnome libtool pkgconfig \ tar:bzip2 xfce USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 intltool pango -USE_XFCE= panel +USE_XFCE= libmenu panel GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile index c383ba187390..0d2fe32318bd 100644 --- a/x11/xfce4-whiskermenu-plugin/Makefile +++ b/x11/xfce4-whiskermenu-plugin/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-whiskermenu-plugin PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake compiler:c++14-lang gettext-tools gnome localbase \ pkgconfig tar:bzip2 xfce USE_GNOME= cairo gdkpixbuf2 gtk30 -USE_XFCE= panel +USE_XFCE= garcon libexo panel xfconf OPTIONS_DEFINE= ACCOUNTS_SERVICE GTK_LAYER_SHELL LTO NLS OPTIONS_DEFAULT= ACCOUNTS_SERVICE GTK_LAYER_SHELL LTO diff --git a/x11/xfce4-windowck-plugin/Makefile b/x11/xfce4-windowck-plugin/Makefile index edeaaf373476..2f5bef6b5b9b 100644 --- a/x11/xfce4-windowck-plugin/Makefile +++ b/x11/xfce4-windowck-plugin/Makefile @@ -1,6 +1,6 @@ PORTNAME= xfce4-windowck-plugin PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= XFCE/panel-plugins DIST_SUBDIR= xfce4 @@ -17,7 +17,7 @@ BUILD_DEPENDS= xdt-csource:devel/xfce4-dev-tools USES= gettext-tools gmake gnome libtool python:build pkgconfig \ shebangfix tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 libwnck3 intltool -USE_XFCE= panel +USE_XFCE= libmenu panel xfconf USE_XORG= x11 SHEBANG_GLOB= *.py