diff options
165 files changed, 1633 insertions, 2474 deletions
@@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20150305: + AUTHOR: olivierd@FreeBSD.org + + Dependencies on the Xfce ports have been migrated to USES. Instead + of USE_XFCE= configenv, you should use USES= xfce. + 20150224: AUTHOR: makc@FreeBSD.org diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk new file mode 100644 index 0000000..6ceb9ca --- /dev/null +++ b/Mk/Uses/xfce.mk @@ -0,0 +1,105 @@ +# +# $FreeBSD$ +# +# Provide support for Xfce related ports. +# +# Feature: xfce +# Usage: USES=xfce or USES=xfce:ARGS +# Valid ARGS: gtk3 +# +# Variables, which can be set by the port: +# +# MASTER_SITE_SUBDIR Path +# USE_XFCE List of components +# +# MAINTAINER: xfce@FreeBSD.org + +.if !defined(_INCLUDE_USES_XFCE_Mk) +_INCLUDE_USES_XFCE_Mk= yes +_USES_POST+= xfce + +_USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf + +MASTER_SITE_SUBDIR?= xfce/4.12/src + +xfce_ARGS?= # empty + +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib + +garcon_LIB_DEPENDS= libgarcon-1.so:${PORTSDIR}/sysutils/garcon +garcon_USE_XFCE_REQ= libmenu + +libexo_LIB_DEPENDS= libexo-1.so:${PORTSDIR}/x11/libexo +libexo_USE_XFCE_REQ= libmenu + +libgui_LIB_DEPENDS= libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui +libgui_USE_XFCE_REQ= libutil + +libmenu_LIB_DEPENDS= libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu +libmenu_USE_XFCE_REQ= xfconf + +libutil_LIB_DEPENDS= libxfce4util.so:${PORTSDIR}/x11/libxfce4util + +panel_LIB_DEPENDS= libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel +panel_RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel +panel_USE_XFCE_REQ= garcon libexo xfconf + +thunar_LIB_DEPENDS= libthunarx-2.so:${PORTSDIR}/x11-fm/thunar +thunar_RUN_DEPENDS= Thunar:${PORTSDIR}/x11-fm/thunar +thunar_USE_XFCE_REQ= xfconf libmenu + +xfconf_LIB_DEPENDS= libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf +xfconf_USE_XFCE_REQ= libutil + +.if defined(USE_XFCE) +# First, expand all USE_XFCE_REQ recursively. +.for comp in ${_USE_XFCE_ALL} +. for subcomp in ${${comp}_USE_XFCE_REQ} +${comp}_USE_XFCE_REQ+=${${subcomp}_USE_XFCE_REQ} +. endfor +.endfor + +# Then, use already expanded USE_XFCE_REQ to expand USE_XFCE. +.for comp in ${USE_XFCE} +. if ${_USE_XFCE_ALL:M${comp}} == "" +IGNORE= cannot install: Unknown component ${comp} +. endif +_USE_XFCE+= ${${comp}_USE_XFCE_REQ} ${comp} +.endfor + +# Remove duplicate components +USE_XFCE= ${_USE_XFCE:O:u} + +.for comp in ${USE_XFCE} +. if defined(${comp}_BUILD_DEPENDS) +BUILD_DEPENDS+= ${${comp}_BUILD_DEPENDS} +. endif + +. if defined(${comp}_LIB_DEPENDS) +LIB_DEPENDS+= ${${comp}_LIB_DEPENDS} +. endif + +. if defined(${comp}_RUN_DEPENDS) +RUN_DEPENDS+= ${${comp}_RUN_DEPENDS} +. endif +.endfor + +.if ${USE_XFCE:M*gui} == libgui +DEPRECATED?= Depends on unmaintained x11-toolkits/libxfce4gui +. endif + +.if ${xfce_ARGS} == gtk3 +. if exists(${LOCALBASE}/lib/libxfce4ui-1.so) && !exists(${LOCALBASE}/lib/libxfce4ui-2.so) +BROKEN= GTK3 option needs to be set in x11/libxfce4menu +. endif +.endif + +.endif # end of defined(USE_XFCE) + +.endif + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XFCE_POST_MK) +_INCLUDE_USES_XFCE_POST_MK= yes + +.endif diff --git a/Mk/bsd.xfce.mk b/Mk/bsd.xfce.mk deleted file mode 100644 index 55ee09f..0000000 --- a/Mk/bsd.xfce.mk +++ /dev/null @@ -1,72 +0,0 @@ -# -# $FreeBSD$ -# - -.if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include) - -Xfce_Pre_Include= bsd.xfce.mk -Xfce_Include_MAINTAINER= xfce@FreeBSD.org - -# This file contains some variable definitions that are supposed to -# make your life easier when dealing with ports related to the Xfce -# desktop environment. It's automatically included when USE_XFCE -# is defined in the ports' makefile. - -_USE_XFCE_ALL= configenv garcon libexo libgui libmenu libutil panel \ - thunar wm xfconf xfdev - -MASTER_SITE_SUBDIR?= xfce/4.10/src - -configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" - -garcon_BUILD_DEPENDS= garcon>=0.2.1:${PORTSDIR}/sysutils/garcon -garcon_RUN_DEPENDS= garcon>=0.2.1:${PORTSDIR}/sysutils/garcon - -libexo_BUILD_DEPENDS= libexo>=0.10.1:${PORTSDIR}/x11/libexo -libexo_RUN_DEPENDS= libexo>=0.10.1:${PORTSDIR}/x11/libexo - -libgui_BUILD_DEPENDS= libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui -libgui_RUN_DEPENDS= libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui - -libmenu_BUILD_DEPENDS= libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu -libmenu_RUN_DEPENDS= libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu - -libutil_BUILD_DEPENDS= libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util -libutil_RUN_DEPENDS= libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util - -panel_BUILD_DEPENDS= xfce4-panel>=4.10.1:${PORTSDIR}/x11-wm/xfce4-panel -panel_RUN_DEPENDS= xfce4-panel>=4.10.1:${PORTSDIR}/x11-wm/xfce4-panel - -thunar_BUILD_DEPENDS= Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar -thunar_RUN_DEPENDS= Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar - -wm_BUILD_DEPENDS= xfce4-wm>=4.10.1:${PORTSDIR}/x11-wm/xfce4-wm -wm_RUN_DEPENDS= xfce4-wm>=4.10.1:${PORTSDIR}/x11-wm/xfce4-wm - -xfconf_BUILD_DEPENDS= xfce4-conf>=4.10.0:${PORTSDIR}/x11/xfce4-conf -xfconf_RUN_DEPENDS= xfce4-conf>=4.10.0:${PORTSDIR}/x11/xfce4-conf - -xfdev_BUILD_DEPENDS= xdt-csource:${PORTSDIR}/devel/xfce4-dev-tools -xfdev_RUN_DEPENDS= xdt-csource:${PORTSDIR}/devel/xfce4-dev-tools - -.endif - -.if defined(_POSTMKINCLUDED) && !defined(Xfce_Post_Include) - -Xfce_Post_Include= bsd.xfce.mk - -.for component in ${USE_XFCE} -BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} -LIB_DEPENDS+= ${${component}_LIB_DEPENDS} -RUN_DEPENDS+= ${${component}_RUN_DEPENDS} -CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} \ - ac_cv_prog_AWK="${AWK}" -.endfor - -.for component in ${USE_XFCE} -. if ${_USE_XFCE_ALL:M${component}}=="" -IGNORE= cannot install: Unknown component ${component} -. endif -.endfor - -.endif @@ -5,6 +5,27 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150305: + AFFECTS: users of x11-wm/xfce4 and multimedia/xfce4-parole + AUTHOR: olivierd@FreeBSD.org + + Xfce 4.12 has been imported. Please use the following instructions to + upgrade. + + For package users: + # pkg upgrade + + For ports users: + # portmaster -a + # portmaster x11-wm/xfce4 + + GStreamer 1.0 is enabled by default in Parole media player. + + Xfce 4.12 now depends of Adwaita icon theme. If you are upgrading from + Xfce 4.10 you probably still have the Tango or GNOME theme selected. + Open the Settings Manager and select Appearance. Inside dialog box switch + to the Icons tag and select the "Adwaita" entry in the list. + 20150304: AFFECTS: users of security/libressl AUTHOR: vsevolod@highsecure.ru diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile index 6fd5ec8..98ebb91 100644 --- a/archivers/squeeze/Makefile +++ b/archivers/squeeze/Makefile @@ -3,7 +3,7 @@ PORTNAME= squeeze PORTVERSION= 0.2.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= archivers xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -19,22 +19,14 @@ LIB_DEPENDS= libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs SSP_UNSAFE= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils libtool -USE_XFCE= configenv libutil thunar +USES= tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils \ + libtool xfce +USE_XFCE= thunar USE_XORG= x11 USE_GNOME= gtk20 glib20 intltool intlhack USE_LDCONFIG= yes MAKE_JOB_SAFE= yes -OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes - -.include <bsd.port.options.mk> - -post-patch: -# Needed to remove gtk-doc installation -.if empty(PORT_OPTIONS:MDOCS) - @${REINPLACE_CMD} -e "s|docs||g" ${WRKSRC}/Makefile.in -.endif +CONFIGURE_ARGS=--disable-static --without-html-dir .include <bsd.port.mk> diff --git a/archivers/squeeze/pkg-plist b/archivers/squeeze/pkg-plist index 1af2be0..781bcb9 100644 --- a/archivers/squeeze/pkg-plist +++ b/archivers/squeeze/pkg-plist @@ -5,7 +5,6 @@ include/libsqueeze-0.2/libsqueeze/libsqueeze-module.h include/libsqueeze-0.2/libsqueeze/libsqueeze-vfs-mime.h include/libsqueeze-0.2/libsqueeze/libsqueeze-view.h include/libsqueeze-0.2/libsqueeze/libsqueeze.h -lib/libsqueeze-0.2.a lib/libsqueeze-0.2.so lib/libsqueeze-0.2.so.0 lib/libsqueeze-0.2.so.0.0.2 @@ -30,22 +29,6 @@ share/locale/tr/LC_MESSAGES/squeeze.mo share/locale/uk/LC_MESSAGES/squeeze.mo share/pixmaps/squeeze/archive-add.png share/pixmaps/squeeze/archive-extract.png -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchive.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchiveCommand.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/archiving.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/home.png -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.sgml -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/ix01.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/left.png -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-LSQArchiveSupport.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-libsqueeze.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp2 -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.html -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/right.png -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/style.css -%%PORTDOCS%%share/gtk-doc/html/libsqueeze/up.png share/icons/hicolor/16x16/apps/squeeze.png share/icons/hicolor/48x48/apps/squeeze.png share/icons/hicolor/scalable/apps/squeeze.svg diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile index 88dd822..a57d896 100644 --- a/archivers/thunar-archive-plugin/Makefile +++ b/archivers/thunar-archive-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunar-archive-plugin PORTVERSION= 0.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= archivers xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} @@ -13,8 +13,8 @@ MAINTAINER= xfce@FreeBSD.org COMMENT= Archive plugin for the Thunar File Manager GNU_CONFIGURE= yes -USE_XFCE= configenv libexo thunar -USES= gettext gmake libtool pkgconfig tar:bzip2 +USE_XFCE= thunar +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 INSTALLS_ICONS= yes USE_GNOME= intltool diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile index e2a06a5..3336d42 100644 --- a/audio/thunar-media-tags-plugin/Makefile +++ b/audio/thunar-media-tags-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunar-media-tags-plugin PORTVERSION= 0.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} @@ -17,9 +17,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib -USES= gmake pkgconfig gettext libtool tar:bzip2 +USES= gmake pkgconfig gettext libtool xfce tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libexo thunar +USE_XFCE= thunar .include <bsd.port.mk> diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile index a8cc638..abf2ebb 100644 --- a/audio/xfce4-mixer/Makefile +++ b/audio/xfce4-mixer/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-mixer PORTVERSION= 4.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -19,34 +19,20 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel xfconf +USE_XFCE= panel USE_GSTREAMER= good MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= KEYBIND NLS - KEYBIND_DESC= Multimedia keyboard shortcuts - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MKEYBIND} -LIB_DEPENDS+= libkeybinder.so:${PORTSDIR}/x11/keybinder -CONFIGURE_ARGS+=--enable-keybinder -.else -CONFIGURE_ARGS+=--disable-keybinder -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +KEYBIND_LIB_DEPENDS= libkeybinder.so:${PORTSDIR}/x11/keybinder +KEYBIND_CONFIGURE_ENABLE= keybinder +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes post-patch: @${FIND} ${WRKSRC} -name 'Makefile.in' -or -name 'xfce-mixer-track.c' \ diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile index 074870a..31b6397 100644 --- a/audio/xfce4-mpc-plugin/Makefile +++ b/audio/xfce4-mpc-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-mpc-plugin -PORTVERSION= 0.4.4 -PORTREVISION= 8 +PORTVERSION= 0.4.5 CATEGORIES= audio xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -19,8 +18,8 @@ RUN_DEPENDS= musicpd:${PORTSDIR}/audio/musicpd GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libexo libmenu panel +USE_XFCE= panel .include <bsd.port.mk> diff --git a/audio/xfce4-mpc-plugin/distinfo b/audio/xfce4-mpc-plugin/distinfo index 873bc68..4f97548 100644 --- a/audio/xfce4-mpc-plugin/distinfo +++ b/audio/xfce4-mpc-plugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-mpc-plugin-0.4.4.tar.bz2) = 4f0ce6146aa2680a4c1ca7bad1be30187a8a179e8c4355a8fe13d1fc38dac5c5 -SIZE (xfce4/xfce4-mpc-plugin-0.4.4.tar.bz2) = 287320 +SHA256 (xfce4/xfce4-mpc-plugin-0.4.5.tar.bz2) = e71f57a28915c57459d6ce0eeeee1d0934f523c0ed083158c3d3b3836fc06fcf +SIZE (xfce4/xfce4-mpc-plugin-0.4.5.tar.bz2) = 284335 diff --git a/audio/xfce4-mpc-plugin/pkg-plist b/audio/xfce4-mpc-plugin/pkg-plist index 96ba2ef..44f7553 100644 --- a/audio/xfce4-mpc-plugin/pkg-plist +++ b/audio/xfce4-mpc-plugin/pkg-plist @@ -1,11 +1,13 @@ lib/xfce4/panel/plugins/libmpc.so share/locale/ar/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/ast/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/da/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/de/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/el/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/es/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-mpc-plugin.mo @@ -20,14 +22,19 @@ share/locale/ja/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/lv/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/pt/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/sk/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-mpc-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/tr/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/ug/LC_MESSAGES/xfce4-mpc-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-mpc-plugin.mo diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile index d990af3..099e6fc 100644 --- a/audio/xfmpc/Makefile +++ b/audio/xfmpc/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfmpc PORTVERSION= 0.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R} @@ -12,14 +12,16 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Graphical MPD client focusing on low footprint +LICENSE= GPLv2 + BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio/libmpd INSTALLS_ICONS= yes -USES= tar:bzip2 gettext gmake pkgconfig +USES= tar:bzip2 gettext gmake xfce pkgconfig GNU_CONFIGURE= yes USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil +USE_XFCE= libmenu post-extract: ${CP} ${FILESDIR}/config.vapi ${WRKSRC}/src diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile index 95c7b43..626d16f 100644 --- a/deskutils/orage/Makefile +++ b/deskutils/orage/Makefile @@ -3,7 +3,7 @@ PORTNAME= orage PORTVERSION= 4.10.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} @@ -20,12 +20,13 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= pkgconfig gettext desktop-file-utils gmake tar:bzip2 +USES= pkgconfig gettext desktop-file-utils gmake \ + xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu panel +USE_XFCE= panel USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \ xfixes -LDFLAGS+= -L${LOCALBASE}/lib +#LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= BDB ICAL NOTIFY OPTIONS_DEFAULT= NOTIFY diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile index 42efc85..ae2dd45 100644 --- a/deskutils/xfce4-generic-slider/Makefile +++ b/deskutils/xfce4-generic-slider/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-generic-slider PORTVERSION= 0.0.20100827 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MASTER_SITES= LOCAL/ehaupt/ @@ -12,8 +12,8 @@ COMMENT= Slider plugin to adjust and/or monitor any numeric variable LICENSE= GPLv3 -USES= pkgconfig -USE_XFCE= panel libutil libgui +USES= pkgconfig xfce +USE_XFCE= panel libgui CFLAGS+= `pkg-config --cflags libxfce4panel-1.0 libxfcegui4-1.0` LDFLAGS+= `pkg-config --libs libxfce4panel-1.0 libxfcegui4-1.0` diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile index d9a0a71..f29880e 100644 --- a/deskutils/xfce4-notes-plugin/Makefile +++ b/deskutils/xfce4-notes-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-notes-plugin PORTVERSION= 1.7.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -17,9 +17,11 @@ LICENSE= GPLv2 LIB_DEPENDS= libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique GNU_CONFIGURE= yes -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libgui libutil panel xfconf +USE_XFCE= libgui panel INSTALLS_ICONS= yes +CONFIGURE_ARGS=--disable-static + .include <bsd.port.mk> diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist index 1e50fe4..4d562de 100644 --- a/deskutils/xfce4-notes-plugin/pkg-plist +++ b/deskutils/xfce4-notes-plugin/pkg-plist @@ -2,7 +2,6 @@ bin/xfce4-notes bin/xfce4-notes-settings bin/xfce4-popup-notes etc/xdg/autostart/xfce4-notes-autostart.desktop -lib/xfce4/panel-plugins/libnotes.a lib/xfce4/panel-plugins/libnotes.so lib/xfce4/panel-plugins/libnotes.so.0 lib/xfce4/panel-plugins/libnotes.so.0.0.0 diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile index 1e2fe99..0146f41 100644 --- a/deskutils/xfce4-notification-daemon/Makefile +++ b/deskutils/xfce4-notification-daemon/Makefile @@ -3,7 +3,7 @@ PORTNAME= notification-daemon PORTVERSION= 0.3.7 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= deskutils xfce MASTER_SITES= LOCAL/ehaupt/ PKGNAMEPREFIX= xfce4- @@ -22,10 +22,10 @@ RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= librsvg2 USE_LDCONFIG= yes -USE_XFCE= configenv libutil libgui +USE_XFCE= libgui CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/xfce4 \ --libexecdir=${PREFIX}/libexec/xfce4 \ @@ -43,7 +43,7 @@ OPTIONS_DEFAULT=CLOSE NLS .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USES+= gettext +USES+= gettext-runtime PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile index d7b85d8..9e6a987 100644 --- a/deskutils/xfce4-notifyd/Makefile +++ b/deskutils/xfce4-notifyd/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-notifyd PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -16,10 +17,10 @@ LICENSE= GPLv3 LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libnotify.so:${PORTSDIR}/devel/libnotify -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil xfconf +USE_XFCE= libmenu INSTALLS_ICONS= yes USE_XORG= x11 @@ -28,7 +29,7 @@ OPTIONS_DEFINE= NLS .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -USES+= gettext +USES+= gettext-runtime CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" .else diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 472665b..4940f25 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= tumbler -PORTVERSION= 0.1.30 -PORTREVISION= 6 +PORTVERSION= 0.1.31 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} PKGNAMEPREFIX= xfce4- DIST_SUBDIR= xfce4 @@ -19,163 +17,43 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -USES= pathfix pkgconfig gmake libtool tar:bzip2 +USES= pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2 GNU_CONFIGURE= yes -USE_GNOME= glib20 intltool intlhack +USE_GNOME= glib20 intltool intlhack gdkpixbuf2 USE_LDCONFIG= yes -USE_XFCE= configenv CONFIGURE_ARGS= --enable-xdg-cache \ - --disable-gtk-doc-html + --enable-pixbuf-thumbnailer \ + --disable-gtk-doc-html \ + --without-html-dir + +OPTIONS_DEFINE= NLS FONTS JPEG FFMPEG POPPLER \ + GSTREAMER ODF COVER +OPTIONS_DEFAULT= FONTS JPEG POPPLER GSTREAMER ODF -OPTIONS_DEFINE= DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER \ - GSTREAMER ODF OPENRAW COVER -OPTIONS_DEFAULT= PIXBUF FONTS JPEG POPPLER ODF FONTS_DESC= Fonts thumbnailer plugin COVER_DESC= Open Movie Database thumbnailer plugin GSTREAMER_DESC= GStreamer (1.0) thumbnailer plugin -SUB_FILES= pkg-message - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif - -.if ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.else -CONFIGURE_ARGS+=--disable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="@comment " -.endif - -.if ${PORT_OPTIONS:MFONTS} -# PIXBUF needs to be set -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 -CONFIGURE_ARGS+=--enable-font-thumbnailer -PLIST_SUB+= FONTS="" -.else -CONFIGURE_ARGS+=--disable-font-thumbnailer -PLIST_SUB+= FONTS="@comment " -.endif +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +FONTS_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 +FONTS_CONFIGURE_ENABLE= font-thumbnailer +JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libexif.so:${PORTSDIR}/graphics/libexif +JPEG_CONFIGURE_ENABLE= jpeg-thumbnailer +FFMPEG_LIB_DEPENDS= libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer +FFMPEG_CONFIGURE_ENABLE= ffmpeg-thumbnailer +POPPLER_LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib +POPPLER_CONFIGURE_ENABLE= poppler-thumbnailer +GSTREAMER_USE= gstreamer1=yes +GSTREAMER_CONFIGURE_ENABLE= gstreamer-thumbnailer +ODF_USE= gnome=libgsf +ODF_CONFIGURE_ENABLE= odf-thumbnailer +COVER_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +COVER_CONFIGURE_ENABLE= cover-thumbnailer +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MJPEG} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg -CONFIGURE_ARGS+=--enable-jpeg-thumbnailer -PLIST_SUB+= JPEG="" -.else -CONFIGURE_ARGS+=--disable-jpeg-thumbnailer -PLIST_SUB+= JPEG="@comment " -.endif - -.if ${PORT_OPTIONS:MFFMPEG} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -LIB_DEPENDS+= libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer -CONFIGURE_ARGS+=--enable-ffmpeg-thumbnailer -PLIST_SUB+= FFMPEG="" -.else -CONFIGURE_ARGS+=--disable-ffmpeg-thumbnailer -PLIST_SUB+= FFMPEG="@comment " -.endif - -.if ${PORT_OPTIONS:MPOPPLER} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -LIB_DEPENDS+= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib -CONFIGURE_ARGS+=--enable-poppler-thumbnailer -PLIST_SUB+= POPPLER="" -.else -CONFIGURE_ARGS+=--disable-poppler-thumbnailer -PLIST_SUB+= POPPLER="@comment " -.endif - -.if ${PORT_OPTIONS:MGSTREAMER} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -USE_GSTREAMER1= yes -CONFIGURE_ARGS+=--enable-gstreamer-thumbnailer -PLIST_SUB+= GSTREAMER="" -.else -CONFIGURE_ARGS+=--disable-gstreamer-thumbnailer -PLIST_SUB+= GSTREAMER="@comment " -.endif - -.if ${PORT_OPTIONS:MODF} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -USE_GNOME+= libgsf -CONFIGURE_ARGS+=--enable-odf-thumbnailer -PLIST_SUB+= ODF="" -.else -CONFIGURE_ARGS+=--disable-odf-thumbnailer -PLIST_SUB+= ODF="@comment " -.endif - -.if ${PORT_OPTIONS:MOPENRAW} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -LIB_DEPENDS+= libopenraw.so:${PORTSDIR}/graphics/libopenraw -CONFIGURE_ARGS+=--enable-raw-thumbnailer -PLIST_SUB+= RAW="" -.else -CONFIGURE_ARGS+=--disable-raw-thumbnailer -PLIST_SUB+= RAW="@comment " -.endif - -.if ${PORT_OPTIONS:MCOVER} -.if ! ${PORT_OPTIONS:MPIXBUF} -USE_GNOME+= gdkpixbuf2 -CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer -PLIST_SUB+= PIXBUF="" -.endif -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -CONFIGURE_ARGS+=--enable-cover-thumbnailer -PLIST_SUB+= COVER="" -.else -CONFIGURE_ARGS+=--disable-cover-thumbnailer -PLIST_SUB+= COVER="@comment " -.endif +SUB_FILES= pkg-message .include <bsd.port.mk> diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo index 076266d..b1cc29e 100644 --- a/deskutils/xfce4-tumbler/distinfo +++ b/deskutils/xfce4-tumbler/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/tumbler-0.1.30.tar.bz2) = e7c20d79c830465f8b3b792893f05e8b8d5ba90aec4973e7517e07ef31537304 -SIZE (xfce4/tumbler-0.1.30.tar.bz2) = 515676 +SHA256 (xfce4/tumbler-0.1.31.tar.bz2) = d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173 +SIZE (xfce4/tumbler-0.1.31.tar.bz2) = 550650 diff --git a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc index 6f182e7..0084f72 100644 --- a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc +++ b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc @@ -1,6 +1,6 @@ ---- ./tumblerd/tumbler.rc.orig 2013-01-12 11:14:28.000000000 +0000 -+++ ./tumblerd/tumbler.rc 2013-01-12 22:12:40.000000000 +0000 -@@ -37,7 +37,7 @@ +--- tumblerd/tumbler.rc.orig 2015-02-28 15:23:08 UTC ++++ tumblerd/tumbler.rc +@@ -37,7 +37,7 @@ MaxFileSize=0 # RAW image files using libopenraw [RawThumbnailer] @@ -9,7 +9,7 @@ Priority=1 Locations= MaxFileSize=0 -@@ -58,14 +58,14 @@ +@@ -58,7 +58,7 @@ MaxFileSize=0 # ffmpegthumbnailer plugin [FfmegThumbnailer] @@ -18,11 +18,3 @@ Priority=2 Locations= MaxFileSize=0 - - # GStreamer plugin - [GstThumbnailer] --Disabled=false -+Disabled=true - Priority=1 - Locations= - MaxFileSize=0 diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist index c8e046a..0bfa3d4 100644 --- a/deskutils/xfce4-tumbler/pkg-plist +++ b/deskutils/xfce4-tumbler/pkg-plist @@ -27,42 +27,13 @@ lib/tumbler-1/plugins/cache/tumbler-xdg-cache.so %%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.so %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so %%ODF%%lib/tumbler-1/plugins/tumbler-odf-thumbnailer.so -%%PIXBUF%%lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so +lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so %%POPPLER%%lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.so -%%RAW%%lib/tumbler-1/plugins/tumbler-raw-thumbnailer.so lib/tumbler-1/tumblerd libdata/pkgconfig/tumbler-1.pc share/dbus-1/services/org.xfce.Tumbler.Cache1.service share/dbus-1/services/org.xfce.Tumbler.Manager1.service share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service -%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerAbstractThumbnailer.html -%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerCache.html -%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerThumbnail.html -%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerThumbnailerProvider.html -%%APIDOCS%%share/gtk-doc/html/tumbler/api-index-full.html -%%APIDOCS%%share/gtk-doc/html/tumbler/extension-api.html -%%APIDOCS%%share/gtk-doc/html/tumbler/extension-tutorial.html -%%APIDOCS%%share/gtk-doc/html/tumbler/home.png -%%APIDOCS%%share/gtk-doc/html/tumbler/index.html -%%APIDOCS%%share/gtk-doc/html/tumbler/index.sgml -%%APIDOCS%%share/gtk-doc/html/tumbler/left-insensitive.png -%%APIDOCS%%share/gtk-doc/html/tumbler/left.png -%%APIDOCS%%share/gtk-doc/html/tumbler/miscellaneous.html -%%APIDOCS%%share/gtk-doc/html/tumbler/object-tree.html -%%APIDOCS%%share/gtk-doc/html/tumbler/pt01.html -%%APIDOCS%%share/gtk-doc/html/tumbler/right-insensitive.png -%%APIDOCS%%share/gtk-doc/html/tumbler/right.png -%%APIDOCS%%share/gtk-doc/html/tumbler/style.css -%%APIDOCS%%share/gtk-doc/html/tumbler/thumbnails.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Error-Domain-and-Types.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Various-Enumeration-Types.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Version-Information-and-Compatibility-Checks.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-file-info.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-provider-factory.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-provider-plugin.html -%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler.devhelp2 -%%APIDOCS%%share/gtk-doc/html/tumbler/up-insensitive.png -%%APIDOCS%%share/gtk-doc/html/tumbler/up.png %%NLS%%share/locale/ar/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/ast/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/bg/LC_MESSAGES/tumbler.mo @@ -80,6 +51,7 @@ share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service %%NLS%%share/locale/fr/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/gl/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/he/LC_MESSAGES/tumbler.mo +%%NLS%%share/locale/hr/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/hu/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/id/LC_MESSAGES/tumbler.mo %%NLS%%share/locale/is/LC_MESSAGES/tumbler.mo diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile index 159dd2b..5411410 100644 --- a/deskutils/xfce4-volumed-pulse/Makefile +++ b/deskutils/xfce4-volumed-pulse/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-volumed-pulse PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= https://launchpadlibrarian.net/133628016/ \ https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ @@ -18,10 +19,10 @@ LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio \ libnotify.so:${PORTSDIR}/devel/libnotify \ libkeybinder.so:${PORTSDIR}/x11/keybinder -USES= pkgconfig gmake tar:bz2 +USES= pkgconfig gmake xfce tar:bz2 GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 -USE_XFCE= configenv xfconf +USE_XFCE= xfconf INSTALL_TARGET= install-strip CONFIGURE_ARGS=--enable-libnotify diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile index 3bd4a82..3cca6e4 100644 --- a/deskutils/xfce4-volumed/Makefile +++ b/deskutils/xfce4-volumed/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-volumed PORTVERSION= 0.1.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= XFCE MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -17,10 +17,10 @@ LICENSE= GPLv3 LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libkeybinder.so:${PORTSDIR}/x11/keybinder -USES= pkgconfig gmake tar:bzip2 +USES= pkgconfig gmake xfce tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 USE_GSTREAMER= yes -USE_XFCE= configenv xfconf +USE_XFCE= xfconf .include <bsd.port.mk> diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile index b1aa0c5..78ca084 100644 --- a/deskutils/xfce4-xkb-plugin/Makefile +++ b/deskutils/xfce4-xkb-plugin/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xfce4-xkb-plugin -PORTVERSION= 0.5.6 -PORTREVISION= 2 +PORTVERSION= 0.7.1 CATEGORIES= deskutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -10,12 +9,14 @@ MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} MAINTAINER= xfce@FreeBSD.org COMMENT= Keyboard layout switching plugin for the Xfce panel +LICENSE= GPLv2 + LIB_DEPENDS= libxklavier.so:${PORTSDIR}/x11/libxklavier GNU_CONFIGURE= yes -USES= gettext pkgconfig gmake tar:bzip2 +USES= gettext pkgconfig gmake xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack librsvg2 libwnck -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel USE_XORG= x11 .include <bsd.port.mk> diff --git a/deskutils/xfce4-xkb-plugin/distinfo b/deskutils/xfce4-xkb-plugin/distinfo index 8b0d2ab..fad51fe 100644 --- a/deskutils/xfce4-xkb-plugin/distinfo +++ b/deskutils/xfce4-xkb-plugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4-xkb-plugin-0.5.6.tar.bz2) = 09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5 -SIZE (xfce4-xkb-plugin-0.5.6.tar.bz2) = 815228 +SHA256 (xfce4-xkb-plugin-0.7.1.tar.bz2) = 61fe2e33fe99939d5d06a682e94e40e05ef844c930ad612154090d158b2ce681 +SIZE (xfce4-xkb-plugin-0.7.1.tar.bz2) = 837922 diff --git a/deskutils/xfce4-xkb-plugin/pkg-descr b/deskutils/xfce4-xkb-plugin/pkg-descr index a879e01..3e4f7b0 100644 --- a/deskutils/xfce4-xkb-plugin/pkg-descr +++ b/deskutils/xfce4-xkb-plugin/pkg-descr @@ -7,6 +7,6 @@ label for that layout. This plugin is used along with the XKB extension. For now the keyboard layouts cannot be configured from the plugin itself, they should be -set in the XF86Config file or some other way (e.g. setxkbmap). +set in the Xorg file or some other way (e.g. setxkbmap). WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin diff --git a/deskutils/xfce4-xkb-plugin/pkg-plist b/deskutils/xfce4-xkb-plugin/pkg-plist index e3a3eee..15d2930 100644 --- a/deskutils/xfce4-xkb-plugin/pkg-plist +++ b/deskutils/xfce4-xkb-plugin/pkg-plist @@ -8,22 +8,28 @@ share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/da/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/es/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/he/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/hr/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/id/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/it/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo -share/locale/ka/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/kk/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/lv/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/pt/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-xkb-plugin.mo @@ -31,12 +37,16 @@ share/locale/ro/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/sk/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ug/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/ur_PK/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/uz/LC_MESSAGES/xfce4-xkb-plugin.mo +share/locale/uz@Latn/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo share/xfce4/panel-plugins/xkb-plugin.desktop @@ -65,6 +75,7 @@ share/xfce4/xkb/flags/dvorak.svg share/xfce4/xkb/flags/dz.svg share/xfce4/xkb/flags/ee.svg share/xfce4/xkb/flags/eg.svg +share/xfce4/xkb/flags/el.svg share/xfce4/xkb/flags/epo.svg share/xfce4/xkb/flags/es.svg share/xfce4/xkb/flags/fi.svg diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile index 96995a4..19246723 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.1.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} @@ -14,43 +14,21 @@ COMMENT= Version Control System plugin for Thunar GNU_CONFIGURE= yes USE_GNOME= gtk20 glib20 intltool intlhack -USE_XFCE= configenv libexo libutil thunar +USE_XFCE= thunar INSTALLS_ICONS= yes -USES= pkgconfig gmake libtool tar:bzip2 +USES= pkgconfig gmake libtool gettext-tools xfce tar:bzip2 LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS GIT SVN OPTIONS_DEFAULT= SVN GIT_DESC= Git support - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MGIT} -RUN_DEPENDS+= git:${PORTSDIR}/devel/git -CONFIGURE_ARGS+=--enable-git -PLIST_SUB+= GIT="" -.else -CONFIGURE_ARGS+=--disable-git -PLIST_SUB+= GIT="@comment " -.endif - -.if ${PORT_OPTIONS:MSVN} -LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion -CONFIGURE_ARGS+=--enable-subversion -PLIST_SUB+= SVN="" -.else -CONFIGURE_ARGS+=--disable-subversion -PLIST_SUB+= SVN="@comment " -.endif +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +GIT_RUN_DEPENDS= git:${PORTSDIR}/devel/git +GIT_CONFIGURE_ENABLE= git +SVN_LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion +SVN_CONFIGURE_ENABLE= subversion +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile index 98a858cb..df25370 100644 --- a/devel/xfce4-dev-tools/Makefile +++ b/devel/xfce4-dev-tools/Makefile @@ -2,22 +2,22 @@ # $FreeBSD$ PORTNAME= xfce4-dev-tools -PORTVERSION= 4.10.0 -PORTREVISION= 1 +PORTVERSION= 4.12.0 CATEGORIES= devel xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org -COMMENT= Xfce 4 development tools +COMMENT= Xfce development tools + +LICENSE= GPLv2 RUN_DEPENDS= autoconf-2.69:${PORTSDIR}/devel/autoconf \ automake-1.15:${PORTSDIR}/devel/automake \ libtoolize:${PORTSDIR}/devel/libtool GNU_CONFIGURE= yes -USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined USE_GNOME= glib20 -USES= pkgconfig tar:bzip2 +USES= pkgconfig xfce tar:bzip2 .include <bsd.port.mk> diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo index d643576..a460297 100644 --- a/devel/xfce4-dev-tools/distinfo +++ b/devel/xfce4-dev-tools/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-dev-tools-4.10.0.tar.bz2) = f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8 -SIZE (xfce4/xfce4-dev-tools-4.10.0.tar.bz2) = 283987 +SHA256 (xfce4/xfce4-dev-tools-4.12.0.tar.bz2) = e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb +SIZE (xfce4/xfce4-dev-tools-4.12.0.tar.bz2) = 309586 diff --git a/devel/xfce4-dev-tools/pkg-descr b/devel/xfce4-dev-tools/pkg-descr index 8e9848d..a3ab2e3 100644 --- a/devel/xfce4-dev-tools/pkg-descr +++ b/devel/xfce4-dev-tools/pkg-descr @@ -1,4 +1,4 @@ The Xfce development tools are a collection of tools and macros for Xfce developers and people that want to build Xfce from Git. -WWW: http://www.xfce.org/projects +WWW: http://www.xfce.org/ diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile index 067814e..a71342f 100644 --- a/devel/xfce4-vala/Makefile +++ b/devel/xfce4-vala/Makefile @@ -3,6 +3,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} @@ -16,14 +17,9 @@ LICENSE= LGPL21 BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala GNU_CONFIGURE= yes -USES= pkgconfig gmake pathfix tar:bzip2 -USE_XFCE= configenv garcon libexo libmenu libutil panel xfconf +USES= pkgconfig gmake pathfix xfce tar:bzip2 +USE_XFCE= panel -# vala-1.0.pc is symlink to libvala-${VALA_VER}.pc -CONFIGURE_ARGS= --with-vala-api=1.0 - -post-patch: - @${REINPLACE_CMD} -e 's|libvala-|vala-|g' ${WRKSRC}/acinclude.m4 \ - ${WRKSRC}/configure +CONFIGURE_ARGS= --with-vala-api=0.26 .include <bsd.port.mk> diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile index 6bbe48a..8d5172c 100644 --- a/editors/mousepad/Makefile +++ b/editors/mousepad/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mousepad -PORTVERSION= 0.3.0 +PORTVERSION= 0.4.0 CATEGORIES= editors xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} @@ -14,21 +14,19 @@ COMMENT= Simple text editor for the Xfce Desktop LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -USES= desktop-file-utils gettext gmake pathfix pkgconfig perl5 tar:bzip2 -USE_GNOME= glib20 gtk20 intltool intlhack gtksourceview2 -USE_XFCE= configenv +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -OPTIONS_DEFINE= DBUS -OPTIONS_DEFAULT= DBUS +GNU_CONFIGURE= yes +USES= desktop-file-utils gettext gmake libtool pkgconfig perl5 tar:bzip2 +USE_GNOME= glib20 intltool intlhack -.include <bsd.port.options.mk> +OPTIONS_DEFINE= GTK3 +GTK3_CONFIGURE_ENABLE= gtk3 +GTK3_USE= gnome=gtk30,gtksourceview3 +GTK3_USES= xfce:gtk3 +GTK3_USE_OFF= gnome=gtk20,gtksourceview2 +GTK3_USES_OFF= xfce -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -CONFIGURE_ARGS+=--enable-dbus -.else -CONFIGURE_ARGS+=--disable-dbus -.endif +GLIB_SCHEMAS= org.xfce.mousepad.gschema.xml .include <bsd.port.mk> diff --git a/editors/mousepad/distinfo b/editors/mousepad/distinfo index f888f96..5e8fe9c 100644 --- a/editors/mousepad/distinfo +++ b/editors/mousepad/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/mousepad-0.3.0.tar.bz2) = 10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d -SIZE (xfce4/mousepad-0.3.0.tar.bz2) = 481125 +SHA256 (xfce4/mousepad-0.4.0.tar.bz2) = 60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132 +SIZE (xfce4/mousepad-0.4.0.tar.bz2) = 578483 diff --git a/editors/mousepad/files/patch-mousepad.desktop.in.in b/editors/mousepad/files/patch-mousepad.desktop.in.in deleted file mode 100644 index d73cf19..0000000 --- a/editors/mousepad/files/patch-mousepad.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ ---- ./mousepad.desktop.in.in.orig 2012-12-30 11:04:01.000000000 +0000 -+++ ./mousepad.desktop.in.in 2012-12-30 15:36:39.000000000 +0000 -@@ -9,5 +9,5 @@ - Terminal=false - StartupNotify=true - Type=Application --Categories=Application;Utility;TextEditor;GTK; --MimeType=text/plain -+Categories=Utility;TextEditor;GTK; -+MimeType=text/plain; diff --git a/editors/mousepad/files/patch-mousepad__main.c b/editors/mousepad/files/patch-mousepad__main.c deleted file mode 100644 index 09d6963..0000000 --- a/editors/mousepad/files/patch-mousepad__main.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./mousepad/main.c.orig 2012-12-30 11:04:01.000000000 +0000 -+++ ./mousepad/main.c 2012-12-30 15:35:18.000000000 +0000 -@@ -72,6 +72,7 @@ - - /* bind the text domain to the locale directory */ - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); -+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - /* set the package textdomain */ - textdomain (GETTEXT_PACKAGE); diff --git a/editors/mousepad/pkg-descr b/editors/mousepad/pkg-descr index ea25bff..8edb218 100644 --- a/editors/mousepad/pkg-descr +++ b/editors/mousepad/pkg-descr @@ -1,3 +1,3 @@ Mousepad is a simple text editor for the Xfce desktop environment. -WWW: http://www.xfce.org/projects/mousepad/ +WWW: http://goodies.xfce.org/projects/applications/mousepad diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist index 018deff..c884380 100644 --- a/editors/mousepad/pkg-plist +++ b/editors/mousepad/pkg-plist @@ -1,17 +1,31 @@ bin/mousepad share/applications/mousepad.desktop share/locale/ar/LC_MESSAGES/mousepad.mo +share/locale/ast/LC_MESSAGES/mousepad.mo +share/locale/bg/LC_MESSAGES/mousepad.mo share/locale/cs/LC_MESSAGES/mousepad.mo share/locale/da/LC_MESSAGES/mousepad.mo share/locale/de/LC_MESSAGES/mousepad.mo +share/locale/el/LC_MESSAGES/mousepad.mo +share/locale/en_AU/LC_MESSAGES/mousepad.mo +share/locale/en_GB/LC_MESSAGES/mousepad.mo share/locale/es/LC_MESSAGES/mousepad.mo +share/locale/eu/LC_MESSAGES/mousepad.mo +share/locale/fi/LC_MESSAGES/mousepad.mo share/locale/fr/LC_MESSAGES/mousepad.mo +share/locale/hu/LC_MESSAGES/mousepad.mo share/locale/hr/LC_MESSAGES/mousepad.mo share/locale/id/LC_MESSAGES/mousepad.mo +share/locale/is/LC_MESSAGES/mousepad.mo share/locale/it/LC_MESSAGES/mousepad.mo share/locale/ja/LC_MESSAGES/mousepad.mo +share/locale/kk/LC_MESSAGES/mousepad.mo share/locale/ko/LC_MESSAGES/mousepad.mo share/locale/lt/LC_MESSAGES/mousepad.mo +share/locale/ms/LC_MESSAGES/mousepad.mo +share/locale/nb/LC_MESSAGES/mousepad.mo +share/locale/nl/LC_MESSAGES/mousepad.mo +share/locale/oc/LC_MESSAGES/mousepad.mo share/locale/pl/LC_MESSAGES/mousepad.mo share/locale/pt/LC_MESSAGES/mousepad.mo share/locale/pt_BR/LC_MESSAGES/mousepad.mo @@ -20,6 +34,9 @@ share/locale/ru/LC_MESSAGES/mousepad.mo share/locale/sk/LC_MESSAGES/mousepad.mo share/locale/sr/LC_MESSAGES/mousepad.mo share/locale/sv/LC_MESSAGES/mousepad.mo +share/locale/te/LC_MESSAGES/mousepad.mo +share/locale/th/LC_MESSAGES/mousepad.mo +share/locale/tr/LC_MESSAGES/mousepad.mo share/locale/ug/LC_MESSAGES/mousepad.mo share/locale/uk/LC_MESSAGES/mousepad.mo share/locale/zh_CN/LC_MESSAGES/mousepad.mo diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index b84e8d3..bb1fb08 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ristretto -PORTVERSION= 0.6.3 -PORTREVISION= 2 +PORTVERSION= 0.8.0 CATEGORIES= graphics xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -17,13 +16,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libcairo.so:${PORTSDIR}/graphics/cairo -USES= pkgconfig gettext pathfix desktop-file-utils gmake tar:bzip2 +USES= pkgconfig gettext desktop-file-utils gmake xfce tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gtk20 glib20 intltool intlhack INSTALLS_ICONS= yes -USE_XFCE= configenv libmenu libutil xfconf +USE_XFCE= libmenu USE_XORG= x11 .include <bsd.port.mk> diff --git a/graphics/ristretto/distinfo b/graphics/ristretto/distinfo index 76358df..2812467 100644 --- a/graphics/ristretto/distinfo +++ b/graphics/ristretto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/ristretto-0.6.3.tar.bz2) = 2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79 -SIZE (xfce4/ristretto-0.6.3.tar.bz2) = 499323 +SHA256 (xfce4/ristretto-0.8.0.tar.bz2) = 71625324cecda7199acbc95a3ea5132d0dcbf808771e7a209ea2b9503ae4f328 +SIZE (xfce4/ristretto-0.8.0.tar.bz2) = 541473 diff --git a/graphics/ristretto/pkg-plist b/graphics/ristretto/pkg-plist index 17a9ccf..f040f27 100644 --- a/graphics/ristretto/pkg-plist +++ b/graphics/ristretto/pkg-plist @@ -1,4 +1,5 @@ bin/ristretto +share/appdata/ristretto.appdata.xml share/applications/ristretto.desktop share/icons/hicolor/16x16/apps/ristretto.png share/icons/hicolor/48x48/apps/ristretto.png @@ -11,6 +12,7 @@ share/locale/cs/LC_MESSAGES/ristretto.mo share/locale/da/LC_MESSAGES/ristretto.mo share/locale/de/LC_MESSAGES/ristretto.mo share/locale/el/LC_MESSAGES/ristretto.mo +share/locale/en_AU/LC_MESSAGES/ristretto.mo share/locale/en_GB/LC_MESSAGES/ristretto.mo share/locale/es/LC_MESSAGES/ristretto.mo share/locale/eu/LC_MESSAGES/ristretto.mo @@ -23,11 +25,14 @@ share/locale/id/LC_MESSAGES/ristretto.mo share/locale/is/LC_MESSAGES/ristretto.mo share/locale/it/LC_MESSAGES/ristretto.mo share/locale/ja/LC_MESSAGES/ristretto.mo +share/locale/kk/LC_MESSAGES/ristretto.mo share/locale/ko/LC_MESSAGES/ristretto.mo share/locale/lt/LC_MESSAGES/ristretto.mo share/locale/lv/LC_MESSAGES/ristretto.mo +share/locale/ms/LC_MESSAGES/ristretto.mo share/locale/nb/LC_MESSAGES/ristretto.mo share/locale/nl/LC_MESSAGES/ristretto.mo +share/locale/oc/LC_MESSAGES/ristretto.mo share/locale/pl/LC_MESSAGES/ristretto.mo share/locale/pt/LC_MESSAGES/ristretto.mo share/locale/pt_BR/LC_MESSAGES/ristretto.mo @@ -38,6 +43,7 @@ share/locale/sl/LC_MESSAGES/ristretto.mo share/locale/sr/LC_MESSAGES/ristretto.mo share/locale/sv/LC_MESSAGES/ristretto.mo share/locale/te/LC_MESSAGES/ristretto.mo +share/locale/th/LC_MESSAGES/ristretto.mo share/locale/tr/LC_MESSAGES/ristretto.mo share/locale/ug/LC_MESSAGES/ristretto.mo share/locale/uk/LC_MESSAGES/ristretto.mo diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index d95ff9b..6b022b0 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -18,9 +18,9 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libexo libmenu libutil panel +USE_XFCE= panel USE_XORG= x11 CONFIGURE_ARGS=--enable-ipv6 diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile index 1165d10..35980cb 100644 --- a/misc/xfce4-appfinder/Makefile +++ b/misc/xfce4-appfinder/Makefile @@ -2,35 +2,33 @@ # $FreeBSD$ PORTNAME= xfce4-appfinder -PORTVERSION= 4.10.1 -PORTREVISION= 1 +PORTVERSION= 4.12.0 CATEGORIES= misc xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Application launcher and finder +LICENSE= GPLv2 + LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes -USES= gmake pathfix pkgconfig tar:bzip2 -USE_GNOME= gtk20 glib20 intltool intlhack -USE_XFCE= configenv garcon libmenu libutil xfconf - -OPTIONS_DEFINE= NLS +USES= gmake pkgconfig gettext-tools tar:bzip2 +USE_GNOME= glib20 intltool intlhack +USE_XFCE= garcon + +OPTIONS_DEFINE= GTK3 NLS +GTK3_USES= xfce:gtk3 +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gtk3 +GTK3_USES_OFF= xfce +GTK3_USE_OFF= gnome=gtk20 +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -.else -CONFIGURE_ARGS+=--disable-nls -.endif - post-patch: ${REINPLACE_CMD} -e 's|=gtk-find|=system-search|' \ ${WRKSRC}/data/xfce4-appfinder.desktop.in diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo index 3641dc1..b19bb8d9 100644 --- a/misc/xfce4-appfinder/distinfo +++ b/misc/xfce4-appfinder/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-appfinder-4.10.1.tar.bz2) = 65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77 -SIZE (xfce4/xfce4-appfinder-4.10.1.tar.bz2) = 446043 +SHA256 (xfce4/xfce4-appfinder-4.12.0.tar.bz2) = 2ad4a58019a76a6b64a816050db25f96854917c2f2e89d6a9df6c18e6c84c567 +SIZE (xfce4/xfce4-appfinder-4.12.0.tar.bz2) = 459338 diff --git a/misc/xfce4-appfinder/pkg-descr b/misc/xfce4-appfinder/pkg-descr index cb9be8a..39e1319 100644 --- a/misc/xfce4-appfinder/pkg-descr +++ b/misc/xfce4-appfinder/pkg-descr @@ -1,4 +1,4 @@ This application allows you to search, launch and find information about applications installed on your system. -WWW: http://docs.xfce.org/xfce4-appfinder/start +WWW: http://www.xfce.org/ diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist index afff15c..8cae807 100644 --- a/misc/xfce4-appfinder/pkg-plist +++ b/misc/xfce4-appfinder/pkg-plist @@ -1,5 +1,6 @@ bin/xfce4-appfinder bin/xfrun4 +share/appdata/xfce4-appfinder.appdata.xml share/applications/xfce4-appfinder.desktop share/applications/xfce4-run.desktop %%NLS%%share/locale/am/LC_MESSAGES/xfce4-appfinder.mo @@ -8,43 +9,36 @@ share/applications/xfce4-run.desktop %%NLS%%share/locale/be/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-appfinder.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo +%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-appfinder.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-appfinder.mo @@ -53,10 +47,12 @@ share/applications/xfce4-run.desktop %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-appfinder.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo @@ -64,4 +60,5 @@ share/applications/xfce4-run.desktop %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-appfinder.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile index f510d40..0ffd77a 100644 --- a/misc/xfce4-weather-plugin/Makefile +++ b/misc/xfce4-weather-plugin/Makefile @@ -3,6 +3,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} @@ -19,9 +20,9 @@ LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack libxml2 -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel OPTIONS_DEFINE= UPOWER UPOWER_DESC= Power management tasks diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile index 8ff40a2..523ecf3 100644 --- a/multimedia/xfce4-parole/Makefile +++ b/multimedia/xfce4-parole/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= parole -PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTVERSION= 0.8.0 CATEGORIES= multimedia xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/ DIST_SUBDIR= xfce4 @@ -17,35 +16,38 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ libnotify.so:${PORTSDIR}/devel/libnotify \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib - -PORTSCOUT= limit:^0\.6\. +RUN_DEPENDS= gnome-icon-theme-symbolic>=3.6:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-notify-plugin \ --enable-tray-plugin \ --enable-taglib \ + --disable-mpris2-plugin \ --without-html-dir -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= gtk20 glib20 intltool intlhack -USE_XFCE= configenv libmenu libutil +USE_GNOME= gtk30 glib20 intltool intlhack +USE_XFCE= panel USE_XORG= x11 sm USE_LDCONFIG= yes -USES= desktop-file-utils pkgconfig gmake libtool tar:bzip2 +USES= desktop-file-utils pkgconfig gmake libtool gettext-tools \ + xfce:gtk3 tar:bzip2 -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= CLUTTER NLS +# With some video cards, Parole displays a purple/pink overlay on the video +OPTIONS_EXCLUDE= CLUTTER OPTIONS_SINGLE= GSTREAMER # GST01 (GStreamer 0.10), GST10 (GStreamer 1.0) OPTIONS_SINGLE_GSTREAMER= GST01 GST10 OPTIONS_GROUP= GST_PLUG OPTIONS_GROUP_GST_PLUG= CDDA HTTP -OPTIONS_DEFAULT= GST01 NLS +# Since 0.5.91 release, GStreamer 1.0 is enabled by default +OPTIONS_DEFAULT= GST10 HTTP NLS CDDA_DESC= CD audio (cdparanoia) HTTP_DESC= HTTP streaming (libsoup) GST01_DESC= GStreamer 0.10 GST10_DESC= GStreamer 1.0 GST_PLUG_DESC= Additional GStreamer plugins +CLUTTER_DESC= Clutter (OpenGL) backend .include <bsd.port.options.mk> @@ -78,7 +80,7 @@ USE_GSTREAMER1+= soup .endif .if ${PORT_OPTIONS:MNLS} -USES+= gettext +USES+= gettext-runtime CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else @@ -86,6 +88,14 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif +.if ${PORT_OPTIONS:MCLUTTER} && ${PORT_OPTIONS:MGST10} +LIB_DEPENDS+= libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \ + libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 +CONFIGURE_ARGS+=--enable-clutter +.else +CONFIGURE_ARGS+=--disable-clutter +.endif + post-patch: # Fix .rc files path @${REINPLACE_CMD} -e 's|xfce4/src/misc|${PORTNAME}|g' \ diff --git a/multimedia/xfce4-parole/distinfo b/multimedia/xfce4-parole/distinfo index 88cbe90..ff23cc2 100644 --- a/multimedia/xfce4-parole/distinfo +++ b/multimedia/xfce4-parole/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/parole-0.5.4.tar.bz2) = c0f4bd7b45a016a0a84ec86336b912d0a12388e29c316beb86193ed7d2c3bfc3 -SIZE (xfce4/parole-0.5.4.tar.bz2) = 669806 +SHA256 (xfce4/parole-0.8.0.tar.bz2) = 2d966aeb426de81d992829e33b3f66185b19fd031a1891968b3a40d6d50239cc +SIZE (xfce4/parole-0.8.0.tar.bz2) = 813553 diff --git a/multimedia/xfce4-parole/pkg-plist b/multimedia/xfce4-parole/pkg-plist index e5b6d09..6e09c1e 100644 --- a/multimedia/xfce4-parole/pkg-plist +++ b/multimedia/xfce4-parole/pkg-plist @@ -9,13 +9,17 @@ include/parole/parole-stream.h include/parole/parole.h lib/parole-0/parole-notify.so lib/parole-0/tray-icon.so +share/appdata/parole.appdata.xml share/applications/parole.desktop share/icons/hicolor/16x16/apps/parole-extension.png +share/icons/hicolor/16x16/apps/parole-extension-symbolic.svg +share/icons/hicolor/128x128/apps/parole.png share/icons/hicolor/16x16/apps/parole.png share/icons/hicolor/24x24/apps/parole.png share/icons/hicolor/32x32/apps/parole.png share/icons/hicolor/48x48/apps/parole-extension.png share/icons/hicolor/48x48/apps/parole.png +share/icons/hicolor/64x64/apps/parole.png share/icons/hicolor/scalable/apps/parole.svg %%NLS%%share/locale/ar/LC_MESSAGES/parole.mo %%NLS%%share/locale/ast/LC_MESSAGES/parole.mo @@ -29,6 +33,7 @@ share/icons/hicolor/scalable/apps/parole.svg %%NLS%%share/locale/en_GB/LC_MESSAGES/parole.mo %%NLS%%share/locale/es/LC_MESSAGES/parole.mo %%NLS%%share/locale/eu/LC_MESSAGES/parole.mo +%%NLS%%share/locale/fi/LC_MESSAGES/parole.mo %%NLS%%share/locale/fr/LC_MESSAGES/parole.mo %%NLS%%share/locale/gl/LC_MESSAGES/parole.mo %%NLS%%share/locale/he/LC_MESSAGES/parole.mo @@ -42,8 +47,11 @@ share/icons/hicolor/scalable/apps/parole.svg %%NLS%%share/locale/kk/LC_MESSAGES/parole.mo %%NLS%%share/locale/lt/LC_MESSAGES/parole.mo %%NLS%%share/locale/lv/LC_MESSAGES/parole.mo +%%NLS%%share/locale/ms/LC_MESSAGES/parole.mo +%%NLS%%share/locale/nb/LC_MESSAGES/parole.mo %%NLS%%share/locale/nl/LC_MESSAGES/parole.mo %%NLS%%share/locale/nn/LC_MESSAGES/parole.mo +%%NLS%%share/locale/oc/LC_MESSAGES/parole.mo %%NLS%%share/locale/pl/LC_MESSAGES/parole.mo %%NLS%%share/locale/pt/LC_MESSAGES/parole.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/parole.mo @@ -52,12 +60,13 @@ share/icons/hicolor/scalable/apps/parole.svg %%NLS%%share/locale/sr/LC_MESSAGES/parole.mo %%NLS%%share/locale/sv/LC_MESSAGES/parole.mo %%NLS%%share/locale/te/LC_MESSAGES/parole.mo +%%NLS%%share/locale/th/LC_MESSAGES/parole.mo %%NLS%%share/locale/tr/LC_MESSAGES/parole.mo %%NLS%%share/locale/ug/LC_MESSAGES/parole.mo %%NLS%%share/locale/uk/LC_MESSAGES/parole.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/parole.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/parole.mo -%%DATADIR%%/gtk-2.0/parole.gtkrc %%DATADIR%%/parole-plugins-0/notify.desktop %%DATADIR%%/parole-plugins-0/system-tray.desktop +share/pixmaps/no-cover.png share/pixmaps/parole.png diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 061999e..c3fcfb2 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-print PORTVERSION= 4.6.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= print xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/archive/xfprint/${PORTVERSION:R} @@ -20,10 +20,10 @@ RUN_DEPENDS= a2ps:${PORTSDIR}/print/a2ps GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 +USES= gettext gmake libtool pathfix pkgconfig xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack USE_LDCONFIG= yes -USE_XFCE= configenv libgui libutil xfconf +USE_XFCE= libgui xfconf OPTIONS_DEFINE= LETTER OPTIONS_DEFAULT= LPR @@ -31,31 +31,12 @@ OPTIONS_SINGLE= PRINTMETHOD OPTIONS_SINGLE_PRINTMETHOD= LPR CUPS LETTER_DESC= Use letter paper format instead of A4 LPR_DESC= LPR printing system support - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCUPS} -CONFIGURE_ARGS+=--enable-cups -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -PLIST_SUB+= CUPS="" -.else -CONFIGURE_ARGS+=--disable-cups -PLIST_SUB+= CUPS="@comment " -.endif - -.if ${PORT_OPTIONS:MLPR} -CONFIGURE_ARGS+=--enable-bsdlpr --with-printcap=/etc/printcap -PLIST_SUB+= LPR="" -.else -CONFIGURE_ARGS+=--disable-bsdlpr -PLIST_SUB+= LPR="@comment " -.endif - -.if ${PORT_OPTIONS:MLETTER} -CONFIGURE_ARGS+=--enable-letter -.else -CONFIGURE_ARGS+=--disable-letter -.endif +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_CONFIGURE_ENABLE= cups +LPR_CONFIGURE_ENABLE= bsdlpr +LPR_CONFIGURE_WITH= printcap=/etc/printcap +LETTER_CONFIGURE_ENABLE= letter +OPTIONS_SUB= yes post-patch: @${REINPLACE_CMD} '/_LDADD =/s/=/= -lX11/' \ diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile index 371d409..5cdb85f 100644 --- a/science/xfce4-equake-plugin/Makefile +++ b/science/xfce4-equake-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-equake-plugin PORTVERSION= 1.3.6 +PORTREVISION= 1 CATEGORIES= science xfce MASTER_SITES= XFCE MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -15,9 +16,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -USES= gettext pkgconfig gmake tar:bzip2 +USES= gettext pkgconfig gmake xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libexo libmenu libutil panel +USE_XFCE= panel USE_XORG= x11 INSTALLS_ICONS= yes diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile index 0ce5ee9..9874160 100644 --- a/sysutils/garcon/Makefile +++ b/sysutils/garcon/Makefile @@ -2,28 +2,29 @@ # $FreeBSD$ PORTNAME= garcon -PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTVERSION= 0.4.0 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org -COMMENT= Xfce 4 essential utilities and scripts +COMMENT= Freedesktop compliant menu library + +# garcon's source code is licensed under GPLv2, while its +# documentation is under GFDL 1.1. +LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gmake libtool pathfix pkgconfig tar:bzip2 -USE_GNOME= glib20 intltool intlhack -USE_XFCE= configenv libutil - -OPTIONS_DEFINE= DOCS NLS -OPTIONS_SUB= yes +USES= gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2 +USE_GNOME= glib20 gtk20 intltool intlhack +USE_XFCE= libmenu -DOCS_CONFIGURE_ENABLE= gtk-doc-html +CONFIGURE_ARGS=--without-html-dir +OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/sysutils/garcon/distinfo b/sysutils/garcon/distinfo index 431e598..11dc61e 100644 --- a/sysutils/garcon/distinfo +++ b/sysutils/garcon/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/garcon-0.2.1.tar.bz2) = 48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7 -SIZE (xfce4/garcon-0.2.1.tar.bz2) = 454321 +SHA256 (xfce4/garcon-0.4.0.tar.bz2) = 787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972 +SIZE (xfce4/garcon-0.4.0.tar.bz2) = 466118 diff --git a/sysutils/garcon/pkg-plist b/sysutils/garcon/pkg-plist index fb4a98d..b1496d1 100644 --- a/sysutils/garcon/pkg-plist +++ b/sysutils/garcon/pkg-plist @@ -14,10 +14,16 @@ include/garcon-1/garcon/garcon-menu-separator.h include/garcon-1/garcon/garcon-menu-tree-provider.h include/garcon-1/garcon/garcon-menu.h include/garcon-1/garcon/garcon.h +include/garcon-gtk2-1/garcon-gtk/garcon-gtk-menu.h +include/garcon-gtk2-1/garcon-gtk/garcon-gtk.h lib/libgarcon-1.so lib/libgarcon-1.so.0 lib/libgarcon-1.so.0.0.0 +lib/libgarcon-gtk2-1.so +lib/libgarcon-gtk2-1.so.0 +lib/libgarcon-gtk2-1.so.0.0.0 libdata/pkgconfig/garcon-1.pc +libdata/pkgconfig/garcon-gtk2-1.pc share/desktop-directories/xfce-accessories.directory share/desktop-directories/xfce-development.directory share/desktop-directories/xfce-education.directory @@ -32,35 +38,8 @@ share/desktop-directories/xfce-personal.directory share/desktop-directories/xfce-screensavers.directory share/desktop-directories/xfce-settings.directory share/desktop-directories/xfce-system.directory -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenu.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuDirectory.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuElement.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuItem.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuItemCache.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuMerger.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuParser.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuSeparator.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-GarconMenuTreeProvider.html -%%PORTDOCS%%share/gtk-doc/html/garcon/api-index-full.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-Desktop-Environment-Configuration.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-Version-Information.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-garcon-menu-item-pool.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-garcon-menu-node.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-garcon.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-menus.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-miscellaneous.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon-parsing.html -%%PORTDOCS%%share/gtk-doc/html/garcon/garcon.devhelp2 -%%PORTDOCS%%share/gtk-doc/html/garcon/home.png -%%PORTDOCS%%share/gtk-doc/html/garcon/index.html -%%PORTDOCS%%share/gtk-doc/html/garcon/index.sgml -%%PORTDOCS%%share/gtk-doc/html/garcon/left.png -%%PORTDOCS%%share/gtk-doc/html/garcon/object-tree.html -%%PORTDOCS%%share/gtk-doc/html/garcon/pt01.html -%%PORTDOCS%%share/gtk-doc/html/garcon/right.png -%%PORTDOCS%%share/gtk-doc/html/garcon/style.css -%%PORTDOCS%%share/gtk-doc/html/garcon/up.png %%NLS%%share/locale/ar/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/ast/LC_MESSAGES/garcon.mo %%NLS%%share/locale/bg/LC_MESSAGES/garcon.mo %%NLS%%share/locale/bn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ca/LC_MESSAGES/garcon.mo @@ -68,9 +47,11 @@ share/desktop-directories/xfce-system.directory %%NLS%%share/locale/da/LC_MESSAGES/garcon.mo %%NLS%%share/locale/de/LC_MESSAGES/garcon.mo %%NLS%%share/locale/el/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/garcon.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/garcon.mo %%NLS%%share/locale/eo/LC_MESSAGES/garcon.mo %%NLS%%share/locale/es/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/et/LC_MESSAGES/garcon.mo %%NLS%%share/locale/eu/LC_MESSAGES/garcon.mo %%NLS%%share/locale/fi/LC_MESSAGES/garcon.mo %%NLS%%share/locale/fr/LC_MESSAGES/garcon.mo @@ -86,15 +67,15 @@ share/desktop-directories/xfce-system.directory %%NLS%%share/locale/ko/LC_MESSAGES/garcon.mo %%NLS%%share/locale/lt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/lv/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/ms/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nb/LC_MESSAGES/garcon.mo -%%NLS%%share/locale/nb_NO/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/nn/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/oc/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pa/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pl/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pt/LC_MESSAGES/garcon.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/garcon.mo -%%NLS%%share/locale/pt_PT/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ro/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ru/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sk/LC_MESSAGES/garcon.mo @@ -103,9 +84,12 @@ share/desktop-directories/xfce-system.directory %%NLS%%share/locale/sr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/sv/LC_MESSAGES/garcon.mo %%NLS%%share/locale/te/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/th/LC_MESSAGES/garcon.mo %%NLS%%share/locale/tr/LC_MESSAGES/garcon.mo %%NLS%%share/locale/ug/LC_MESSAGES/garcon.mo %%NLS%%share/locale/uk/LC_MESSAGES/garcon.mo -%%NLS%%share/locale/ur/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/uz/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/uz@Latn/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/garcon.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/garcon.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/garcon.mo diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile index 2d043dc..cc644b6 100644 --- a/sysutils/gigolo/Makefile +++ b/sysutils/gigolo/Makefile @@ -3,6 +3,7 @@ PORTNAME= gigolo PORTVERSION= 0.4.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= XFCE MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -14,7 +15,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -USES= gmake fuse pkgconfig tar:bzip2 +USES= gmake fuse pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= cairo gtk20 gvfs intlhack USE_XORG= x11 GNU_CONFIGURE= yes @@ -25,7 +26,7 @@ OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext +NLS_USES= gettext-runtime ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Does not compile diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile index c3eaad5..7086ec2 100644 --- a/sysutils/xfburn/Makefile +++ b/sysutils/xfburn/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} @@ -20,24 +20,17 @@ RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao GNU_CONFIGURE= yes USE_GNOME= intltool intlhack glib20 gtk20 -USE_XFCE= configenv libexo libmenu -USES= pkgconfig gmake desktop-file-utils tar:bzip2 +USE_XFCE= libexo +USES= pkgconfig gmake desktop-file-utils gettext-tools xfce tar:bzip2 INSTALLS_ICONS= yes CONFIGURE_ARGS=--disable-gudev OPTIONS_DEFINE= GSTREAMER NLS OPTIONS_SUB= yes -NLS_USES= gettext +NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGSTREAMER} -USE_GSTREAMER= yes -CONFIGURE_ARGS+=--enable-gstreamer -.else -CONFIGURE_ARGS+=--disable-gstreamer -.endif +GSTREAMER_USE= gstreamer=yes +GSTREAMER_CONFIGURE_ENABLE= gstreamer .include <bsd.port.mk> diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile index 077e680..7495872 100644 --- a/sysutils/xfce4-battery-plugin/Makefile +++ b/sysutils/xfce4-battery-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-battery-plugin PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -20,22 +20,14 @@ SSP_UNSAFE= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= alias gmake libtool pkgconfig tar:bzip2 +USES= alias gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= gtk20 glib20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= NLS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/sysutils/xfce4-bsdcpufreq-plugin/Makefile b/sysutils/xfce4-bsdcpufreq-plugin/Makefile index b2317ac..04bb7a0 100644 --- a/sysutils/xfce4-bsdcpufreq-plugin/Makefile +++ b/sysutils/xfce4-bsdcpufreq-plugin/Makefile @@ -4,7 +4,9 @@ PORTNAME= xfce4-bsdcpufreq-plugin PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= sysutils xfce +MASTER_SITES= GH GHC MAINTAINER= riggs@FreeBSD.org COMMENT= Displays the current CPU clock frequency in the panel @@ -19,11 +21,8 @@ GH_TAGNAME= ${GH_COMMIT} USE_GNOME= gtk20 -USES= pkgconfig - -LIB_DEPENDS+= libxfce4util.so:${PORTSDIR}/x11/libxfce4util \ - libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel \ - libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu +USES= pkgconfig xfce +USE_XFCE= panel PLIST_FILES= lib/xfce4/panel/plugins/libbsdcpufreq.so \ share/xfce4/panel/plugins/bsdcpufreq.desktop diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile index dce6d78..27e1eed 100644 --- a/sysutils/xfce4-diskperf-plugin/Makefile +++ b/sysutils/xfce4-diskperf-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-diskperf-plugin -PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTVERSION= 2.5.5 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -15,16 +14,16 @@ COMMENT= Graphical representation of the disk IO GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu panel +USE_XFCE= panel LIBS+= -ldevstat OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext +NLS_USES= gettext-runtime .include <bsd.port.options.mk> diff --git a/sysutils/xfce4-diskperf-plugin/distinfo b/sysutils/xfce4-diskperf-plugin/distinfo index 11fceb8..6ce2b94 100644 --- a/sysutils/xfce4-diskperf-plugin/distinfo +++ b/sysutils/xfce4-diskperf-plugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-diskperf-plugin-2.5.4.tar.bz2) = aab6b9c4e2f78620920efac6874c4edf426f05b63b94cfda0da8c99a91110a0b -SIZE (xfce4/xfce4-diskperf-plugin-2.5.4.tar.bz2) = 321974 +SHA256 (xfce4/xfce4-diskperf-plugin-2.5.5.tar.bz2) = cbeb0c00f97362eef3f135afb77947aef73e938bae0386250a122ac6644b521b +SIZE (xfce4/xfce4-diskperf-plugin-2.5.5.tar.bz2) = 321446 diff --git a/sysutils/xfce4-diskperf-plugin/files/patch-panel-plugin__devperf.c b/sysutils/xfce4-diskperf-plugin/files/patch-panel-plugin__devperf.c deleted file mode 100644 index c4199f4..0000000 --- a/sysutils/xfce4-diskperf-plugin/files/patch-panel-plugin__devperf.c +++ /dev/null @@ -1,96 +0,0 @@ ---- panel-plugin/devperf.c.orig 2012-04-03 13:22:41 UTC -+++ panel-plugin/devperf.c -@@ -225,6 +225,93 @@ - - /************************** Linux End ***************/ - -+#elif defined(__FreeBSD__) -+ -+#include <sys/disk.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <sys/types.h> -+#include <sys/errno.h> -+#include <sys/resource.h> -+#include <sys/time.h> -+#include <devstat.h> -+#include <fcntl.h> -+#include <limits.h> -+#include <string.h> -+#include <syslog.h> -+#include <stdarg.h> -+ -+#define MAXNAMELEN 256 -+ -+struct statinfo stats; -+struct devinfo dinfo; -+ -+int DevPerfInit () -+{ -+ stats.dinfo = &dinfo; -+ -+ return (0); -+} -+ -+int DevCheckStatAvailability(char const **strptr) -+{ -+ return (0); -+} -+ -+int DevGetPerfData (const void *p_pvDevice, struct devperf_t *perf) -+{ -+ struct timeval tv; -+ struct timespec ts; -+ struct devstat dev; -+ kvm_t *kd = NULL; -+ int i, found = 0; -+ char *check_dev = (char *) p_pvDevice; -+ -+ if(devstat_getdevs(kd, &stats) == -1) { -+ syslog(0, "DISKPERF: getdevs fail"); -+ } -+ -+ for(found = 0, i = 0; i < (stats.dinfo)->numdevs; i++) { -+ char dev_name[MAXNAMELEN]; -+ dev = (stats.dinfo)->devices[i]; -+ snprintf(dev_name, MAXNAMELEN-1, "%s%d", -+ dev.device_name, dev.unit_number); -+ if ((check_dev != NULL) && (strcmp(check_dev, dev_name) != 0)) -+ continue; -+ else { -+ found = 1; -+ break; -+ } -+ -+ } -+ -+ if(check_dev != NULL && found) { -+ perf->wbytes = dev.bytes[DEVSTAT_WRITE]; -+ perf->rbytes = dev.bytes[DEVSTAT_READ]; -+ gettimeofday (&tv, 0); -+ perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * -+ tv.tv_sec + 1000ull * tv.tv_usec; -+ perf->qlen = dev.start_count - dev.end_count; -+ // I'm not sure about rbusy and wbusy calculation -+ bintime2timespec(&dev.busy_time, &ts); -+ perf->rbusy_ns = (uint64_t) ts.tv_nsec; -+ perf->wbusy_ns = perf->rbusy_ns; -+ } -+ -+ return (0); -+} -+ -+#if 0 /* Standalone test purpose */ -+int main () -+{ -+ struct devperf_t oPerf; -+ DevGetPerfData ((void*)"ada0", &oPerf); -+ printf ("%lu\t%lu\n", oPerf.rbytes, oPerf.wbytes); -+ return (0); -+} -+#endif -+ -+ - - #elif defined(__NetBSD__) - /**************************************************************/ diff --git a/sysutils/xfce4-diskperf-plugin/files/patch-panel-plugin__main.c b/sysutils/xfce4-diskperf-plugin/files/patch-panel-plugin__main.c deleted file mode 100644 index f02368c..0000000 --- a/sysutils/xfce4-diskperf-plugin/files/patch-panel-plugin__main.c +++ /dev/null @@ -1,75 +0,0 @@ ---- ./panel-plugin/main.c.orig 2012-06-23 05:02:16.000000000 -0300 -+++ ./panel-plugin/main.c 2013-09-11 17:44:45.000000000 -0300 -@@ -86,7 +86,7 @@ - typedef struct param_t { - /* Configurable parameters */ - char acDevice[64]; --#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) - dev_t st_rdev; - #endif - int fTitleDisplayed; -@@ -172,7 +172,7 @@ - struct param_t *poConf = &(p_poPlugin->oConf.oParam); - struct monitor_t *poMonitor = &(p_poPlugin->oMonitor); - struct perfbar_t *poPerf = poMonitor->aoPerfBar; --#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) - struct stat oStat; - #endif - uint64_t iInterval_ns, rbytes, wbytes, iRBusy_ns, iWBusy_ns; -@@ -185,7 +185,7 @@ - rbytes = wbytes = iRBusy_ns = iWBusy_ns = -1; - memset (&oPerf, 0, sizeof (oPerf)); - oPerf.qlen = -1; --#if defined (__NetBSD__) || defined(__OpenBSD__) || defined(__sun__) -+#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) || defined(__sun__) - status = DevGetPerfData (poConf->acDevice, &oPerf); - #else - if (poConf->st_rdev == 0) -@@ -429,7 +429,7 @@ - struct diskperf_t *poPlugin; - struct param_t *poConf; - struct monitor_t *poMonitor; --#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) - struct stat oStat; - int status; - #endif -@@ -444,6 +444,9 @@ - #if defined(__NetBSD__) || defined(__OpenBSD__) - strncpy (poConf->acDevice, "wd0", 64); - strncpy (poConf->acTitle, "wd0", 16); -+#elif defined(__FreeBSD__) -+ strncpy (poConf->acDevice, "ada0", 64); -+ strncpy (poConf->acTitle, "ada0", 16); - #elif defined(__sun__) - strncpy (poConf->acDevice, "sd0", 64); - strncpy (poConf->acTitle, "sd0", 16); -@@ -517,7 +520,7 @@ - struct param_t *poConf = &(poPlugin->oConf.oParam); - struct monitor_t *poMonitor = &(poPlugin->oMonitor); - Widget_t *pw2ndBar = poPlugin->oMonitor.awProgressBar + 1; --#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) - struct stat oStat; - int status; - #endif -@@ -534,7 +537,7 @@ - if ((value = xfce_rc_read_entry (rc, (CONF_DEVICE), NULL))) { - memset (poConf->acDevice, 0, sizeof (poConf->acDevice)); - strncpy (poConf->acDevice, value, sizeof (poConf->acDevice) - 1); --#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) - status = stat (poConf->acDevice, &oStat); - poConf->st_rdev = (status == -1 ? 0 : oStat.st_rdev); - #endif -@@ -666,7 +669,7 @@ - struct diskperf_t *poPlugin = (diskperf_t *) p_pvPlugin; - struct param_t *poConf = &(poPlugin->oConf.oParam); - const char *pcDevice = gtk_entry_get_text (GTK_ENTRY (p_wTF)); --#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__) - struct stat oStat; - int status; - diff --git a/sysutils/xfce4-diskperf-plugin/pkg-plist b/sysutils/xfce4-diskperf-plugin/pkg-plist index 49df433..ea1695f 100644 --- a/sysutils/xfce4-diskperf-plugin/pkg-plist +++ b/sysutils/xfce4-diskperf-plugin/pkg-plist @@ -3,14 +3,17 @@ lib/xfce4/panel/plugins/libdiskperf.so %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-diskperf-plugin.mo @@ -18,8 +21,10 @@ lib/xfce4/panel/plugins/libdiskperf.so %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-diskperf-plugin.mo @@ -27,7 +32,9 @@ lib/xfce4/panel/plugins/libdiskperf.so %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-diskperf-plugin.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-diskperf-plugin.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-diskperf-plugin.mo diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile index f4a2a64..4725bcd 100644 --- a/sysutils/xfce4-fsguard-plugin/Makefile +++ b/sysutils/xfce4-fsguard-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-fsguard-plugin -PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTVERSION= 1.0.2 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -15,24 +14,18 @@ COMMENT= Panel plugin which displays free space of mountpoint GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel USE_XORG= x11 OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - post-patch: .if empty(PORT_OPTIONS:MNLS) @${REINPLACE_CMD} -e 's| po||' ${WRKSRC}/Makefile.in diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo index f75f3cc..df0e317 100644 --- a/sysutils/xfce4-fsguard-plugin/distinfo +++ b/sysutils/xfce4-fsguard-plugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-fsguard-plugin-1.0.1.tar.bz2) = fffb7ee09769ec0b991b8752b848578e6434a675a939c5588f0728c2ef33aab7 -SIZE (xfce4/xfce4-fsguard-plugin-1.0.1.tar.bz2) = 356783 +SHA256 (xfce4/xfce4-fsguard-plugin-1.0.2.tar.bz2) = a2c8d59386ae3d23cf6bdd06a1cdd7a1b9473cf6f38ae106600b194c601040ae +SIZE (xfce4/xfce4-fsguard-plugin-1.0.2.tar.bz2) = 356715 diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist index 159cc4b..ef9f964 100644 --- a/sysutils/xfce4-fsguard-plugin/pkg-plist +++ b/sysutils/xfce4-fsguard-plugin/pkg-plist @@ -22,11 +22,13 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-warning.svg share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-fsguard-plugin.mo @@ -36,22 +38,28 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/is/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-fsguard-plugin.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-fsguard-plugin.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-fsguard-plugin.mo diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile index 87948f6..a261a9e 100644 --- a/sysutils/xfce4-genmon-plugin/Makefile +++ b/sysutils/xfce4-genmon-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-genmon-plugin PORTVERSION= 3.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -16,9 +16,9 @@ LICENSE= LGPL21 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu panel +USE_XFCE= panel WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile index 75ffe7a..37a041a 100644 --- a/sysutils/xfce4-minicmd-plugin/Makefile +++ b/sysutils/xfce4-minicmd-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-minicmd-plugin PORTVERSION= 0.4 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= sysutils xfce MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/ DIST_SUBDIR= xfce4 @@ -12,8 +12,10 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Displays a mini-command line on the xfce4-panel GNU_CONFIGURE= yes -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= libgui configenv panel +USE_XFCE= libgui panel + +CONFIGURE_ARGS=--disable-static .include <bsd.port.mk> diff --git a/sysutils/xfce4-minicmd-plugin/pkg-plist b/sysutils/xfce4-minicmd-plugin/pkg-plist index 671c694..2671058 100644 --- a/sysutils/xfce4-minicmd-plugin/pkg-plist +++ b/sysutils/xfce4-minicmd-plugin/pkg-plist @@ -1,3 +1,2 @@ -lib/xfce4/panel-plugins/libminicmd.a lib/xfce4/panel-plugins/libminicmd.so share/xfce4/panel-plugins/minicmd.desktop diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile index df0e262..5bd3c43 100644 --- a/sysutils/xfce4-mount-plugin/Makefile +++ b/sysutils/xfce4-mount-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-mount-plugin PORTVERSION= 0.6.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -17,9 +17,9 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= intltool intlhack USE_LDCONFIG= yes -USE_XFCE= configenv libmenu panel +USE_XFCE= panel .include <bsd.port.mk> diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile index cb32aa0..afd5deb 100644 --- a/sysutils/xfce4-netload-plugin/Makefile +++ b/sysutils/xfce4-netload-plugin/Makefile @@ -3,6 +3,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} @@ -16,15 +17,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USE_GNOME= intltool intlhack -USE_XFCE= configenv libmenu panel -USES= gmake pkgconfig libtool tar:bzip2 +USE_XFCE= panel +USES= gmake pkgconfig libtool gettext-tools xfce tar:bzip2 INSTALLS_ICONS= yes OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext +NLS_USES= gettext-runtime .include <bsd.port.options.mk> diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index 1758659..5967168 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -2,27 +2,30 @@ # $FreeBSD$ PORTNAME= xfce4-power-manager -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.3 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Power manager for the Xfce Desktop +LICENSE= GPLv2 + LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit + libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ + libupower-glib.so:${PORTSDIR}/sysutils/upower GNU_CONFIGURE= yes -USES= gettext pkgconfig gmake tar:bzip2 +USES= gettext pkgconfig gmake libtool xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libutil libmenu panel xfconf +USE_XFCE= panel INSTALLS_ICONS= yes -USE_XORG= xrandr x11 xext +USE_XORG= xrandr x11 xext xtst xscrnsaver CONFIGURE_ARGS= --disable-network-manager \ - --enable-polkit + --enable-polkit \ + --enable-xfce4panel \ + --disable-lxdepanel .include <bsd.port.mk> diff --git a/sysutils/xfce4-power-manager/distinfo b/sysutils/xfce4-power-manager/distinfo index ab8dac7..2b07b52 100644 --- a/sysutils/xfce4-power-manager/distinfo +++ b/sysutils/xfce4-power-manager/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-power-manager-1.2.0.tar.bz2) = d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9 -SIZE (xfce4/xfce4-power-manager-1.2.0.tar.bz2) = 1034821 +SHA256 (xfce4/xfce4-power-manager-1.4.3.tar.bz2) = 018e11dd315745f582d70108b6071d37fb94854fde70961e17325bc19c4e2011 +SIZE (xfce4/xfce4-power-manager-1.4.3.tar.bz2) = 1138831 diff --git a/sysutils/xfce4-power-manager/files/patch-config.h.in b/sysutils/xfce4-power-manager/files/patch-config.h.in new file mode 100644 index 0000000..e1d331f --- /dev/null +++ b/sysutils/xfce4-power-manager/files/patch-config.h.in @@ -0,0 +1,28 @@ +--- config.h.in.orig 2014-12-01 11:37:05 UTC ++++ config.h.in +@@ -60,6 +60,12 @@ + /* Define if libxfce4panel-1.0 >= libxfce4panel_minimum_version present */ + #undef HAVE_LIBXFCE4PANEL + ++/* Define to 1 if you have the `Xss' library (-lXss). */ ++#undef HAVE_LIBXSS ++ ++/* Define to 1 if you have the `Xtst' library (-lXtst). */ ++#undef HAVE_LIBXTST ++ + /* Define to 1 if you have the <locale.h> header file. */ + #undef HAVE_LOCALE_H + +@@ -132,6 +138,12 @@ + /* Define to 1 if you have the <unistd.h> header file. */ + #undef HAVE_UNISTD_H + ++/* Define to 1 if you have the <X11/extensions/scrnsaver.h> header file. */ ++#undef HAVE_X11_EXTENSIONS_SCRNSAVER_H ++ ++/* Define to 1 if you have the <X11/extensions/XTest.h> header file. */ ++#undef HAVE_X11_EXTENSIONS_XTEST_H ++ + /* Define if XF86XK_Hibernate is available */ + #undef HAVE_XF86XK_HIBERNATE + diff --git a/sysutils/xfce4-power-manager/files/patch-configure b/sysutils/xfce4-power-manager/files/patch-configure new file mode 100644 index 0000000..88f6447 --- /dev/null +++ b/sysutils/xfce4-power-manager/files/patch-configure @@ -0,0 +1,117 @@ +--- configure.orig 2014-12-01 11:37:01 UTC ++++ configure +@@ -13481,7 +13481,8 @@ fi + for ac_header in errno.h signal.h stddef.h sys/types.h memory.h stdlib.h \ + string.h sys/stat.h sys/user.h sys/wait.h time.h math.h \ + unistd.h sys/resource.h sys/socket.h sys/sysctl.h fcntl.h \ +- sys/param.h procfs.h ++ sys/param.h procfs.h X11/extensions/scrnsaver.h \ ++ X11/extensions/XTest.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +@@ -13558,6 +13559,104 @@ fi + + + # ===================================================== # ++# Check for XScreenSaverSuspend # ++# ===================================================== # ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverSuspend in -lXss" >&5 ++$as_echo_n "checking for XScreenSaverSuspend in -lXss... " >&6; } ++if ${ac_cv_lib_Xss_XScreenSaverSuspend+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXss $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XScreenSaverSuspend (); ++int ++main () ++{ ++return XScreenSaverSuspend (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_Xss_XScreenSaverSuspend=yes ++else ++ ac_cv_lib_Xss_XScreenSaverSuspend=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverSuspend" >&5 ++$as_echo "$ac_cv_lib_Xss_XScreenSaverSuspend" >&6; } ++if test "x$ac_cv_lib_Xss_XScreenSaverSuspend" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBXSS 1 ++_ACEOF ++ ++ LIBS="-lXss $LIBS" ++ ++fi ++ ++ ++# ===================================================== # ++# Check for XTestFakeKeyEvent # ++# ===================================================== # ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTestFakeKeyEvent in -lXtst" >&5 ++$as_echo_n "checking for XTestFakeKeyEvent in -lXtst... " >&6; } ++if ${ac_cv_lib_Xtst_XTestFakeKeyEvent+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXtst $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XTestFakeKeyEvent (); ++int ++main () ++{ ++return XTestFakeKeyEvent (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_Xtst_XTestFakeKeyEvent=yes ++else ++ ac_cv_lib_Xtst_XTestFakeKeyEvent=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5 ++$as_echo "$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; } ++if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBXTST 1 ++_ACEOF ++ ++ LIBS="-lXtst $LIBS" ++ ++fi ++ ++ ++# ===================================================== # + # Check for i18n support # + # ===================================================== # + diff --git a/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_xfce_xfce-power-manager-plugin.c b/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_xfce_xfce-power-manager-plugin.c new file mode 100644 index 0000000..67f3c67 --- /dev/null +++ b/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_xfce_xfce-power-manager-plugin.c @@ -0,0 +1,19 @@ +--- panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c.orig 2014-08-20 20:18:43 UTC ++++ panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c +@@ -33,6 +33,7 @@ + #ifdef XFCE_PLUGIN + #include <libxfce4panel/libxfce4panel.h> + #include <libxfce4panel/xfce-panel-plugin.h> ++#include <libxfce4util/libxfce4util.h> + #endif + + #include "../power-manager-button.h" +@@ -84,6 +85,8 @@ power_manager_plugin_construct (XfcePane + { + PowerManagerPlugin *power_manager_plugin; + ++ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); ++ + /* create the plugin */ + power_manager_plugin = power_manager_plugin_new (plugin); + diff --git a/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.c b/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.c deleted file mode 100644 index 79bf555..0000000 --- a/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.c +++ /dev/null @@ -1,45 +0,0 @@ ---- ./src/xfpm-battery.c.orig 2011-02-15 08:58:47.000000000 -0500 -+++ ./src/xfpm-battery.c 2011-05-29 14:46:28.720111315 -0400 -@@ -144,6 +144,8 @@ - visible = FALSE; - else visible = TRUE; - } -+ if ( battery->priv->state == XFPM_DEVICE_STATE_UNKNOWN ) -+ visible = FALSE; - - XFPM_DEBUG_ENUM (show_icon, XFPM_TYPE_SHOW_ICON, "visible=%s", xfpm_bool_to_string (visible)); - -@@ -537,13 +539,18 @@ - } - - state = g_value_get_uint (value); -+ - if ( state != battery->priv->state ) - { - battery->priv->state = state; - xfpm_battery_refresh_visible (battery); - xfpm_battery_notify_state (battery); - } -- -+ else { -+ if ( battery->priv->state == XFPM_DEVICE_STATE_UNKNOWN ) -+ goto out; -+ } -+ - value = g_hash_table_lookup (props, "Percentage"); - - if ( value == NULL ) -@@ -896,6 +903,13 @@ - return battery->priv->battery_name; - } - -+XfpmDeviceState xfpm_battery_get_device_state (XfpmBattery *battery) -+{ -+ g_return_val_if_fail (XFPM_IS_BATTERY (battery), XFPM_DEVICE_STATE_UNKNOWN); -+ -+ return battery->priv->state; -+} -+ - gchar *xfpm_battery_get_time_left (XfpmBattery *battery) - { - g_return_val_if_fail (XFPM_IS_BATTERY (battery), NULL); diff --git a/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.h b/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.h deleted file mode 100644 index bdb17c1..0000000 --- a/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/xfpm-battery.h.orig 2011-02-15 04:53:05.000000000 -0500 -+++ ./src/xfpm-battery.h 2011-05-29 14:46:28.721112321 -0400 -@@ -62,6 +62,8 @@ - - XfpmDeviceType xfpm_battery_get_device_type (XfpmBattery *battery); - -+XfpmDeviceState xfpm_battery_get_device_state (XfpmBattery *battery); -+ - XfpmBatteryCharge xfpm_battery_get_charge (XfpmBattery *battery); - - const gchar *xfpm_battery_get_battery_name(XfpmBattery *battery); diff --git a/sysutils/xfce4-power-manager/files/patch-src__xfpm-power.c b/sysutils/xfce4-power-manager/files/patch-src__xfpm-power.c deleted file mode 100644 index 1727738..0000000 --- a/sysutils/xfce4-power-manager/files/patch-src__xfpm-power.c +++ /dev/null @@ -1,56 +0,0 @@ ---- ./src/xfpm-power.c.orig 2011-02-15 15:30:04.000000000 -0500 -+++ ./src/xfpm-power.c 2011-05-29 19:25:21.634588113 -0400 -@@ -1028,6 +1028,9 @@ - g_signal_connect (battery, "battery-charge-changed", - G_CALLBACK (xfpm_power_battery_charge_changed_cb), power); - -+ g_signal_connect_swapped (battery, "battery-charge-changed", -+ G_CALLBACK (xfpm_power_refresh_adaptor_visible), power); -+ - xfpm_power_refresh_adaptor_visible (power); - } - else if ( device_type != XFPM_DEVICE_TYPE_LINE_POWER ) -@@ -1144,6 +1147,11 @@ - xfpm_power_refresh_adaptor_visible (XfpmPower *power) - { - XfpmShowIcon show_icon; -+ XfpmDeviceState state; -+ GtkStatusIcon *battery = NULL; -+ gboolean show_adapter_icon; -+ guint i, len; -+ GList *list; - - g_object_get (G_OBJECT (power->priv->conf), - SHOW_TRAY_ICON_CFG, &show_icon, -@@ -1153,8 +1161,30 @@ - - if ( show_icon == SHOW_ICON_ALWAYS ) - { -- if ( g_hash_table_size (power->priv->hash) == 0 ) -+ show_adapter_icon = TRUE; -+ if ( g_hash_table_size (power->priv->hash) != 0 ) - { -+ /* -+ * Make sure that a least one battery has a valid state before disabling -+ * the adapter icon. -+ */ -+ list = g_hash_table_get_values (power->priv->hash); -+ len = g_list_length (list); -+ -+ for ( i = 0; i < len; i++) -+ { -+ battery = g_list_nth_data (list, i); -+ state = xfpm_battery_get_device_state(XFPM_BATTERY (battery)); -+ if ( state != XFPM_DEVICE_STATE_UNKNOWN ) -+ { -+ show_adapter_icon = FALSE; -+ break; -+ } -+ } -+ } -+ -+ if ( show_adapter_icon ) -+ { - xfpm_power_show_adapter_icon (power); - #if GTK_CHECK_VERSION (2, 16, 0) - gtk_status_icon_set_tooltip_text (power->priv->adapter_icon, diff --git a/sysutils/xfce4-power-manager/files/patch-src_xfpm-power.c b/sysutils/xfce4-power-manager/files/patch-src_xfpm-power.c new file mode 100644 index 0000000..122c2b8 --- /dev/null +++ b/sysutils/xfce4-power-manager/files/patch-src_xfpm-power.c @@ -0,0 +1,206 @@ +From: Eric Koegel <eric.koegel@gmail.com> +Date: Mon, 1 Sep 2014 20:19:15 +0300 +Subject: [PATCH] Use XScreenSaverSuspend and XTestFakeKeyEvent (Bug 11083) + +--- src/xfpm-power.c.orig 2014-12-01 11:33:52 UTC ++++ src/xfpm-power.c +@@ -63,6 +63,13 @@ + #include "xfpm-suspend.h" + #include "xfpm-brightness.h" + ++#ifdef HAVE_LIBXTST ++#include "X11/extensions/XTest.h" ++#endif ++ ++#ifdef HAVE_LIBXSS ++#include <X11/extensions/scrnsaver.h> ++#endif /* HAVE_LIBXSS */ + + static void xfpm_power_finalize (GObject *object); + +@@ -112,6 +119,8 @@ struct XfpmPowerPrivate + EggIdletime *idletime; + + gboolean inhibited; ++ gboolean screensaver_inhibited; ++ gulong screensaver_id; + + XfpmNotify *notify; + #ifdef ENABLE_POLKIT +@@ -886,10 +895,106 @@ xfpm_power_remove_device (XfpmPower *pow + g_hash_table_remove (power->priv->hash, object_path); + } + ++static gboolean ++idle_reset_screen_saver (XfpmPower *power) ++{ ++ Display *dpy = gdk_x11_get_default_xdisplay (); ++ ++ TRACE("entering"); ++ ++ XResetScreenSaver (dpy); ++ ++#ifdef HAVE_LIBXTST ++ /* keycode of 255 does not map to any actual key, ++ * this works for xscreensaver */ ++ XTestFakeKeyEvent (dpy, 255, TRUE, 0); ++ XTestFakeKeyEvent (dpy, 255, FALSE, 0); ++#endif /* HAVE_LIBXTST */ ++ ++ XFlush (dpy); ++ ++ /* continue until we're removed */ ++ return TRUE; ++} ++ ++static void ++screen_saver_suspend(XfpmPower *power, gboolean suspend) ++{ ++#ifndef HAVE_LIBXSS ++ TRACE("!HAVE_XSS"); ++#else ++ int event, dummy, major, minor; ++ Display *dpy = gdk_x11_get_default_xdisplay(); ++ ++ TRACE("entering"); ++ ++ if (XScreenSaverQueryExtension(dpy, &event, &dummy) != TRUE || ++ XScreenSaverQueryVersion(dpy, &major, &minor) != TRUE) ++ { ++ XFPM_DEBUG ("XScreenSaverQueryExtension or XScreenSaverQueryVersion call failed"); ++ } ++ ++ /* XScreenSaverSuspend was introduced in MIT-SCREEN-SAVER 1.1 */ ++ if (major < 1 || (major == 1 && minor < 1)) ++ { ++ XFPM_DEBUG ("version %d.%d not supported", major, minor); ++ } ++ ++ XFPM_DEBUG ("XScreenSaverSuspend: %s", suspend ? "TRUE" : "FALSE"); ++ XScreenSaverSuspend(dpy, suspend); ++#endif /* HAVE_LIBXSS */ ++ ++ if (power->priv->screensaver_id != 0) ++ { ++ g_source_remove (power->priv->screensaver_id); ++ power->priv->screensaver_id = 0; ++ } ++ ++ if (suspend) ++ { ++ /* Reset the screensaver timers every so often so they don't activate */ ++ power->priv->screensaver_id = g_timeout_add_seconds (20, ++ (GSourceFunc)idle_reset_screen_saver, ++ power); ++ } ++} ++ + static void + xfpm_power_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean is_inhibit, XfpmPower *power) + { +- power->priv->inhibited = is_inhibit; ++ if (power->priv->inhibited != is_inhibit) ++ { ++ power->priv->inhibited = is_inhibit; ++ ++ DBG ("is_inhibit %s, screensaver_inhibited %s, presentation_mode %s", ++ power->priv->inhibited ? "TRUE" : "FALSE", ++ power->priv->screensaver_inhibited ? "TRUE" : "FALSE", ++ power->priv->presentation_mode ? "TRUE" : "FALSE"); ++ ++ /* If we are inhibited make sure we inhibit the screensaver too */ ++ if (is_inhibit) ++ { ++ if (!power->priv->screensaver_inhibited) ++ { ++ screen_saver_suspend (power, TRUE); ++ power->priv->screensaver_inhibited = TRUE; ++ } ++ } ++ else ++ { ++ /* Or make sure we remove the screensaver inhibit */ ++ if (power->priv->screensaver_inhibited && !power->priv->presentation_mode) ++ { ++ screen_saver_suspend (power, FALSE); ++ power->priv->screensaver_inhibited = FALSE; ++ } ++ } ++ } ++ ++ DBG ("is_inhibit %s, screensaver_inhibited %s, presentation_mode %s", ++ power->priv->inhibited ? "TRUE" : "FALSE", ++ power->priv->screensaver_inhibited ? "TRUE" : "FALSE", ++ power->priv->presentation_mode ? "TRUE" : "FALSE"); + } + + static void +@@ -1270,6 +1375,12 @@ xfpm_power_finalize (GObject *object) + + g_object_unref(power->priv->dpms); + ++ if (power->priv->screensaver_id != 0) ++ { ++ g_source_remove (power->priv->screensaver_id); ++ power->priv->screensaver_id = 0; ++ } ++ + G_OBJECT_CLASS (xfpm_power_parent_class)->finalize (object); + } + +@@ -1375,24 +1486,49 @@ xfpm_power_change_presentation_mode (Xfp + if (power->priv->presentation_mode == presentation_mode) + return; + +- XFPM_DEBUG ("presentation mode %s, changing to %s", +- power->priv->presentation_mode ? "TRUE" : "FALSE", +- presentation_mode ? "TRUE" : "FALSE"); +- + power->priv->presentation_mode = presentation_mode; + + /* presentation mode inhibits dpms */ + xfpm_dpms_inhibit (power->priv->dpms, presentation_mode); + +- if (presentation_mode == FALSE) ++ DBG ("is_inhibit %s, screensaver_inhibited %s, presentation_mode %s", ++ power->priv->inhibited ? "TRUE" : "FALSE", ++ power->priv->screensaver_inhibited ? "TRUE" : "FALSE", ++ power->priv->presentation_mode ? "TRUE" : "FALSE"); ++ ++ if (presentation_mode) + { +- EggIdletime *idletime; ++ /* presentation mode inhibits the screensaver */ ++ if (!power->priv->screensaver_inhibited) ++ { ++ screen_saver_suspend (power, TRUE); ++ power->priv->screensaver_inhibited = TRUE; ++ } ++ } ++ else ++ { ++ EggIdletime *idletime; ++ ++ /* make sure we remove the screensaver inhibit */ ++ if (power->priv->screensaver_inhibited && !power->priv->inhibited) ++ { ++ DBG("here"); ++ screen_saver_suspend (power, FALSE); ++ power->priv->screensaver_inhibited = FALSE; ++ } ++ ++ /* reset the timers */ + idletime = egg_idletime_new (); + egg_idletime_alarm_reset_all (idletime); + + g_object_unref (idletime); + } + ++ DBG ("is_inhibit %s, screensaver_inhibited %s, presentation_mode %s", ++ power->priv->inhibited ? "TRUE" : "FALSE", ++ power->priv->screensaver_inhibited ? "TRUE" : "FALSE", ++ power->priv->presentation_mode ? "TRUE" : "FALSE"); ++ + xfpm_update_blank_time (power); + } + diff --git a/sysutils/xfce4-power-manager/pkg-plist b/sysutils/xfce4-power-manager/pkg-plist index 5e711d0..3f942d4 100644 --- a/sysutils/xfce4-power-manager/pkg-plist +++ b/sysutils/xfce4-power-manager/pkg-plist @@ -1,30 +1,14 @@ -bin/xfce4-power-information bin/xfce4-power-manager bin/xfce4-power-manager-settings etc/xdg/autostart/xfce4-power-manager.desktop -lib/xfce4/panel-plugins/xfce4-brightness-plugin -man/man1/xfce4-power-manager.1.gz +lib/xfce4/panel/plugins/libxfce4powermanager.so man/man1/xfce4-power-manager-settings.1.gz +man/man1/xfce4-power-manager.1.gz +sbin/xfce4-pm-helper sbin/xfpm-power-backlight-helper +share/appdata/xfce4-power-manager.appdata.xml share/applications/xfce4-power-manager-settings.desktop -share/icons/hicolor/128x128/devices/processor.png -share/icons/hicolor/16x16/actions/xfpm-hibernate.png -share/icons/hicolor/16x16/actions/xfpm-suspend.png share/icons/hicolor/16x16/status/xfpm-ac-adapter.png -share/icons/hicolor/16x16/status/xfpm-brightness-lcd-invalid.png -share/icons/hicolor/16x16/status/xfpm-brightness-lcd.png -share/icons/hicolor/16x16/status/xfpm-keyboard-000.png -share/icons/hicolor/16x16/status/xfpm-keyboard-030.png -share/icons/hicolor/16x16/status/xfpm-keyboard-060.png -share/icons/hicolor/16x16/status/xfpm-keyboard-100.png -share/icons/hicolor/16x16/status/xfpm-mouse-000.png -share/icons/hicolor/16x16/status/xfpm-mouse-030.png -share/icons/hicolor/16x16/status/xfpm-mouse-060.png -share/icons/hicolor/16x16/status/xfpm-mouse-100.png -share/icons/hicolor/16x16/status/xfpm-phone-000.png -share/icons/hicolor/16x16/status/xfpm-phone-030.png -share/icons/hicolor/16x16/status/xfpm-phone-060.png -share/icons/hicolor/16x16/status/xfpm-phone-100.png share/icons/hicolor/16x16/status/xfpm-primary-000-charging.png share/icons/hicolor/16x16/status/xfpm-primary-000.png share/icons/hicolor/16x16/status/xfpm-primary-020-charging.png @@ -39,37 +23,7 @@ share/icons/hicolor/16x16/status/xfpm-primary-100-charging.png share/icons/hicolor/16x16/status/xfpm-primary-100.png share/icons/hicolor/16x16/status/xfpm-primary-charged.png share/icons/hicolor/16x16/status/xfpm-primary-missing.png -share/icons/hicolor/16x16/status/xfpm-ups-000-charging.png -share/icons/hicolor/16x16/status/xfpm-ups-000.png -share/icons/hicolor/16x16/status/xfpm-ups-020-charging.png -share/icons/hicolor/16x16/status/xfpm-ups-020.png -share/icons/hicolor/16x16/status/xfpm-ups-040-charging.png -share/icons/hicolor/16x16/status/xfpm-ups-040.png -share/icons/hicolor/16x16/status/xfpm-ups-060-charging.png -share/icons/hicolor/16x16/status/xfpm-ups-060.png -share/icons/hicolor/16x16/status/xfpm-ups-080-charging.png -share/icons/hicolor/16x16/status/xfpm-ups-080.png -share/icons/hicolor/16x16/status/xfpm-ups-100-charging.png -share/icons/hicolor/16x16/status/xfpm-ups-100.png -share/icons/hicolor/16x16/status/xfpm-ups-charged.png -share/icons/hicolor/16x16/status/xfpm-ups-missing.png -share/icons/hicolor/22x22/actions/xfpm-hibernate.png -share/icons/hicolor/22x22/actions/xfpm-suspend.png share/icons/hicolor/22x22/status/xfpm-ac-adapter.png -share/icons/hicolor/22x22/status/xfpm-brightness-lcd-invalid.png -share/icons/hicolor/22x22/status/xfpm-brightness-lcd.png -share/icons/hicolor/22x22/status/xfpm-keyboard-000.png -share/icons/hicolor/22x22/status/xfpm-keyboard-030.png -share/icons/hicolor/22x22/status/xfpm-keyboard-060.png -share/icons/hicolor/22x22/status/xfpm-keyboard-100.png -share/icons/hicolor/22x22/status/xfpm-mouse-000.png -share/icons/hicolor/22x22/status/xfpm-mouse-030.png -share/icons/hicolor/22x22/status/xfpm-mouse-060.png -share/icons/hicolor/22x22/status/xfpm-mouse-100.png -share/icons/hicolor/22x22/status/xfpm-phone-000.png -share/icons/hicolor/22x22/status/xfpm-phone-030.png -share/icons/hicolor/22x22/status/xfpm-phone-060.png -share/icons/hicolor/22x22/status/xfpm-phone-100.png share/icons/hicolor/22x22/status/xfpm-primary-000-charging.png share/icons/hicolor/22x22/status/xfpm-primary-000.png share/icons/hicolor/22x22/status/xfpm-primary-020-charging.png @@ -84,37 +38,7 @@ share/icons/hicolor/22x22/status/xfpm-primary-100-charging.png share/icons/hicolor/22x22/status/xfpm-primary-100.png share/icons/hicolor/22x22/status/xfpm-primary-charged.png share/icons/hicolor/22x22/status/xfpm-primary-missing.png -share/icons/hicolor/22x22/status/xfpm-ups-000-charging.png -share/icons/hicolor/22x22/status/xfpm-ups-000.png -share/icons/hicolor/22x22/status/xfpm-ups-020-charging.png -share/icons/hicolor/22x22/status/xfpm-ups-020.png -share/icons/hicolor/22x22/status/xfpm-ups-040-charging.png -share/icons/hicolor/22x22/status/xfpm-ups-040.png -share/icons/hicolor/22x22/status/xfpm-ups-060-charging.png -share/icons/hicolor/22x22/status/xfpm-ups-060.png -share/icons/hicolor/22x22/status/xfpm-ups-080-charging.png -share/icons/hicolor/22x22/status/xfpm-ups-080.png -share/icons/hicolor/22x22/status/xfpm-ups-100-charging.png -share/icons/hicolor/22x22/status/xfpm-ups-100.png -share/icons/hicolor/22x22/status/xfpm-ups-charged.png -share/icons/hicolor/22x22/status/xfpm-ups-missing.png -share/icons/hicolor/24x24/actions/xfpm-hibernate.png -share/icons/hicolor/24x24/actions/xfpm-suspend.png share/icons/hicolor/24x24/status/xfpm-ac-adapter.png -share/icons/hicolor/24x24/status/xfpm-brightness-lcd-invalid.png -share/icons/hicolor/24x24/status/xfpm-brightness-lcd.png -share/icons/hicolor/24x24/status/xfpm-keyboard-000.png -share/icons/hicolor/24x24/status/xfpm-keyboard-030.png -share/icons/hicolor/24x24/status/xfpm-keyboard-060.png -share/icons/hicolor/24x24/status/xfpm-keyboard-100.png -share/icons/hicolor/24x24/status/xfpm-mouse-000.png -share/icons/hicolor/24x24/status/xfpm-mouse-030.png -share/icons/hicolor/24x24/status/xfpm-mouse-060.png -share/icons/hicolor/24x24/status/xfpm-mouse-100.png -share/icons/hicolor/24x24/status/xfpm-phone-000.png -share/icons/hicolor/24x24/status/xfpm-phone-030.png -share/icons/hicolor/24x24/status/xfpm-phone-060.png -share/icons/hicolor/24x24/status/xfpm-phone-100.png share/icons/hicolor/24x24/status/xfpm-primary-000-charging.png share/icons/hicolor/24x24/status/xfpm-primary-000.png share/icons/hicolor/24x24/status/xfpm-primary-020-charging.png @@ -129,37 +53,47 @@ share/icons/hicolor/24x24/status/xfpm-primary-100-charging.png share/icons/hicolor/24x24/status/xfpm-primary-100.png share/icons/hicolor/24x24/status/xfpm-primary-charged.png share/icons/hicolor/24x24/status/xfpm-primary-missing.png -share/icons/hicolor/24x24/status/xfpm-ups-000-charging.png -share/icons/hicolor/24x24/status/xfpm-ups-000.png -share/icons/hicolor/24x24/status/xfpm-ups-020-charging.png -share/icons/hicolor/24x24/status/xfpm-ups-020.png -share/icons/hicolor/24x24/status/xfpm-ups-040-charging.png -share/icons/hicolor/24x24/status/xfpm-ups-040.png -share/icons/hicolor/24x24/status/xfpm-ups-060-charging.png -share/icons/hicolor/24x24/status/xfpm-ups-060.png -share/icons/hicolor/24x24/status/xfpm-ups-080-charging.png -share/icons/hicolor/24x24/status/xfpm-ups-080.png -share/icons/hicolor/24x24/status/xfpm-ups-100-charging.png -share/icons/hicolor/24x24/status/xfpm-ups-100.png -share/icons/hicolor/24x24/status/xfpm-ups-charged.png -share/icons/hicolor/24x24/status/xfpm-ups-missing.png -share/icons/hicolor/48x48/actions/xfpm-hibernate.png -share/icons/hicolor/48x48/actions/xfpm-suspend.png +share/icons/hicolor/32x32/status/computer.png +share/icons/hicolor/32x32/status/input-keyboard.png +share/icons/hicolor/32x32/status/input-mouse.png +share/icons/hicolor/32x32/status/multimedia-player.png +share/icons/hicolor/32x32/status/pda.png +share/icons/hicolor/32x32/status/phone.png +share/icons/hicolor/32x32/status/tablet.png +share/icons/hicolor/32x32/status/video-display.png +share/icons/hicolor/32x32/status/xfpm-ac-adapter.png +share/icons/hicolor/32x32/status/xfpm-brightness-lcd.png +share/icons/hicolor/32x32/status/xfpm-primary-000-charging.png +share/icons/hicolor/32x32/status/xfpm-primary-000.png +share/icons/hicolor/32x32/status/xfpm-primary-020-charging.png +share/icons/hicolor/32x32/status/xfpm-primary-020.png +share/icons/hicolor/32x32/status/xfpm-primary-040-charging.png +share/icons/hicolor/32x32/status/xfpm-primary-040.png +share/icons/hicolor/32x32/status/xfpm-primary-060-charging.png +share/icons/hicolor/32x32/status/xfpm-primary-060.png +share/icons/hicolor/32x32/status/xfpm-primary-080-charging.png +share/icons/hicolor/32x32/status/xfpm-primary-080.png +share/icons/hicolor/32x32/status/xfpm-primary-100-charging.png +share/icons/hicolor/32x32/status/xfpm-primary-100.png +share/icons/hicolor/32x32/status/xfpm-primary-charged.png +share/icons/hicolor/32x32/status/xfpm-primary-missing.png +share/icons/hicolor/32x32/status/xfpm-ups-000.png +share/icons/hicolor/32x32/status/xfpm-ups-020.png +share/icons/hicolor/32x32/status/xfpm-ups-040.png +share/icons/hicolor/32x32/status/xfpm-ups-060.png +share/icons/hicolor/32x32/status/xfpm-ups-080.png +share/icons/hicolor/32x32/status/xfpm-ups-100.png +share/icons/hicolor/48x48/status/computer.png +share/icons/hicolor/48x48/status/input-keyboard.png +share/icons/hicolor/48x48/status/input-mouse.png +share/icons/hicolor/48x48/status/multimedia-player.png +share/icons/hicolor/48x48/status/pda.png +share/icons/hicolor/48x48/status/phone.png +share/icons/hicolor/48x48/status/tablet.png +share/icons/hicolor/48x48/status/video-display.png share/icons/hicolor/48x48/status/xfpm-ac-adapter.png -share/icons/hicolor/48x48/status/xfpm-brightness-lcd-invalid.png +share/icons/hicolor/48x48/status/xfpm-brightness-keyboard.png share/icons/hicolor/48x48/status/xfpm-brightness-lcd.png -share/icons/hicolor/48x48/status/xfpm-keyboard-000.png -share/icons/hicolor/48x48/status/xfpm-keyboard-030.png -share/icons/hicolor/48x48/status/xfpm-keyboard-060.png -share/icons/hicolor/48x48/status/xfpm-keyboard-100.png -share/icons/hicolor/48x48/status/xfpm-mouse-000.png -share/icons/hicolor/48x48/status/xfpm-mouse-030.png -share/icons/hicolor/48x48/status/xfpm-mouse-060.png -share/icons/hicolor/48x48/status/xfpm-mouse-100.png -share/icons/hicolor/48x48/status/xfpm-phone-000.png -share/icons/hicolor/48x48/status/xfpm-phone-030.png -share/icons/hicolor/48x48/status/xfpm-phone-060.png -share/icons/hicolor/48x48/status/xfpm-phone-100.png share/icons/hicolor/48x48/status/xfpm-primary-000-charging.png share/icons/hicolor/48x48/status/xfpm-primary-000.png share/icons/hicolor/48x48/status/xfpm-primary-020-charging.png @@ -174,37 +108,23 @@ share/icons/hicolor/48x48/status/xfpm-primary-100-charging.png share/icons/hicolor/48x48/status/xfpm-primary-100.png share/icons/hicolor/48x48/status/xfpm-primary-charged.png share/icons/hicolor/48x48/status/xfpm-primary-missing.png -share/icons/hicolor/48x48/status/xfpm-ups-000-charging.png share/icons/hicolor/48x48/status/xfpm-ups-000.png -share/icons/hicolor/48x48/status/xfpm-ups-020-charging.png share/icons/hicolor/48x48/status/xfpm-ups-020.png -share/icons/hicolor/48x48/status/xfpm-ups-040-charging.png share/icons/hicolor/48x48/status/xfpm-ups-040.png -share/icons/hicolor/48x48/status/xfpm-ups-060-charging.png share/icons/hicolor/48x48/status/xfpm-ups-060.png -share/icons/hicolor/48x48/status/xfpm-ups-080-charging.png share/icons/hicolor/48x48/status/xfpm-ups-080.png -share/icons/hicolor/48x48/status/xfpm-ups-100-charging.png share/icons/hicolor/48x48/status/xfpm-ups-100.png -share/icons/hicolor/48x48/status/xfpm-ups-charged.png -share/icons/hicolor/48x48/status/xfpm-ups-missing.png -share/icons/hicolor/scalable/actions/xfpm-hibernate.svg -share/icons/hicolor/scalable/actions/xfpm-suspend.svg +share/icons/hicolor/scalable/status/computer.svg +share/icons/hicolor/scalable/status/keyboard.svg +share/icons/hicolor/scalable/status/mouse.svg +share/icons/hicolor/scalable/status/multimedia-player.svg +share/icons/hicolor/scalable/status/pda.svg +share/icons/hicolor/scalable/status/phone.svg +share/icons/hicolor/scalable/status/tablet.svg +share/icons/hicolor/scalable/status/video-display.svg share/icons/hicolor/scalable/status/xfpm-ac-adapter.svg -share/icons/hicolor/scalable/status/xfpm-brightness-lcd-invalid.svg +share/icons/hicolor/scalable/status/xfpm-brightness-keyboard.svg share/icons/hicolor/scalable/status/xfpm-brightness-lcd.svg -share/icons/hicolor/scalable/status/xfpm-keyboard-000.svg -share/icons/hicolor/scalable/status/xfpm-keyboard-030.svg -share/icons/hicolor/scalable/status/xfpm-keyboard-060.svg -share/icons/hicolor/scalable/status/xfpm-keyboard-100.svg -share/icons/hicolor/scalable/status/xfpm-mouse-000.svg -share/icons/hicolor/scalable/status/xfpm-mouse-030.svg -share/icons/hicolor/scalable/status/xfpm-mouse-060.svg -share/icons/hicolor/scalable/status/xfpm-mouse-100.svg -share/icons/hicolor/scalable/status/xfpm-phone-000.svg -share/icons/hicolor/scalable/status/xfpm-phone-030.svg -share/icons/hicolor/scalable/status/xfpm-phone-060.svg -share/icons/hicolor/scalable/status/xfpm-phone-100.svg share/icons/hicolor/scalable/status/xfpm-primary-000-charging.svg share/icons/hicolor/scalable/status/xfpm-primary-000.svg share/icons/hicolor/scalable/status/xfpm-primary-020-charging.svg @@ -219,20 +139,12 @@ share/icons/hicolor/scalable/status/xfpm-primary-100-charging.svg share/icons/hicolor/scalable/status/xfpm-primary-100.svg share/icons/hicolor/scalable/status/xfpm-primary-charged.svg share/icons/hicolor/scalable/status/xfpm-primary-missing.svg -share/icons/hicolor/scalable/status/xfpm-ups-000-charging.svg share/icons/hicolor/scalable/status/xfpm-ups-000.svg -share/icons/hicolor/scalable/status/xfpm-ups-020-charging.svg share/icons/hicolor/scalable/status/xfpm-ups-020.svg -share/icons/hicolor/scalable/status/xfpm-ups-040-charging.svg share/icons/hicolor/scalable/status/xfpm-ups-040.svg -share/icons/hicolor/scalable/status/xfpm-ups-060-charging.svg share/icons/hicolor/scalable/status/xfpm-ups-060.svg -share/icons/hicolor/scalable/status/xfpm-ups-080-charging.svg share/icons/hicolor/scalable/status/xfpm-ups-080.svg -share/icons/hicolor/scalable/status/xfpm-ups-100-charging.svg share/icons/hicolor/scalable/status/xfpm-ups-100.svg -share/icons/hicolor/scalable/status/xfpm-ups-charged.svg -share/icons/hicolor/scalable/status/xfpm-ups-missing.svg share/locale/ar/LC_MESSAGES/xfce4-power-manager.mo share/locale/ast/LC_MESSAGES/xfce4-power-manager.mo share/locale/bg/LC_MESSAGES/xfce4-power-manager.mo @@ -241,6 +153,7 @@ share/locale/cs/LC_MESSAGES/xfce4-power-manager.mo share/locale/da/LC_MESSAGES/xfce4-power-manager.mo share/locale/de/LC_MESSAGES/xfce4-power-manager.mo share/locale/el/LC_MESSAGES/xfce4-power-manager.mo +share/locale/en_AU/LC_MESSAGES/xfce4-power-manager.mo share/locale/en_GB/LC_MESSAGES/xfce4-power-manager.mo share/locale/es/LC_MESSAGES/xfce4-power-manager.mo share/locale/et/LC_MESSAGES/xfce4-power-manager.mo @@ -248,6 +161,7 @@ share/locale/eu/LC_MESSAGES/xfce4-power-manager.mo share/locale/fi/LC_MESSAGES/xfce4-power-manager.mo share/locale/fr/LC_MESSAGES/xfce4-power-manager.mo share/locale/gl/LC_MESSAGES/xfce4-power-manager.mo +share/locale/he/LC_MESSAGES/xfce4-power-manager.mo share/locale/hr/LC_MESSAGES/xfce4-power-manager.mo share/locale/hu/LC_MESSAGES/xfce4-power-manager.mo share/locale/id/LC_MESSAGES/xfce4-power-manager.mo @@ -257,9 +171,11 @@ share/locale/ja/LC_MESSAGES/xfce4-power-manager.mo share/locale/kk/LC_MESSAGES/xfce4-power-manager.mo share/locale/ko/LC_MESSAGES/xfce4-power-manager.mo share/locale/lt/LC_MESSAGES/xfce4-power-manager.mo -share/locale/nn/LC_MESSAGES/xfce4-power-manager.mo +share/locale/ms/LC_MESSAGES/xfce4-power-manager.mo share/locale/nb/LC_MESSAGES/xfce4-power-manager.mo share/locale/nl/LC_MESSAGES/xfce4-power-manager.mo +share/locale/nn/LC_MESSAGES/xfce4-power-manager.mo +share/locale/oc/LC_MESSAGES/xfce4-power-manager.mo share/locale/pa/LC_MESSAGES/xfce4-power-manager.mo share/locale/pl/LC_MESSAGES/xfce4-power-manager.mo share/locale/pt/LC_MESSAGES/xfce4-power-manager.mo @@ -268,19 +184,19 @@ share/locale/ro/LC_MESSAGES/xfce4-power-manager.mo share/locale/ru/LC_MESSAGES/xfce4-power-manager.mo share/locale/si/LC_MESSAGES/xfce4-power-manager.mo share/locale/sk/LC_MESSAGES/xfce4-power-manager.mo +share/locale/sl/LC_MESSAGES/xfce4-power-manager.mo +share/locale/sr/LC_MESSAGES/xfce4-power-manager.mo share/locale/sv/LC_MESSAGES/xfce4-power-manager.mo share/locale/te/LC_MESSAGES/xfce4-power-manager.mo +share/locale/th/LC_MESSAGES/xfce4-power-manager.mo share/locale/tr/LC_MESSAGES/xfce4-power-manager.mo share/locale/ug/LC_MESSAGES/xfce4-power-manager.mo share/locale/uk/LC_MESSAGES/xfce4-power-manager.mo share/locale/ur/LC_MESSAGES/xfce4-power-manager.mo share/locale/ur_PK/LC_MESSAGES/xfce4-power-manager.mo +share/locale/vi/LC_MESSAGES/xfce4-power-manager.mo share/locale/zh_CN/LC_MESSAGES/xfce4-power-manager.mo +share/locale/zh_HK/LC_MESSAGES/xfce4-power-manager.mo share/locale/zh_TW/LC_MESSAGES/xfce4-power-manager.mo share/polkit-1/actions/org.xfce.power.policy -share/xfce4/doc/C/images/xfpm-brightness-plugin.png -share/xfce4/doc/C/images/xfpm-context-menu.png -share/xfce4/doc/C/images/xfpm-extended-settings.png -share/xfce4/doc/C/images/xfpm-general-settings.png -share/xfce4/doc/C/xfce4-power-manager.html -share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop +share/xfce4/panel/plugins/power-manager-plugin.desktop diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index e1141e1..e7d6580 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= xfce4-settings -PORTVERSION= 4.10.1 -PORTREVISION= 5 +PORTVERSION= 4.12.0 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org @@ -16,79 +14,37 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libxklavier.so:${PORTSDIR}/x11/libxklavier GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv garcon libexo libmenu libutil xfconf -USE_XORG= inputproto x11 xi -USES= libtool pkgconfig gmake tar:bzip2 +USE_XFCE= garcon libexo +USE_XORG= inputproto x11 xcursor xi xrandr +USES= libtool pkgconfig gmake gettext-tools xfce tar:bzip2 -CONFIGURE_ARGS= --enable-pluggable-dialogs \ - --enable-gio-unix +CONFIGURE_ARGS=--enable-debug=yes \ + --disable-xorg-libinput -OPTIONS_DEFINE= XKLAVIER XCURSOR XRANDR NOTIFY NLS SOUND -OPTIONS_DEFAULT= XKLAVIER XCURSOR XRANDR NOTIFY NLS -SOUND_DESC= Enable sound control +OPTIONS_DEFINE= NOTIFY NLS UPOWER +OPTIONS_DEFAULT= NOTIFY NLS -.include <bsd.port.options.mk> +UPOWER_DESC= Power management tasks -.if ${PORT_OPTIONS:MXKLAVIER} -LIB_DEPENDS+= libxklavier.so:${PORTSDIR}/x11/libxklavier -CONFIGURE_ARGS+=--enable-libxklavier -.else -CONFIGURE_ARGS+=--disable-libxklavier -.endif - -.if ${PORT_OPTIONS:MXCURSOR} -USE_XORG+= xcursor -CONFIGURE_ARGS+=--enable-xcursor -.else -CONFIGURE_ARGS+=--disable-xcursor -.endif - -.if ${PORT_OPTIONS:MXRANDR} -USE_XORG+= xrandr -CONFIGURE_ARGS+=--enable-xrandr -PLIST_SUB+= XRANDR="" -.else -CONFIGURE_ARGS+=--disable-xrandr -PLIST_SUB+= XRANDR="@comment " -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify -CONFIGURE_ARGS+=--enable-libnotify -.else -CONFIGURE_ARGS+=--disable-libnotify -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MSOUND} -LIB_DEPENDS+= libcanberra.so:${PORTSDIR}/audio/libcanberra -CONFIGURE_ARGS+=--enable-sound-settings -.else -CONFIGURE_ARGS+=--disable-sound-settings -.endif +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +NOTIFY_CONFIGURE_ENABLE= libnotify +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext-runtime +UPOWER_LIB_DEPENDS= libupower-glib.so:${PORTSDIR}/sysutils/upower +UPOWER_CONFIGURE_ENABLE= upower-glib +OPTIONS_SUB= yes post-patch: -# GNOME is default icon theme - @${REINPLACE_CMD} -e 's|Rodent|gnome|g' \ + @${REINPLACE_CMD} -e 's|Rodent|Adwaita|g' \ ${WRKSRC}/dialogs/appearance-settings/main.c - @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="gnome|; \ + @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Adwaita|; \ s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \ ${WRKSRC}/xfsettingsd/xsettings.xml - @${REINPLACE_CMD} -e 's|xkl_config_registry_load (settings->priv->xkl_registry)|xkl_config_registry_load (settings->priv->xkl_registry, FALSE)|g; \ - s|xkl_engine_stop_listen (settings->priv->xkl_engine)|xkl_engine_stop_listen (settings->priv->xkl_engine, FALSE)|g' \ - ${WRKSRC}/dialogs/keyboard-settings/xfce-keyboard-settings.c .include <bsd.port.mk> diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo index 42a667d..ebba63d 100644 --- a/sysutils/xfce4-settings/distinfo +++ b/sysutils/xfce4-settings/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-settings-4.10.1.tar.bz2) = 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 -SIZE (xfce4/xfce4-settings-4.10.1.tar.bz2) = 777735 +SHA256 (xfce4/xfce4-settings-4.12.0.tar.bz2) = 04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81 +SIZE (xfce4/xfce4-settings-4.12.0.tar.bz2) = 973324 diff --git a/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme b/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme deleted file mode 100644 index 1fa8884..0000000 --- a/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme +++ /dev/null @@ -1,15 +0,0 @@ ---- ./dialogs/appearance-settings/appearance-install-theme.orig 2014-02-22 23:09:05.000000000 +0000 -+++ ./dialogs/appearance-settings/appearance-install-theme 2014-02-23 18:58:38.000000000 +0000 -@@ -89,7 +89,11 @@ - - # check file size, abort if bigger then 50Mb, only works for files - if test x"`which stat 2>/dev/null`" != x""; then -- dndsize=`stat -c %s "$dndfilename"` -+ if test "`uname -s`" = "Linux"; then -+ dndsize=`stat -c %s "$dndfilename"` -+ elif [ "`uname -s`" = "FreeBSD" ] || [ "`uname -s`" = "DragonFly" ]; then -+ dndsize=`stat -f %z "$dndfilename"` -+ fi - if test "$dndsize" -gt 52428800; then - # 2: File too big - exit 2 diff --git a/sysutils/xfce4-settings/pkg-descr b/sysutils/xfce4-settings/pkg-descr index 2e7ba9b..cebec5e 100644 --- a/sysutils/xfce4-settings/pkg-descr +++ b/sysutils/xfce4-settings/pkg-descr @@ -1,4 +1,4 @@ The settings manager allows you to configure every detail of your desktop environment. -WWW: http://docs.xfce.org/xfce/xfce4-settings/start +WWW: http://www.xfce.org/ diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist index 869a3f0..1099d85 100644 --- a/sysutils/xfce4-settings/pkg-plist +++ b/sysutils/xfce4-settings/pkg-plist @@ -1,6 +1,6 @@ bin/xfce4-accessibility-settings bin/xfce4-appearance-settings -%%XRANDR%%bin/xfce4-display-settings +bin/xfce4-display-settings bin/xfce4-keyboard-settings bin/xfce4-mime-settings bin/xfce4-mouse-settings @@ -11,7 +11,7 @@ etc/xdg/autostart/xfsettingsd.desktop etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml etc/xdg/menus/xfce-settings-manager.menu lib/xfce4/settings/appearance-install-theme -%%XRANDR%%share/applications/xfce-display-settings.desktop +share/applications/xfce-display-settings.desktop share/applications/xfce-keyboard-settings.desktop share/applications/xfce4-mime-settings.desktop share/applications/xfce-mouse-settings.desktop @@ -19,6 +19,10 @@ share/applications/xfce-settings-manager.desktop share/applications/xfce-ui-settings.desktop share/applications/xfce4-accessibility-settings.desktop share/applications/xfce4-settings-editor.desktop +share/icons/hicolor/128x128/devices/xfce-display-extend.png +share/icons/hicolor/128x128/devices/xfce-display-external.png +share/icons/hicolor/128x128/devices/xfce-display-internal.png +share/icons/hicolor/128x128/devices/xfce-display-mirror.png %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-settings.mo @@ -28,6 +32,7 @@ share/applications/xfce4-settings-editor.desktop %%NLS%%share/locale/da/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo @@ -45,9 +50,11 @@ share/applications/xfce4-settings-editor.desktop %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo @@ -56,13 +63,16 @@ share/applications/xfce4-settings-editor.desktop %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile index 134a863..ac244ce 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -3,6 +3,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} @@ -18,15 +19,15 @@ LIB_DEPENDS= libupower-glib.so:${PORTSDIR}/sysutils/upower SSP_UNSAFE= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel OPTIONS_DEFINE= NLS OPTIONS_DEFAULT=NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext +NLS_USES= gettext-runtime .include <bsd.port.mk> diff --git a/sysutils/xfce4-systemload-plugin/pkg-descr b/sysutils/xfce4-systemload-plugin/pkg-descr index bf277e2..40f5a6d 100644 --- a/sysutils/xfce4-systemload-plugin/pkg-descr +++ b/sysutils/xfce4-systemload-plugin/pkg-descr @@ -1,3 +1,4 @@ System Load plugin for XFce4. +Author: Riccardo Persichetti <riccardo.persichetti@tin.it> WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile index b42bfc4..bd7ba4a 100644 --- a/sysutils/xfce4-wavelan-plugin/Makefile +++ b/sysutils/xfce4-wavelan-plugin/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-wavelan-plugin -PORTVERSION= 0.5.11 -PORTREVISION= 1 +PORTVERSION= 0.5.12 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -12,9 +11,11 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Displays various information about a WaveLAN device +LICENSE= BSD3CLAUSE + GNU_CONFIGURE= yes -USES= gettext pkgconfig gmake libtool tar:bzip2 +USES= gettext pkgconfig gmake libtool xfce tar:bzip2 USE_GNOME= gtk20 glib20 intltool intlhack -USE_XFCE= configenv libutil libmenu panel +USE_XFCE= panel .include <bsd.port.mk> diff --git a/sysutils/xfce4-wavelan-plugin/distinfo b/sysutils/xfce4-wavelan-plugin/distinfo index 9f8447f..6b03d10 100644 --- a/sysutils/xfce4-wavelan-plugin/distinfo +++ b/sysutils/xfce4-wavelan-plugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-wavelan-plugin-0.5.11.tar.bz2) = fe06c7ffc29c2d4ca7bc452b3356825354e276565de9b0a2d087ab55471755ae -SIZE (xfce4/xfce4-wavelan-plugin-0.5.11.tar.bz2) = 293840 +SHA256 (xfce4/xfce4-wavelan-plugin-0.5.12.tar.bz2) = 67dce45739f063b95e2bc2232c625277685887b1f84088316d919671b5500ac4 +SIZE (xfce4/xfce4-wavelan-plugin-0.5.12.tar.bz2) = 302148 diff --git a/sysutils/xfce4-wavelan-plugin/pkg-plist b/sysutils/xfce4-wavelan-plugin/pkg-plist index e556eda..c0b9f88 100644 --- a/sysutils/xfce4-wavelan-plugin/pkg-plist +++ b/sysutils/xfce4-wavelan-plugin/pkg-plist @@ -2,34 +2,43 @@ lib/xfce4/panel/plugins/libwavelan.so share/locale/ar/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/ast/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/be/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/da/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/de/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/el/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/es/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/he/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/hr/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/id/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/it/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/kk/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/lv/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/nb/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/pt/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/sk/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-wavelan-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/tr/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/ug/LC_MESSAGES/xfce4-wavelan-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-wavelan-plugin.mo diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile index 3a60bf1..0be96cc 100644 --- a/textproc/xfce4-dict-plugin/Makefile +++ b/textproc/xfce4-dict-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-dict PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -18,9 +18,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= gettext pkgconfig gmake libtool tar:bzip2 +USES= gettext pkgconfig gmake libtool xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel USE_XORG= x11 USE_LDCONFIG= yes diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile index 8f9fe71..81ba2b3 100644 --- a/www/xfce4-smartbookmark-plugin/Makefile +++ b/www/xfce4-smartbookmark-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-smartbookmark-plugin PORTVERSION= 0.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USE_GNOME= gtk20 intltool intlhack -USES= pkgconfig gettext gmake libtool:keepla tar:bzip2 -USE_XFCE= configenv libexo libmenu libutil panel +USES= pkgconfig gettext gmake libtool xfce tar:bzip2 +USE_XFCE= panel USE_XORG= ice .include <bsd.port.mk> diff --git a/www/xfce4-smartbookmark-plugin/pkg-plist b/www/xfce4-smartbookmark-plugin/pkg-plist index 1ebcdf3..01e8072 100644 --- a/www/xfce4-smartbookmark-plugin/pkg-plist +++ b/www/xfce4-smartbookmark-plugin/pkg-plist @@ -1,4 +1,3 @@ -lib/xfce4/panel/plugins/libsmartbookmark.la lib/xfce4/panel/plugins/libsmartbookmark.so share/locale/ar/LC_MESSAGES/xfce4-smartbookmark-plugin.mo share/locale/ast/LC_MESSAGES/xfce4-smartbookmark-plugin.mo diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile index b050260..5a42d30 100644 --- a/x11-clocks/xfce4-datetime-plugin/Makefile +++ b/x11-clocks/xfce4-datetime-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-datetime-plugin PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-clocks xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -17,8 +17,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel .include <bsd.port.mk> diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile index e1af04c2..7e00825 100644 --- a/x11-clocks/xfce4-timer-out-plugin/Makefile +++ b/x11-clocks/xfce4-timer-out-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-time-out-plugin PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-clocks xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -17,8 +17,8 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel .include <bsd.port.mk> diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile index fdf876d..e6e447b 100644 --- a/x11-clocks/xfce4-timer-plugin/Makefile +++ b/x11-clocks/xfce4-timer-plugin/Makefile @@ -3,6 +3,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} @@ -16,7 +17,7 @@ LICENSE= GPLv2 INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel -USES= pkgconfig gettext gmake tar:bzip2 +USE_XFCE= panel +USES= pkgconfig gettext gmake xfce tar:bzip2 .include <bsd.port.mk> diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile index 9e7eb0a7..73e4d17 100644 --- a/x11-fm/thunar-vfs/Makefile +++ b/x11-fm/thunar-vfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunar-vfs PORTVERSION= 1.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-fm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/archive/${PORTNAME}/${PORTVERSION:R} @@ -22,66 +22,30 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 gdkpixbuf2 intltool intlhack -USE_XFCE= configenv libutil libexo +USE_XFCE= libexo USE_XORG= x11 USES= gmake pathfix perl5 pkgconfig libtool desktop-file-utils \ - tar:bzip2 + gettext-tools xfce tar:bzip2 -CONFIGURE_ARGS= --disable-debug +CONFIGURE_ARGS= --disable-debug --without-html-dir -OPTIONS_DEFINE= NLS HAL DBUS STARTUP GCONF DOCS +OPTIONS_DEFINE= NLS HAL DBUS STARTUP GCONF OPTIONS_DEFAULT= NLS HAL DBUS STARTUP STARTUP_DESC= Startup notification - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MHAL} -LIB_DEPENDS+= libhal.so:${PORTSDIR}/sysutils/hal -CONFIGURE_ARGS+=--with-volume-manager=hal -.else -CONFIGURE_ARGS+=--with-volume-manager=freebsd -.endif - -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -CONFIGURE_ARGS+=--enable-dbus -.else -CONFIGURE_ARGS+=--disable-dbus -.endif - -.if ${PORT_OPTIONS:MSTARTUP} -LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+=--enable-startup-notification -.else -CONFIGURE_ARGS+=--disable-startup-notification -.endif - -# GNOME thumbnailers -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CONFIGURE_ARGS+=--enable-gnome-thumbnailers -.else -CONFIGURE_ARGS+=--disable-gnome-thumbnailers -.endif - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal +HAL_CONFIGURE_WITH= volume-manager=hal +HAL_CONFIGURE_OFF= --with-volume-manager=freebsd +DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +DBUS_CONFIGURE_ENABLE= dbus +STARTUP_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +STARTUP_CONFIGURE_ENABLE= startup-notification +GCONF_USE= gnome=gconf2 +GCONF_CONFIGURE_ENABLE= gnome-thumbnailers +OPTIONS_SUB= yes post-patch: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11-fm/thunar-vfs/pkg-plist b/x11-fm/thunar-vfs/pkg-plist index 9d2a2eb..96af06d 100644 --- a/x11-fm/thunar-vfs/pkg-plist +++ b/x11-fm/thunar-vfs/pkg-plist @@ -26,41 +26,6 @@ lib/thunar-vfs-1/thunar-vfs-update-thumbnailers-cache-1 libdata/pkgconfig/thunar-vfs-1.pc %%DOCSDIR%%/README.volumes %%DOCSDIR%%/ThumbnailersCacheFormat.txt -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeApplication.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeDatabase.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeHandler.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMonitor.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsUser.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsUserManager.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsVolume.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsVolumeManager.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/filesystem-monitoring.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/fundamentals.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/home.png -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/index.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/index.sgml -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/introduction.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ix01.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/jobs.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/left.png -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/mime-types.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/right.png -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/style.css -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Basic-Types.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Initialization-and-Shutdown.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Jobs.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsInfo.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsMimeInfo.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsPath.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Utility-Functions.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp2 -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/up.png -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/users-and-groups-handling.html -%%APIDOCS%%share/gtk-doc/html/thunar-vfs/volume-handling.html %%NLS%%share/locale/ar/LC_MESSAGES/thunar-vfs.mo %%NLS%%share/locale/be/LC_MESSAGES/thunar-vfs.mo %%NLS%%share/locale/bn/LC_MESSAGES/thunar-vfs.mo diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index 302b557..e8a39103 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= Thunar -PORTVERSION= 1.6.4 -PORTREVISION= 1 +PORTVERSION= 1.6.6 CATEGORIES= x11-fm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME:tl}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org @@ -24,15 +22,15 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= gtk20 intltool intlhack gdkpixbuf2 USE_LDCONFIG= yes -USE_XFCE= configenv libexo libmenu libutil xfconf +USE_XFCE= libexo USE_XORG= sm x11 USES= desktop-file-utils gmake pathfix perl5 libtool pkgconfig \ - tar:bzip2 + gettext-tools xfce tar:bzip2 OPTIONS_DEFINE= GVFS NLS NOTIFY STARTUP OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL -OPTIONS_DEFAULT= GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA STARTUP +OPTIONS_DEFAULT= GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA PLUG_WALL STARTUP # Override NOTIFY_DESC NOTIFY_DESC= Display notifications @@ -43,83 +41,28 @@ PLUG_TPA_DESC= Trash Panel Applet plugin PLUG_UCA_DESC= User Customizable Actions plugin PLUG_WALL_DESC= Wallpaper plugin +GVF_USE= gnome=gvfs +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +NOTIFY_CONFIGURE_ENABLE= notifications +STARTUP_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +STARTUP_CONFIGURE_ENABLE= startup-notification +PLUG_APR_LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif +PLUG_APR_CONFIGURE_ENABLE= apr-plugin exif +PLUG_SBR_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +PLUG_SBR_CONFIGURE_ENABLE= sbr-plugin pcre +PLUG_TPA_USE= xfce=panel +PLUG_TPA_CONFIGURE_ENABLE= tpa-plugin +PLUG_UCA_CONFIGURE_ENABLE= uca-plugin +PLUG_WALL_CONFIGURE_ENABLE= wallpaper-plugin +OPTIONS_SUB= yes + CONFIGURE_ARGS+=--enable-gio-unix \ --disable-gudev \ --enable-dbus \ --without-html-dir -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify -CONFIGURE_ARGS+=--enable-notifications -.else -CONFIGURE_ARGS+=--disable-notifications -.endif - -.if ${PORT_OPTIONS:MPLUG_APR} -LIB_DEPENDS+= libexif.so:${PORTSDIR}/graphics/libexif -CONFIGURE_ARGS+=--enable-apr-plugin --enable-exif -PLIST_SUB+= PLUGIN_APR="" -.else -CONFIGURE_ARGS+=--disable-apr-plugin --disable-exif -PLIST_SUB+= PLUGIN_APR="@comment " -.endif - -.if ${PORT_OPTIONS:MPLUG_SBR} -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -CONFIGURE_ARGS+=--enable-sbr-plugin --enable-pcre -PLIST_SUB+= PLUGIN_SBR="" -.else -CONFIGURE_ARGS+=--disable-sbr-plugin --disable-pcre -PLIST_SUB+= PLUGIN_SBR="@comment " -.endif - -.if ${PORT_OPTIONS:MPLUG_TPA} -CONFIGURE_ARGS+=--enable-tpa-plugin -PLIST_SUB+= PLUGIN_TPA="" -USE_XFCE+= panel -.else -CONFIGURE_ARGS+=--disable-tpa-plugin -PLIST_SUB+= PLUGIN_TPA="@comment " -.endif - -.if ${PORT_OPTIONS:MPLUG_UCA} -CONFIGURE_ARGS+=--enable-uca-plugin -PLIST_SUB+= PLUGIN_UCA="" -.else -CONFIGURE_ARGS+=--disable-uca-plugin -PLIST_SUB+= PLUGIN_UCA="@comment " -.endif - -.if ${PORT_OPTIONS:MPLUG_WALL} -CONFIGURE_ARGS+=--enable-wallpaper-plugin -PLIST_SUB+= PLUGIN_WALL="" -.else -CONFIGURE_ARGS+=--disable-wallpaper-plugin -PLIST_SUB+= PLUGIN_WALL="@comment " -.endif - -.if ${PORT_OPTIONS:MSTARTUP} -LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+=--enable-startup-notification -.else -CONFIGURE_ARGS+=--disable-startup-notification -.endif - -.if ${PORT_OPTIONS:MGVFS} -USE_GNOME+=gvfs -.endif - post-patch: ${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \ ${WRKSRC}/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo index 5971157..6f2a006 100644 --- a/x11-fm/thunar/distinfo +++ b/x11-fm/thunar/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/Thunar-1.6.4.tar.bz2) = 40efc74349313c20cef2047842a06ad8dfc8522ed792a087e9fb4618ad309dae -SIZE (xfce4/Thunar-1.6.4.tar.bz2) = 2064286 +SHA256 (xfce4/Thunar-1.6.6.tar.bz2) = b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2 +SIZE (xfce4/Thunar-1.6.6.tar.bz2) = 2160158 diff --git a/x11-fm/thunar/files/patch-thunar_thunar-launcher.c b/x11-fm/thunar/files/patch-thunar_thunar-launcher.c deleted file mode 100644 index 8fd8e14..0000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-launcher.c +++ /dev/null @@ -1,34 +0,0 @@ -Right click context menu with wrong icon (bug #10652) - ---- thunar/thunar-launcher.c.orig 2013-12-18 23:41:57 UTC -+++ thunar/thunar-launcher.c -@@ -815,8 +815,9 @@ thunar_launcher_update_idle (gpointer da - ** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions - **/ - -- /* Prepare "Open" label */ -+ /* Prepare "Open" label and icon */ - gtk_action_set_label (launcher->action_open, _("_Open")); -+ gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN); - - if (n_selected_files == n_directories && n_directories >= 1) - { -@@ -928,6 +929,7 @@ thunar_launcher_update_idle (gpointer da - /* turn the "Open" action into "Execute" */ - g_object_set (G_OBJECT (launcher->action_open), - "label", _("_Execute"), -+ "stock-id", GTK_STOCK_EXECUTE, - "tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files), - NULL); - } -@@ -945,6 +947,10 @@ thunar_launcher_update_idle (gpointer da - g_free (tooltip); - g_free (label); - -+ /* load default application icon */ -+ gtk_action_set_stock_id (launcher->action_open, NULL); -+ gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data)); -+ - /* remember the default application for the "Open" action */ - g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref); - diff --git a/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c b/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c deleted file mode 100644 index ee60b45..0000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c +++ /dev/null @@ -1,13 +0,0 @@ -Right click context menu with wrong icon (bug #10652) - ---- thunar/thunar-location-buttons.c.orig 2013-12-18 23:41:57 UTC -+++ thunar/thunar-location-buttons.c -@@ -175,7 +175,7 @@ static const GtkActionEntry action_entri - { "location-buttons-open", GTK_STOCK_OPEN, N_("_Open"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open), }, - { "location-buttons-open-in-new-tab", NULL, N_("Open in New Tab"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_tab), }, - { "location-buttons-open-in-new-window", NULL, N_("Open in New Window"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_window), }, -- { "location-buttons-create-folder", NULL, N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), }, -+ { "location-buttons-create-folder", "folder-new", N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), }, - { "location-buttons-empty-trash", NULL, N_("_Empty Trash"), "", N_("Delete all files and folders in the Trash"), G_CALLBACK (thunar_location_buttons_action_empty_trash), }, - { "location-buttons-paste-into-folder", GTK_STOCK_PASTE, N_("Paste Into Folder"), "", NULL, G_CALLBACK (thunar_location_buttons_action_paste_into_folder), }, - { "location-buttons-properties", GTK_STOCK_PROPERTIES, N_("_Properties..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_properties), }, diff --git a/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c b/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c deleted file mode 100644 index 06659ae..0000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c +++ /dev/null @@ -1,13 +0,0 @@ -Right click context menu with wrong icon (bug #10652) - ---- thunar/thunar-standard-view.c.orig 2014-12-20 00:21:57 UTC -+++ thunar/thunar-standard-view.c -@@ -393,7 +393,7 @@ static const GtkActionEntry action_entri - { - { "file-context-menu", NULL, N_ ("File Context Menu"), NULL, NULL, NULL, }, - { "folder-context-menu", NULL, N_ ("Folder Context Menu"), NULL, NULL, NULL, }, -- { "create-folder", NULL, N_ ("Create _Folder..."), "<control><shift>N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), }, -+ { "create-folder", "folder-new", N_ ("Create _Folder..."), "<control><shift>N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), }, - { "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties..."), "<alt>Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_standard_view_action_properties), }, - { "cut", GTK_STOCK_CUT, N_ ("Cu_t"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_cut), }, - { "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_copy), }, diff --git a/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c b/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c deleted file mode 100644 index adc6307..0000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c +++ /dev/null @@ -1,21 +0,0 @@ -Right click context menu with wrong icon (bug #10652) - ---- thunar/thunar-templates-action.c.orig 2013-12-18 23:41:57 UTC -+++ thunar/thunar-templates-action.c -@@ -477,7 +477,7 @@ thunar_templates_action_load_finished (T - gtk_widget_show (item); - - /* add the icon for the emtpy file item */ -- image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); -+ image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - } - -@@ -542,6 +542,7 @@ thunar_templates_action_new (const gchar - "hide-if-empty", FALSE, - "label", label, - "name", name, -+ "icon-name", "document-new", - NULL); - } - diff --git a/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c b/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c deleted file mode 100644 index 7ef0e67..0000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c +++ /dev/null @@ -1,25 +0,0 @@ -Right click context menu with wrong icon (bug #10652) - ---- thunar/thunar-tree-view.c.orig 2013-12-18 23:41:57 UTC -+++ thunar/thunar-tree-view.c -@@ -1093,6 +1093,7 @@ thunar_tree_view_context_menu (ThunarTre - GtkWidget *menu; - GtkWidget *item; - GtkWidget *window; -+ GIcon *icon; - GList *providers, *lp; - GList *actions = NULL, *tmp; - -@@ -1201,6 +1202,12 @@ thunar_tree_view_context_menu (ThunarTre - g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - gtk_widget_show (item); -+ -+ /* set the stock icon */ -+ icon = g_themed_icon_new ("folder-new"); -+ image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU); -+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); -+ g_object_unref (icon); - - /* append a separator item */ - item = gtk_separator_menu_item_new (); diff --git a/x11-fm/thunar/files/patch-thunar_thunar-window.c b/x11-fm/thunar/files/patch-thunar_thunar-window.c deleted file mode 100644 index acc4dbc..0000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-window.c +++ /dev/null @@ -1,15 +0,0 @@ -Right click context menu with wrong icon (bug #10652) - ---- thunar/thunar-window.c.orig 2013-12-18 23:41:57 UTC -+++ thunar/thunar-window.c -@@ -345,8 +345,8 @@ struct _ThunarWindow - static GtkActionEntry action_entries[] = - { - { "file-menu", NULL, N_ ("_File"), NULL, }, -- { "new-tab", NULL, N_ ("New _Tab"), "<control>T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), }, -- { "new-window", NULL, N_ ("New _Window"), "<control>N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), }, -+ { "new-tab", "tab-new", N_ ("New _Tab"), "<control>T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), }, -+ { "new-window", "window-new", N_ ("New _Window"), "<control>N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), }, - { "sendto-menu", NULL, N_ ("_Send To"), NULL, }, - { "empty-trash", NULL, N_ ("_Empty Trash"), NULL, N_ ("Delete all files and folders in the Trash"), G_CALLBACK (thunar_window_action_empty_trash), }, - { "detach-tab", NULL, N_ ("Detac_h Tab"), NULL, N_ ("Open current folder in a new window"), G_CALLBACK (thunar_window_action_detach_tab), }, diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist index 5650b1e..f61a28b 100644 --- a/x11-fm/thunar/pkg-plist +++ b/x11-fm/thunar/pkg-plist @@ -1,7 +1,7 @@ bin/Thunar bin/thunar bin/thunar-settings -%%PLUGIN_UCA%%etc/xdg/Thunar/uca.xml +%%PLUG_UCA%%etc/xdg/Thunar/uca.xml include/thunarx-2/thunarx/thunarx-config.h include/thunarx-2/thunarx/thunarx-file-info.h include/thunarx-2/thunarx/thunarx-menu-provider.h @@ -18,11 +18,11 @@ lib/Thunar/thunar-sendto-email lib/libthunarx-2.so lib/libthunarx-2.so.0 lib/libthunarx-2.so.0.0.0 -%%PLUGIN_APR%%lib/thunarx-2/thunar-apr.so -%%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.so -%%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.so -%%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so -%%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so +%%PLUG_APR%%lib/thunarx-2/thunar-apr.so +%%PLUG_SBR%%lib/thunarx-2/thunar-sbr.so +%%PLUG_UCA%%lib/thunarx-2/thunar-uca.so +%%PLUG_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so +%%PLUG_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so libdata/pkgconfig/thunarx-2.pc man/man1/Thunar.1.gz share/Thunar/sendto/thunar-sendto-email.desktop @@ -106,4 +106,4 @@ share/icons/hicolor/scalable/apps/Thunar.svg %%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo share/pixmaps/Thunar/Thunar-about-logo.png share/polkit-1/actions/org.xfce.thunar.policy -%%PLUGIN_TPA%%share/xfce4/panel-plugins/thunar-tpa.desktop +%%PLUG_TPA%%share/xfce4/panel/plugins/thunar-tpa.desktop diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile index fa0e457..8c5d55a 100644 --- a/x11-themes/gtk-xfce-engine/Makefile +++ b/x11-themes/gtk-xfce-engine/Makefile @@ -2,23 +2,19 @@ # $FreeBSD$ PORTNAME= gtk-xfce-engine -PORTVERSION= 3.0.1 -PORTREVISION= 1 +PORTVERSION= 3.2.0 CATEGORIES= x11-themes xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org -COMMENT= Xfce gtk theme engine +COMMENT= Xfce GTK2 theme engine + +LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= glib20 gtk20 -USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined - -CONFIGURE_ARGS+=--disable-glibtest \ - --enable-gtk2 \ - --disable-gtk3 .include <bsd.port.mk> diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo index 52f01a6..c60f251 100644 --- a/x11-themes/gtk-xfce-engine/distinfo +++ b/x11-themes/gtk-xfce-engine/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/gtk-xfce-engine-3.0.1.tar.bz2) = eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d -SIZE (xfce4/gtk-xfce-engine-3.0.1.tar.bz2) = 369040 +SHA256 (xfce4/gtk-xfce-engine-3.2.0.tar.bz2) = 875c9c3bda96faf050a2224649cc42129ffb662c4de33add8c0fd1fb860b47ed +SIZE (xfce4/gtk-xfce-engine-3.2.0.tar.bz2) = 376203 diff --git a/x11-themes/gtk-xfce-engine/pkg-descr b/x11-themes/gtk-xfce-engine/pkg-descr index b450fa1..ae0bf6a 100644 --- a/x11-themes/gtk-xfce-engine/pkg-descr +++ b/x11-themes/gtk-xfce-engine/pkg-descr @@ -1,4 +1,4 @@ -This package provides the Xfce Gtk+-2.0 and Gtk+-3.0 engines, which allows +This package provides the Xfce Gtk+-2.0 engine, which allows for homogeneity in applications for both business and personal desktops. -WWW: http://www.xfce.org/projects +WWW: http://www.xfce.org/ diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist index e50694d..68683b5 100644 --- a/x11-themes/gtk-xfce-engine/pkg-plist +++ b/x11-themes/gtk-xfce-engine/pkg-plist @@ -9,6 +9,7 @@ share/themes/Xfce-cadmium/gtk-2.0/gtkrc share/themes/Xfce-curve/gtk-2.0/gtkrc share/themes/Xfce-dawn/gtk-2.0/gtkrc share/themes/Xfce-dusk/gtk-2.0/gtkrc +share/themes/Xfce-flat/gtk-2.0/gtkrc share/themes/Xfce-kde2/gtk-2.0/gtkrc share/themes/Xfce-kolors/gtk-2.0/gtkrc share/themes/Xfce-light/gtk-2.0/gtkrc diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile index 07a8cff..0cb5ad0 100644 --- a/x11-toolkits/libxfce4gui/Makefile +++ b/x11-toolkits/libxfce4gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= libxfce4gui PORTVERSION= 4.10.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/archive/libxfcegui4/${PORTVERSION:R} @@ -13,44 +13,26 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Various Gtk widgets for the Xfce Desktop +LICENSE= GPLv2 + GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= gmake libtool pathfix pkgconfig tar:bzip2 +USES= gmake libtool pathfix pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack libglade2 USE_LDCONFIG= yes -USE_XFCE= configenv libutil +USE_XFCE= libutil USE_XORG= sm x11 -CONFIGURE_ARGS+=--disable-gladeui +CONFIGURE_ARGS+=--disable-gladeui --disable-static \ + --without-html-dir -OPTIONS_DEFINE= DOCS NLS STARTUP -OPTIONS_DEFAULT= STARTUP +OPTIONS_DEFINE= NLS STARTUP +OPTIONS_DEFAULT= NLS STARTUP STARTUP_DESC= Startup notification - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MSTARTUP} -LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+=--enable-startup-notification -.else -CONFIGURE_ARGS+=--disable-startup-notification -.endif - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +STARTUP_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +STARTUP_CONFIGURE_ENABLE= startup-notification +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c b/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c new file mode 100644 index 0000000..a8a9e80 --- /dev/null +++ b/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c @@ -0,0 +1,11 @@ +--- ./libxfcegui4/xfce-exec.c.orig 2012-04-28 20:10:43.000000000 +0000 ++++ ./libxfcegui4/xfce-exec.c 2014-03-24 21:25:39.000000000 +0000 +@@ -79,7 +79,7 @@ + #ifndef G_OS_WIN32 + gchar *dpyname = user_data; + +- xfce_setenv ("DISPLAY", dpyname, TRUE); ++ g_setenv ("DISPLAY", dpyname, TRUE); + #endif + } + diff --git a/x11-toolkits/libxfce4gui/pkg-descr b/x11-toolkits/libxfce4gui/pkg-descr index ad2b8fb..05888a7 100644 --- a/x11-toolkits/libxfce4gui/pkg-descr +++ b/x11-toolkits/libxfce4gui/pkg-descr @@ -1,3 +1,3 @@ GUI-related extension widgets and libraries for the Xfce Desktop. -WWW: http://www.xfce.org/projects/libraries/ +WWW: http://www.xfce.org/ diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist index f2d4c49..cab628a 100644 --- a/x11-toolkits/libxfce4gui/pkg-plist +++ b/x11-toolkits/libxfce4gui/pkg-plist @@ -43,37 +43,11 @@ include/xfce4/libxfcegui4/xfce_scaled_image.h include/xfce4/libxfcegui4/xfce_systemtray.h include/xfce4/libxfcegui4/xfce_togglebutton.h include/xfce4/libxfcegui4/xinerama.h -lib/libxfcegui4.a lib/libxfcegui4.so lib/libxfcegui4.so.4 lib/libxfcegui4.so.4.3.0 -lib/libglade/2.0/libxfce4.a lib/libglade/2.0/libxfce4.so libdata/pkgconfig/libxfcegui4-1.0.pc -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceFramebox.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceHeading.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceIconTheme.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceTitledDialog.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/home.png -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/index.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/index.sgml -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/left.png -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2 -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/reference.html -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/right.png -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/style.css -%%APIDOCS%%share/gtk-doc/html/libxfcegui4/up.png share/icons/hicolor/48x48/apps/xfce-edit.png share/icons/hicolor/48x48/apps/xfce-filemanager.png share/icons/hicolor/48x48/apps/xfce-games.png diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 7ff176d..1e7bb44 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= xfce4-desktop -PORTVERSION= 4.10.3 -PORTREVISION= 2 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/xfdesktop/${PORTVERSION:R} DISTNAME= xfdesktop-${PORTVERSION} DIST_SUBDIR= xfce4 @@ -22,41 +20,24 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= glib20 gtk20 intltool intlhack libwnck -USE_XFCE= configenv garcon libmenu libutil libexo xfconf -USES= pkgconfig gmake tar:bzip2 +USE_XFCE= garcon thunar +USES= pkgconfig gmake gettext-tools xfce tar:bzip2 USE_XORG= x11 sm -# Prevent build error, with macro 'g_return_val_if_fail ()' -CFLAGS+= -Wno-return-type - CONFIGURE_ARGS+=--enable-gio-unix \ - --enable-notifications - -OPTIONS_DEFINE= THUNAR NLS -OPTIONS_DEFAULT= THUNAR NLS -THUNAR_DESC= Enable thunar support + --enable-notifications \ + --with-file-manager-fallback=Thunar -.include <bsd.port.options.mk> +OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MTHUNAR} -CONFIGURE_ARGS+=--enable-thunarx --with-file-manager-fallback=Thunar -USE_XFCE+= thunar -.else -CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.pre.mk> post-patch: .if !${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo index caafbe6..f139376 100644 --- a/x11-wm/xfce4-desktop/distinfo +++ b/x11-wm/xfce4-desktop/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfdesktop-4.10.3.tar.bz2) = 09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce -SIZE (xfce4/xfdesktop-4.10.3.tar.bz2) = 1054828 +SHA256 (xfce4/xfdesktop-4.12.0.tar.bz2) = 6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7 +SIZE (xfce4/xfdesktop-4.12.0.tar.bz2) = 1408116 diff --git a/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c b/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c deleted file mode 100644 index c7ac702..0000000 --- a/x11-wm/xfce4-desktop/files/patch-src__xfdesktop-app-menu-item.c +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/xfdesktop-app-menu-item.c.orig 2013-09-16 07:17:42.000000000 +0000 -+++ ./src/xfdesktop-app-menu-item.c 2013-12-17 20:23:34.000000000 +0000 -@@ -31,6 +31,7 @@ - - #include <libxfce4util/libxfce4util.h> - #include <libxfce4ui/libxfce4ui.h> -+#include <exo/exo.h> - - #include "xfdesktop-app-menu-item.h" - -@@ -212,6 +213,11 @@ - - /* Turn the pixbuf into a gtk_image */ - if(G_LIKELY(pixbuf)) { -+ /* scale the pixbuf down if it needs it */ -+ GdkPixbuf *tmp = exo_gdk_pixbuf_scale_down(pixbuf, TRUE, w, h); -+ g_object_unref(pixbuf); -+ pixbuf = tmp; -+ - image = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(G_OBJECT(pixbuf)); - } diff --git a/x11-wm/xfce4-desktop/pkg-descr b/x11-wm/xfce4-desktop/pkg-descr index f22117d..b7b0115 100644 --- a/x11-wm/xfce4-desktop/pkg-descr +++ b/x11-wm/xfce4-desktop/pkg-descr @@ -1,4 +1,4 @@ The desktop manager sets the background image, and provides a root window menu, desktop icons or minimized icons and windows list. -WWW: http://docs.xfce.org/xfce/xfdesktop/start +WWW: http://www.xfce.org/ diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist index de9240f..c20a0a3 100644 --- a/x11-wm/xfce4-desktop/pkg-plist +++ b/x11-wm/xfce4-desktop/pkg-plist @@ -3,6 +3,7 @@ bin/xfdesktop-settings man/man1/xfdesktop.1.gz share/applications/xfce-backdrop-settings.desktop share/backgrounds/xfce/xfce-blue.jpg +share/backgrounds/xfce/xfce-teal.jpg share/icons/hicolor/32x32/apps/xfce4-backdrop.png share/icons/hicolor/32x32/apps/xfce4-menueditor.png share/icons/hicolor/48x48/apps/xfce4-backdrop.png @@ -26,6 +27,7 @@ share/icons/hicolor/scalable/apps/xfce4-menueditor.svg %%NLS%%share/locale/es/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/et/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfdesktop.mo +%%NLS%%share/locale/fa_IR/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfdesktop.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfdesktop.mo diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 45b1862..b04b9d89 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= xfce4-panel -PORTVERSION= 4.10.1 -PORTREVISION= 3 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org @@ -17,39 +15,27 @@ LICENSE_COMB= multi LICENSE_DISTFILES= ${WRKSRC}/COPYING \ ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ - libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -USES= desktop-file-utils gmake libtool:keepla pathfix perl5 \ +USES= desktop-file-utils gmake libtool pathfix gettext-tools perl5 \ pkgconfig tar:bzip2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GNOME= glib20 gtk20 intltool intlhack libwnck +USE_GNOME= glib20 gtk20 intltool intlhack libwnck cairo USE_LDCONFIG= yes -USE_XFCE= configenv garcon libexo libmenu libutil xfconf +USE_XFCE= garcon libexo USE_XORG= x11 sm -CONFIGURE_ARGS+=--enable-gio-unix - -OPTIONS_DEFINE= NLS DOCS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif +CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir + +OPTIONS_DEFINE= GTK3 NLS +OPTIONS_DEFAULT= GTK3 NLS +GTK3_USES= xfce:gtk3 +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gtk3 +GTK3_USES_OFF= xfce +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo index 89f2375..0080c07 100644 --- a/x11-wm/xfce4-panel/distinfo +++ b/x11-wm/xfce4-panel/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-panel-4.10.1.tar.bz2) = 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6 -SIZE (xfce4/xfce4-panel-4.10.1.tar.bz2) = 1061090 +SHA256 (xfce4/xfce4-panel-4.12.0.tar.bz2) = 30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0 +SIZE (xfce4/xfce4-panel-4.12.0.tar.bz2) = 1107470 diff --git a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c b/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c deleted file mode 100644 index 58384b8..0000000 --- a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c +++ /dev/null @@ -1,23 +0,0 @@ -'system-hibernate' and 'system-suspend' icons don't exist when Gnome or -Adwaita are default icons theme. - ---- plugins/actions/actions.c.orig 2013-05-05 15:47:07 UTC -+++ plugins/actions/actions.c -@@ -181,7 +181,7 @@ static ActionEntry action_entries[] = - N_("_Hibernate"), - N_("Do you want to suspend to disk?"), - N_("Hibernating computer in %d seconds."), -- "system-hibernate" -+ "xfsm-hibernate" - }, - { ACTION_TYPE_SUSPEND, - "suspend", -@@ -189,7 +189,7 @@ static ActionEntry action_entries[] = - N_("Sus_pend"), - N_("Do you want to suspend to RAM?"), - N_("Suspending computer in %d seconds."), -- "system-suspend" -+ "xfsm-suspend" - }, - { ACTION_TYPE_RESTART, - "restart", diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist index aab1dcb..b0d981f 100644 --- a/x11-wm/xfce4-panel/pkg-plist +++ b/x11-wm/xfce4-panel/pkg-plist @@ -15,64 +15,41 @@ include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h -lib/libxfce4panel-1.0.la +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros-46.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h +%%GTK3%%include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h lib/libxfce4panel-1.0.so lib/libxfce4panel-1.0.so.4 lib/libxfce4panel-1.0.so.4.0.0 +%%GTK3%%lib/libxfce4panel-2.0.so +%%GTK3%%lib/libxfce4panel-2.0.so.4 +%%GTK3%%lib/libxfce4panel-2.0.so.4.0.0 lib/xfce4/panel/migrate -lib/xfce4/panel/plugins/libactions.la lib/xfce4/panel/plugins/libactions.so -lib/xfce4/panel/plugins/libapplicationsmenu.la lib/xfce4/panel/plugins/libapplicationsmenu.so -lib/xfce4/panel/plugins/libclock.la lib/xfce4/panel/plugins/libclock.so -lib/xfce4/panel/plugins/libdirectorymenu.la lib/xfce4/panel/plugins/libdirectorymenu.so -lib/xfce4/panel/plugins/liblauncher.la lib/xfce4/panel/plugins/liblauncher.so -lib/xfce4/panel/plugins/libpager.la lib/xfce4/panel/plugins/libpager.so -lib/xfce4/panel/plugins/libseparator.la lib/xfce4/panel/plugins/libseparator.so -lib/xfce4/panel/plugins/libshowdesktop.la lib/xfce4/panel/plugins/libshowdesktop.so -lib/xfce4/panel/plugins/libsystray.la lib/xfce4/panel/plugins/libsystray.so -lib/xfce4/panel/plugins/libtasklist.la lib/xfce4/panel/plugins/libtasklist.so -lib/xfce4/panel/plugins/libwindowmenu.la lib/xfce4/panel/plugins/libwindowmenu.so -lib/xfce4/panel/wrapper +lib/xfce4/panel/wrapper-1.0 +%%GTK3%%lib/xfce4/panel/wrapper-2.0 libdata/pkgconfig/libxfce4panel-1.0.pc +%%GTK3%%libdata/pkgconfig/libxfce4panel-2.0.pc share/applications/panel-desktop-handler.desktop share/applications/panel-preferences.desktop -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/home.png -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.sgml -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/left.png -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2 -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/right.png -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/style.css -%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/up.png share/icons/hicolor/16x16/apps/xfce4-panel-menu.png share/icons/hicolor/16x16/apps/xfce4-panel.png share/icons/hicolor/22x22/apps/xfce4-panel-menu.png @@ -87,49 +64,39 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/az/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/be/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-panel.mo @@ -138,11 +105,12 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo -%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo @@ -150,6 +118,7 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo share/xfce4/panel/plugins/actions.desktop share/xfce4/panel/plugins/applicationsmenu.desktop diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index f068fff..681b895 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -2,52 +2,41 @@ # $FreeBSD$ PORTNAME= xfce4-session -PORTVERSION= 4.10.1 -PORTREVISION= 3 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's session manager +LICENSE= GPLv2 + BUILD_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth \ console-kit-daemon:${PORTSDIR}/sysutils/consolekit -LIB_DEPENDS= libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \ - libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libupower-glib.so:${PORTSDIR}/sysutils/upower \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GNOME= gtk20 glib20 intltool intlhack -USES= pathfix pkgconfig gmake tar:bzip2 libtool +USE_GNOME= gtk20 glib20 intltool intlhack libwnck +USES= pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2 USE_LDCONFIG= yes -USE_XFCE= configenv libmenu libutil xfconf +USE_XFCE= libmenu USE_XORG= x11 sm ice CONFIGURE_ARGS+=--enable-legacy-sm \ - --disable-systemd \ --with-xsession-prefix=${PREFIX} SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes PLIST_SUB= VERSION="4.6" -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - .include <bsd.port.mk> diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo index f8466cf..4b47d55 100644 --- a/x11-wm/xfce4-session/distinfo +++ b/x11-wm/xfce4-session/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-session-4.10.1.tar.bz2) = 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 -SIZE (xfce4/xfce4-session-4.10.1.tar.bz2) = 1273015 +SHA256 (xfce4/xfce4-session-4.12.0.tar.bz2) = 68c85453b097d3ada573dcb7e72acd06e0fc34531996122c10d20096405b7b06 +SIZE (xfce4/xfce4-session-4.12.0.tar.bz2) = 1247710 diff --git a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c b/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c deleted file mode 100644 index f806b76..0000000 --- a/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c +++ /dev/null @@ -1,12 +0,0 @@ ---- xfce4-session/xfsm-shutdown.c.orig 2012-04-28 22:43:27.000000000 +0200 -+++ xfce4-session/xfsm-shutdown.c 2012-05-17 20:32:41.000000000 +0200 -@@ -52,6 +52,9 @@ - #include <signal.h> - #endif - -+#include <sys/param.h> -+#include <sys/user.h> -+#include <sys/sysctl.h> - - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-lowlevel.h> diff --git a/x11-wm/xfce4-session/pkg-descr b/x11-wm/xfce4-session/pkg-descr index 65af86d..e38b77e 100644 --- a/x11-wm/xfce4-session/pkg-descr +++ b/x11-wm/xfce4-session/pkg-descr @@ -1,4 +1,5 @@ -The session manager controls all aspects of the startup and the -shutdown of the user session. +The Xfce session manager controls the loading of applications when +Xfce is started. It also handles logging out, shutting down, and +rebooting. -WWW: http://docs.xfce.org/xfce/xfce4-session/start +WWW: http://www.xfce.org/ diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist index a788af1..98be06b 100644 --- a/x11-wm/xfce4-session/pkg-plist +++ b/x11-wm/xfce4-session/pkg-plist @@ -4,8 +4,8 @@ bin/xfce4-session-logout bin/xfce4-session-settings bin/xflock4 etc/xdg/autostart/xscreensaver.desktop -etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml etc/xdg/xfce4/Xft.xrdb +etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml etc/xdg/xfce4/xinitrc include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h @@ -23,8 +23,12 @@ man/man1/xfce4-session-logout.1.gz man/man1/xfce4-session.1.gz share/applications/xfce-session-settings.desktop share/applications/xfce4-session-logout.desktop -share/xsessions/xfce.desktop share/icons/hicolor/128x128/apps/xfce4-session.png +share/icons/hicolor/48x48/apps/system-hibernate.png +share/icons/hicolor/48x48/apps/system-log-out.png +share/icons/hicolor/48x48/apps/system-reboot.png +share/icons/hicolor/48x48/apps/system-shutdown.png +share/icons/hicolor/48x48/apps/system-suspend.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png share/icons/hicolor/48x48/apps/xfsm-hibernate.png @@ -32,52 +36,45 @@ share/icons/hicolor/48x48/apps/xfsm-logout.png share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png share/icons/hicolor/48x48/apps/xfsm-suspend.png +share/icons/hicolor/scalable/apps/system-shutdown.svg share/icons/hicolor/scalable/apps/xfce4-session.svg share/icons/hicolor/scalable/apps/xfsm-shutdown.svg %%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/az/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/be/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-session.mo @@ -86,11 +83,12 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-session.mo -%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-session.mo @@ -98,6 +96,9 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo +share/polkit-1/actions/org.xfce.session.policy share/themes/Default/balou/logo.png share/themes/Default/balou/themerc +share/xsessions/xfce.desktop diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 170e65c..6853e56 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -2,63 +2,43 @@ # $FreeBSD$ PORTNAME= xfce4-wm -PORTVERSION= 4.10.1 -PORTREVISION= 1 +PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/xfwm4/${PORTVERSION:R} DISTNAME= xfwm4-${PORTVERSION} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's window manager -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck +LICENSE= GPLv2 + +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS= --enable-xsync \ --enable-render \ --enable-randr \ + --enable-compositor \ --disable-kde-systray GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USES= pathfix pkgconfig gmake tar:bzip2 -USE_GNOME= gtk20 intltool intlhack +USES= pkgconfig gmake gettext-tools xfce tar:bzip2 +USE_GNOME= gtk20 intltool intlhack libwnck USE_LDCONFIG= yes -USE_XFCE= configenv libmenu libutil xfconf -USE_XORG= x11 sm xext xrandr xrender +USE_XFCE= libmenu +USE_XORG= x11 sm xcomposite xdamage xext xfixes xrandr xrender DATADIR= ${PREFIX}/share/xfwm4 -OPTIONS_DEFINE= COMPOSITE NLS NOTIFY REVMOUSE -OPTIONS_DEFAULT= COMPOSITE NOTIFY -REVMOUSE_DESC= Reverse mouse workspace changing direction - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCOMPOSITE} -CONFIGURE_ARGS+=--enable-compositor -.else -CONFIGURE_ARGS+=--disable-compositor -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+=--enable-startup-notification -.else -CONFIGURE_ARGS+=--disable-startup-notification -.endif - -.if ${PORT_OPTIONS:MREVMOUSE} -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src__events.c -.endif +OPTIONS_DEFINE= DRM NLS STARTUP +OPTIONS_DEFAULT= NLS STARTUP +DRM_DESC= Direct Rendering Module service +STARTUP_DESC= Startup notification +DRM_LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm +DRM_CONFIGURE_ENABLE= libdrm +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +STARTUP_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +STARTUP_CONFIGURE_ENABLE= startup-notification +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo index 20ec30c..bdb5d91 100644 --- a/x11-wm/xfce4-wm/distinfo +++ b/x11-wm/xfce4-wm/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfwm4-4.10.1.tar.bz2) = 380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 -SIZE (xfce4/xfwm4-4.10.1.tar.bz2) = 1093825 +SHA256 (xfce4/xfwm4-4.12.0.tar.bz2) = 29f4cbe2869ae32a6775877ed6bfc4ded7000f013ff7eb70b2639c49f415cc3a +SIZE (xfce4/xfwm4-4.12.0.tar.bz2) = 1200700 diff --git a/x11-wm/xfce4-wm/files/extrapatch-src__events.c b/x11-wm/xfce4-wm/files/extrapatch-src__events.c deleted file mode 100644 index af5798a..0000000 --- a/x11-wm/xfce4-wm/files/extrapatch-src__events.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/events.c.orig Mon Apr 2 21:48:20 2007 -+++ src/events.c Tue Jun 19 06:49:58 2007 -@@ -860,11 +860,11 @@ - - if (ev->button == Button4) - { -- workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time); -+ workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time); - } - else if (ev->button == Button5) - { -- workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time); -+ workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time); - } - } - diff --git a/x11-wm/xfce4-wm/files/patch-src__client.c b/x11-wm/xfce4-wm/files/patch-src__client.c deleted file mode 100644 index 9a8fa2c9..0000000 --- a/x11-wm/xfce4-wm/files/patch-src__client.c +++ /dev/null @@ -1,47 +0,0 @@ -Obtained from: -- Fullscreen mode doesn't work correctly for Chromium (bug #8563) -- Panels don't hide when full screening VLC, which is maximized (bug #10622) - ---- src/client.c.orig 2013-05-05 15:58:42 UTC -+++ src/client.c -@@ -981,8 +981,13 @@ - wc.width = c->width; - wc.height = c->height; - -+ if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) -+ { -+ clientUpdateFullscreenSize (c); -+ } -+ - /* If client is maximized, we need to update its coordonates and size as well */ -- if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) -+ else if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) - { - GdkRectangle rect; - myScreenFindMonitorAtPoint (screen_info, -@@ -3538,8 +3543,13 @@ - continue; - } - -+ if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) -+ { -+ clientUpdateFullscreenSize (c); -+ } -+ - /* Recompute size and position of maximized windows */ -- if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) -+ else if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED)) - { - maximization_flags = c->flags & CLIENT_FLAG_MAXIMIZED; - -@@ -3553,10 +3563,6 @@ - wc.height = c->height; - clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight, CFG_NOTIFY); - } -- else if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) -- { -- clientUpdateFullscreenSize (c); -- } - else - { - configure_flags = CFG_CONSTRAINED | CFG_REQUEST; diff --git a/x11-wm/xfce4-wm/pkg-descr b/x11-wm/xfce4-wm/pkg-descr index 199bf2b..f121986 100644 --- a/x11-wm/xfce4-wm/pkg-descr +++ b/x11-wm/xfce4-wm/pkg-descr @@ -2,4 +2,4 @@ The Xfce 4 window manager manages the placement of application windows on the screen, provides window decorations, and manages work- spaces or virtual desktops. -WWW: http://docs.xfce.org/xfce/xfwm4/start +WWW: http://www.xfce.org/ diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist index 9884475..a24eb61 100644 --- a/x11-wm/xfce4-wm/pkg-plist +++ b/x11-wm/xfce4-wm/pkg-plist @@ -27,53 +27,45 @@ share/icons/hicolor/scalable/actions/xfce-wm-stick.svg share/icons/hicolor/scalable/actions/xfce-wm-unmaximize.svg share/icons/hicolor/scalable/actions/xfce-wm-unshade.svg share/icons/hicolor/scalable/actions/xfce-wm-unstick.svg -share/icons/hicolor/scalable/apps/xfce4-workspaces.svg share/icons/hicolor/scalable/apps/wmtweaks.svg +share/icons/hicolor/scalable/apps/xfce4-workspaces.svg share/icons/hicolor/scalable/apps/xfwm4.svg %%NLS%%share/locale/am/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/az/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/be/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/da/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/de/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/dz/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/el/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/es/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/es_MX/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/et/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/fa/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/gu/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/he/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/hi/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/id/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/is/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/it/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/ka/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/mk/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/mr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfwm4.mo @@ -82,11 +74,12 @@ share/icons/hicolor/scalable/apps/xfwm4.svg %%NLS%%share/locale/ru/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/si/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfwm4.mo -%%NLS%%share/locale/ta/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/te/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfwm4.mo @@ -94,6 +87,7 @@ share/icons/hicolor/scalable/apps/xfwm4.svg %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfwm4.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfwm4.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfwm4.mo share/themes/Daloa/xfwm4/README share/themes/Daloa/xfwm4/bottom-active.png @@ -217,6 +211,250 @@ share/themes/Daloa/xfwm4/top-right-active.png share/themes/Daloa/xfwm4/top-right-active.xpm share/themes/Daloa/xfwm4/top-right-inactive.png share/themes/Daloa/xfwm4/top-right-inactive.xpm +share/themes/Default-hdpi/xfwm4/README +share/themes/Default-hdpi/xfwm4/bottom-active.png +share/themes/Default-hdpi/xfwm4/bottom-active.xpm +share/themes/Default-hdpi/xfwm4/bottom-inactive.png +share/themes/Default-hdpi/xfwm4/bottom-inactive.xpm +share/themes/Default-hdpi/xfwm4/bottom-left-active.png +share/themes/Default-hdpi/xfwm4/bottom-left-active.xpm +share/themes/Default-hdpi/xfwm4/bottom-left-inactive.png +share/themes/Default-hdpi/xfwm4/bottom-left-inactive.xpm +share/themes/Default-hdpi/xfwm4/bottom-right-active.png +share/themes/Default-hdpi/xfwm4/bottom-right-active.xpm +share/themes/Default-hdpi/xfwm4/bottom-right-inactive.png +share/themes/Default-hdpi/xfwm4/bottom-right-inactive.xpm +share/themes/Default-hdpi/xfwm4/close-active.png +share/themes/Default-hdpi/xfwm4/close-active.xpm +share/themes/Default-hdpi/xfwm4/close-inactive.png +share/themes/Default-hdpi/xfwm4/close-inactive.xpm +share/themes/Default-hdpi/xfwm4/close-prelight.png +share/themes/Default-hdpi/xfwm4/close-prelight.xpm +share/themes/Default-hdpi/xfwm4/close-pressed.png +share/themes/Default-hdpi/xfwm4/close-pressed.xpm +share/themes/Default-hdpi/xfwm4/hide-active.png +share/themes/Default-hdpi/xfwm4/hide-active.xpm +share/themes/Default-hdpi/xfwm4/hide-inactive.png +share/themes/Default-hdpi/xfwm4/hide-inactive.xpm +share/themes/Default-hdpi/xfwm4/hide-prelight.png +share/themes/Default-hdpi/xfwm4/hide-prelight.xpm +share/themes/Default-hdpi/xfwm4/hide-pressed.png +share/themes/Default-hdpi/xfwm4/hide-pressed.xpm +share/themes/Default-hdpi/xfwm4/left-active.png +share/themes/Default-hdpi/xfwm4/left-active.xpm +share/themes/Default-hdpi/xfwm4/left-inactive.png +share/themes/Default-hdpi/xfwm4/left-inactive.xpm +share/themes/Default-hdpi/xfwm4/maximize-active.png +share/themes/Default-hdpi/xfwm4/maximize-active.xpm +share/themes/Default-hdpi/xfwm4/maximize-inactive.png +share/themes/Default-hdpi/xfwm4/maximize-inactive.xpm +share/themes/Default-hdpi/xfwm4/maximize-prelight.png +share/themes/Default-hdpi/xfwm4/maximize-prelight.xpm +share/themes/Default-hdpi/xfwm4/maximize-pressed.png +share/themes/Default-hdpi/xfwm4/maximize-pressed.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-active.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-active.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-inactive.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-prelight.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-prelight.xpm +share/themes/Default-hdpi/xfwm4/maximize-toggled-pressed.png +share/themes/Default-hdpi/xfwm4/maximize-toggled-pressed.xpm +share/themes/Default-hdpi/xfwm4/menu-active.png +share/themes/Default-hdpi/xfwm4/menu-active.xpm +share/themes/Default-hdpi/xfwm4/menu-inactive.png +share/themes/Default-hdpi/xfwm4/menu-inactive.xpm +share/themes/Default-hdpi/xfwm4/menu-prelight.png +share/themes/Default-hdpi/xfwm4/menu-prelight.xpm +share/themes/Default-hdpi/xfwm4/menu-pressed.png +share/themes/Default-hdpi/xfwm4/menu-pressed.xpm +share/themes/Default-hdpi/xfwm4/right-active.png +share/themes/Default-hdpi/xfwm4/right-active.xpm +share/themes/Default-hdpi/xfwm4/right-inactive.png +share/themes/Default-hdpi/xfwm4/right-inactive.xpm +share/themes/Default-hdpi/xfwm4/shade-active.png +share/themes/Default-hdpi/xfwm4/shade-active.xpm +share/themes/Default-hdpi/xfwm4/shade-inactive.png +share/themes/Default-hdpi/xfwm4/shade-inactive.xpm +share/themes/Default-hdpi/xfwm4/shade-prelight.png +share/themes/Default-hdpi/xfwm4/shade-prelight.xpm +share/themes/Default-hdpi/xfwm4/shade-pressed.png +share/themes/Default-hdpi/xfwm4/shade-pressed.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-active.png +share/themes/Default-hdpi/xfwm4/shade-toggled-active.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-inactive.png +share/themes/Default-hdpi/xfwm4/shade-toggled-inactive.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-prelight.png +share/themes/Default-hdpi/xfwm4/shade-toggled-prelight.xpm +share/themes/Default-hdpi/xfwm4/shade-toggled-pressed.png +share/themes/Default-hdpi/xfwm4/shade-toggled-pressed.xpm +share/themes/Default-hdpi/xfwm4/stick-active.png +share/themes/Default-hdpi/xfwm4/stick-active.xpm +share/themes/Default-hdpi/xfwm4/stick-inactive.png +share/themes/Default-hdpi/xfwm4/stick-inactive.xpm +share/themes/Default-hdpi/xfwm4/stick-prelight.png +share/themes/Default-hdpi/xfwm4/stick-prelight.xpm +share/themes/Default-hdpi/xfwm4/stick-pressed.png +share/themes/Default-hdpi/xfwm4/stick-pressed.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-active.png +share/themes/Default-hdpi/xfwm4/stick-toggled-active.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-inactive.png +share/themes/Default-hdpi/xfwm4/stick-toggled-inactive.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-prelight.png +share/themes/Default-hdpi/xfwm4/stick-toggled-prelight.xpm +share/themes/Default-hdpi/xfwm4/stick-toggled-pressed.png +share/themes/Default-hdpi/xfwm4/stick-toggled-pressed.xpm +share/themes/Default-hdpi/xfwm4/themerc +share/themes/Default-hdpi/xfwm4/title-1-active.png +share/themes/Default-hdpi/xfwm4/title-1-active.xpm +share/themes/Default-hdpi/xfwm4/title-1-inactive.png +share/themes/Default-hdpi/xfwm4/title-1-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-2-active.png +share/themes/Default-hdpi/xfwm4/title-2-active.xpm +share/themes/Default-hdpi/xfwm4/title-2-inactive.png +share/themes/Default-hdpi/xfwm4/title-2-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-3-active.png +share/themes/Default-hdpi/xfwm4/title-3-active.xpm +share/themes/Default-hdpi/xfwm4/title-3-inactive.png +share/themes/Default-hdpi/xfwm4/title-3-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-4-active.png +share/themes/Default-hdpi/xfwm4/title-4-active.xpm +share/themes/Default-hdpi/xfwm4/title-4-inactive.png +share/themes/Default-hdpi/xfwm4/title-4-inactive.xpm +share/themes/Default-hdpi/xfwm4/title-5-active.png +share/themes/Default-hdpi/xfwm4/title-5-active.xpm +share/themes/Default-hdpi/xfwm4/title-5-inactive.png +share/themes/Default-hdpi/xfwm4/title-5-inactive.xpm +share/themes/Default-hdpi/xfwm4/top-left-active.png +share/themes/Default-hdpi/xfwm4/top-left-active.xpm +share/themes/Default-hdpi/xfwm4/top-left-inactive.png +share/themes/Default-hdpi/xfwm4/top-left-inactive.xpm +share/themes/Default-hdpi/xfwm4/top-right-active.png +share/themes/Default-hdpi/xfwm4/top-right-active.xpm +share/themes/Default-hdpi/xfwm4/top-right-inactive.png +share/themes/Default-hdpi/xfwm4/top-right-inactive.xpm +share/themes/Default-xhdpi/xfwm4/README +share/themes/Default-xhdpi/xfwm4/bottom-active.png +share/themes/Default-xhdpi/xfwm4/bottom-active.xpm +share/themes/Default-xhdpi/xfwm4/bottom-inactive.png +share/themes/Default-xhdpi/xfwm4/bottom-inactive.xpm +share/themes/Default-xhdpi/xfwm4/bottom-left-active.png +share/themes/Default-xhdpi/xfwm4/bottom-left-active.xpm +share/themes/Default-xhdpi/xfwm4/bottom-left-inactive.png +share/themes/Default-xhdpi/xfwm4/bottom-left-inactive.xpm +share/themes/Default-xhdpi/xfwm4/bottom-right-active.png +share/themes/Default-xhdpi/xfwm4/bottom-right-active.xpm +share/themes/Default-xhdpi/xfwm4/bottom-right-inactive.png +share/themes/Default-xhdpi/xfwm4/bottom-right-inactive.xpm +share/themes/Default-xhdpi/xfwm4/close-active.png +share/themes/Default-xhdpi/xfwm4/close-active.xpm +share/themes/Default-xhdpi/xfwm4/close-inactive.png +share/themes/Default-xhdpi/xfwm4/close-inactive.xpm +share/themes/Default-xhdpi/xfwm4/close-prelight.png +share/themes/Default-xhdpi/xfwm4/close-prelight.xpm +share/themes/Default-xhdpi/xfwm4/close-pressed.png +share/themes/Default-xhdpi/xfwm4/close-pressed.xpm +share/themes/Default-xhdpi/xfwm4/hide-active.png +share/themes/Default-xhdpi/xfwm4/hide-active.xpm +share/themes/Default-xhdpi/xfwm4/hide-inactive.png +share/themes/Default-xhdpi/xfwm4/hide-inactive.xpm +share/themes/Default-xhdpi/xfwm4/hide-prelight.png +share/themes/Default-xhdpi/xfwm4/hide-prelight.xpm +share/themes/Default-xhdpi/xfwm4/hide-pressed.png +share/themes/Default-xhdpi/xfwm4/hide-pressed.xpm +share/themes/Default-xhdpi/xfwm4/left-active.png +share/themes/Default-xhdpi/xfwm4/left-active.xpm +share/themes/Default-xhdpi/xfwm4/left-inactive.png +share/themes/Default-xhdpi/xfwm4/left-inactive.xpm +share/themes/Default-xhdpi/xfwm4/maximize-active.png +share/themes/Default-xhdpi/xfwm4/maximize-active.xpm +share/themes/Default-xhdpi/xfwm4/maximize-inactive.png +share/themes/Default-xhdpi/xfwm4/maximize-inactive.xpm +share/themes/Default-xhdpi/xfwm4/maximize-prelight.png +share/themes/Default-xhdpi/xfwm4/maximize-prelight.xpm +share/themes/Default-xhdpi/xfwm4/maximize-pressed.png +share/themes/Default-xhdpi/xfwm4/maximize-pressed.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-active.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-active.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-inactive.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-inactive.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-prelight.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-prelight.xpm +share/themes/Default-xhdpi/xfwm4/maximize-toggled-pressed.png +share/themes/Default-xhdpi/xfwm4/maximize-toggled-pressed.xpm +share/themes/Default-xhdpi/xfwm4/menu-active.png +share/themes/Default-xhdpi/xfwm4/menu-active.xpm +share/themes/Default-xhdpi/xfwm4/menu-inactive.png +share/themes/Default-xhdpi/xfwm4/menu-inactive.xpm +share/themes/Default-xhdpi/xfwm4/menu-prelight.png +share/themes/Default-xhdpi/xfwm4/menu-prelight.xpm +share/themes/Default-xhdpi/xfwm4/menu-pressed.png +share/themes/Default-xhdpi/xfwm4/menu-pressed.xpm +share/themes/Default-xhdpi/xfwm4/right-active.png +share/themes/Default-xhdpi/xfwm4/right-active.xpm +share/themes/Default-xhdpi/xfwm4/right-inactive.png +share/themes/Default-xhdpi/xfwm4/right-inactive.xpm +share/themes/Default-xhdpi/xfwm4/shade-active.png +share/themes/Default-xhdpi/xfwm4/shade-active.xpm +share/themes/Default-xhdpi/xfwm4/shade-inactive.png +share/themes/Default-xhdpi/xfwm4/shade-inactive.xpm +share/themes/Default-xhdpi/xfwm4/shade-prelight.png +share/themes/Default-xhdpi/xfwm4/shade-prelight.xpm +share/themes/Default-xhdpi/xfwm4/shade-pressed.png +share/themes/Default-xhdpi/xfwm4/shade-pressed.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-active.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-active.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-inactive.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-inactive.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-prelight.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-prelight.xpm +share/themes/Default-xhdpi/xfwm4/shade-toggled-pressed.png +share/themes/Default-xhdpi/xfwm4/shade-toggled-pressed.xpm +share/themes/Default-xhdpi/xfwm4/stick-active.png +share/themes/Default-xhdpi/xfwm4/stick-active.xpm +share/themes/Default-xhdpi/xfwm4/stick-inactive.png +share/themes/Default-xhdpi/xfwm4/stick-inactive.xpm +share/themes/Default-xhdpi/xfwm4/stick-prelight.png +share/themes/Default-xhdpi/xfwm4/stick-prelight.xpm +share/themes/Default-xhdpi/xfwm4/stick-pressed.png +share/themes/Default-xhdpi/xfwm4/stick-pressed.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-active.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-active.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-inactive.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-inactive.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-prelight.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-prelight.xpm +share/themes/Default-xhdpi/xfwm4/stick-toggled-pressed.png +share/themes/Default-xhdpi/xfwm4/stick-toggled-pressed.xpm +share/themes/Default-xhdpi/xfwm4/themerc +share/themes/Default-xhdpi/xfwm4/title-1-active.png +share/themes/Default-xhdpi/xfwm4/title-1-active.xpm +share/themes/Default-xhdpi/xfwm4/title-1-inactive.png +share/themes/Default-xhdpi/xfwm4/title-1-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-2-active.png +share/themes/Default-xhdpi/xfwm4/title-2-active.xpm +share/themes/Default-xhdpi/xfwm4/title-2-inactive.png +share/themes/Default-xhdpi/xfwm4/title-2-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-3-active.png +share/themes/Default-xhdpi/xfwm4/title-3-active.xpm +share/themes/Default-xhdpi/xfwm4/title-3-inactive.png +share/themes/Default-xhdpi/xfwm4/title-3-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-4-active.png +share/themes/Default-xhdpi/xfwm4/title-4-active.xpm +share/themes/Default-xhdpi/xfwm4/title-4-inactive.png +share/themes/Default-xhdpi/xfwm4/title-4-inactive.xpm +share/themes/Default-xhdpi/xfwm4/title-5-active.png +share/themes/Default-xhdpi/xfwm4/title-5-active.xpm +share/themes/Default-xhdpi/xfwm4/title-5-inactive.png +share/themes/Default-xhdpi/xfwm4/title-5-inactive.xpm +share/themes/Default-xhdpi/xfwm4/top-left-active.png +share/themes/Default-xhdpi/xfwm4/top-left-active.xpm +share/themes/Default-xhdpi/xfwm4/top-left-inactive.png +share/themes/Default-xhdpi/xfwm4/top-left-inactive.xpm +share/themes/Default-xhdpi/xfwm4/top-right-active.png +share/themes/Default-xhdpi/xfwm4/top-right-active.xpm +share/themes/Default-xhdpi/xfwm4/top-right-inactive.png +share/themes/Default-xhdpi/xfwm4/top-right-inactive.xpm share/themes/Default/xfwm4/README share/themes/Default/xfwm4/bottom-active.png share/themes/Default/xfwm4/bottom-active.xpm diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index c1d30ec..b305a68 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce -PORTVERSION= 4.10 -PORTREVISION= 9 +PORTVERSION= 4.12 CATEGORIES= x11-wm xfce MASTER_SITES= # empty DISTFILES= # empty @@ -36,7 +35,7 @@ NO_MTREE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MICONS} -RUN_DEPENDS+= gnome-icon-theme>=3.12.0:${PORTSDIR}/misc/gnome-icon-theme +RUN_DEPENDS+= adwaita-icon-theme>=3.14.0:${PORTSDIR}/x11-themes/adwaita-icon-theme .endif .if ${PORT_OPTIONS:MORAGE} diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile index 645b5e6..63144d0 100644 --- a/x11/libexo/Makefile +++ b/x11/libexo/Makefile @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= libexo -PORTVERSION= 0.10.2 -PORTREVISION= 5 +PORTVERSION= 0.10.3 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/exo/${PORTVERSION:R} DISTNAME= exo-${PORTVERSION} DIST_SUBDIR= xfce4 @@ -22,38 +20,23 @@ BUILD_DEPENDS= p5-URI>=1.60:${PORTSDIR}/net/p5-URI RUN_DEPENDS= p5-URI>=1.60:${PORTSDIR}/net/p5-URI WRKSRC= ${WRKDIR}/${DISTNAME} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/lib//} GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip USES= desktop-file-utils gmake libtool pathfix perl5 \ - pkgconfig tar:bzip2 + pkgconfig gettext-tools xfce tar:bzip2 USE_GNOME= glib20 gtk20 intltool intlhack USE_LDCONFIG= yes -USE_XFCE= configenv libmenu libutil +USE_XFCE= libmenu USE_XORG= x11 -OPTIONS_DEFINE= DOCS NLS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +CONFIGURE_ARGS=--without-html-dir + +OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes post-patch: ${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \ diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo index 200deca..1ff17e4 100644 --- a/x11/libexo/distinfo +++ b/x11/libexo/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/exo-0.10.2.tar.bz2) = b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce -SIZE (xfce4/exo-0.10.2.tar.bz2) = 1209633 +SHA256 (xfce4/exo-0.10.3.tar.bz2) = 95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd +SIZE (xfce4/exo-0.10.3.tar.bz2) = 1222247 diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist index 858a2ea..f816ae3 100644 --- a/x11/libexo/pkg-plist +++ b/x11/libexo/pkg-plist @@ -40,57 +40,10 @@ share/applications/exo-mail-reader.desktop share/applications/exo-preferred-applications.desktop share/applications/exo-terminal-emulator.desktop share/applications/exo-web-browser.desktop -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererIcon.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconBar.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconChooserDialog.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconView.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoJob.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoSimpleJob.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsEditor.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsEditorDialog.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsModel.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoToolbarsView.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoTreeView.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoWrapTable.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ExoXsessionClient.html -%%APIDOCS%%share/gtk-doc/html/exo-1/ch01.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp2 -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Executing-Applications.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-GObject.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-Gtk.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Extensions-to-gdk-pixbuf.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Miscellaneous-Utility-Functions.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-String-Utility-Functions.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-Version-Information.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-cell-renderers.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-csource.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-extensions.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-gtk-file-chooser-add-thumbnail-preview.png -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-icon-chooser-dialog.png -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-jobs.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-miscelleanous.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-overview.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-editor-dialog.png -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-editor.png -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars-view.png -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-toolbars.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-tools.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-widgets.html -%%APIDOCS%%share/gtk-doc/html/exo-1/exo-wrap-table.png -%%APIDOCS%%share/gtk-doc/html/exo-1/home.png -%%APIDOCS%%share/gtk-doc/html/exo-1/index.html -%%APIDOCS%%share/gtk-doc/html/exo-1/index.sgml -%%APIDOCS%%share/gtk-doc/html/exo-1/ix01.html -%%APIDOCS%%share/gtk-doc/html/exo-1/left.png -%%APIDOCS%%share/gtk-doc/html/exo-1/right.png -%%APIDOCS%%share/gtk-doc/html/exo-1/style.css -%%APIDOCS%%share/gtk-doc/html/exo-1/up.png share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png -share/icons/hicolor/48x48/apps/applications-internet.png -share/icons/hicolor/48x48/apps/applications-other.png share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png +share/icons/hicolor/48x48/categories/applications-internet.png +share/icons/hicolor/48x48/categories/applications-other.png %%NLS%%share/locale/ar/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/ast/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/be/LC_MESSAGES/exo-1.mo @@ -101,6 +54,7 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png %%NLS%%share/locale/da/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/de/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/el/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/es/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/et/LC_MESSAGES/exo-1.mo @@ -119,9 +73,11 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png %%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/ms/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/nb/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/nl/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/nn/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/oc/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/pa/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/pl/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/pt/LC_MESSAGES/exo-1.mo @@ -130,15 +86,20 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png %%NLS%%share/locale/ru/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/si/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/sk/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/sl/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/sq/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/sr/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/sv/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/tr/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/te/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/th/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/ug/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/uk/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/ur/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/vi/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-1.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/exo-1.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-1.mo share/pixmaps/exo-1/exo-thumbnail-frame.png share/xfce4/helpers/Thunar.desktop @@ -174,13 +135,18 @@ share/xfce4/helpers/nxterm.desktop share/xfce4/helpers/opera-browser.desktop share/xfce4/helpers/opera-mailer.desktop share/xfce4/helpers/pcmanfm.desktop +share/xfce4/helpers/qterminal.desktop +share/xfce4/helpers/qtfm.desktop +share/xfce4/helpers/qupzilla.desktop share/xfce4/helpers/rodent.desktop share/xfce4/helpers/rox-filer.desktop share/xfce4/helpers/sakura.desktop +share/xfce4/helpers/surf.desktop share/xfce4/helpers/sylpheed-claws.desktop share/xfce4/helpers/sylpheed.desktop share/xfce4/helpers/thunderbird.desktop share/xfce4/helpers/urxvt.desktop +share/xfce4/helpers/vimprobable2.desktop share/xfce4/helpers/w3m.desktop share/xfce4/helpers/xfce4-terminal.desktop share/xfce4/helpers/xfe.desktop diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile index c637be7..e993300 100644 --- a/x11/libxfce4menu/Makefile +++ b/x11/libxfce4menu/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libxfce4menu -PORTVERSION= 4.10.0 -PORTREVISION= 5 +PORTVERSION= 4.12.0 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} DISTNAME= libxfce4ui-${PORTVERSION} @@ -12,49 +11,29 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Widgets library for the Xfce desktop environment +LICENSE= GPLv2 + GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 intltool intlhack USE_LDCONFIG= yes -USE_XFCE= configenv libutil xfconf +USE_XFCE= xfconf INSTALLS_ICONS= yes -USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 - -CONFIGURE_ARGS= --with-vendor-info=FreeBSD - -OPTIONS_DEFINE= DOCS NLS NOTIFY GLADE -OPTIONS_DEFAULT= NOTIFY - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+=--enable-startup-notification -.else -CONFIGURE_ARGS+=--disable-startup-notification -.endif - -.if ${PORT_OPTIONS:MGLADE} -LIB_DEPENDS+= libgladeui-1.so:${PORTSDIR}/devel/glade3 -CONFIGURE_ARGS+=--enable-gladeui -.else -CONFIGURE_ARGS+=--disable-gladeui -.endif +USES= gmake libtool pathfix pkgconfig gettext-tools \ + xfce tar:bzip2 + +CONFIGURE_ARGS= --with-vendor-info=${OPSYS} --without-html-dir + +OPTIONS_DEFINE= GLADE GTK3 NLS STARTUP +OPTIONS_DEFAULT= GTK3 STARTUP +STARTUP_DESC= Startup notification +STARTUP_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +STARTUP_CONFIGURE_ENABLE= startup-notification +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +GLADE_LIB_DEPENDS= libgladeui-1.so:${PORTSDIR}/devel/glade3 +GLADE_CONFIGURE_ENABLE= gladeui +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gtk3 +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo index 9c5f727..0813552 100644 --- a/x11/libxfce4menu/distinfo +++ b/x11/libxfce4menu/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/libxfce4ui-4.10.0.tar.bz2) = a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2 -SIZE (xfce4/libxfce4ui-4.10.0.tar.bz2) = 545486 +SHA256 (xfce4/libxfce4ui-4.12.0.tar.bz2) = 011d9532337a8d0c4d6d2c4dfc854b4f298dbad0e9513b3495a573673b863987 +SIZE (xfce4/libxfce4ui-4.12.0.tar.bz2) = 678568 diff --git a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c b/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c deleted file mode 100644 index 8f87c4e..0000000 --- a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c +++ /dev/null @@ -1,13 +0,0 @@ -https://bugzilla.xfce.org/show_bug.cgi?id=8744 - ---- ./libxfce4kbd-private/xfce-shortcut-dialog.c.orig 2012-04-28 19:46:52.000000000 +0000 -+++ ./libxfce4kbd-private/xfce-shortcut-dialog.c 2013-05-09 09:19:32.000000000 +0000 -@@ -327,6 +327,8 @@ - &keyval, NULL, NULL, &consumed); - - /* Get the modifiers */ -+ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) -+ consumed &= ~GDK_SHIFT_MASK; - modifiers &= ~consumed; - modifiers &= mod_mask; - diff --git a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c b/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c deleted file mode 100644 index 983d2f1..0000000 --- a/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c +++ /dev/null @@ -1,24 +0,0 @@ -https://bugzilla.xfce.org/show_bug.cgi?id=8744 - ---- ./libxfce4kbd-private/xfce-shortcuts-grabber.c.orig 2012-04-28 19:46:52.000000000 +0000 -+++ ./libxfce4kbd-private/xfce-shortcuts-grabber.c 2013-05-09 09:25:50.000000000 +0000 -@@ -512,8 +512,10 @@ - &keyval, NULL, NULL, &consumed); - - /* Get the modifiers */ -- modifiers &= ~consumed; -+ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) -+ consumed &= ~GDK_SHIFT_MASK; - gdk_keymap_add_virtual_modifiers (keymap, &modifiers); -+ modifiers &= ~consumed; - modifiers &= mod_mask; - - context.keyval = keyval; -@@ -521,6 +523,7 @@ - - raw_shortcut_name = gtk_accelerator_name (keyval, modifiers); - TRACE ("Looking for %s", raw_shortcut_name); -+ gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers); - g_free (raw_shortcut_name); - - g_hash_table_foreach (grabber->priv->keys, (GHFunc) find_event_key, &context); diff --git a/x11/libxfce4menu/pkg-descr b/x11/libxfce4menu/pkg-descr index 1453c44..5024829 100644 --- a/x11/libxfce4menu/pkg-descr +++ b/x11/libxfce4menu/pkg-descr @@ -1,4 +1,4 @@ libxfce4ui is used to share commonly used Xfce widgets amoung the Xfce applications. -WWW: http://www.xfce.org/projects +WWW: http://www.xfce.org/ diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist index 72ac666..ddefb8f 100644 --- a/x11/libxfce4menu/pkg-plist +++ b/x11/libxfce4menu/pkg-plist @@ -3,7 +3,13 @@ etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-grabber.h include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-provider.h +include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-xfwm4.h include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts.h +%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcut-dialog.h +%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-grabber.h +%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-provider.h +%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts-xfwm4.h +%%GTK3%%include/xfce4/libxfce4kbd-private-3/libxfce4kbd-private/xfce-shortcuts.h include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-config.h include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-enum-types.h include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h @@ -13,47 +19,49 @@ include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gtk-extensions.h include/xfce4/libxfce4ui-1/libxfce4ui/xfce-sm-client.h include/xfce4/libxfce4ui-1/libxfce4ui/xfce-spawn.h include/xfce4/libxfce4ui-1/libxfce4ui/xfce-titled-dialog.h -lib/libxfce4kbd-private-2.la +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-config.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui-enum-types.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/libxfce4ui.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-dialogs.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gdk-extensions.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-gtk-extensions.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-sm-client.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-spawn.h +%%GTK3%%include/xfce4/libxfce4ui-2/libxfce4ui/xfce-titled-dialog.h +%%GLADE%%lib/glade3/modules/libxfce4uiglade.so lib/libxfce4kbd-private-2.so lib/libxfce4kbd-private-2.so.0 lib/libxfce4kbd-private-2.so.0.0.0 -lib/libxfce4ui-1.la +%%GTK3%%lib/libxfce4kbd-private-3.so +%%GTK3%%lib/libxfce4kbd-private-3.so.0 +%%GTK3%%lib/libxfce4kbd-private-3.so.0.0.0 lib/libxfce4ui-1.so lib/libxfce4ui-1.so.0 lib/libxfce4ui-1.so.0.0.0 +%%GTK3%%lib/libxfce4ui-2.so +%%GTK3%%lib/libxfce4ui-2.so.0 +%%GTK3%%lib/libxfce4ui-2.so.0.0.0 libdata/pkgconfig/libxfce4kbd-private-2.pc +%%GTK3%%libdata/pkgconfig/libxfce4kbd-private-3.pc libdata/pkgconfig/libxfce4ui-1.pc +%%GTK3%%libdata/pkgconfig/libxfce4ui-2.pc share/applications/xfce4-about.desktop -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/XfceSMClient.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/home.png -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/index.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/index.sgml -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/ix01.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/left.png -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-extensions.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-fundamentals.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-introduction.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-libxfce4ui-config.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-sm.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-widgets.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-dialogs.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gdk-extensions.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gtk-extensions.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-spawn.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-titled-dialog.html -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/libxfce4ui.devhelp2 -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/right.png -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/style.css -%%APIDOCS%%share/gtk-doc/html/libxfce4ui/up.png +%%GLADE%%share/glade3/catalogs/libxfce4ui.xml +%%GLADE%%share/glade3/catalogs/libxfce4ui.xml.in +%%GLADE%%share/glade3/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png +%%GLADE%%share/glade3/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png share/icons/hicolor/48x48/apps/xfce4-logo.png +%%NLS%%share/locale/am/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/bg/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/bn/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/ca/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/cs/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/da/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/de/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/el/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/es/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/eu/LC_MESSAGES/libxfce4ui.mo @@ -69,12 +77,13 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png %%NLS%%share/locale/ja/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/kk/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/ko/LC_MESSAGES/libxfce4ui.mo -%%NLS%%share/locale/ku/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/lt/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/lv/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/ms/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/nb/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/nl/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/nn/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/oc/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/pa/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/pl/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/pt/LC_MESSAGES/libxfce4ui.mo @@ -83,10 +92,11 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png %%NLS%%share/locale/ru/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/si/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/sk/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/sr/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/sv/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/te/LC_MESSAGES/libxfce4ui.mo -%%NLS%%share/locale/tl/LC_MESSAGES/libxfce4ui.mo -%%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/th/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/tr/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/ug/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/uk/LC_MESSAGES/libxfce4ui.mo @@ -94,4 +104,5 @@ share/icons/hicolor/48x48/apps/xfce4-logo.png %%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/vi/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/libxfce4ui.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 476d379..311bad6 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -2,29 +2,28 @@ # $FreeBSD$ PORTNAME= libxfce4util -PORTVERSION= 4.10.1 -PORTREVISION= 2 +PORTVERSION= 4.12.1 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Extension library for the Xfce desktop environment +LICENSE= GPLv2 + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gmake libtool pathfix perl5 pkgconfig tar:bzip2 +USES= gmake libtool pathfix perl5 pkgconfig gettext-tools \ + xfce tar:bzip2 USE_GNOME= glib20 intltool intlhack USE_LDCONFIG= yes -USE_XFCE= configenv - -OPTIONS_DEFINE= DOCS NLS -OPTIONS_SUB= yes -DOCS_CONFIGURE_ENABLE= gtk-doc-html +CONFIGURE_ARGS=--without-html-dir +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes +NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext .include <bsd.port.mk> diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index 23b4a91..02d509a 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/libxfce4util-4.10.1.tar.bz2) = e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb -SIZE (xfce4/libxfce4util-4.10.1.tar.bz2) = 453499 +SHA256 (xfce4/libxfce4util-4.12.1.tar.bz2) = 876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d +SIZE (xfce4/libxfce4util-4.12.1.tar.bz2) = 455329 diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist index db9f7b9..7278aae 100644 --- a/x11/libxfce4util/pkg-plist +++ b/x11/libxfce4util/pkg-plist @@ -12,45 +12,21 @@ include/xfce4/libxfce4util/xfce-rc.h include/xfce4/libxfce4util/xfce-resource.h include/xfce4/libxfce4util/xfce-utf8.h lib/libxfce4util.so -lib/libxfce4util.so.6 -lib/libxfce4util.so.6.0.0 +lib/libxfce4util.so.7 +lib/libxfce4util.so.7.0.0 libdata/pkgconfig/libxfce4util-1.0.pc sbin/xfce4-kiosk-query -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/home.png -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/index.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/index.sgml -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/left.png -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-core.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2 -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/reference.html -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/right.png -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/style.css -%%PORTDOCS%%share/gtk-doc/html/libxfce4util/up.png %%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/bg/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/bn/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ca/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/cs/LC_MESSAGES/libxfce4util.mo -%%NLS%%share/locale/cy/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/da/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/de/LC_MESSAGES/libxfce4util.mo -%%NLS%%share/locale/dz/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/el/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/es/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/et/LC_MESSAGES/libxfce4util.mo @@ -59,20 +35,21 @@ sbin/xfce4-kiosk-query %%NLS%%share/locale/fr/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/gl/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/hr/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/hu/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/id/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/is/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/it/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ja/LC_MESSAGES/libxfce4util.mo -%%NLS%%share/locale/ka/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/kk/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ko/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/lt/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/lv/LC_MESSAGES/libxfce4util.mo -%%NLS%%share/locale/mk/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/ms/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/nb/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/nl/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/nn/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/oc/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/pa/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/pl/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/pt/LC_MESSAGES/libxfce4util.mo @@ -81,14 +58,16 @@ sbin/xfce4-kiosk-query %%NLS%%share/locale/ru/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/si/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/sk/LC_MESSAGES/libxfce4util.mo -%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/sq/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/sr/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/sv/LC_MESSAGES/libxfce4util.mo -%%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/th/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/tr/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ug/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/uk/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ur/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/uz/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/libxfce4util.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4util.mo diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index 368e9ed..387c621 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-clipman-plugin PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -15,30 +15,19 @@ COMMENT= Clipboard manager for the Xfce panel LICENSE= GPLv2 OPTIONS_DEFINE= QRCODE UNIQUE +OPTIONS_DEFAULT= UNIQUE QRCODE_DESC= QR Code support UNIQUE_DESC= Unique (single instance) support +QRCODE_LIB_DEPENDS= libqrencode.so:${PORTSDIR}/graphics/libqrencode +QRCODE_CONFIGURE_ENABLE= libqrencode +UNIQUE_LIB_DEPENDS= libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique +UNIQUE_CONFIGURE_ENABLE= unique GNU_CONFIGURE= yes USE_GNOME= gtk20 intltool intlhack glib20 -USE_XFCE= configenv libexo libmenu libutil panel xfconf +USE_XFCE= panel USE_XORG= xtst xproto -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 INSTALLS_ICONS= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MUNIQUE} -LIB_DEPENDS+= libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique -CONFIGURE_ARGS+= --enable-unique -.else -CONFIGURE_ARGS+= --disable-unique -.endif - -.if ${PORT_OPTIONS:MQRCODE} -LIB_DEPENDS+= libqrencode.so:${PORTSDIR}/graphics/libqrencode -CONFIGURE_ARGS+= --enable-libqrencode -.else -CONFIGURE_ARGS+= --disable-libqrencode -.endif - .include <bsd.port.mk> diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile index 3dc54da..7a47826 100644 --- a/x11/xfce4-conf/Makefile +++ b/x11/xfce4-conf/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-conf -PORTVERSION= 4.10.0 -PORTREVISION= 6 +PORTVERSION= 4.12.0 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} DISTNAME= xfconf-${PORTVERSION} @@ -12,6 +11,8 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= D-Bus-based configuration storage system +LICENSE= GPLv2 + BUILD_DEPENDS= p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib @@ -19,42 +20,21 @@ GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 intltool intlhack USE_LDCONFIG= yes USE_PERL5= build -USE_XFCE= configenv libutil +USE_XFCE= libutil USE_XORG= x11 -USES= gmake libtool pathfix pkgconfig perl5 tar:bzip2 - -OPTIONS_DEFINE= DOCS PERL NLS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html -PLIST_SUB+= APIDOCS="" -.else -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.endif - -.if ${PORT_OPTIONS:MPERL} -BUILD_DEPENDS+= p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends \ - p5-ExtUtils-PkgConfig>=1.15:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \ - p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2 -RUN_DEPENDS+= ${BUILD_DEPENDS} -USE_PERL5+= run -CONFIGURE_ARGS+=--enable-perl-bindings -PLIST_SUB+= PERLBIND="" -.else -CONFIGURE_ARGS+=--disable-perl-bindings -PLIST_SUB+= PERLBIND="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +USES= gmake libtool pathfix pkgconfig perl5 gettext-tools \ + xfce tar:bzip2 + +CONFIGURE_ARGS=--without-html-dir + +OPTIONS_DEFINE= PERL NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +PERL_BUILD_DEPENDS= p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends \ + p5-ExtUtils-PkgConfig>=1.15:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \ + p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2 +PERL_USE= perl5=run +PERL_CONFIGURE_ENABLE= perl-bindings +OPTIONS_SUB= yes .include <bsd.port.mk> diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo index 180bec8..ce33d31 100644 --- a/x11/xfce4-conf/distinfo +++ b/x11/xfce4-conf/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfconf-4.10.0.tar.bz2) = 175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576 -SIZE (xfce4/xfconf-4.10.0.tar.bz2) = 517425 +SHA256 (xfce4/xfconf-4.12.0.tar.bz2) = 9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156 +SIZE (xfce4/xfconf-4.12.0.tar.bz2) = 542544 diff --git a/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c b/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c deleted file mode 100644 index 2db3fae..0000000 --- a/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c +++ /dev/null @@ -1,221 +0,0 @@ ---- ./xfconf/xfconf-cache.c.orig 2012-04-28 19:51:47.000000000 +0000 -+++ ./xfconf/xfconf-cache.c 2013-03-08 20:38:01.000000000 +0000 -@@ -47,10 +47,16 @@ - - #define ALIGN_VAL(val, align) ( ((val) + ((align) -1)) & ~((align) - 1) ) - --static void xfconf_cache_mutex_lock(GStaticMutex *mtx) __attribute__((noinline)); --static void xfconf_cache_mutex_lock(GStaticMutex *mtx) { g_static_mutex_lock(mtx); } --static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) __attribute__((noinline)); --static void xfconf_cache_mutex_unlock(GStaticMutex *mtx) { g_static_mutex_unlock(mtx); } -+ -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) -+#define xfconf_cache_mutex_lock(cache) g_mutex_lock (&(cache)->cache_lock) -+#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock (&(cache)->cache_lock) -+#else -+#define xfconf_cache_mutex_lock(cache) g_mutex_lock ((cache)->cache_lock) -+#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock ((cache)->cache_lock) -+#endif -+ - - - /**************** XfconfCacheItem ****************/ -@@ -210,7 +216,11 @@ - GHashTable *pending_calls; - GHashTable *old_properties; - -- GStaticMutex cache_lock; -+#if GLIB_CHECK_VERSION (2, 32, 0) -+ GMutex cache_lock; -+#else -+ GMutex *cache_lock; -+#endif - }; - - typedef struct _XfconfCacheClass -@@ -347,7 +357,11 @@ - cache->old_properties = g_hash_table_new_full(g_str_hash, g_str_equal, - NULL, NULL); - -- g_static_mutex_init(&cache->cache_lock); -+#if GLIB_CHECK_VERSION (2, 32, 0) -+ g_mutex_init (&cache->cache_lock); -+#else -+ cache->cache_lock = g_mutex_new (); -+#endif - } - - static void -@@ -433,7 +447,9 @@ - g_tree_destroy(cache->properties); - g_hash_table_destroy(cache->old_properties); - -- g_static_mutex_free(&cache->cache_lock); -+#if !GLIB_CHECK_VERSION (2, 32, 0) -+ g_mutex_free (cache->cache_lock); -+#endif - - G_OBJECT_CLASS(xfconf_cache_parent_class)->finalize(obj); - } -@@ -508,7 +524,7 @@ - if(!cache->pending_calls) - return; - -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - - old_item = g_hash_table_lookup(cache->pending_calls, call); - if(G_UNLIKELY(!old_item)) { -@@ -547,12 +563,12 @@ - } - - /* we need to drop the lock when running the signal handlers */ -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - g_signal_emit(G_OBJECT(cache), signals[SIG_PROPERTY_CHANGED], - g_quark_from_string(old_item->property), - cache->channel_name, old_item->property, - item ? item->value : &empty_val); -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - } - - /* we handled the call, so set it to %NULL */ -@@ -561,7 +577,7 @@ - if(old_item) - xfconf_cache_old_item_free(old_item); - out: -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - } - - -@@ -576,7 +592,7 @@ - XfconfCacheOldItem *old_item; - GError *error = NULL; - -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - - old_item = g_hash_table_lookup(cache->pending_calls, call); - if(G_UNLIKELY(!old_item)) { -@@ -594,7 +610,7 @@ - if(old_item) - g_hash_table_remove(cache->pending_calls, old_item->call); - -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - } - #endif - -@@ -634,7 +650,7 @@ - - g_return_val_if_fail(g_tree_nnodes(cache->properties) == 0, FALSE); - -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - - if(xfconf_client_get_all_properties(proxy, cache->channel_name, - property_base ? property_base : "/", -@@ -647,7 +663,7 @@ - } else - g_propagate_error(error, tmp_error); - -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - - return ret; - } -@@ -710,9 +726,9 @@ - g_return_val_if_fail(XFCONF_IS_CACHE(cache) && property - && (!error || !*error), FALSE); - -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - ret = xfconf_cache_lookup_locked(cache, property, value, error); -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - - return ret; - } -@@ -727,7 +743,7 @@ - XfconfCacheItem *item = NULL; - XfconfCacheOldItem *old_item = NULL; - -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - - item = g_tree_lookup(cache->properties, property); - if(!item) { -@@ -756,7 +772,7 @@ - { - /* this is bad... */ - g_propagate_error(error, tmp_error); -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - return FALSE; - } - -@@ -771,7 +787,7 @@ - if(item) { - /* if the value isn't changing, there's no reason to continue */ - if(_xfconf_gvalue_is_equal(item->value, value)) { -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - return TRUE; - } - } -@@ -814,7 +830,7 @@ - g_tree_insert(cache->properties, g_strdup(property), item); - } - -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - - g_signal_emit(G_OBJECT(cache), signals[SIG_PROPERTY_CHANGED], 0, - cache->channel_name, property, value); -@@ -855,7 +871,7 @@ - XfconfCacheOldItem *old_item = NULL; - #endif - -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - - #if 0 - /* it's not really feasible here to look up all the old/new values -@@ -919,7 +935,7 @@ - } - #endif - -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - - return ret; - } -@@ -929,10 +945,10 @@ - xfconf_cache_set_max_entries(XfconfCache *cache, - gint max_entries) - { -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - cache->max_entries = max_entries; - /* TODO: check tree for eviction */ -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - } - - gint -@@ -945,10 +961,10 @@ - xfconf_cache_set_max_age(XfconfCache *cache, - gint max_age) - { -- xfconf_cache_mutex_lock(&cache->cache_lock); -+ xfconf_cache_mutex_lock(cache); - cache->max_age = max_age; - /* TODO: check tree for eviction */ -- xfconf_cache_mutex_unlock(&cache->cache_lock); -+ xfconf_cache_mutex_unlock(cache); - } - - gint diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist index 213a358..fb3b899 100644 --- a/x11/xfce4-conf/pkg-plist +++ b/x11/xfce4-conf/pkg-plist @@ -10,31 +10,16 @@ lib/libxfconf-0.so.2.0.0 lib/xfce4/xfconf/xfconfd libdata/pkgconfig/libxfconf-0.pc share/dbus-1/services/org.xfce.Xfconf.service -%%APIDOCS%%share/gtk-doc/html/xfconf/ch01.html -%%APIDOCS%%share/gtk-doc/html/xfconf/ch02.html -%%APIDOCS%%share/gtk-doc/html/xfconf/ch03.html -%%APIDOCS%%share/gtk-doc/html/xfconf/home.png -%%APIDOCS%%share/gtk-doc/html/xfconf/index.html -%%APIDOCS%%share/gtk-doc/html/xfconf/index.sgml -%%APIDOCS%%share/gtk-doc/html/xfconf/left.png -%%APIDOCS%%share/gtk-doc/html/xfconf/right.png -%%APIDOCS%%share/gtk-doc/html/xfconf/style.css -%%APIDOCS%%share/gtk-doc/html/xfconf/up.png -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-backend.html -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-binding.html -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-channel.html -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-errors.html -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-types.html -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf.html -%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf.devhelp2 %%NLS%%share/locale/ar/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/bg/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/da/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/de/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/el/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/en_AU/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/es/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfconf.mo @@ -52,9 +37,11 @@ share/dbus-1/services/org.xfce.Xfconf.service %%NLS%%share/locale/ko/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/ms/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/oc/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfconf.mo @@ -63,19 +50,22 @@ share/dbus-1/services/org.xfce.Xfconf.service %%NLS%%share/locale/ru/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/si/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/sr/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/te/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/th/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/ur/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfconf.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo -%%PERLBIND%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz -%%PERLBIND%%%%SITE_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so -%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/Files.pm -%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h -%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h -%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap -%%PERLBIND%%%%SITE_ARCH%%/Xfce4/Xfconf.pm +%%PERL%%%%PERL5_MAN3%%/Xfce4::Xfconf.3.gz +%%PERL%%%%SITE_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so +%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/Files.pm +%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h +%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h +%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap +%%PERL%%%%SITE_ARCH%%/Xfce4/Xfconf.pm diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile index 6a0a9ed..098c777 100644 --- a/x11/xfce4-dashboard/Makefile +++ b/x11/xfce4-dashboard/Makefile @@ -3,6 +3,7 @@ PORTNAME= dashboard PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= http://xfdashboard.froevel.de/releases/ PKGNAMEPREFIX= xfce4- @@ -20,9 +21,9 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ RUN_DEPENDS= gnome-icon-theme-symbolic>=3.6.2:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic GNU_CONFIGURE= yes -USES= pkgconfig libtool gmake perl5 gettext tar:bzip2 +USES= pkgconfig libtool gmake perl5 gettext xfce tar:bzip2 USE_GNOME= glib20 libwnck intltool intlhack -USE_XFCE= configenv garcon xfconf +USE_XFCE= garcon USE_XORG= x11 xcomposite xdamage USE_GL= gl INSTALLS_ICONS= yes diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile index 4b748fe..400d2a7 100644 --- a/x11/xfce4-embed-plugin/Makefile +++ b/x11/xfce4-embed-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-embed-plugin PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -16,23 +16,20 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 USE_XORG= x11 USE_GNOME= glib20 gtk20 intltool intlhack -USE_XFCE= configenv libmenu libutil panel +USE_XFCE= panel OPTIONS_DEFINE= NLS +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls +OPTIONS_SUB= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else +.if !${PORT_OPTIONS:MNLS} EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile index 056cd7f..7dde7d0 100644 --- a/x11/xfce4-quicklauncher-plugin/Makefile +++ b/x11/xfce4-quicklauncher-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-quicklauncher-plugin PORTVERSION= 1.9.4 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -16,8 +16,8 @@ LICENSE= GPLv2 SSP_UNSAFE= yes GNU_CONFIGURE= yes -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= gtk20 intltool intlhack -USE_XFCE= configenv libgui panel +USE_XFCE= libgui panel .include <bsd.port.mk> diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile index 9687df2..636eee3 100644 --- a/x11/xfce4-screenshooter-plugin/Makefile +++ b/x11/xfce4-screenshooter-plugin/Makefile @@ -3,6 +3,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} @@ -20,8 +21,8 @@ LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= glib20 gtk20 intltool intlhack libxml2 -USE_XFCE= configenv libexo libmenu libutil panel -USES= pkgconfig gmake libtool tar:bzip2 +USE_XFCE= panel +USES= pkgconfig gmake libtool xfce tar:bzip2 USE_XORG= xfixes xext OPTIONS_DEFINE= NLS diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index 965166c..9c0cdc7 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-terminal PORTVERSION= 0.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -19,24 +19,18 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes USE_GNOME= gtk20 glib20 intltool intlhack vte libxml2 -USE_XFCE= configenv libmenu +USE_XFCE= libmenu USE_XORG= x11 -USES= pkgconfig gmake tar:bzip2 +USES= pkgconfig gmake gettext-tools xfce tar:bzip2 CONFIGURE_ARGS= --without-gnome-default-appsdir OPTIONS_DEFINE= NLS +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext-runtime +OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.pre.mk> post-patch: .if ! ${PORT_OPTIONS:MNLS} @@ -44,4 +38,4 @@ post-patch: s|po \\|terminal|' ${WRKSRC}/Makefile.in .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile index 2abd3ab..c3e3af8 100644 --- a/x11/xfce4-verve-plugin/Makefile +++ b/x11/xfce4-verve-plugin/Makefile @@ -3,6 +3,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} @@ -19,9 +20,9 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes -USES= gmake libtool pkgconfig tar:bzip2 +USES= gmake libtool pkgconfig xfce tar:bzip2 USE_GNOME= glib20 intltool intlhack -USE_XFCE= configenv libexo libmenu libutil panel +USE_XFCE= panel CONFIGURE_ARGS=--enable-dbus diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile index 2c87a8b..1c7274e 100644 --- a/x11/xfce4-whiskermenu-plugin/Makefile +++ b/x11/xfce4-whiskermenu-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-whiskermenu-plugin PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= x11 xfce MASTER_SITES= XFCE MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -16,9 +17,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= pkgconfig cmake gettext tar:bzip2 +USES= pkgconfig cmake gettext xfce tar:bzip2 USE_GNOME= gtk20 -USE_XFCE= configenv garcon libexo libmenu libutil panel +USE_XFCE= panel INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile index 057093b..1a14437 100644 --- a/x11/xfce4-wmdock-plugin/Makefile +++ b/x11/xfce4-wmdock-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-wmdock-plugin PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 xfce MASTER_SITES= XFCE/src/panel-plugins/xfce4-wmdock-plugin/0.6 DIST_SUBDIR= xfce4 @@ -12,10 +12,10 @@ MAINTAINER= xfce@FreeBSD.org COMMENT= WMdock plugin for Xfce GNU_CONFIGURE= yes -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig xfce tar:bzip2 INSTALLS_ICONS= yes USE_GNOME= gtk20 intltool intlhack libwnck -USE_XFCE= configenv libgui libutil panel +USE_XFCE= libgui panel INSTALLS_ICONS= yes USE_XORG= x11 |
