diff options
| author | jperkin <jperkin> | 2015-04-21 08:56:37 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-04-21 08:56:37 +0000 |
| commit | 69a9a7ef1bd8e3798cb4254b082188157b25c32c (patch) | |
| tree | ae790a249f25dd74c81f5e89461d2643574091dc /x11 | |
| parent | c4075f0ca19efd108c2391a406cf7c6742e154f5 (diff) | |
| download | pkgsrc-69a9a7ef1bd8e3798cb4254b082188157b25c32c.tar.gz | |
Update Xfce to 4.12.0.
This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major
Xfce releases since 4.6.2, our previous pkgsrc release. For more information
about the thousands of changes in each major release since then, please see:
Xfce 4.12 announcement:
http://www.xfce.org/about/news
Xfce 4.12 tour:
http://www.xfce.org/about/tour
Xfce 4.10 announcement:
http://www.xfce.org/about/news/?post=1335571200
Xfce 4.10 tour:
http://www.xfce.org/about/tour410
Xfce 4.8 announcement:
http://www.xfce.org/about/news/?post=1295136000
Xfce 4.8 tour:
http://www.xfce.org/about/tour48
The pkgsrc changes since then are:
New packages:
archivers/xfce4-thunar-archive
graphics/elementary-xfce-icon-theme
mail/xfce4-mailwatch-plugin
misc/xfce4-time-out-plugin
multimedia/xfce4-thunar-media-tags
sysutils/xfce4-mount-plugin
sysutils/xfce4-taskmanager
sysutils/xfce4-thunar-vcs
sysutils/xfce4-verve-plugin
x11/xfce4-garcon
x11/xfce4-notifyd
x11/xfce4-tumbler
x11/xfce4-whiskermenu-plugin
Renamed packages:
devel/xfconf to devel/xfce4-conf
x11/libxfce4menu to x11/libxfce4ui
x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter
Updated packages:
audio/xfce4-mixer
audio/xfce4-xmms-plugin
devel/xfce4-dev-tools
editors/xfce4-mousepad
graphics/ristretto
meta-pkgs/xfce4-extras
meta-pkgs/xfce4
misc/xfce4-weather-plugin
multimedia/xfce4-mpc-plugin
net/xfce4-wavelan-plugin
sysutils/xfce4-appfinder
sysutils/xfce4-battery-plugin
sysutils/xfce4-cpugraph-plugin
sysutils/xfce4-diskperf-plugin
sysutils/xfce4-fsguard-plugin
sysutils/xfce4-genmon-plugin
sysutils/xfce4-netload-plugin
sysutils/xfce4-quicklauncher-plugin
sysutils/xfce4-systemload-plugin
sysutils/xfce4-thunar
sysutils/xfce4-xarchiver
sysutils/xfce4-xkb-plugin
textproc/xfce4-dict-plugin
time/xfce4-datetime-plugin
time/xfce4-orage
time/xfce4-timer-plugin
wm/xfce4-wm-themes
wm/xfce4-wm
x11/libxfce4gui
x11/libxfce4util
x11/xfce4-clipman-plugin
x11/xfce4-desktop
x11/xfce4-exo
x11/xfce4-eyes-plugin
x11/xfce4-gtk2-engine
x11/xfce4-notes-plugin
x11/xfce4-panel
x11/xfce4-places-plugin
x11/xfce4-session
x11/xfce4-settings
x11/xfce4-terminal
Removed packages:
sysutils/xfce4-volman
x11/xfce4-utils
This is based on a huge amount of work by the NetBSDfr team and Youri Mouton,
who takes over as MAINTAINER, and has been tested by Youri on a large number
of platforms prior to commit. A massive thanks to them. Any issues with the
import are mine alone as the committer-by-proxy.
Diffstat (limited to 'x11')
138 files changed, 2035 insertions, 1933 deletions
diff --git a/x11/Makefile b/x11/Makefile index 754b8249e18..31964cbd7f9 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.748 2015/04/20 20:23:09 cheusov Exp $ +# $NetBSD: Makefile,v 1.749 2015/04/21 08:56:43 jperkin Exp $ # COMMENT= Packages to support the X window system @@ -310,7 +310,7 @@ SUBDIR+= libunique3 SUBDIR+= libxcb SUBDIR+= libxdg-basedir SUBDIR+= libxfce4gui -SUBDIR+= libxfce4menu +SUBDIR+= libxfce4ui SUBDIR+= libxfce4util SUBDIR+= libxkbcommon SUBDIR+= libxkbfile @@ -584,15 +584,18 @@ SUBDIR+= xfce4-clipman-plugin SUBDIR+= xfce4-desktop SUBDIR+= xfce4-exo SUBDIR+= xfce4-eyes-plugin +SUBDIR+= xfce4-garcon SUBDIR+= xfce4-gtk2-engine SUBDIR+= xfce4-notes-plugin +SUBDIR+= xfce4-notifyd SUBDIR+= xfce4-panel SUBDIR+= xfce4-places-plugin -SUBDIR+= xfce4-screenshooter-plugin +SUBDIR+= xfce4-screenshooter SUBDIR+= xfce4-session SUBDIR+= xfce4-settings SUBDIR+= xfce4-terminal -SUBDIR+= xfce4-utils +SUBDIR+= xfce4-tumbler +SUBDIR+= xfce4-whiskermenu-plugin SUBDIR+= xfd SUBDIR+= xfishtank SUBDIR+= xflame diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index cae64fb60da..503d1b1888e 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,33 +1,21 @@ -# $NetBSD: Makefile,v 1.50 2014/05/05 00:48:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2015/04/21 08:56:43 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= libxfcegui4-${XFCE4_VERSION} -PKGNAME= libxfce4gui-${XFCE4_VERSION} -PKGREVISION= 21 +VERSION= 4.10.0 +DISTNAME= libxfcegui4-${VERSION} +PKGNAME= libxfce4gui-${VERSION} CATEGORIES= x11 -COMMENT= Xfce widget library - -PKGCONFIG_OVERRIDE= libxfce4kbd-private/libxfce4kbd-private-1.0.pc.in -PKGCONFIG_OVERRIDE+= libxfcegui4/libxfcegui4-1.0.pc.in +MASTER_SITES= http://archive.xfce.org/src/archive/libxfcegui4/4.10/ -CONFIGURE_ARGS+= --disable-gladeui +COMMENT= Xfce widget library -EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml -PKG_SYSCONFSUBDIR= xdg -CONF_FILES= ${EGDIR}/xfce4-keyboard-shortcuts.xml \ - ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in -MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/include/xfce4 -MAKE_DIRS+= ${XFCE4_EGBASE} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR} -OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4 ${PKG_SYSCONFDIR}/xfce4/xfconf -OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml +HOMEPAGE= http://archive.xfce.org/src/archive/libxfcegui4/4.10/ +COMMENT= Xfce widget library .include "../../devel/libglade/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST index 9d404a343f2..f0f80af1910 100644 --- a/x11/libxfce4gui/PLIST +++ b/x11/libxfce4gui/PLIST @@ -1,8 +1,5 @@ -@comment $NetBSD: PLIST,v 1.21 2009/09/16 01:15:34 reed Exp $ -include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h -include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h -include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h -include/xfce4/libxfce4kbd-private/xfce-shortcuts.h +@comment $NetBSD: PLIST,v 1.22 2015/04/21 08:56:43 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.22 2015/04/21 08:56:43 jperkin Exp $ include/xfce4/libxfcegui4/dialogs.h include/xfce4/libxfcegui4/gtk_style.h include/xfce4/libxfcegui4/gtktoxevent.h @@ -49,11 +46,8 @@ include/xfce4/libxfcegui4/xfce_systemtray.h include/xfce4/libxfcegui4/xfce_togglebutton.h include/xfce4/libxfcegui4/xinerama.h lib/libglade/2.0/libxfce4.la -lib/libxfce4kbd-private.la lib/libxfcegui4.la -lib/pkgconfig/libxfce4kbd-private-1.0.pc lib/pkgconfig/libxfcegui4-1.0.pc -share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html share/gtk-doc/html/libxfcegui4/XfceFramebox.html @@ -73,7 +67,6 @@ share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html -share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2 share/gtk-doc/html/libxfcegui4/reference.html share/gtk-doc/html/libxfcegui4/right.png @@ -95,6 +88,7 @@ share/icons/hicolor/48x48/apps/xfce-utils.png share/icons/hicolor/scalable/apps/xfce-filemanager.svg share/locale/am/LC_MESSAGES/libxfcegui4.mo share/locale/ar/LC_MESSAGES/libxfcegui4.mo +share/locale/ast/LC_MESSAGES/libxfcegui4.mo share/locale/be/LC_MESSAGES/libxfcegui4.mo share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo share/locale/ca/LC_MESSAGES/libxfcegui4.mo @@ -115,12 +109,15 @@ share/locale/fr/LC_MESSAGES/libxfcegui4.mo share/locale/gl/LC_MESSAGES/libxfcegui4.mo share/locale/gu/LC_MESSAGES/libxfcegui4.mo share/locale/he/LC_MESSAGES/libxfcegui4.mo +share/locale/hr/LC_MESSAGES/libxfcegui4.mo share/locale/hu/LC_MESSAGES/libxfcegui4.mo share/locale/hy/LC_MESSAGES/libxfcegui4.mo share/locale/id/LC_MESSAGES/libxfcegui4.mo +share/locale/is/LC_MESSAGES/libxfcegui4.mo share/locale/it/LC_MESSAGES/libxfcegui4.mo share/locale/ja/LC_MESSAGES/libxfcegui4.mo share/locale/ka/LC_MESSAGES/libxfcegui4.mo +share/locale/kk/LC_MESSAGES/libxfcegui4.mo share/locale/ko/LC_MESSAGES/libxfcegui4.mo share/locale/ku/LC_MESSAGES/libxfcegui4.mo share/locale/lt/LC_MESSAGES/libxfcegui4.mo @@ -129,6 +126,7 @@ share/locale/mk/LC_MESSAGES/libxfcegui4.mo share/locale/mr/LC_MESSAGES/libxfcegui4.mo share/locale/nb/LC_MESSAGES/libxfcegui4.mo share/locale/nl/LC_MESSAGES/libxfcegui4.mo +share/locale/nn/LC_MESSAGES/libxfcegui4.mo share/locale/pa/LC_MESSAGES/libxfcegui4.mo share/locale/pl/LC_MESSAGES/libxfcegui4.mo share/locale/pt/LC_MESSAGES/libxfcegui4.mo @@ -140,8 +138,12 @@ share/locale/sk/LC_MESSAGES/libxfcegui4.mo share/locale/sq/LC_MESSAGES/libxfcegui4.mo share/locale/sv/LC_MESSAGES/libxfcegui4.mo share/locale/ta/LC_MESSAGES/libxfcegui4.mo +share/locale/te/LC_MESSAGES/libxfcegui4.mo +share/locale/tl_PH/LC_MESSAGES/libxfcegui4.mo share/locale/tr/LC_MESSAGES/libxfcegui4.mo +share/locale/ug/LC_MESSAGES/libxfcegui4.mo share/locale/uk/LC_MESSAGES/libxfcegui4.mo share/locale/ur/LC_MESSAGES/libxfcegui4.mo +share/locale/ur_PK/LC_MESSAGES/libxfcegui4.mo share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 703a8b8da43..f41a382ddfa 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,19 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.48 2014/05/05 00:48:31 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.49 2015/04/21 08:56:43 jperkin Exp $ BUILDLINK_TREE+= libxfce4gui .if !defined(LIBXFCE4GUI_BUILDLINK3_MK) LIBXFCE4GUI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.6.0 -BUILDLINK_ABI_DEPENDS.libxfce4gui+= libxfce4gui>=4.6.1nb21 +BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.10.0 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" -.endif # LIBXFCE4GUI_BUILDLINK3_MK +.endif # LIBXFCE4GUI_BUILDLINK3_MK BUILDLINK_TREE+= -libxfce4gui diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo index fa98d38db15..013efdf6438 100644 --- a/x11/libxfce4gui/distinfo +++ b/x11/libxfce4gui/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $ +$NetBSD: distinfo,v 1.19 2015/04/21 08:56:43 jperkin Exp $ -SHA1 (libxfcegui4-4.6.1.tar.bz2) = 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 -RMD160 (libxfcegui4-4.6.1.tar.bz2) = 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568 -Size (libxfcegui4-4.6.1.tar.bz2) = 650666 bytes -SHA1 (patch-aa) = c054345fcb2aa5c516009d0740ac0abc3ba15706 +SHA1 (libxfcegui4-4.10.0.tar.bz2) = 6d6f24a7f69dfee359b96bd2867fbe9e3262549f +RMD160 (libxfcegui4-4.10.0.tar.bz2) = d9385ced0254e37caf3445725663f56bf95a3083 +Size (libxfcegui4-4.10.0.tar.bz2) = 691012 bytes +SHA1 (patch-libxfcegui4_dialogs.c) = 60632a4ca1119a17f36ff0f2909ea3ab43dceb94 +SHA1 (patch-libxfcegui4_xfce-exec.c) = d38a0fb348560df9c4415c17963d84766d8eabe5 diff --git a/x11/libxfce4gui/patches/patch-libxfcegui4_dialogs.c b/x11/libxfce4gui/patches/patch-libxfcegui4_dialogs.c new file mode 100644 index 00000000000..5e74b6aced2 --- /dev/null +++ b/x11/libxfce4gui/patches/patch-libxfcegui4_dialogs.c @@ -0,0 +1,13 @@ +$NetBSD: patch-libxfcegui4_dialogs.c,v 1.1 2015/04/21 08:56:43 jperkin Exp $ + +Fix build for OS X. +--- libxfcegui4/dialogs.c.orig 2012-04-28 20:10:43.000000000 +0000 ++++ libxfcegui4/dialogs.c +@@ -64,6 +64,7 @@ + + #ifdef HAVE__NSGETENVIRON + /* for support under apple/darwin */ ++#include <crt_externs.h> + #define environ (*_NSGetEnviron()) + #elif !HAVE_DECL_ENVIRON + /* try extern if environ is not defined in unistd.h */ diff --git a/x11/libxfce4gui/patches/patch-libxfcegui4_xfce-exec.c b/x11/libxfce4gui/patches/patch-libxfcegui4_xfce-exec.c new file mode 100644 index 00000000000..0f5879e495a --- /dev/null +++ b/x11/libxfce4gui/patches/patch-libxfcegui4_xfce-exec.c @@ -0,0 +1,22 @@ +$NetBSD: patch-libxfcegui4_xfce-exec.c,v 1.1 2015/04/21 08:56:43 jperkin Exp $ + +Fixes compiling with libxfce4util 4.11+ +--- libxfcegui4/xfce-exec.c.orig 2012-04-28 20:10:43.000000000 +0000 ++++ libxfcegui4/xfce-exec.c +@@ -59,6 +59,7 @@ + + #ifdef HAVE__NSGETENVIRON + /* for support under apple/darwin */ ++#include <crt_externs.h> + #define environ (*_NSGetEnviron()) + #elif !HAVE_DECL_ENVIRON + /* try extern if environ is not defined in unistd.h */ +@@ -79,7 +80,7 @@ child_setup_sync(gpointer user_data) + #ifndef G_OS_WIN32 + gchar *dpyname = user_data; + +- xfce_setenv ("DISPLAY", dpyname, TRUE); ++ g_setenv ("DISPLAY", dpyname, TRUE); + #endif + } + diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile deleted file mode 100644 index e8b149fdb83..00000000000 --- a/x11/libxfce4menu/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.20 2014/05/05 00:48:31 ryoon Exp $ - -.include "../../meta-pkgs/xfce4/Makefile.common" - -DISTNAME= libxfce4menu-${XFCE4_VERSION} -PKGREVISION= 18 -CATEGORIES= x11 -COMMENT= Xfce menu library - -PKGCONFIG_OVERRIDE+= libxfce4menu/libxfce4menu-0.1.pc - -MAKE_DIRS+= ${PREFIX}/include/xfce4 - -.include "../../x11/libxfce4util/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4menu/PLIST b/x11/libxfce4menu/PLIST deleted file mode 100644 index f34c37a9cd9..00000000000 --- a/x11/libxfce4menu/PLIST +++ /dev/null @@ -1,87 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/16 01:05:31 reed Exp $ -include/xfce4/libxfce4menu-0.1/libxfce4menu/libxfce4menu-config.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/libxfce4menu.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-and-rules.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-directory.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-element.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-environment.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-item-cache.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-item-pool.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-item.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-layout.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-monitor.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-move.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-not-rules.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-or-rules.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-rules.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-separator.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-standard-rules.h -include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu.h -lib/libxfce4menu-0.1.la -lib/pkgconfig/libxfce4menu-0.1.pc -share/gtk-doc/html/libxfce4menu/XfceMenu.html -share/gtk-doc/html/libxfce4menu/XfceMenuAndRules.html -share/gtk-doc/html/libxfce4menu/XfceMenuDirectory.html -share/gtk-doc/html/libxfce4menu/XfceMenuElement.html -share/gtk-doc/html/libxfce4menu/XfceMenuItem.html -share/gtk-doc/html/libxfce4menu/XfceMenuItemCache.html -share/gtk-doc/html/libxfce4menu/XfceMenuItemPool.html -share/gtk-doc/html/libxfce4menu/XfceMenuLayout.html -share/gtk-doc/html/libxfce4menu/XfceMenuNotRules.html -share/gtk-doc/html/libxfce4menu/XfceMenuOrRules.html -share/gtk-doc/html/libxfce4menu/XfceMenuRules.html -share/gtk-doc/html/libxfce4menu/XfceMenuSeparator.html -share/gtk-doc/html/libxfce4menu/XfceMenuStandardRules.html -share/gtk-doc/html/libxfce4menu/fundamentals.html -share/gtk-doc/html/libxfce4menu/home.png -share/gtk-doc/html/libxfce4menu/index.html -share/gtk-doc/html/libxfce4menu/index.sgml -share/gtk-doc/html/libxfce4menu/internals.html -share/gtk-doc/html/libxfce4menu/introduction.html -share/gtk-doc/html/libxfce4menu/items.html -share/gtk-doc/html/libxfce4menu/ix01.html -share/gtk-doc/html/libxfce4menu/layout.html -share/gtk-doc/html/libxfce4menu/left.png -share/gtk-doc/html/libxfce4menu/libxfce4menu-Desktop-Environment.html -share/gtk-doc/html/libxfce4menu/libxfce4menu-Initialization-and-Shutdown.html -share/gtk-doc/html/libxfce4menu/libxfce4menu-Monitoring.html -share/gtk-doc/html/libxfce4menu/libxfce4menu-Version-Information.html -share/gtk-doc/html/libxfce4menu/libxfce4menu-XfceMenuMove.html -share/gtk-doc/html/libxfce4menu/libxfce4menu.devhelp -share/gtk-doc/html/libxfce4menu/libxfce4menu.devhelp2 -share/gtk-doc/html/libxfce4menu/menus.html -share/gtk-doc/html/libxfce4menu/move.html -share/gtk-doc/html/libxfce4menu/right.png -share/gtk-doc/html/libxfce4menu/rules.html -share/gtk-doc/html/libxfce4menu/style.css -share/gtk-doc/html/libxfce4menu/up.png -share/gtk-doc/html/libxfce4menu/utilities.html -share/locale/ca/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/cs/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/da/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/de/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/el/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/en_GB/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/es/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/eu/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/fi/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/fr/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/gl/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/hu/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/id/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/it/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/ja/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/ku/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/lv/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/nb/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/pl/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/pt/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/pt_BR/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/ro/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/ru/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/sq/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/sv/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/tr/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/uk/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/ur/LC_MESSAGES/libxfce4menu-0.1.mo -share/locale/zh_CN/LC_MESSAGES/libxfce4menu-0.1.mo diff --git a/x11/libxfce4menu/buildlink3.mk b/x11/libxfce4menu/buildlink3.mk deleted file mode 100644 index fc2c4b2df63..00000000000 --- a/x11/libxfce4menu/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.21 2014/05/05 00:48:31 ryoon Exp $ - -BUILDLINK_TREE+= libxfce4menu - -.if !defined(LIBXFCE4MENU_BUILDLINK3_MK) -LIBXFCE4MENU_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.libxfce4menu+= libxfce4menu>=4.6.0 -BUILDLINK_ABI_DEPENDS.libxfce4menu+= libxfce4menu>=4.6.1nb18 -BUILDLINK_PKGSRCDIR.libxfce4menu?= ../../x11/libxfce4menu - -.include "../../devel/glib2/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" -.endif # LIBXFCE4MENU_BUILDLINK3_MK - -BUILDLINK_TREE+= -libxfce4menu diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo deleted file mode 100644 index 864c27f5174..00000000000 --- a/x11/libxfce4menu/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/09/16 01:05:31 reed Exp $ - -SHA1 (libxfce4menu-4.6.1.tar.bz2) = 17348f661c04e8d8d633b8831638d38987269e9a -RMD160 (libxfce4menu-4.6.1.tar.bz2) = 978071d28288bd737219e4a9c4185937b2fbf50b -Size (libxfce4menu-4.6.1.tar.bz2) = 404201 bytes diff --git a/x11/libxfce4ui/DESCR b/x11/libxfce4ui/DESCR new file mode 100644 index 00000000000..86216c3047b --- /dev/null +++ b/x11/libxfce4ui/DESCR @@ -0,0 +1,2 @@ +This is libxfce4ui, the replacement of the old libxfcegui4 library. It +is used to share commonly used Xfce widgets amoung the Xfce applications. diff --git a/x11/libxfce4ui/Makefile b/x11/libxfce4ui/Makefile new file mode 100644 index 00000000000..b4768c65084 --- /dev/null +++ b/x11/libxfce4ui/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:43 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= libxfce4ui-4.12.1 +CATEGORIES= x11 +MASTER_SITES+= http://archive.xfce.org/src/xfce/libxfce4ui/4.12/ + +COMMENT= Xfce widget library + +PKGCONFIG_OVERRIDE= libxfce4kbd-private/libxfce4kbd-private-2.pc.in +PKGCONFIG_OVERRIDE+= libxfce4ui/libxfce4ui-1.pc.in + +CONF_FILES= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml \ + ${PKG_SYSCONFDIR}/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml + +MAKE_DIRS+= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml + +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../devel/xfce4-conf/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4ui/PLIST b/x11/libxfce4ui/PLIST new file mode 100644 index 00000000000..43c4a47633a --- /dev/null +++ b/x11/libxfce4ui/PLIST @@ -0,0 +1,103 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:43 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:43 jperkin Exp $ +bin/xfce4-about +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 +include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-config.h +include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-enum-types.h +include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h +include/xfce4/libxfce4ui-1/libxfce4ui/xfce-dialogs.h +include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gdk-extensions.h +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 +lib/libxfce4ui-1.la +lib/pkgconfig/libxfce4kbd-private-2.pc +lib/pkgconfig/libxfce4ui-1.pc +share/applications/xfce4-about.desktop +share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +share/gtk-doc/html/libxfce4ui/XfceSMClient.html +share/gtk-doc/html/libxfce4ui/home.png +share/gtk-doc/html/libxfce4ui/index.html +share/gtk-doc/html/libxfce4ui/index.sgml +share/gtk-doc/html/libxfce4ui/ix01.html +share/gtk-doc/html/libxfce4ui/left-insensitive.png +share/gtk-doc/html/libxfce4ui/left.png +share/gtk-doc/html/libxfce4ui/libxfce4ui-extensions.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-fundamentals.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-introduction.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-libxfce4ui-config.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-sm.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-widgets.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-dialogs.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gdk-extensions.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gtk-extensions.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-spawn.html +share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-titled-dialog.html +share/gtk-doc/html/libxfce4ui/libxfce4ui.devhelp2 +share/gtk-doc/html/libxfce4ui/right-insensitive.png +share/gtk-doc/html/libxfce4ui/right.png +share/gtk-doc/html/libxfce4ui/style.css +share/gtk-doc/html/libxfce4ui/up-insensitive.png +share/gtk-doc/html/libxfce4ui/up.png +share/icons/hicolor/48x48/apps/xfce4-logo.png +share/locale/am/LC_MESSAGES/libxfce4ui.mo +share/locale/ar/LC_MESSAGES/libxfce4ui.mo +share/locale/ast/LC_MESSAGES/libxfce4ui.mo +share/locale/bg/LC_MESSAGES/libxfce4ui.mo +share/locale/bn/LC_MESSAGES/libxfce4ui.mo +share/locale/ca/LC_MESSAGES/libxfce4ui.mo +share/locale/cs/LC_MESSAGES/libxfce4ui.mo +share/locale/da/LC_MESSAGES/libxfce4ui.mo +share/locale/de/LC_MESSAGES/libxfce4ui.mo +share/locale/el/LC_MESSAGES/libxfce4ui.mo +share/locale/en_AU/LC_MESSAGES/libxfce4ui.mo +share/locale/en_GB/LC_MESSAGES/libxfce4ui.mo +share/locale/es/LC_MESSAGES/libxfce4ui.mo +share/locale/eu/LC_MESSAGES/libxfce4ui.mo +share/locale/fi/LC_MESSAGES/libxfce4ui.mo +share/locale/fr/LC_MESSAGES/libxfce4ui.mo +share/locale/gl/LC_MESSAGES/libxfce4ui.mo +share/locale/he/LC_MESSAGES/libxfce4ui.mo +share/locale/hr/LC_MESSAGES/libxfce4ui.mo +share/locale/hu/LC_MESSAGES/libxfce4ui.mo +share/locale/id/LC_MESSAGES/libxfce4ui.mo +share/locale/is/LC_MESSAGES/libxfce4ui.mo +share/locale/it/LC_MESSAGES/libxfce4ui.mo +share/locale/ja/LC_MESSAGES/libxfce4ui.mo +share/locale/kk/LC_MESSAGES/libxfce4ui.mo +share/locale/ko/LC_MESSAGES/libxfce4ui.mo +share/locale/lt/LC_MESSAGES/libxfce4ui.mo +share/locale/lv/LC_MESSAGES/libxfce4ui.mo +share/locale/ms/LC_MESSAGES/libxfce4ui.mo +share/locale/nb/LC_MESSAGES/libxfce4ui.mo +share/locale/nl/LC_MESSAGES/libxfce4ui.mo +share/locale/nn/LC_MESSAGES/libxfce4ui.mo +share/locale/oc/LC_MESSAGES/libxfce4ui.mo +share/locale/pa/LC_MESSAGES/libxfce4ui.mo +share/locale/pl/LC_MESSAGES/libxfce4ui.mo +share/locale/pt/LC_MESSAGES/libxfce4ui.mo +share/locale/pt_BR/LC_MESSAGES/libxfce4ui.mo +share/locale/ro/LC_MESSAGES/libxfce4ui.mo +share/locale/ru/LC_MESSAGES/libxfce4ui.mo +share/locale/si/LC_MESSAGES/libxfce4ui.mo +share/locale/sk/LC_MESSAGES/libxfce4ui.mo +share/locale/sl/LC_MESSAGES/libxfce4ui.mo +share/locale/sr/LC_MESSAGES/libxfce4ui.mo +share/locale/sv/LC_MESSAGES/libxfce4ui.mo +share/locale/te/LC_MESSAGES/libxfce4ui.mo +share/locale/th/LC_MESSAGES/libxfce4ui.mo +share/locale/tr/LC_MESSAGES/libxfce4ui.mo +share/locale/ug/LC_MESSAGES/libxfce4ui.mo +share/locale/uk/LC_MESSAGES/libxfce4ui.mo +share/locale/ur/LC_MESSAGES/libxfce4ui.mo +share/locale/ur_PK/LC_MESSAGES/libxfce4ui.mo +share/locale/vi/LC_MESSAGES/libxfce4ui.mo +share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo +share/locale/zh_HK/LC_MESSAGES/libxfce4ui.mo +share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo diff --git a/x11/libxfce4ui/buildlink3.mk b/x11/libxfce4ui/buildlink3.mk new file mode 100644 index 00000000000..c067c3d4a4f --- /dev/null +++ b/x11/libxfce4ui/buildlink3.mk @@ -0,0 +1,16 @@ +# $NetBSD: buildlink3.mk,v 1.1 2015/04/21 08:56:43 jperkin Exp $ + +BUILDLINK_TREE+= libxfce4ui + +.if !defined(LIBXFCE4UI_BUILDLINK3_MK) +LIBXFCE4UI_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.libxfce4ui+= libxfce4ui>=4.12.1 +BUILDLINK_PKGSRCDIR.libxfce4ui?= ../../x11/libxfce4ui + +.include "../../devel/xfce4-conf/buildlink3.mk" +.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" +.endif # LIBXFCE4UI_BUILDLINK3_MK + +BUILDLINK_TREE+= -libxfce4ui diff --git a/x11/libxfce4ui/distinfo b/x11/libxfce4ui/distinfo new file mode 100644 index 00000000000..e666b0367fa --- /dev/null +++ b/x11/libxfce4ui/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:43 jperkin Exp $ + +SHA1 (libxfce4ui-4.12.1.tar.bz2) = ef687867bd087b5fc2befee0e8ca1a281f6bf165 +RMD160 (libxfce4ui-4.12.1.tar.bz2) = 42e2e89026a6c4d3b114b4ce1cb95b92f2781778 +Size (libxfce4ui-4.12.1.tar.bz2) = 665624 bytes +SHA1 (patch-libxfce4kbd-private_Makefile.in) = ab1780a80ffbf8fb95067af826c2880779b4c248 diff --git a/x11/libxfce4gui/patches/patch-aa b/x11/libxfce4ui/patches/patch-libxfce4kbd-private_Makefile.in index 2531cce5a9e..77c871dd77f 100644 --- a/x11/libxfce4gui/patches/patch-aa +++ b/x11/libxfce4ui/patches/patch-libxfce4kbd-private_Makefile.in @@ -1,13 +1,14 @@ -$NetBSD: patch-aa,v 1.3 2009/09/16 01:15:33 reed Exp $ +$NetBSD: patch-libxfce4kbd-private_Makefile.in,v 1.1 2015/04/21 08:56:43 jperkin Exp $ ---- libxfce4kbd-private/Makefile.in.orig 2009-03-08 20:41:51.000000000 +0000 +Adjust config path. +--- libxfce4kbd-private/Makefile.in.orig 2015-02-28 15:11:08.000000000 +0000 +++ libxfce4kbd-private/Makefile.in -@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@ - @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ +@@ -547,7 +547,7 @@ top_srcdir = @top_srcdir@ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_LIBS) -@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml +@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml @ENABLE_KEYBOARD_LIBRARY_TRUE@settings_DATA = xfce4-keyboard-shortcuts.xml @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfigdir = $(libdir)/pkgconfig - @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = libxfce4kbd-private-1.0.pc + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = \ diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index ae2b1e686d7..19c84f1a8e2 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,20 +1,14 @@ -# $NetBSD: Makefile,v 1.36 2013/12/10 20:15:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.37 2015/04/21 08:56:43 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= libxfce4util-${XFCE4_VERSION} -PKGREVISION= 17 +DISTNAME= libxfce4util-4.12.1 CATEGORIES= x11 + COMMENT= Xfce basic library PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in MAKE_DIRS+= ${PREFIX}/include/xfce4 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --disable-visibility -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST index 7deda984b84..01c914d615b 100644 --- a/x11/libxfce4util/PLIST +++ b/x11/libxfce4util/PLIST @@ -1,12 +1,7 @@ -@comment $NetBSD: PLIST,v 1.14 2009/09/16 01:15:35 reed Exp $ -include/xfce4/libxfce4util/debug.h -include/xfce4/libxfce4util/i18n.h +@comment $NetBSD: PLIST,v 1.15 2015/04/21 08:56:43 jperkin Exp $ include/xfce4/libxfce4util/libxfce4util-config.h -include/xfce4/libxfce4util/libxfce4util-enum-types.h include/xfce4/libxfce4util/libxfce4util.h -include/xfce4/libxfce4util/utf8.h -include/xfce4/libxfce4util/util.h -include/xfce4/libxfce4util/xfce-desktopentry.h +include/xfce4/libxfce4util/xfce-debug.h include/xfce4/libxfce4util/xfce-fileutils.h include/xfce4/libxfce4util/xfce-generics.h include/xfce4/libxfce4util/xfce-i18n.h @@ -23,8 +18,8 @@ sbin/xfce4-kiosk-query share/gtk-doc/html/libxfce4util/home.png share/gtk-doc/html/libxfce4util/index.html share/gtk-doc/html/libxfce4util/index.sgml +share/gtk-doc/html/libxfce4util/left-insensitive.png share/gtk-doc/html/libxfce4util/left.png -share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html @@ -40,20 +35,24 @@ share/gtk-doc/html/libxfce4util/libxfce4util-core.html share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html -share/gtk-doc/html/libxfce4util/libxfce4util.devhelp share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2 share/gtk-doc/html/libxfce4util/reference.html +share/gtk-doc/html/libxfce4util/right-insensitive.png share/gtk-doc/html/libxfce4util/right.png share/gtk-doc/html/libxfce4util/style.css +share/gtk-doc/html/libxfce4util/up-insensitive.png share/gtk-doc/html/libxfce4util/up.png share/locale/am/LC_MESSAGES/libxfce4util.mo share/locale/ar/LC_MESSAGES/libxfce4util.mo +share/locale/ast/LC_MESSAGES/libxfce4util.mo +share/locale/bg/LC_MESSAGES/libxfce4util.mo +share/locale/bn/LC_MESSAGES/libxfce4util.mo share/locale/ca/LC_MESSAGES/libxfce4util.mo share/locale/cs/LC_MESSAGES/libxfce4util.mo -share/locale/cy/LC_MESSAGES/libxfce4util.mo share/locale/da/LC_MESSAGES/libxfce4util.mo share/locale/de/LC_MESSAGES/libxfce4util.mo -share/locale/dz/LC_MESSAGES/libxfce4util.mo +share/locale/el/LC_MESSAGES/libxfce4util.mo +share/locale/en_AU/LC_MESSAGES/libxfce4util.mo share/locale/en_GB/LC_MESSAGES/libxfce4util.mo share/locale/es/LC_MESSAGES/libxfce4util.mo share/locale/et/LC_MESSAGES/libxfce4util.mo @@ -62,24 +61,39 @@ share/locale/fi/LC_MESSAGES/libxfce4util.mo share/locale/fr/LC_MESSAGES/libxfce4util.mo share/locale/gl/LC_MESSAGES/libxfce4util.mo share/locale/he/LC_MESSAGES/libxfce4util.mo +share/locale/hr/LC_MESSAGES/libxfce4util.mo +share/locale/hu/LC_MESSAGES/libxfce4util.mo share/locale/id/LC_MESSAGES/libxfce4util.mo +share/locale/is/LC_MESSAGES/libxfce4util.mo +share/locale/it/LC_MESSAGES/libxfce4util.mo share/locale/ja/LC_MESSAGES/libxfce4util.mo -share/locale/ka/LC_MESSAGES/libxfce4util.mo +share/locale/kk/LC_MESSAGES/libxfce4util.mo share/locale/ko/LC_MESSAGES/libxfce4util.mo share/locale/lt/LC_MESSAGES/libxfce4util.mo share/locale/lv/LC_MESSAGES/libxfce4util.mo -share/locale/mk/LC_MESSAGES/libxfce4util.mo +share/locale/ms/LC_MESSAGES/libxfce4util.mo share/locale/nb/LC_MESSAGES/libxfce4util.mo share/locale/nl/LC_MESSAGES/libxfce4util.mo +share/locale/nn/LC_MESSAGES/libxfce4util.mo +share/locale/oc/LC_MESSAGES/libxfce4util.mo +share/locale/pa/LC_MESSAGES/libxfce4util.mo share/locale/pl/LC_MESSAGES/libxfce4util.mo share/locale/pt/LC_MESSAGES/libxfce4util.mo share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo share/locale/ro/LC_MESSAGES/libxfce4util.mo +share/locale/ru/LC_MESSAGES/libxfce4util.mo share/locale/si/LC_MESSAGES/libxfce4util.mo -share/locale/sl/LC_MESSAGES/libxfce4util.mo +share/locale/sk/LC_MESSAGES/libxfce4util.mo share/locale/sq/LC_MESSAGES/libxfce4util.mo +share/locale/sr/LC_MESSAGES/libxfce4util.mo share/locale/sv/LC_MESSAGES/libxfce4util.mo +share/locale/th/LC_MESSAGES/libxfce4util.mo share/locale/tr/LC_MESSAGES/libxfce4util.mo +share/locale/ug/LC_MESSAGES/libxfce4util.mo share/locale/uk/LC_MESSAGES/libxfce4util.mo share/locale/ur/LC_MESSAGES/libxfce4util.mo +share/locale/ur_PK/LC_MESSAGES/libxfce4util.mo +share/locale/uz/LC_MESSAGES/libxfce4util.mo share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo +share/locale/zh_HK/LC_MESSAGES/libxfce4util.mo +share/locale/zh_TW/LC_MESSAGES/libxfce4util.mo diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index 8c1532ea626..1189ba0f57f 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.29 2012/09/15 10:07:10 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2015/04/21 08:56:43 jperkin Exp $ BUILDLINK_TREE+= libxfce4util .if !defined(LIBXFCE4UTIL_BUILDLINK3_MK) LIBXFCE4UTIL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.6.0 -BUILDLINK_ABI_DEPENDS.libxfce4util+= libxfce4util>=4.6.1nb9 +BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.12.0 +BUILDLINK_ABI_DEPENDS.libxfce4util+= libxfce4util>=4.12.0 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util -.include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .endif # LIBXFCE4UTIL_BUILDLINK3_MK BUILDLINK_TREE+= -libxfce4util diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index b8fc9f050ef..48de119b615 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $ +$NetBSD: distinfo,v 1.21 2015/04/21 08:56:43 jperkin Exp $ -SHA1 (libxfce4util-4.6.1.tar.bz2) = 6d14099aa095b2f5d9b6a4348968b741b9ad661d -RMD160 (libxfce4util-4.6.1.tar.bz2) = e54d6c7291bbd7e658bc612b52b1c8d02c47d5ae -Size (libxfce4util-4.6.1.tar.bz2) = 405327 bytes +SHA1 (libxfce4util-4.12.1.tar.bz2) = fbea10b13db55c1f7756ec36ea7c8e84ca781492 +RMD160 (libxfce4util-4.12.1.tar.bz2) = 64403bff38b7a76fbe1e3092891694bd27961964 +Size (libxfce4util-4.12.1.tar.bz2) = 455329 bytes diff --git a/x11/libxfce4util/hacks.mk b/x11/libxfce4util/hacks.mk deleted file mode 100644 index 35e413c9339..00000000000 --- a/x11/libxfce4util/hacks.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2008/02/08 10:25:26 tnn Exp $ - -.if !defined(LIBXFCE4UTIL_HACKS_MK) -LIBXFCE4UTIL_HACKS_MK= # defined - -### [Sat Feb 4 09:07:25 CET 2006: schwarz] -### SGI ido compiler does not handle (...) in defines -### -.if !empty(PKGSRC_COMPILER:Mido) -PKG_HACKS+= no-dots-in-defines -SUBST_CLASSES+= dots -SUBST_STAGE.dots= post-patch -SUBST_FILES.dots= libxfce4util/xfce-miscutils.h libxfce4util/debug.h -SUBST_SED.dots= -e 's,(\.\.\.),(x),g' -.endif - -.endif diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index da79917b6d7..840f9e437d0 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -1,14 +1,26 @@ -# $NetBSD: Makefile,v 1.36 2014/05/05 00:48:36 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2015/04/21 08:56:43 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.8.0 - -DISTNAME= xfce4-clipman-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-clipman-plugin-1.2.6 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-clipman-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.2/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin COMMENT= Xfce clipboard plugin +CONF_FILES= ${XFCE4_EGBASE}/autostart/xfce4-clipman-plugin-autostart.desktop \ + ${PKG_SYSCONFDIR}/autostart/xfce4-clipman-plugin-autostart.desktop \ + ${XFCE4_EGBASE}/panel/xfce4-clipman-actions.xml \ + ${PKG_SYSCONFDIR}/panel/xfce4-clipman-actions.xml + +MAKE_DIRS+= ${XFCE4_EGBASE}/autostart \ + ${XFCE4_EGBASE}/panel + +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../x11/libunique/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-clipman-plugin/PLIST b/x11/xfce4-clipman-plugin/PLIST index bc45d59ebc9..a8d35bd48ec 100644 --- a/x11/xfce4-clipman-plugin/PLIST +++ b/x11/xfce4-clipman-plugin/PLIST @@ -1,13 +1,64 @@ -@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:21 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-clipman-plugin +@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:43 jperkin Exp $ +bin/xfce4-clipman +bin/xfce4-clipman-settings +bin/xfce4-popup-clipman +lib/xfce4/panel/plugins/libclipman.la +share/appdata/xfce4-clipman.appdata.xml +share/applications/xfce4-clipman.desktop +share/examples/xfce4/autostart/xfce4-clipman-plugin-autostart.desktop +share/examples/xfce4/panel/xfce4-clipman-actions.xml +share/icons/hicolor/16x16/apps/xfce4-clipman-plugin.png +share/icons/hicolor/22x22/apps/xfce4-clipman-plugin.png +share/icons/hicolor/24x24/apps/xfce4-clipman-plugin.png +share/icons/hicolor/32x32/apps/xfce4-clipman-plugin.png +share/icons/hicolor/scalable/apps/xfce4-clipman-plugin.svg +share/locale/ar/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/be/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/he/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/sl/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-clipman-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo -share/xfce4/panel-plugins/clipman.desktop +share/xfce4/panel/plugins/xfce4-clipman-plugin.desktop diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk deleted file mode 100644 index ae77578e373..00000000000 --- a/x11/xfce4-clipman-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.39 2014/05/05 00:48:36 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-clipman-plugin - -.if !defined(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK) -XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.8.0 -BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.8.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-clipman-plugin diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo index 8966ed32dce..d22fe85b1c6 100644 --- a/x11/xfce4-clipman-plugin/distinfo +++ b/x11/xfce4-clipman-plugin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2007/04/12 09:55:21 martti Exp $ +$NetBSD: distinfo,v 1.6 2015/04/21 08:56:43 jperkin Exp $ -SHA1 (xfce4-clipman-plugin-0.8.0.tar.bz2) = 575bcda816646c5fa18b1a452a7696f70842841b -RMD160 (xfce4-clipman-plugin-0.8.0.tar.bz2) = f5b4f14b2317bcd00ba82e7be7060373b94cf3d7 -Size (xfce4-clipman-plugin-0.8.0.tar.bz2) = 193458 bytes +SHA1 (xfce4-clipman-plugin-1.2.6.tar.bz2) = 71767fef0a8366bb9a6bd3edeacf4a8dabdcaa40 +RMD160 (xfce4-clipman-plugin-1.2.6.tar.bz2) = 0e34628b195b5a452ebdb1c8ed9d631c662d1676 +Size (xfce4-clipman-plugin-1.2.6.tar.bz2) = 438346 bytes +SHA1 (patch-panel-plugin_Makefile.in) = 0c624023ae9e7d2676b979e1f8d740982010dedc diff --git a/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in b/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in new file mode 100644 index 00000000000..13f01d4e5ad --- /dev/null +++ b/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in @@ -0,0 +1,23 @@ +$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/04/21 08:56:43 jperkin Exp $ + +Adjust config path +--- panel-plugin/Makefile.in.orig 2014-05-31 17:03:00.000000000 +0000 ++++ panel-plugin/Makefile.in +@@ -565,7 +565,7 @@ libclipman_la_LIBADD = \ + # + # XML Actions File + # +-actionsdir = $(sysconfdir)/xdg/xfce4/panel ++actionsdir = $(datadir)/examples/xfce4/panel + actions_in_files = xfce4-clipman-actions.xml.in + actions_DATA = $(actions_in_files:.xml.in=.xml) + +@@ -582,7 +582,7 @@ apps_DATA = $(apps_in_files:.desktop.in= + # + # Autostart File + # +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/examples/xfce4/autostart + autostart_in_files = xfce4-clipman-plugin-autostart.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index 3da055f8a62..25fbc6cd08c 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,43 +1,21 @@ -# $NetBSD: Makefile,v 1.58 2014/05/05 00:48:36 ryoon Exp $ +# $NetBSD: Makefile,v 1.59 2015/04/21 08:56:43 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfdesktop-${XFCE4_VERSION} -PKGNAME= xfce4-desktop-${XFCE4_VERSION} -PKGREVISION= 23 +DISTNAME= xfdesktop-4.12.1 +PKGNAME= xfce4-desktop-4.12.1 CATEGORIES= x11 +MASTER_SITES+= http://archive.xfce.org/src/xfce/xfdesktop/4.12/ + +HOMEPAGE= http://docs.xfce.org/xfce/xfdesktop/start COMMENT= Xfce desktop background manager CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} -BUILD_DEFS+= PKG_SYSCONFBASE - -PKG_SYSCONFSUBDIR= xdg/menus - -OWN_DIRS+= ${PKG_SYSCONFDIR} -MAKE_DIRS+= ${PREFIX}/lib/xfce4 ${PREFIX}/libexec/xfce4 -MAKE_DIRS+= ${PREFIX}/libexec/panel-plugins ${XFCE4_EGBASE:Q} -MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/da -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/ja ${PREFIX}/share/xfce4/doc/ja/images -MAKE_DIRS+= ${PREFIX}/share/xfce4/panel-plugins - -CONF_FILES= ${XFCE4_EGBASE:Q}/menus/xfce-applications.menu \ - ${PKG_SYSCONFDIR}/xfce-applications.menu - .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/xfce4-thunar/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4menu/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" -.include "../../x11/xfce4-exo/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/xfce4-garcon/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST index 51ea08f43b5..f5150e02c44 100644 --- a/x11/xfce4-desktop/PLIST +++ b/x11/xfce4-desktop/PLIST @@ -1,31 +1,10 @@ -@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $ -bin/xfce4-popup-menu +@comment $NetBSD: PLIST,v 1.23 2015/04/21 08:56:43 jperkin Exp $ bin/xfdesktop bin/xfdesktop-settings -lib/xfce4/modules/xfce4_desktop_menu.la -libexec/xfce4/panel-plugins/xfce4-menu-plugin man/man1/xfdesktop.1 share/applications/xfce-backdrop-settings.desktop -share/applications/xfce4-about-xfce.desktop -share/applications/xfce4-file-manager.desktop -share/applications/xfce4-help.desktop -share/applications/xfce4-logout.desktop -share/applications/xfce4-run-program.desktop -share/applications/xfce4-terminal.desktop -share/applications/xfce4-web-browser.desktop -share/desktop-directories/xfce-accessories.directory -share/desktop-directories/xfce-development.directory -share/desktop-directories/xfce-education.directory -share/desktop-directories/xfce-games.directory -share/desktop-directories/xfce-graphics.directory -share/desktop-directories/xfce-multimedia.directory -share/desktop-directories/xfce-network.directory -share/desktop-directories/xfce-office.directory -share/desktop-directories/xfce-other.directory -share/desktop-directories/xfce-screensavers.directory -share/desktop-directories/xfce-settings.directory -share/desktop-directories/xfce-system.directory -share/examples/xfce4/menus/xfce-applications.menu +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 @@ -34,97 +13,68 @@ share/icons/hicolor/scalable/apps/xfce4-backdrop.svg share/icons/hicolor/scalable/apps/xfce4-menueditor.svg share/locale/am/LC_MESSAGES/xfdesktop.mo share/locale/ar/LC_MESSAGES/xfdesktop.mo -share/locale/az/LC_MESSAGES/xfdesktop.mo +share/locale/ast/LC_MESSAGES/xfdesktop.mo share/locale/be/LC_MESSAGES/xfdesktop.mo share/locale/bg/LC_MESSAGES/xfdesktop.mo -share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo +share/locale/bn/LC_MESSAGES/xfdesktop.mo share/locale/ca/LC_MESSAGES/xfdesktop.mo share/locale/cs/LC_MESSAGES/xfdesktop.mo share/locale/da/LC_MESSAGES/xfdesktop.mo share/locale/de/LC_MESSAGES/xfdesktop.mo -share/locale/dz/LC_MESSAGES/xfdesktop.mo share/locale/el/LC_MESSAGES/xfdesktop.mo +share/locale/en_AU/LC_MESSAGES/xfdesktop.mo share/locale/en_GB/LC_MESSAGES/xfdesktop.mo share/locale/eo/LC_MESSAGES/xfdesktop.mo share/locale/es/LC_MESSAGES/xfdesktop.mo -share/locale/es_MX/LC_MESSAGES/xfdesktop.mo share/locale/et/LC_MESSAGES/xfdesktop.mo share/locale/eu/LC_MESSAGES/xfdesktop.mo -share/locale/fa/LC_MESSAGES/xfdesktop.mo +share/locale/fa_IR/LC_MESSAGES/xfdesktop.mo share/locale/fi/LC_MESSAGES/xfdesktop.mo share/locale/fr/LC_MESSAGES/xfdesktop.mo share/locale/gl/LC_MESSAGES/xfdesktop.mo -share/locale/gu/LC_MESSAGES/xfdesktop.mo share/locale/he/LC_MESSAGES/xfdesktop.mo -share/locale/hi/LC_MESSAGES/xfdesktop.mo +share/locale/hr/LC_MESSAGES/xfdesktop.mo share/locale/hu/LC_MESSAGES/xfdesktop.mo -share/locale/hy/LC_MESSAGES/xfdesktop.mo share/locale/id/LC_MESSAGES/xfdesktop.mo +share/locale/is/LC_MESSAGES/xfdesktop.mo share/locale/it/LC_MESSAGES/xfdesktop.mo share/locale/ja/LC_MESSAGES/xfdesktop.mo -share/locale/ka/LC_MESSAGES/xfdesktop.mo +share/locale/kk/LC_MESSAGES/xfdesktop.mo share/locale/ko/LC_MESSAGES/xfdesktop.mo share/locale/lt/LC_MESSAGES/xfdesktop.mo share/locale/lv/LC_MESSAGES/xfdesktop.mo -share/locale/mk/LC_MESSAGES/xfdesktop.mo -share/locale/mr/LC_MESSAGES/xfdesktop.mo share/locale/ms/LC_MESSAGES/xfdesktop.mo share/locale/nb/LC_MESSAGES/xfdesktop.mo share/locale/nl/LC_MESSAGES/xfdesktop.mo +share/locale/nn/LC_MESSAGES/xfdesktop.mo +share/locale/oc/LC_MESSAGES/xfdesktop.mo share/locale/pa/LC_MESSAGES/xfdesktop.mo share/locale/pl/LC_MESSAGES/xfdesktop.mo share/locale/pt/LC_MESSAGES/xfdesktop.mo share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo share/locale/ro/LC_MESSAGES/xfdesktop.mo share/locale/ru/LC_MESSAGES/xfdesktop.mo +share/locale/si/LC_MESSAGES/xfdesktop.mo share/locale/sk/LC_MESSAGES/xfdesktop.mo +share/locale/sl/LC_MESSAGES/xfdesktop.mo share/locale/sq/LC_MESSAGES/xfdesktop.mo +share/locale/sr/LC_MESSAGES/xfdesktop.mo share/locale/sv/LC_MESSAGES/xfdesktop.mo -share/locale/ta/LC_MESSAGES/xfdesktop.mo +share/locale/te/LC_MESSAGES/xfdesktop.mo +share/locale/th/LC_MESSAGES/xfdesktop.mo share/locale/tr/LC_MESSAGES/xfdesktop.mo +share/locale/ug/LC_MESSAGES/xfdesktop.mo share/locale/uk/LC_MESSAGES/xfdesktop.mo share/locale/ur/LC_MESSAGES/xfdesktop.mo +share/locale/ur_PK/LC_MESSAGES/xfdesktop.mo +share/locale/uz/LC_MESSAGES/xfdesktop.mo share/locale/vi/LC_MESSAGES/xfdesktop.mo share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo +share/locale/zh_HK/LC_MESSAGES/xfdesktop.mo share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo -share/pixmaps/xfce4/xfdesktop/text-selection-frame.png share/pixmaps/xfce4_xicon.png share/pixmaps/xfce4_xicon1.png share/pixmaps/xfce4_xicon2.png share/pixmaps/xfce4_xicon3.png share/pixmaps/xfce4_xicon4.png share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png -share/xfce4/backdrops/flower.png -share/xfce4/backdrops/xfce-in-a-grid.png -share/xfce4/backdrops/xfce-in-the-moon.png -share/xfce4/backdrops/xfce-smoke.png -share/xfce4/backdrops/xfce-stellar-tile.png -share/xfce4/backdrops/xfce-stripes.png -share/xfce4/backdrops/xfce-turbulence.png -share/xfce4/backdrops/xfce4gradientcurve.png -share/xfce4/backdrops/xfce4logo.png -share/xfce4/doc/C/images/root_menu.png -share/xfce4/doc/C/images/root_menu2.png -share/xfce4/doc/C/images/select_bg_color.png -share/xfce4/doc/C/images/xfdesktop-appearance-tab.png -share/xfce4/doc/C/images/xfdesktop-behavior-tab.png -share/xfce4/doc/C/images/xfdesktop-editor.png -share/xfce4/doc/C/images/xfdesktop-list.png -share/xfce4/doc/C/xfdesktop.html -share/xfce4/doc/da/xfdesktop.html -share/xfce4/doc/fr/images/root_menu.png -share/xfce4/doc/fr/images/root_menu2.png -share/xfce4/doc/fr/images/select_bg_color.png -share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png -share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png -share/xfce4/doc/fr/images/xfdesktop-editor.png -share/xfce4/doc/fr/images/xfdesktop-list.png -share/xfce4/doc/fr/xfdesktop.html -share/xfce4/doc/ja/images/root_menu.png -share/xfce4/doc/ja/images/root_menu2.png -share/xfce4/doc/ja/images/select_bg_color.png -share/xfce4/doc/ja/images/xfdesktop-background-tab.png -share/xfce4/doc/ja/images/xfdesktop-icons-tab.png -share/xfce4/doc/ja/images/xfdesktop-menus-tab.png -share/xfce4/doc/ja/xfdesktop.html -share/xfce4/panel-plugins/xfce4-menu.desktop diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk deleted file mode 100644 index 13d3ac8824b..00000000000 --- a/x11/xfce4-desktop/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.26 2009/09/16 01:15:35 reed Exp $ - -BUILDLINK_TREE+= xfce4-desktop - -.if !defined(XFCE4_DESKTOP_BUILDLINK3_MK) -XFCE4_DESKTOP_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.6.0 -BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop - -.endif # XFCE4_DESKTOP_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-desktop diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo index 2a50f17c981..825bc147397 100644 --- a/x11/xfce4-desktop/distinfo +++ b/x11/xfce4-desktop/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.20 2009/09/16 01:15:35 reed Exp $ +$NetBSD: distinfo,v 1.21 2015/04/21 08:56:43 jperkin Exp $ -SHA1 (xfdesktop-4.6.1.tar.bz2) = c2c1b54acaae924077caa3cdffe449e3bb34b2bd -RMD160 (xfdesktop-4.6.1.tar.bz2) = 86785f706a65e443c5521179b68309b9aca0cb32 -Size (xfdesktop-4.6.1.tar.bz2) = 3671378 bytes -SHA1 (patch-ac) = 1d63ec32443690ac989a88704079999894a67ad5 +SHA1 (xfdesktop-4.12.1.tar.bz2) = 1bb6eaef5e97873e9516b6fb68cf851e1cee95ac +RMD160 (xfdesktop-4.12.1.tar.bz2) = d6baa543559a0b29ff2c3be5240d29cae7142e8f +Size (xfdesktop-4.12.1.tar.bz2) = 1417153 bytes diff --git a/x11/xfce4-desktop/patches/patch-ac b/x11/xfce4-desktop/patches/patch-ac deleted file mode 100644 index 637db20cc5e..00000000000 --- a/x11/xfce4-desktop/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2009/09/16 01:15:33 reed Exp $ - ---- modules/menu/menu-data/Makefile.in.orig 2009-03-09 11:13:35.000000000 +0000 -+++ modules/menu/menu-data/Makefile.in -@@ -291,7 +291,7 @@ desktop_in_files = \ - xfce4-web-browser.desktop.in - - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) --menudir = $(sysconfdir)/xdg/menus -+menudir = $(datadir)/examples/xfce4/menus - menu_DATA = xfce-applications.menu - EXTRA_DIST = $(desktop_in_files) $(menu_DATA) - DISTCLEANFILES = $(desktop_DATA) diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile index 2d8734b650b..41a0f63789f 100644 --- a/x11/xfce4-exo/Makefile +++ b/x11/xfce4-exo/Makefile @@ -1,42 +1,30 @@ -# $NetBSD: Makefile,v 1.37 2014/05/29 23:38:20 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2015/04/21 08:56:44 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.3.101 - -DISTNAME= exo-${XFCE4_VERSION} -PKGNAME= xfce4-exo-${XFCE4_VERSION} -PKGREVISION= 26 +VERSION= 0.10.4 +DISTNAME= exo-${VERSION} +PKGNAME= xfce4-exo-${VERSION} CATEGORIES= x11 +MASTER_SITES= http://archive.xfce.org/src/xfce/exo/0.10/ + +HOMEPAGE= http://docs.xfce.org/xfce/exo/start COMMENT= Xfce extension library -DEPENDS+= p5-URI>=0:../../www/p5-URI +USE_TOOLS+= perl:run +REPLACE_PERL= exo-helper/helpers/exo-compose-mail-1 -PKGCONFIG_OVERRIDE+= exo/exo-0.3.pc.in exo-hal/exo-hal-0.3.pc.in +DEPENDS+= p5-URI>=0:../../www/p5-URI -CONFIGURE_ARGS+= --disable-python - -USE_TOOLS+= perl:run -REPLACE_PERL+= exo-helper/helpers/exo-compose-mail-0.3 +PKGCONFIG_OVERRIDE+= exo/exo-1.pc.in PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} -MAKE_DIRS+= ${SYSCONFDIR} -MAKE_DIRS+= ${EGDIR} ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc -.for f in C es fr id ja pt_BR tr -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/${f} -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/${f}/images -.endfor - CONF_FILES= ${EGDIR}/helpers.rc ${PKG_SYSCONFDIR}/helpers.rc OWN_DIRS+= ${EGDIR} -.include "options.mk" - -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/libnotify/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-exo/PLIST b/x11/xfce4-exo/PLIST index e7a41b371f7..0d5ec234704 100644 --- a/x11/xfce4-exo/PLIST +++ b/x11/xfce4-exo/PLIST @@ -1,188 +1,161 @@ -@comment $NetBSD: PLIST,v 1.7 2010/01/24 20:00:06 gls Exp $ +@comment $NetBSD: PLIST,v 1.8 2015/04/21 08:56:44 jperkin Exp $ bin/exo-csource bin/exo-desktop-item-edit -bin/exo-eject -bin/exo-mount bin/exo-open bin/exo-preferred-applications -bin/exo-unmount -include/exo-0.3/exo-hal/exo-hal.h -include/exo-0.3/exo/exo-binding.h -include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h -include/exo-0.3/exo/exo-cell-renderer-icon.h -include/exo-0.3/exo/exo-config.h -include/exo-0.3/exo/exo-ellipsized-label.h -include/exo-0.3/exo/exo-enum-types.h -include/exo-0.3/exo/exo-execute.h -include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h -include/exo-0.3/exo/exo-gobject-extensions.h -include/exo-0.3/exo/exo-gtk-extensions.h -include/exo-0.3/exo/exo-icon-bar.h -include/exo-0.3/exo/exo-icon-chooser-dialog.h -include/exo-0.3/exo/exo-icon-view.h -include/exo-0.3/exo/exo-md5.h -include/exo-0.3/exo/exo-mount-point.h -include/exo-0.3/exo/exo-pango-extensions.h -include/exo-0.3/exo/exo-string.h -include/exo-0.3/exo/exo-toolbars-editor-dialog.h -include/exo-0.3/exo/exo-toolbars-editor.h -include/exo-0.3/exo/exo-toolbars-model.h -include/exo-0.3/exo/exo-toolbars-view.h -include/exo-0.3/exo/exo-tree-view.h -include/exo-0.3/exo/exo-url.h -include/exo-0.3/exo/exo-utils.h -include/exo-0.3/exo/exo-wrap-table.h -include/exo-0.3/exo/exo-xsession-client.h -include/exo-0.3/exo/exo.h -lib/libexo-0.3.la -lib/libexo-hal-0.3.la -lib/pkgconfig/exo-0.3.pc -lib/pkgconfig/exo-hal-0.3.pc -libexec/exo-compose-mail-0.3 -libexec/exo-helper-0.3 -libexec/exo-mount-notify-0.3 +include/exo-1/exo/exo-binding.h +include/exo-1/exo/exo-cell-renderer-ellipsized-text.h +include/exo-1/exo/exo-cell-renderer-icon.h +include/exo-1/exo/exo-config.h +include/exo-1/exo/exo-enum-types.h +include/exo-1/exo/exo-execute.h +include/exo-1/exo/exo-gdk-pixbuf-extensions.h +include/exo-1/exo/exo-gobject-extensions.h +include/exo-1/exo/exo-gtk-extensions.h +include/exo-1/exo/exo-icon-bar.h +include/exo-1/exo/exo-icon-chooser-dialog.h +include/exo-1/exo/exo-icon-view.h +include/exo-1/exo/exo-job.h +include/exo-1/exo/exo-simple-job.h +include/exo-1/exo/exo-string.h +include/exo-1/exo/exo-toolbars-editor-dialog.h +include/exo-1/exo/exo-toolbars-editor.h +include/exo-1/exo/exo-toolbars-model.h +include/exo-1/exo/exo-toolbars-view.h +include/exo-1/exo/exo-tree-view.h +include/exo-1/exo/exo-utils.h +include/exo-1/exo/exo-wrap-table.h +include/exo-1/exo/exo-xsession-client.h +include/exo-1/exo/exo.h +lib/libexo-1.la +lib/pkgconfig/exo-1.pc +lib/xfce4/exo-1/exo-compose-mail-1 +lib/xfce4/exo-1/exo-helper-1 man/man1/exo-csource.1 man/man1/exo-open.1 +share/applications/exo-file-manager.desktop +share/applications/exo-mail-reader.desktop share/applications/exo-preferred-applications.desktop +share/applications/exo-terminal-emulator.desktop +share/applications/exo-web-browser.desktop share/examples/xfce4/helpers.rc -share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html -share/gtk-doc/html/exo/ExoCellRendererIcon.html -share/gtk-doc/html/exo/ExoEllipsizedLabel.html -share/gtk-doc/html/exo/ExoIconBar.html -share/gtk-doc/html/exo/ExoIconChooserDialog.html -share/gtk-doc/html/exo/ExoIconView.html -share/gtk-doc/html/exo/ExoToolbarsEditor.html -share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html -share/gtk-doc/html/exo/ExoToolbarsModel.html -share/gtk-doc/html/exo/ExoToolbarsView.html -share/gtk-doc/html/exo/ExoTreeView.html -share/gtk-doc/html/exo/ExoWrapTable.html -share/gtk-doc/html/exo/ExoXsessionClient.html -share/gtk-doc/html/exo/ch01.html -share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html -share/gtk-doc/html/exo/exo-Executing-Applications.html -share/gtk-doc/html/exo/exo-Extensions-to-GObject.html -share/gtk-doc/html/exo/exo-Extensions-to-Gtk.html -share/gtk-doc/html/exo/exo-Extensions-to-Pango.html -share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html -share/gtk-doc/html/exo/exo-HAL-Support-Functions.html -share/gtk-doc/html/exo/exo-MD5-functions.html -share/gtk-doc/html/exo/exo-Miscellaneous-Utility-Functions.html -share/gtk-doc/html/exo/exo-Mount-Points.html -share/gtk-doc/html/exo/exo-Opening-URLs.html -share/gtk-doc/html/exo/exo-String-Utility-Functions.html -share/gtk-doc/html/exo/exo-Version-Information.html -share/gtk-doc/html/exo/exo-cell-renderers.html -share/gtk-doc/html/exo/exo-csource.html -share/gtk-doc/html/exo/exo-deprecated-widgets.html -share/gtk-doc/html/exo/exo-extensions.html -share/gtk-doc/html/exo/exo-gtk-file-chooser-add-thumbnail-preview.png -share/gtk-doc/html/exo/exo-icon-chooser-dialog.png -share/gtk-doc/html/exo/exo-miscelleanous.html -share/gtk-doc/html/exo/exo-overview.html -share/gtk-doc/html/exo/exo-toolbars-editor-dialog.png -share/gtk-doc/html/exo/exo-toolbars-editor.png -share/gtk-doc/html/exo/exo-toolbars-view.png -share/gtk-doc/html/exo/exo-toolbars.html -share/gtk-doc/html/exo/exo-tools.html -share/gtk-doc/html/exo/exo-widgets.html -share/gtk-doc/html/exo/exo-wrap-table.png -share/gtk-doc/html/exo/exo.devhelp -share/gtk-doc/html/exo/exo.devhelp2 -share/gtk-doc/html/exo/home.png -share/gtk-doc/html/exo/index.html -share/gtk-doc/html/exo/index.sgml -share/gtk-doc/html/exo/ix01.html -share/gtk-doc/html/exo/left.png -share/gtk-doc/html/exo/right.png -share/gtk-doc/html/exo/style.css -share/gtk-doc/html/exo/up.png +share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html +share/gtk-doc/html/exo-1/ExoCellRendererIcon.html +share/gtk-doc/html/exo-1/ExoIconBar.html +share/gtk-doc/html/exo-1/ExoIconChooserDialog.html +share/gtk-doc/html/exo-1/ExoIconView.html +share/gtk-doc/html/exo-1/ExoJob.html +share/gtk-doc/html/exo-1/ExoSimpleJob.html +share/gtk-doc/html/exo-1/ExoToolbarsEditor.html +share/gtk-doc/html/exo-1/ExoToolbarsEditorDialog.html +share/gtk-doc/html/exo-1/ExoToolbarsModel.html +share/gtk-doc/html/exo-1/ExoToolbarsView.html +share/gtk-doc/html/exo-1/ExoTreeView.html +share/gtk-doc/html/exo-1/ExoWrapTable.html +share/gtk-doc/html/exo-1/ExoXsessionClient.html +share/gtk-doc/html/exo-1/ch01.html +share/gtk-doc/html/exo-1/exo-1.devhelp2 +share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html +share/gtk-doc/html/exo-1/exo-Executing-Applications.html +share/gtk-doc/html/exo-1/exo-Extensions-to-GObject.html +share/gtk-doc/html/exo-1/exo-Extensions-to-Gtk.html +share/gtk-doc/html/exo-1/exo-Extensions-to-gdk-pixbuf.html +share/gtk-doc/html/exo-1/exo-Miscellaneous-Utility-Functions.html +share/gtk-doc/html/exo-1/exo-String-Utility-Functions.html +share/gtk-doc/html/exo-1/exo-Version-Information.html +share/gtk-doc/html/exo-1/exo-cell-renderers.html +share/gtk-doc/html/exo-1/exo-csource.html +share/gtk-doc/html/exo-1/exo-extensions.html +share/gtk-doc/html/exo-1/exo-gtk-file-chooser-add-thumbnail-preview.png +share/gtk-doc/html/exo-1/exo-icon-chooser-dialog.png +share/gtk-doc/html/exo-1/exo-jobs.html +share/gtk-doc/html/exo-1/exo-miscelleanous.html +share/gtk-doc/html/exo-1/exo-overview.html +share/gtk-doc/html/exo-1/exo-toolbars-editor-dialog.png +share/gtk-doc/html/exo-1/exo-toolbars-editor.png +share/gtk-doc/html/exo-1/exo-toolbars-view.png +share/gtk-doc/html/exo-1/exo-toolbars.html +share/gtk-doc/html/exo-1/exo-tools.html +share/gtk-doc/html/exo-1/exo-widgets.html +share/gtk-doc/html/exo-1/exo-wrap-table.png +share/gtk-doc/html/exo-1/home.png +share/gtk-doc/html/exo-1/index.html +share/gtk-doc/html/exo-1/index.sgml +share/gtk-doc/html/exo-1/ix01.html +share/gtk-doc/html/exo-1/left.png +share/gtk-doc/html/exo-1/right.png +share/gtk-doc/html/exo-1/style.css +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/locale/ar/LC_MESSAGES/libexo-0.3.mo -share/locale/be/LC_MESSAGES/libexo-0.3.mo -share/locale/ca/LC_MESSAGES/libexo-0.3.mo -share/locale/cs/LC_MESSAGES/libexo-0.3.mo -share/locale/cy/LC_MESSAGES/libexo-0.3.mo -share/locale/da/LC_MESSAGES/libexo-0.3.mo -share/locale/de/LC_MESSAGES/libexo-0.3.mo -share/locale/dz/LC_MESSAGES/libexo-0.3.mo -share/locale/el/LC_MESSAGES/libexo-0.3.mo -share/locale/en_GB/LC_MESSAGES/libexo-0.3.mo -share/locale/es/LC_MESSAGES/libexo-0.3.mo -share/locale/et/LC_MESSAGES/libexo-0.3.mo -share/locale/eu/LC_MESSAGES/libexo-0.3.mo -share/locale/fi/LC_MESSAGES/libexo-0.3.mo -share/locale/fr/LC_MESSAGES/libexo-0.3.mo -share/locale/gl/LC_MESSAGES/libexo-0.3.mo -share/locale/he/LC_MESSAGES/libexo-0.3.mo -share/locale/hu/LC_MESSAGES/libexo-0.3.mo -share/locale/id/LC_MESSAGES/libexo-0.3.mo -share/locale/it/LC_MESSAGES/libexo-0.3.mo -share/locale/ja/LC_MESSAGES/libexo-0.3.mo -share/locale/ka/LC_MESSAGES/libexo-0.3.mo -share/locale/ku/LC_MESSAGES/libexo-0.3.mo -share/locale/lt/LC_MESSAGES/libexo-0.3.mo -share/locale/lv/LC_MESSAGES/libexo-0.3.mo -share/locale/mk/LC_MESSAGES/libexo-0.3.mo -share/locale/nb/LC_MESSAGES/libexo-0.3.mo -share/locale/nl/LC_MESSAGES/libexo-0.3.mo -share/locale/pa/LC_MESSAGES/libexo-0.3.mo -share/locale/pl/LC_MESSAGES/libexo-0.3.mo -share/locale/pt/LC_MESSAGES/libexo-0.3.mo -share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo -share/locale/ro/LC_MESSAGES/libexo-0.3.mo -share/locale/ru/LC_MESSAGES/libexo-0.3.mo -share/locale/sq/LC_MESSAGES/libexo-0.3.mo -share/locale/sv/LC_MESSAGES/libexo-0.3.mo -share/locale/tr/LC_MESSAGES/libexo-0.3.mo -share/locale/uk/LC_MESSAGES/libexo-0.3.mo -share/locale/ur/LC_MESSAGES/libexo-0.3.mo -share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo -share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo -share/pixmaps/exo-0.3/exo-thumbnail-frame.png -share/xfce4/doc/C/exo-preferred-applications.html -share/xfce4/doc/C/images/exo-preferred-applications-internet.png -share/xfce4/doc/C/images/exo-preferred-applications-utilities.png -share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/doc/es/exo-preferred-applications.html -share/xfce4/doc/es/images/exo-preferred-applications-internet.png -share/xfce4/doc/es/images/exo-preferred-applications-utilities.png -share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/doc/fr/exo-preferred-applications.html -share/xfce4/doc/fr/images/exo-preferred-applications-internet.png -share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png -share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/doc/id/exo-preferred-applications.html -share/xfce4/doc/id/images/exo-preferred-applications-internet.png -share/xfce4/doc/id/images/exo-preferred-applications-utilities.png -share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/doc/ja/exo-preferred-applications.html -share/xfce4/doc/ja/images/exo-preferred-applications-internet.png -share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png -share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/doc/pt_BR/exo-preferred-applications.html -share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png -share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png -share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/doc/tr/exo-preferred-applications.html -share/xfce4/doc/tr/images/exo-preferred-applications-internet.png -share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png -share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png -share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png -share/xfce4/helpers/Terminal.desktop +share/icons/hicolor/48x48/categories/applications-internet.png +share/icons/hicolor/48x48/categories/applications-other.png +share/locale/ar/LC_MESSAGES/exo-1.mo +share/locale/ast/LC_MESSAGES/exo-1.mo +share/locale/be/LC_MESSAGES/exo-1.mo +share/locale/bg/LC_MESSAGES/exo-1.mo +share/locale/bn/LC_MESSAGES/exo-1.mo +share/locale/ca/LC_MESSAGES/exo-1.mo +share/locale/cs/LC_MESSAGES/exo-1.mo +share/locale/da/LC_MESSAGES/exo-1.mo +share/locale/de/LC_MESSAGES/exo-1.mo +share/locale/el/LC_MESSAGES/exo-1.mo +share/locale/en_AU/LC_MESSAGES/exo-1.mo +share/locale/en_GB/LC_MESSAGES/exo-1.mo +share/locale/es/LC_MESSAGES/exo-1.mo +share/locale/et/LC_MESSAGES/exo-1.mo +share/locale/eu/LC_MESSAGES/exo-1.mo +share/locale/fi/LC_MESSAGES/exo-1.mo +share/locale/fr/LC_MESSAGES/exo-1.mo +share/locale/gl/LC_MESSAGES/exo-1.mo +share/locale/he/LC_MESSAGES/exo-1.mo +share/locale/hr/LC_MESSAGES/exo-1.mo +share/locale/hu/LC_MESSAGES/exo-1.mo +share/locale/id/LC_MESSAGES/exo-1.mo +share/locale/is/LC_MESSAGES/exo-1.mo +share/locale/it/LC_MESSAGES/exo-1.mo +share/locale/ja/LC_MESSAGES/exo-1.mo +share/locale/kk/LC_MESSAGES/exo-1.mo +share/locale/ko/LC_MESSAGES/exo-1.mo +share/locale/lt/LC_MESSAGES/exo-1.mo +share/locale/lv/LC_MESSAGES/exo-1.mo +share/locale/ms/LC_MESSAGES/exo-1.mo +share/locale/nb/LC_MESSAGES/exo-1.mo +share/locale/nl/LC_MESSAGES/exo-1.mo +share/locale/nn/LC_MESSAGES/exo-1.mo +share/locale/oc/LC_MESSAGES/exo-1.mo +share/locale/pa/LC_MESSAGES/exo-1.mo +share/locale/pl/LC_MESSAGES/exo-1.mo +share/locale/pt/LC_MESSAGES/exo-1.mo +share/locale/pt_BR/LC_MESSAGES/exo-1.mo +share/locale/ro/LC_MESSAGES/exo-1.mo +share/locale/ru/LC_MESSAGES/exo-1.mo +share/locale/si/LC_MESSAGES/exo-1.mo +share/locale/sk/LC_MESSAGES/exo-1.mo +share/locale/sl/LC_MESSAGES/exo-1.mo +share/locale/sq/LC_MESSAGES/exo-1.mo +share/locale/sr/LC_MESSAGES/exo-1.mo +share/locale/sv/LC_MESSAGES/exo-1.mo +share/locale/te/LC_MESSAGES/exo-1.mo +share/locale/th/LC_MESSAGES/exo-1.mo +share/locale/tr/LC_MESSAGES/exo-1.mo +share/locale/ug/LC_MESSAGES/exo-1.mo +share/locale/uk/LC_MESSAGES/exo-1.mo +share/locale/ur/LC_MESSAGES/exo-1.mo +share/locale/ur_PK/LC_MESSAGES/exo-1.mo +share/locale/vi/LC_MESSAGES/exo-1.mo +share/locale/zh_CN/LC_MESSAGES/exo-1.mo +share/locale/zh_HK/LC_MESSAGES/exo-1.mo +share/locale/zh_TW/LC_MESSAGES/exo-1.mo +share/pixmaps/exo-1/exo-thumbnail-frame.png +share/xfce4/helpers/Thunar.desktop share/xfce4/helpers/aterm.desktop share/xfce4/helpers/balsa.desktop +share/xfce4/helpers/caja.desktop +share/xfce4/helpers/chromium.desktop share/xfce4/helpers/debian-sensible-browser.desktop share/xfce4/helpers/debian-x-terminal-emulator.desktop +share/xfce4/helpers/dillo.desktop share/xfce4/helpers/encompass.desktop share/xfce4/helpers/epiphany.desktop share/xfce4/helpers/eterm.desktop @@ -190,6 +163,10 @@ share/xfce4/helpers/evolution.desktop share/xfce4/helpers/firefox.desktop share/xfce4/helpers/galeon.desktop share/xfce4/helpers/gnome-terminal.desktop +share/xfce4/helpers/icecat.desktop +share/xfce4/helpers/icedove.desktop +share/xfce4/helpers/iceweasel.desktop +share/xfce4/helpers/jumanji.desktop share/xfce4/helpers/kmail.desktop share/xfce4/helpers/konqueror.desktop share/xfce4/helpers/links.desktop @@ -198,13 +175,25 @@ share/xfce4/helpers/midori.desktop share/xfce4/helpers/mozilla-browser.desktop share/xfce4/helpers/mozilla-mailer.desktop share/xfce4/helpers/mutt.desktop +share/xfce4/helpers/nautilus.desktop share/xfce4/helpers/netscape-navigator.desktop 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 share/xfce4/helpers/xterm.desktop diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk index 43386facc6f..59784c3bf27 100644 --- a/x11/xfce4-exo/buildlink3.mk +++ b/x11/xfce4-exo/buildlink3.mk @@ -1,24 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.26 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2015/04/21 08:56:44 jperkin Exp $ BUILDLINK_TREE+= xfce4-exo .if !defined(XFCE4_EXO_BUILDLINK3_MK) XFCE4_EXO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.100 -BUILDLINK_ABI_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.101nb25 +BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.10.4 BUILDLINK_PKGSRCDIR.xfce4-exo?= ../../x11/xfce4-exo -pkgbase := xfce4-exo -.include "../../mk/pkg-build-options.mk" - -.if !empty(PKG_BUILD_OPTIONS.xfce4-exo:Mhal) -.include "../../sysutils/hal/buildlink3.mk" -.endif - -.include "../../devel/glib2/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" -.endif # XFCE4_EXO_BUILDLINK3_MK +.include "../../x11/libxfce4ui/buildlink3.mk" +.endif # XFCE4_EXO_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-exo diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo index 8edf04f6de1..42c41b0b65c 100644 --- a/x11/xfce4-exo/distinfo +++ b/x11/xfce4-exo/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.8 2013/08/16 06:45:12 obache Exp $ +$NetBSD: distinfo,v 1.9 2015/04/21 08:56:44 jperkin Exp $ -SHA1 (exo-0.3.101.tar.bz2) = 74194f58278a2b9d963264806f142e5d6d05336c -RMD160 (exo-0.3.101.tar.bz2) = 92dfc1e8f0bfa8ca74f151a2283f6988ce703649 -Size (exo-0.3.101.tar.bz2) = 1793815 bytes -SHA1 (patch-ad) = af08127aad06a5e9d8e8055dff1f55982666d8d9 -SHA1 (patch-ae) = 18a95737a6eaef8697224d4c099625c18be7ddfb -SHA1 (patch-af) = 86aee9fdf075c2de36deeebbb7594193e92cde95 -SHA1 (patch-exo-mount-notify_main.c) = 99892d72b240e90faa75bc91ae32308aceeb0b17 +SHA1 (exo-0.10.4.tar.bz2) = 85847a06182c316c42222b8cfcfab3a710fa96cc +RMD160 (exo-0.10.4.tar.bz2) = a4ab860d6df42476c7f71e5cc1e8662c27a62db6 +Size (exo-0.10.4.tar.bz2) = 1219342 bytes +SHA1 (patch-af) = 3c2a9313fab9b31797100eba2c88c0b01375e847 +SHA1 (patch-exo-helper_helpers_helpers.rc) = 85c19a3e034031e4c85aa61a27ea1c6500c290cf diff --git a/x11/xfce4-exo/patches/patch-ad b/x11/xfce4-exo/patches/patch-ad deleted file mode 100644 index 4cb3c83d773..00000000000 --- a/x11/xfce4-exo/patches/patch-ad +++ /dev/null @@ -1,86 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2008/07/01 13:41:08 obache Exp $ - ---- exo/exo-mount-point.c.orig 2007-12-02 14:33:44 +0200 -+++ exo/exo-mount-point.c 2008-06-06 15:14:00 +0300 -@@ -253,57 +253,57 @@ exo_mount_point_list_match_active (ExoMo - - /* close the file handle */ - fclose (fp); --#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */ -- struct statfs *mntbuf = NULL; -- glong bufsize = 0; -- gint mntsize; -- gint n; -+#elif defined(HAVE_GETVFSSTAT) && !defined(__DragonFly__) /* Newer NetBSD */ -+ struct statvfs *mntbuf = NULL; -+ glong bufsize = 0; -+ gint mntsize; -+ gint n; - - /* determine the number of active mount points */ -- mntsize = getfsstat (NULL, 0, MNT_NOWAIT); -+ mntsize = getvfsstat (NULL, 0, MNT_NOWAIT); - if (G_LIKELY (mntsize > 0)) - { - /* allocate a new buffer */ - bufsize = (mntsize + 4) * sizeof (*mntbuf); -- mntbuf = (struct statfs *) malloc (bufsize); -+ mntbuf = (struct statvfs *) malloc (bufsize); - - /* determine the mount point for the device file */ -- mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT); -+ mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT); - for (n = 0; n < mntsize; ++n) - { - /* check if we have a match here */ -- exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname, -- mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points); -+ exo_mount_point_add_if_matches (mask, device, folder, fstype, -+ mntbuf[n].f_mntfromname, -+ mntbuf[n].f_mntonname, -+ mntbuf[n].f_fstypename, -+ ((mntbuf[n].f_flag & MNT_RDONLY) != 0), -+ &mount_points); - } - - /* release the buffer */ - free (mntbuf); - } --#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */ -- struct statvfs *mntbuf = NULL; -- glong bufsize = 0; -- gint mntsize; -- gint n; -+#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */ -+ struct statfs *mntbuf = NULL; -+ glong bufsize = 0; -+ gint mntsize; -+ gint n; - - /* determine the number of active mount points */ -- mntsize = getvfsstat (NULL, 0, MNT_NOWAIT); -+ mntsize = getfsstat (NULL, 0, MNT_NOWAIT); - if (G_LIKELY (mntsize > 0)) - { - /* allocate a new buffer */ - bufsize = (mntsize + 4) * sizeof (*mntbuf); -- mntbuf = (struct statvfs *) malloc (bufsize); -+ mntbuf = (struct statfs *) malloc (bufsize); - - /* determine the mount point for the device file */ -- mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT); -+ mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT); - for (n = 0; n < mntsize; ++n) - { - /* check if we have a match here */ -- exo_mount_point_add_if_matches (mask, device, folder, fstype, -- mntbuf[n].f_mntfromname, -- mntbuf[n].f_mntonname, -- mntbuf[n].f_fstypename, -- ((mntbuf[n].f_flag & MNT_RDONLY) != 0), -- &mount_points); -+ exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname, -+ mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points); - } - - /* release the buffer */ diff --git a/x11/xfce4-exo/patches/patch-ae b/x11/xfce4-exo/patches/patch-ae deleted file mode 100644 index 835c9e72ac2..00000000000 --- a/x11/xfce4-exo/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2008/12/09 10:33:36 ahoka Exp $ - ---- exo-mount/exo-mount-fstab.c.orig 2007-12-02 13:33:44.000000000 +0100 -+++ exo-mount/exo-mount-fstab.c -@@ -36,9 +36,15 @@ - - - --/* define _PATH_MOUNT if undefined */ -+/* define _PATH_MOUNT if undefined -+ * TODO: My fix is even worse than the original, make it correct. -+ */ - #ifndef _PATH_MOUNT --#define _PATH_MOUNT "/bin/mount" -+# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) -+# define _PATH_MOUNT "/sbin/mount" -+# else -+# define _PATH_MOUNT "/bin/mount" -+# endif /* __NetBSD__ */ - #endif - - diff --git a/x11/xfce4-exo/patches/patch-af b/x11/xfce4-exo/patches/patch-af index 53eea103146..f194f8546fb 100644 --- a/x11/xfce4-exo/patches/patch-af +++ b/x11/xfce4-exo/patches/patch-af @@ -1,9 +1,10 @@ -$NetBSD: patch-af,v 1.2 2009/09/16 01:15:35 reed Exp $ +$NetBSD: patch-af,v 1.3 2015/04/21 08:56:44 jperkin Exp $ ---- exo-helper/helpers/Makefile.in.orig 2009-02-24 20:56:34.000000000 +0000 +Adjust config path. +--- exo-helper/helpers/Makefile.in.orig 2015-02-28 14:00:16.000000000 +0000 +++ exo-helper/helpers/Makefile.in -@@ -273,7 +273,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ +@@ -292,7 +292,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -defaultsdir = $(sysconfdir)/xdg/xfce4 diff --git a/x11/xfce4-exo/patches/patch-exo-helper_helpers_helpers.rc b/x11/xfce4-exo/patches/patch-exo-helper_helpers_helpers.rc new file mode 100644 index 00000000000..aea9112ae04 --- /dev/null +++ b/x11/xfce4-exo/patches/patch-exo-helper_helpers_helpers.rc @@ -0,0 +1,11 @@ +$NetBSD: patch-exo-helper_helpers_helpers.rc,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +Look for thunar, not Thunar. +--- exo-helper/helpers/helpers.rc.orig 2015-02-28 14:00:00.000000000 +0000 ++++ exo-helper/helpers/helpers.rc +@@ -7,4 +7,4 @@ + WebBrowser=firefox + MailReader=thunderbird + TerminalEmulator=xfce4-terminal +-FileManager=Thunar ++FileManager=thunar diff --git a/x11/xfce4-exo/patches/patch-exo-mount-notify_main.c b/x11/xfce4-exo/patches/patch-exo-mount-notify_main.c deleted file mode 100644 index e55517a1153..00000000000 --- a/x11/xfce4-exo/patches/patch-exo-mount-notify_main.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-exo-mount-notify_main.c,v 1.1 2013/08/16 06:45:13 obache Exp $ - -* for libnotify-0.7 API change - ---- exo-mount-notify/main.c.orig 2009-01-12 20:33:40.000000000 +0000 -+++ exo-mount-notify/main.c -@@ -243,7 +243,7 @@ main (int argc, char **argv) - } - - /* setup the notification */ -- notification = notify_notification_new (summary, message, opt_icon, NULL); -+ notification = notify_notification_new (summary, message, opt_icon); - g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (gtk_main_quit), NULL); - g_object_add_weak_pointer (G_OBJECT (notification), (gpointer) ¬ification); - notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL); diff --git a/x11/xfce4-eyes-plugin/Makefile b/x11/xfce4-eyes-plugin/Makefile index 3c5cd4d5f9b..92f30cff980 100644 --- a/x11/xfce4-eyes-plugin/Makefile +++ b/x11/xfce4-eyes-plugin/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.24 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.25 2015/04/21 08:56:44 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 4.4.0 - -DISTNAME= xfce4-eyes-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-eyes-plugin-4.4.3 CATEGORIES= x11 -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-eyes-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin COMMENT= Xfce eyes plugin +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-eyes-plugin/PLIST b/x11/xfce4-eyes-plugin/PLIST index b9f178f1fe8..c3fc3e77aec 100644 --- a/x11/xfce4-eyes-plugin/PLIST +++ b/x11/xfce4-eyes-plugin/PLIST @@ -1,45 +1,55 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:15 joerg Exp $ -libexec/xfce4/panel-plugins/xfce4-eyes-plugin +@comment $NetBSD: PLIST,v 1.3 2015/04/21 08:56:44 jperkin Exp $ +lib/xfce4/panel/plugins/libeyes.la share/icons/hicolor/48x48/apps/xfce4-eyes.png share/locale/ar/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/az/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/be/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/bg/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/bn_IN/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/de/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/eo/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/es/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/es_MX/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/et/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/fa/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/fi/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/gu/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/he/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/hi/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/it/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/mr/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/ms/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/pa/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/ro/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/sk/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/sl/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-eyes-plugin.mo -share/locale/ta/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/tr/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-eyes-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/vi/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/zh_CN/LC_MESSAGES/xfce4-eyes-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-eyes-plugin.mo @@ -61,4 +71,4 @@ share/xfce4/eyes/themes/Horrid/config share/xfce4/eyes/themes/Tango/config share/xfce4/eyes/themes/Tango/tango-eye.png share/xfce4/eyes/themes/Tango/tango-pupil.png -share/xfce4/panel-plugins/eyes.desktop +share/xfce4/panel/plugins/eyes.desktop diff --git a/x11/xfce4-eyes-plugin/buildlink3.mk b/x11/xfce4-eyes-plugin/buildlink3.mk deleted file mode 100644 index 1cd2bcbe184..00000000000 --- a/x11/xfce4-eyes-plugin/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.25 2014/05/05 00:48:37 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-eyes-plugin - -.if !defined(XFCE4_EYES_PLUGIN_BUILDLINK3_MK) -XFCE4_EYES_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-eyes-plugin+= xfce4-eyes-plugin>=4.4.0 -BUILDLINK_ABI_DEPENDS.xfce4-eyes-plugin+= xfce4-eyes-plugin>=4.4.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-eyes-plugin?= ../../x11/xfce4-eyes-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_EYES_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-eyes-plugin diff --git a/x11/xfce4-eyes-plugin/distinfo b/x11/xfce4-eyes-plugin/distinfo index 8c2dfbf01e8..09df9af2629 100644 --- a/x11/xfce4-eyes-plugin/distinfo +++ b/x11/xfce4-eyes-plugin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +$NetBSD: distinfo,v 1.2 2015/04/21 08:56:44 jperkin Exp $ -SHA1 (xfce4-eyes-plugin-4.4.0.tar.bz2) = c081a1971b55491ab4441ef429ce30cc6a43a70b -RMD160 (xfce4-eyes-plugin-4.4.0.tar.bz2) = 5a637b0d8e15b113d525d82c253d4b3c77e5c6e0 -Size (xfce4-eyes-plugin-4.4.0.tar.bz2) = 212885 bytes +SHA1 (xfce4-eyes-plugin-4.4.3.tar.bz2) = de7eacee4895848d9f4fff38df03812901f44ba1 +RMD160 (xfce4-eyes-plugin-4.4.3.tar.bz2) = 00ae14a7be023c91228c64d4dba195f40b28bb21 +Size (xfce4-eyes-plugin-4.4.3.tar.bz2) = 365589 bytes diff --git a/x11/libxfce4menu/DESCR b/x11/xfce4-garcon/DESCR index b9de4c14442..b9de4c14442 100644 --- a/x11/libxfce4menu/DESCR +++ b/x11/xfce4-garcon/DESCR diff --git a/x11/xfce4-garcon/Makefile b/x11/xfce4-garcon/Makefile new file mode 100644 index 00000000000..fd95e858fc0 --- /dev/null +++ b/x11/xfce4-garcon/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= garcon-0.4.0 +PKGNAME= xfce4-garcon-0.4.0 +CATEGORIES= x11 + +HOMEPAGE= https://wiki.xfce.org/dev/garcon +COMMENT= Xfce menu library + +CONF_FILES= ${XFCE4_EGBASE}/menus/xfce-applications.menu \ + ${PKG_SYSCONFDIR}/menus/xfce-applications.menu + +MAKE_DIRS+= ${XFCE4_EGBASE}/menus + +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-garcon/PLIST b/x11/xfce4-garcon/PLIST new file mode 100644 index 00000000000..f021369240f --- /dev/null +++ b/x11/xfce4-garcon/PLIST @@ -0,0 +1,123 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:44 jperkin Exp $ +include/garcon-1/garcon/garcon-config.h +include/garcon-1/garcon/garcon-environment.h +include/garcon-1/garcon/garcon-marshal.h +include/garcon-1/garcon/garcon-menu-directory.h +include/garcon-1/garcon/garcon-menu-element.h +include/garcon-1/garcon/garcon-menu-item-cache.h +include/garcon-1/garcon/garcon-menu-item-pool.h +include/garcon-1/garcon/garcon-menu-item.h +include/garcon-1/garcon/garcon-menu-merger.h +include/garcon-1/garcon/garcon-menu-node.h +include/garcon-1/garcon/garcon-menu-parser.h +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.la +lib/libgarcon-gtk2-1.la +lib/pkgconfig/garcon-1.pc +lib/pkgconfig/garcon-gtk2-1.pc +share/desktop-directories/xfce-accessories.directory +share/desktop-directories/xfce-development.directory +share/desktop-directories/xfce-education.directory +share/desktop-directories/xfce-games.directory +share/desktop-directories/xfce-graphics.directory +share/desktop-directories/xfce-hardware.directory +share/desktop-directories/xfce-multimedia.directory +share/desktop-directories/xfce-network.directory +share/desktop-directories/xfce-office.directory +share/desktop-directories/xfce-other.directory +share/desktop-directories/xfce-personal.directory +share/desktop-directories/xfce-screensavers.directory +share/desktop-directories/xfce-settings.directory +share/desktop-directories/xfce-system.directory +share/examples/xfce4/menus/xfce-applications.menu +share/gtk-doc/html/garcon/GarconMenu.html +share/gtk-doc/html/garcon/GarconMenuDirectory.html +share/gtk-doc/html/garcon/GarconMenuElement.html +share/gtk-doc/html/garcon/GarconMenuItem.html +share/gtk-doc/html/garcon/GarconMenuItemCache.html +share/gtk-doc/html/garcon/GarconMenuMerger.html +share/gtk-doc/html/garcon/GarconMenuParser.html +share/gtk-doc/html/garcon/GarconMenuSeparator.html +share/gtk-doc/html/garcon/GarconMenuTreeProvider.html +share/gtk-doc/html/garcon/api-index-full.html +share/gtk-doc/html/garcon/garcon-Desktop-Environment-Configuration.html +share/gtk-doc/html/garcon/garcon-Version-Information.html +share/gtk-doc/html/garcon/garcon-garcon-menu-item-pool.html +share/gtk-doc/html/garcon/garcon-garcon-menu-node.html +share/gtk-doc/html/garcon/garcon-garcon.html +share/gtk-doc/html/garcon/garcon-menus.html +share/gtk-doc/html/garcon/garcon-miscellaneous.html +share/gtk-doc/html/garcon/garcon-parsing.html +share/gtk-doc/html/garcon/garcon.devhelp2 +share/gtk-doc/html/garcon/home.png +share/gtk-doc/html/garcon/index.html +share/gtk-doc/html/garcon/index.sgml +share/gtk-doc/html/garcon/left-insensitive.png +share/gtk-doc/html/garcon/left.png +share/gtk-doc/html/garcon/object-tree.html +share/gtk-doc/html/garcon/pt01.html +share/gtk-doc/html/garcon/right-insensitive.png +share/gtk-doc/html/garcon/right.png +share/gtk-doc/html/garcon/style.css +share/gtk-doc/html/garcon/up-insensitive.png +share/gtk-doc/html/garcon/up.png +share/locale/ar/LC_MESSAGES/garcon.mo +share/locale/ast/LC_MESSAGES/garcon.mo +share/locale/bg/LC_MESSAGES/garcon.mo +share/locale/bn/LC_MESSAGES/garcon.mo +share/locale/ca/LC_MESSAGES/garcon.mo +share/locale/cs/LC_MESSAGES/garcon.mo +share/locale/da/LC_MESSAGES/garcon.mo +share/locale/de/LC_MESSAGES/garcon.mo +share/locale/el/LC_MESSAGES/garcon.mo +share/locale/en_AU/LC_MESSAGES/garcon.mo +share/locale/en_GB/LC_MESSAGES/garcon.mo +share/locale/eo/LC_MESSAGES/garcon.mo +share/locale/es/LC_MESSAGES/garcon.mo +share/locale/et/LC_MESSAGES/garcon.mo +share/locale/eu/LC_MESSAGES/garcon.mo +share/locale/fi/LC_MESSAGES/garcon.mo +share/locale/fr/LC_MESSAGES/garcon.mo +share/locale/gl/LC_MESSAGES/garcon.mo +share/locale/he/LC_MESSAGES/garcon.mo +share/locale/hr/LC_MESSAGES/garcon.mo +share/locale/hu/LC_MESSAGES/garcon.mo +share/locale/id/LC_MESSAGES/garcon.mo +share/locale/is/LC_MESSAGES/garcon.mo +share/locale/it/LC_MESSAGES/garcon.mo +share/locale/ja/LC_MESSAGES/garcon.mo +share/locale/kk/LC_MESSAGES/garcon.mo +share/locale/ko/LC_MESSAGES/garcon.mo +share/locale/lt/LC_MESSAGES/garcon.mo +share/locale/lv/LC_MESSAGES/garcon.mo +share/locale/ms/LC_MESSAGES/garcon.mo +share/locale/nb/LC_MESSAGES/garcon.mo +share/locale/nl/LC_MESSAGES/garcon.mo +share/locale/nn/LC_MESSAGES/garcon.mo +share/locale/oc/LC_MESSAGES/garcon.mo +share/locale/pa/LC_MESSAGES/garcon.mo +share/locale/pl/LC_MESSAGES/garcon.mo +share/locale/pt/LC_MESSAGES/garcon.mo +share/locale/pt_BR/LC_MESSAGES/garcon.mo +share/locale/ro/LC_MESSAGES/garcon.mo +share/locale/ru/LC_MESSAGES/garcon.mo +share/locale/sk/LC_MESSAGES/garcon.mo +share/locale/sl/LC_MESSAGES/garcon.mo +share/locale/sq/LC_MESSAGES/garcon.mo +share/locale/sr/LC_MESSAGES/garcon.mo +share/locale/sv/LC_MESSAGES/garcon.mo +share/locale/te/LC_MESSAGES/garcon.mo +share/locale/th/LC_MESSAGES/garcon.mo +share/locale/tr/LC_MESSAGES/garcon.mo +share/locale/ug/LC_MESSAGES/garcon.mo +share/locale/uk/LC_MESSAGES/garcon.mo +share/locale/uz/LC_MESSAGES/garcon.mo +share/locale/uz@Latn/LC_MESSAGES/garcon.mo +share/locale/zh_CN/LC_MESSAGES/garcon.mo +share/locale/zh_HK/LC_MESSAGES/garcon.mo +share/locale/zh_TW/LC_MESSAGES/garcon.mo diff --git a/x11/xfce4-garcon/buildlink3.mk b/x11/xfce4-garcon/buildlink3.mk new file mode 100644 index 00000000000..3231d21f91d --- /dev/null +++ b/x11/xfce4-garcon/buildlink3.mk @@ -0,0 +1,14 @@ +# $NetBSD: buildlink3.mk,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +BUILDLINK_TREE+= xfce4-garcon + +.if !defined(XFCE4_GARCON_BUILDLINK3_MK) +XFCE4_GARCON_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.xfce4-garcon+= xfce4-garcon>=0.4.0 +BUILDLINK_PKGSRCDIR.xfce4-garcon?= ../../x11/xfce4-garcon + +.include "../../x11/libxfce4ui/buildlink3.mk" +.endif # XFCE4_GARCON_BUILDLINK3_MK + +BUILDLINK_TREE+= -xfce4-garcon diff --git a/x11/xfce4-garcon/distinfo b/x11/xfce4-garcon/distinfo new file mode 100644 index 00000000000..9423facc589 --- /dev/null +++ b/x11/xfce4-garcon/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +SHA1 (garcon-0.4.0.tar.bz2) = 9978c7f3181f7d8fd930cce74293d2a360743182 +RMD160 (garcon-0.4.0.tar.bz2) = 2fda30580280f9e00b1cdfe932158a553ce9091a +Size (garcon-0.4.0.tar.bz2) = 466118 bytes +SHA1 (patch-data_xfce_Makefile.in) = f4c247f103669e3b78bb58fe7775372a390af7c1 +SHA1 (patch-garcon-gtk_Makefile.in) = 182a1df29c27ec1b13e4892c259a009b45ad0058 +SHA1 (patch-garcon_Makefile.in) = f180fcd4e7991268017218cb3ce3964566861ec1 diff --git a/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in b/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in new file mode 100644 index 00000000000..cad3814788f --- /dev/null +++ b/x11/xfce4-garcon/patches/patch-data_xfce_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-data_xfce_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +Adjust config path +--- data/xfce/Makefile.in.orig 2015-02-28 15:11:27.000000000 +0000 ++++ data/xfce/Makefile.in +@@ -354,7 +354,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-menudir = $(sysconfdir)/xdg/menus ++menudir = $(datadir)/examples/xfce4/menus + menu_DATA = \ + xfce-applications.menu + diff --git a/x11/xfce4-garcon/patches/patch-garcon-gtk_Makefile.in b/x11/xfce4-garcon/patches/patch-garcon-gtk_Makefile.in new file mode 100644 index 00000000000..23339a31dcc --- /dev/null +++ b/x11/xfce4-garcon/patches/patch-garcon-gtk_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-garcon-gtk_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +Adjust config path. +--- garcon-gtk/Makefile.in.orig 2015-02-28 15:11:27.000000000 +0000 ++++ garcon-gtk/Makefile.in +@@ -425,7 +425,7 @@ AM_CPPFLAGS = \ + -DGARCON_COMPILATION \ + -DGARCON_VERSION_API=\"$(GARCON_VERSION_API)\" \ + -DG_LOG_DOMAIN=\"garcon\" \ +- -DSYSCONFIGDIR=\"$(sysconfdir)/xdg\" \ ++ -DSYSCONFIGDIR=\"$(datadir)/examples/xfce4\" \ + $(PLATFORM_CFLAGS) + + lib_LTLIBRARIES = \ diff --git a/x11/xfce4-garcon/patches/patch-garcon_Makefile.in b/x11/xfce4-garcon/patches/patch-garcon_Makefile.in new file mode 100644 index 00000000000..ba36571e351 --- /dev/null +++ b/x11/xfce4-garcon/patches/patch-garcon_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-garcon_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +Adjust config path. +--- garcon/Makefile.in.orig 2015-02-28 15:11:27.000000000 +0000 ++++ garcon/Makefile.in +@@ -436,7 +436,7 @@ AM_CPPFLAGS = \ + -DGARCON_COMPILATION \ + -DGARCON_VERSION_API=\"$(GARCON_VERSION_API)\" \ + -DG_LOG_DOMAIN=\"garcon\" \ +- -DSYSCONFIGDIR=\"$(sysconfdir)/xdg\" \ ++ -DSYSCONFIGDIR=\"$(datadir)/examples/xfce4\" \ + $(PLATFORM_CFLAGS) + + lib_LTLIBRARIES = \ diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile index 3c00838d05f..3aa153a285e 100644 --- a/x11/xfce4-gtk2-engine/Makefile +++ b/x11/xfce4-gtk2-engine/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.33 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.34 2015/04/21 08:56:44 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 2.6.0 - -DISTNAME= gtk-xfce-engine-${XFCE4_VERSION} -PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} -PKGREVISION= 19 +VERSION= 3.2.0 +DISTNAME= gtk-xfce-engine-${VERSION} +PKGNAME= xfce4-gtk2-engine-${VERSION} CATEGORIES= x11 +MASTER_SITES= http://archive.xfce.org/src/xfce/gtk-xfce-engine/3.2/ + +HOMEPAGE= https://wiki.xfce.org/howto/gtk_theme COMMENT= Xfce GTK2 themes MAKE_DIRS+= ${PREFIX}/share/themes/Xfce diff --git a/x11/xfce4-gtk2-engine/PLIST b/x11/xfce4-gtk2-engine/PLIST index 9b432672e9d..44dfd0439bd 100644 --- a/x11/xfce4-gtk2-engine/PLIST +++ b/x11/xfce4-gtk2-engine/PLIST @@ -1,14 +1,16 @@ -@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:35 reed Exp $ +@comment $NetBSD: PLIST,v 1.7 2015/04/21 08:56:44 jperkin Exp $ lib/gtk-2.0/2.10.0/engines/libxfce.la share/themes/Xfce-4.0/gtk-2.0/gtkrc share/themes/Xfce-4.2/gtk-2.0/gtkrc share/themes/Xfce-4.4/gtk-2.0/gtkrc +share/themes/Xfce-4.6/gtk-2.0/gtkrc share/themes/Xfce-b5/gtk-2.0/gtkrc share/themes/Xfce-basic/gtk-2.0/gtkrc 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/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk deleted file mode 100644 index d2ede2bb486..00000000000 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:15:35 reed Exp $ - -BUILDLINK_TREE+= xfce4-gtk2-engine - -.if !defined(XFCE4_GTK2_ENGINE_BUILDLINK3_MK) -XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.6.0 -BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine - -.endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-gtk2-engine diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo index 692d0c49ad9..611dd51ad3e 100644 --- a/x11/xfce4-gtk2-engine/distinfo +++ b/x11/xfce4-gtk2-engine/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2009/09/16 01:15:35 reed Exp $ +$NetBSD: distinfo,v 1.7 2015/04/21 08:56:44 jperkin Exp $ -SHA1 (gtk-xfce-engine-2.6.0.tar.bz2) = a7be2f330833d150c5fb37f68a4c2138348b5446 -RMD160 (gtk-xfce-engine-2.6.0.tar.bz2) = 07f4ff278056f7714e99da8420268dd950b15a91 -Size (gtk-xfce-engine-2.6.0.tar.bz2) = 280627 bytes +SHA1 (gtk-xfce-engine-3.2.0.tar.bz2) = a00e0925728ca2dd9e8b1d41c692b775c446bf28 +RMD160 (gtk-xfce-engine-3.2.0.tar.bz2) = 4f49ab683f418af78b0dc2b688bb54c7ed38f16a +Size (gtk-xfce-engine-3.2.0.tar.bz2) = 376203 bytes diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile index 646fa6b1717..9b3063e432c 100644 --- a/x11/xfce4-notes-plugin/Makefile +++ b/x11/xfce4-notes-plugin/Makefile @@ -1,17 +1,25 @@ -# $NetBSD: Makefile,v 1.39 2014/08/21 14:33:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.40 2015/04/21 08:56:44 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 1.6.0 - -DISTNAME= xfce4-notes-plugin-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-notes-plugin-1.7.7 CATEGORIES= sysutils -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-notes-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin COMMENT= Xfce notes plugin LDFLAGS.DragonFly= -lm -lX11 LDFLAGS.SunOS+= -lm -lX11 +CONF_FILES= ${XFCE4_EGBASE}/autostart/xfce4-notes-autostart.desktop \ + ${PKG_SYSCONFDIR}/examples/autostart/xfce4-notes-autostart.desktop + +MAKE_DIRS+= ${XFCE4_EGBASE}/autostart + .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/libxfce4gui/buildlink3.mk" +.include "../../x11/libunique/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-notes-plugin/PLIST b/x11/xfce4-notes-plugin/PLIST index 505e0eb8c1b..db39c8c4e46 100644 --- a/x11/xfce4-notes-plugin/PLIST +++ b/x11/xfce4-notes-plugin/PLIST @@ -1,22 +1,68 @@ -@comment $NetBSD: PLIST,v 1.5 2007/12/05 07:50:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/04/21 08:56:44 jperkin Exp $ +bin/xfce4-notes +bin/xfce4-notes-settings bin/xfce4-popup-notes -libexec/xfce4/panel-plugins/xfce4-notes-plugin +lib/xfce4/panel/plugins/libnotes.la +share/applications/xfce4-notes.desktop +share/examples/xfce4/autostart/xfce4-notes-autostart.desktop share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png share/icons/hicolor/24x24/apps/xfce4-notes-plugin.png share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg +share/locale/ar/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/gl/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-notes-plugin.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ro/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/sq/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo -share/xfce4/panel-plugins/xfce4-notes-plugin.desktop +share/xfce4-notes-plugin/gtk-2.0/gradient.png +share/xfce4-notes-plugin/gtk-2.0/notes.gtkrc +share/xfce4-notes-plugin/gtk-2.0/scrollbars/slider-horiz-active.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/slider-horiz.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/slider-vert-active.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/slider-vert.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-down-active.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-down.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-left-active.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-left.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-right-active.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-right.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-up-active.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-up.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/trough-scrollbar-horiz.png +share/xfce4-notes-plugin/gtk-2.0/scrollbars/trough-scrollbar-vert.png +share/xfce4-notes-plugin/pixmaps/notes-menu-active.png +share/xfce4-notes-plugin/pixmaps/notes-menu.png +share/xfce4/panel/plugins/xfce4-notes-plugin-47.desktop diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk deleted file mode 100644 index aee74cba315..00000000000 --- a/x11/xfce4-notes-plugin/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.41 2014/05/05 00:48:37 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-notes-plugin - -.if !defined(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK) -XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=1.6.0 -BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=1.6.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-notes-plugin diff --git a/x11/xfce4-notes-plugin/distinfo b/x11/xfce4-notes-plugin/distinfo index ee41d1d919d..bac7b30a5cc 100644 --- a/x11/xfce4-notes-plugin/distinfo +++ b/x11/xfce4-notes-plugin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2007/12/05 07:50:48 martti Exp $ +$NetBSD: distinfo,v 1.8 2015/04/21 08:56:44 jperkin Exp $ -SHA1 (xfce4-notes-plugin-1.6.0.tar.bz2) = ceb201efd0184f0bbe2cbc571e67cfb1f85e5ffc -RMD160 (xfce4-notes-plugin-1.6.0.tar.bz2) = cb8bf50c35399aacf3ba5d7c8e5b3990aff0d35b -Size (xfce4-notes-plugin-1.6.0.tar.bz2) = 169597 bytes +SHA1 (xfce4-notes-plugin-1.7.7.tar.bz2) = 8a8ab252a65aee386849ddd589c552c2e2a20148 +RMD160 (xfce4-notes-plugin-1.7.7.tar.bz2) = 6b2dc23496fc6feebdf89a8d8ff4a00ea5bce82a +Size (xfce4-notes-plugin-1.7.7.tar.bz2) = 472082 bytes +SHA1 (patch-src_Makefile.in) = 7161f6c95fba7b9191c59855c1efe10490310f3f diff --git a/x11/xfce4-notes-plugin/patches/patch-src_Makefile.in b/x11/xfce4-notes-plugin/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..9c936602e2c --- /dev/null +++ b/x11/xfce4-notes-plugin/patches/patch-src_Makefile.in @@ -0,0 +1,34 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +Adjust config path. +--- src/Makefile.in.orig 2010-11-07 11:27:13.000000000 +0000 ++++ src/Makefile.in +@@ -404,8 +404,8 @@ xfce4_notes_settings_LDADD = \ + @MAINTAINER_MODE_TRUE@BUILT_SOURCES = main-panel-plugin.c \ + @MAINTAINER_MODE_TRUE@ main-panel-plugin-47.c \ + @MAINTAINER_MODE_TRUE@ main-status-icon.c +-@HAVE_LIBXFCE4PANEL47_FALSE@plugindir = $(libexecdir)/xfce4/panel-plugins +-@HAVE_LIBXFCE4PANEL47_TRUE@plugindir = $(libdir)/xfce4/panel-plugins ++@HAVE_LIBXFCE4PANEL47_FALSE@plugindir = $(libexecdir)/xfce4/panel/plugins ++@HAVE_LIBXFCE4PANEL47_TRUE@plugindir = $(libdir)/xfce4/panel/plugins + @HAVE_LIBXFCE4PANEL47_TRUE@plugin_LTLIBRARIES = libnotes.la + @HAVE_LIBXFCE4PANEL47_TRUE@libnotes_la_SOURCES = \ + @HAVE_LIBXFCE4PANEL47_TRUE@ main-panel-plugin-47.c +@@ -476,7 +476,7 @@ xfce4_notes_LDADD = \ + # + # Plugin desktop file + # +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_in_in_files = \ + xfce4-notes-plugin-47.desktop.in \ + xfce4-notes-plugin.desktop.in.in +@@ -495,7 +495,7 @@ applications_DATA = $(applications_in_fi + # + # Autostart desktop file + # +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/examples/xfce4/autostart + autostart_in_files = xfce4-notes-autostart.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + diff --git a/x11/xfce4-notifyd/DESCR b/x11/xfce4-notifyd/DESCR new file mode 100644 index 00000000000..02201b79057 --- /dev/null +++ b/x11/xfce4-notifyd/DESCR @@ -0,0 +1,9 @@ +A simple, visually-appealing notification daemon for Xfce that implements the +Freedesktop.org Desktop Notifications Specification. + +Features: + * Themable using the GTK+ theming mechanism + * Visually appealing: rounded corners, shaped windows + * Supports transparency and fade effects + +WWW: http://goodies.xfce.org/projects/applications/xfce4-notifyd diff --git a/x11/xfce4-notifyd/Makefile b/x11/xfce4-notifyd/Makefile new file mode 100644 index 00000000000..55d88b59b47 --- /dev/null +++ b/x11/xfce4-notifyd/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:44 jperkin Exp $ +# + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= xfce4-notifyd-0.2.4 +CATEGORIES= x11 +MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/ + +HOMEPAGE= http://goodies.xfce.org/projects/applications/xfce4-notifyd +COMMENT= XFCE Notify daemon + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes + +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-notifyd/PLIST b/x11/xfce4-notifyd/PLIST new file mode 100644 index 00000000000..667dbe493d3 --- /dev/null +++ b/x11/xfce4-notifyd/PLIST @@ -0,0 +1,53 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:44 jperkin Exp $ +bin/xfce4-notifyd-config +lib/xfce4/notifyd/xfce4-notifyd +man/man1/xfce4-notifyd-config.1 +share/applications/xfce4-notifyd-config.desktop +share/dbus-1/services/org.xfce.xfce4-notifyd.Notifications.service +share/icons/hicolor/48x48/apps/xfce4-notifyd.png +share/locale/ar/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ast/LC_MESSAGES/xfce4-notifyd.mo +share/locale/bg/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ca/LC_MESSAGES/xfce4-notifyd.mo +share/locale/cs/LC_MESSAGES/xfce4-notifyd.mo +share/locale/da/LC_MESSAGES/xfce4-notifyd.mo +share/locale/de/LC_MESSAGES/xfce4-notifyd.mo +share/locale/el/LC_MESSAGES/xfce4-notifyd.mo +share/locale/en_GB/LC_MESSAGES/xfce4-notifyd.mo +share/locale/es/LC_MESSAGES/xfce4-notifyd.mo +share/locale/eu/LC_MESSAGES/xfce4-notifyd.mo +share/locale/fi/LC_MESSAGES/xfce4-notifyd.mo +share/locale/fr/LC_MESSAGES/xfce4-notifyd.mo +share/locale/gl/LC_MESSAGES/xfce4-notifyd.mo +share/locale/he/LC_MESSAGES/xfce4-notifyd.mo +share/locale/hr/LC_MESSAGES/xfce4-notifyd.mo +share/locale/hu/LC_MESSAGES/xfce4-notifyd.mo +share/locale/id/LC_MESSAGES/xfce4-notifyd.mo +share/locale/it/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ja/LC_MESSAGES/xfce4-notifyd.mo +share/locale/kk/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ko/LC_MESSAGES/xfce4-notifyd.mo +share/locale/lt/LC_MESSAGES/xfce4-notifyd.mo +share/locale/lv/LC_MESSAGES/xfce4-notifyd.mo +share/locale/nb/LC_MESSAGES/xfce4-notifyd.mo +share/locale/nl/LC_MESSAGES/xfce4-notifyd.mo +share/locale/pa/LC_MESSAGES/xfce4-notifyd.mo +share/locale/pl/LC_MESSAGES/xfce4-notifyd.mo +share/locale/pt/LC_MESSAGES/xfce4-notifyd.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-notifyd.mo +share/locale/pt_PT/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ro/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ru/LC_MESSAGES/xfce4-notifyd.mo +share/locale/si/LC_MESSAGES/xfce4-notifyd.mo +share/locale/sk/LC_MESSAGES/xfce4-notifyd.mo +share/locale/sq/LC_MESSAGES/xfce4-notifyd.mo +share/locale/sr/LC_MESSAGES/xfce4-notifyd.mo +share/locale/sv/LC_MESSAGES/xfce4-notifyd.mo +share/locale/tr/LC_MESSAGES/xfce4-notifyd.mo +share/locale/ug/LC_MESSAGES/xfce4-notifyd.mo +share/locale/uk/LC_MESSAGES/xfce4-notifyd.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-notifyd.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-notifyd.mo +share/themes/Default/xfce-notify-4.0/gtkrc +share/themes/Smoke/xfce-notify-4.0/gtkrc +share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtkrc diff --git a/x11/xfce4-notifyd/distinfo b/x11/xfce4-notifyd/distinfo new file mode 100644 index 00000000000..25b80046963 --- /dev/null +++ b/x11/xfce4-notifyd/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +SHA1 (xfce4-notifyd-0.2.4.tar.bz2) = 66458a41f0ddeb350e5fb2e4d7cadfef6a5066f7 +RMD160 (xfce4-notifyd-0.2.4.tar.bz2) = a07e2c12f7d802f08c2787497f66fa5ec6c1aea1 +Size (xfce4-notifyd-0.2.4.tar.bz2) = 361619 bytes diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 3f9a2498ba4..fcd4c6576dc 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.60 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.61 2015/04/21 08:56:44 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -PKGREVISION= 22 - -XFCE4_VERSION= 4.6.2 - DISTNAME= xfce4-panel-${XFCE4_VERSION} CATEGORIES= x11 -COMMENT= Xfce panel -MASTER_SITES+= http://archive.xfce.org/src/xfce/xfce4-panel/4.6/ +HOMEPAGE= http://docs.xfce.org/xfce/xfce4-panel/start +COMMENT= Xfce panel PKGCONFIG_OVERRIDE= libxfce4panel/libxfce4panel-1.0.pc.in PTHREAD_AUTO_VARS= yes @@ -18,29 +14,12 @@ PTHREAD_AUTO_VARS= yes PKG_SYSCONFSUBDIR= xdg/xfce4/panel EGDIR= ${XFCE4_EGBASE}/panel -MAKE_DIRS+= ${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4 -MAKE_DIRS+= ${XFCE4_EGBASE:Q} ${PREFIX}/share/xfce4 -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc ${PREFIX}/share/xfce4/doc/C -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C/images -OWN_DIRS+= ${PKG_SYSCONFDIR} -OWN_DIRS+= ${PREFIX}/share/xfce4/panel-plugins -# The following are not used in this pkg, but here is a good place to rmdir them -MAKE_DIRS+= ${PREFIX}/libexec/xfce4 -MAKE_DIRS+= ${PREFIX}/libexec/xfce4/panel-plugins - -.for f in clock-14.rc launcher-10.rc launcher-7.rc launcher-8.rc launcher-9.rc \ - panels.xml systray-4.rc xfce4-menu-5.rc -CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} -.endfor +CONF_FILES+= ${EGDIR}/default.xml ${PKG_SYSCONFDIR}/default.xml .include "../../devel/libwnck/buildlink3.mk" -.include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" -.include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../x11/xfce4-garcon/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST index f940c07a2cb..05370f6df20 100644 --- a/x11/xfce4-panel/PLIST +++ b/x11/xfce4-panel/PLIST @@ -1,120 +1,115 @@ -@comment $NetBSD: PLIST,v 1.24 2012/05/19 00:32:39 marino Exp $ +@comment $NetBSD: PLIST,v 1.25 2015/04/21 08:56:44 jperkin Exp $ bin/xfce4-panel -bin/xfce4-popup-windowlist -include/xfce4/libxfce4panel/libxfce4panel-enum-types.h -include/xfce4/libxfce4panel/libxfce4panel.h -include/xfce4/libxfce4panel/xfce-arrow-button.h -include/xfce4/libxfce4panel/xfce-hvbox.h -include/xfce4/libxfce4panel/xfce-itembar.h -include/xfce4/libxfce4panel/xfce-panel-convenience.h -include/xfce4/libxfce4panel/xfce-panel-enums.h -include/xfce4/libxfce4panel/xfce-panel-external-plugin.h -include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h -include/xfce4/libxfce4panel/xfce-panel-macros.h -include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h -include/xfce4/libxfce4panel/xfce-panel-plugin.h -include/xfce4/libxfce4panel/xfce-panel-window.h -lib/libxfce4panel.la +bin/xfce4-popup-applicationsmenu +bin/xfce4-popup-directorymenu +bin/xfce4-popup-windowmenu +include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enum-types.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enums.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-arrow-button.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-hvbox.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-convenience.h +include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h +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 lib/pkgconfig/libxfce4panel-1.0.pc -lib/xfce4/panel-plugins/libactions.la -lib/xfce4/panel-plugins/libclock.la -lib/xfce4/panel-plugins/libiconbox.la -lib/xfce4/panel-plugins/liblauncher.la -lib/xfce4/panel-plugins/libpager.la -lib/xfce4/panel-plugins/libseparator.la -lib/xfce4/panel-plugins/libshowdesktop.la -lib/xfce4/panel-plugins/libsystray.la -lib/xfce4/panel-plugins/libtasklist.la -lib/xfce4/panel-plugins/libwindowlist.la -share/applications/xfce4-panel-manager.desktop -share/examples/xfce4/panel/clock-14.rc -share/examples/xfce4/panel/launcher-10.rc -share/examples/xfce4/panel/launcher-7.rc -share/examples/xfce4/panel/launcher-8.rc -share/examples/xfce4/panel/launcher-9.rc -share/examples/xfce4/panel/panels.xml -share/examples/xfce4/panel/systray-4.rc -share/examples/xfce4/panel/xfce4-menu-5.rc -share/gtk-doc/html/libxfce4panel/XfceArrowButton.html -share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html -share/gtk-doc/html/libxfce4panel/XfceHVBox.html -share/gtk-doc/html/libxfce4panel/XfceInternalPanelPlugin.html -share/gtk-doc/html/libxfce4panel/XfceItembar.html -share/gtk-doc/html/libxfce4panel/XfcePanelPlugin.html -share/gtk-doc/html/libxfce4panel/XfcePanelWindow.html -share/gtk-doc/html/libxfce4panel/home.png -share/gtk-doc/html/libxfce4panel/index.html -share/gtk-doc/html/libxfce4panel/index.sgml -share/gtk-doc/html/libxfce4panel/ix01.html -share/gtk-doc/html/libxfce4panel/ix02.html -share/gtk-doc/html/libxfce4panel/left.png -share/gtk-doc/html/libxfce4panel/libxfce4panel-Common-macros.html -share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Widgets.html -share/gtk-doc/html/libxfce4panel/libxfce4panel-Register-Plugins.html -share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html -share/gtk-doc/html/libxfce4panel/libxfce4panel-fundamentals.html -share/gtk-doc/html/libxfce4panel/libxfce4panel-panel.html -share/gtk-doc/html/libxfce4panel/libxfce4panel-widgets.html -share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp -share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp2 -share/gtk-doc/html/libxfce4panel/right.png -share/gtk-doc/html/libxfce4panel/style.css -share/gtk-doc/html/libxfce4panel/up.png -share/icons/hicolor/16x16/apps/xfce-system-exit.png -share/icons/hicolor/16x16/apps/xfce-system-lock.png +lib/xfce4/panel/migrate +lib/xfce4/panel/plugins/libactions.la +lib/xfce4/panel/plugins/libapplicationsmenu.la +lib/xfce4/panel/plugins/libclock.la +lib/xfce4/panel/plugins/libdirectorymenu.la +lib/xfce4/panel/plugins/liblauncher.la +lib/xfce4/panel/plugins/libpager.la +lib/xfce4/panel/plugins/libseparator.la +lib/xfce4/panel/plugins/libshowdesktop.la +lib/xfce4/panel/plugins/libsystray.la +lib/xfce4/panel/plugins/libtasklist.la +lib/xfce4/panel/plugins/libwindowmenu.la +lib/xfce4/panel/wrapper-1.0 +share/applications/panel-desktop-handler.desktop +share/applications/panel-preferences.desktop +share/examples/xfce4/panel/default.xml +share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html +share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html +share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html +share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html +share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html +share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html +share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html +share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html +share/gtk-doc/html/libxfce4panel-1.0/home.png +share/gtk-doc/html/libxfce4panel-1.0/index.html +share/gtk-doc/html/libxfce4panel-1.0/index.sgml +share/gtk-doc/html/libxfce4panel-1.0/left-insensitive.png +share/gtk-doc/html/libxfce4panel-1.0/left.png +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2 +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html +share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html +share/gtk-doc/html/libxfce4panel-1.0/right-insensitive.png +share/gtk-doc/html/libxfce4panel-1.0/right.png +share/gtk-doc/html/libxfce4panel-1.0/style.css +share/gtk-doc/html/libxfce4panel-1.0/up-insensitive.png +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 share/icons/hicolor/22x22/apps/xfce4-panel.png +share/icons/hicolor/24x24/apps/xfce4-panel-menu.png share/icons/hicolor/24x24/apps/xfce4-panel.png +share/icons/hicolor/32x32/apps/xfce4-panel-menu.png share/icons/hicolor/32x32/apps/xfce4-panel.png -share/icons/hicolor/48x48/apps/xfce-mouse.png -share/icons/hicolor/48x48/apps/xfce4-clock.png -share/icons/hicolor/48x48/apps/xfce4-iconbox.png +share/icons/hicolor/48x48/apps/xfce4-panel-menu.png share/icons/hicolor/48x48/apps/xfce4-panel.png -share/icons/hicolor/48x48/apps/xfce4-separator.png -share/icons/hicolor/48x48/apps/xfce4-systray.png -share/icons/hicolor/48x48/apps/xfce4-taskbar.png +share/icons/hicolor/scalable/apps/xfce4-panel.svg share/locale/am/LC_MESSAGES/xfce4-panel.mo share/locale/ar/LC_MESSAGES/xfce4-panel.mo share/locale/ast/LC_MESSAGES/xfce4-panel.mo -share/locale/az/LC_MESSAGES/xfce4-panel.mo share/locale/be/LC_MESSAGES/xfce4-panel.mo share/locale/bg/LC_MESSAGES/xfce4-panel.mo -share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo +share/locale/bn/LC_MESSAGES/xfce4-panel.mo share/locale/ca/LC_MESSAGES/xfce4-panel.mo share/locale/cs/LC_MESSAGES/xfce4-panel.mo share/locale/da/LC_MESSAGES/xfce4-panel.mo share/locale/de/LC_MESSAGES/xfce4-panel.mo -share/locale/dz/LC_MESSAGES/xfce4-panel.mo share/locale/el/LC_MESSAGES/xfce4-panel.mo +share/locale/en_AU/LC_MESSAGES/xfce4-panel.mo share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo share/locale/eo/LC_MESSAGES/xfce4-panel.mo share/locale/es/LC_MESSAGES/xfce4-panel.mo -share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo share/locale/et/LC_MESSAGES/xfce4-panel.mo share/locale/eu/LC_MESSAGES/xfce4-panel.mo -share/locale/fa/LC_MESSAGES/xfce4-panel.mo share/locale/fi/LC_MESSAGES/xfce4-panel.mo share/locale/fr/LC_MESSAGES/xfce4-panel.mo share/locale/gl/LC_MESSAGES/xfce4-panel.mo -share/locale/gu/LC_MESSAGES/xfce4-panel.mo share/locale/he/LC_MESSAGES/xfce4-panel.mo -share/locale/hi/LC_MESSAGES/xfce4-panel.mo +share/locale/hr/LC_MESSAGES/xfce4-panel.mo share/locale/hu/LC_MESSAGES/xfce4-panel.mo -share/locale/hy/LC_MESSAGES/xfce4-panel.mo share/locale/id/LC_MESSAGES/xfce4-panel.mo +share/locale/is/LC_MESSAGES/xfce4-panel.mo share/locale/it/LC_MESSAGES/xfce4-panel.mo share/locale/ja/LC_MESSAGES/xfce4-panel.mo -share/locale/ka/LC_MESSAGES/xfce4-panel.mo share/locale/kk/LC_MESSAGES/xfce4-panel.mo share/locale/ko/LC_MESSAGES/xfce4-panel.mo -share/locale/ku/LC_MESSAGES/xfce4-panel.mo share/locale/lt/LC_MESSAGES/xfce4-panel.mo share/locale/lv/LC_MESSAGES/xfce4-panel.mo -share/locale/mk/LC_MESSAGES/xfce4-panel.mo -share/locale/mr/LC_MESSAGES/xfce4-panel.mo share/locale/ms/LC_MESSAGES/xfce4-panel.mo share/locale/nb/LC_MESSAGES/xfce4-panel.mo share/locale/nl/LC_MESSAGES/xfce4-panel.mo +share/locale/nn/LC_MESSAGES/xfce4-panel.mo +share/locale/oc/LC_MESSAGES/xfce4-panel.mo share/locale/pa/LC_MESSAGES/xfce4-panel.mo share/locale/pl/LC_MESSAGES/xfce4-panel.mo share/locale/pt/LC_MESSAGES/xfce4-panel.mo @@ -123,32 +118,30 @@ share/locale/ro/LC_MESSAGES/xfce4-panel.mo share/locale/ru/LC_MESSAGES/xfce4-panel.mo share/locale/si/LC_MESSAGES/xfce4-panel.mo share/locale/sk/LC_MESSAGES/xfce4-panel.mo +share/locale/sl/LC_MESSAGES/xfce4-panel.mo share/locale/sq/LC_MESSAGES/xfce4-panel.mo +share/locale/sr/LC_MESSAGES/xfce4-panel.mo share/locale/sv/LC_MESSAGES/xfce4-panel.mo -share/locale/ta/LC_MESSAGES/xfce4-panel.mo +share/locale/te/LC_MESSAGES/xfce4-panel.mo +share/locale/th/LC_MESSAGES/xfce4-panel.mo share/locale/tr/LC_MESSAGES/xfce4-panel.mo +share/locale/ug/LC_MESSAGES/xfce4-panel.mo share/locale/uk/LC_MESSAGES/xfce4-panel.mo share/locale/ur/LC_MESSAGES/xfce4-panel.mo share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo share/locale/vi/LC_MESSAGES/xfce4-panel.mo share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo +share/locale/zh_HK/LC_MESSAGES/xfce4-panel.mo share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo -share/xfce4/doc/C/images/add_item_dialog.png -share/xfce4/doc/C/images/default_bottom_panel.png -share/xfce4/doc/C/images/default_top_panel.png -share/xfce4/doc/C/images/item_popup.png -share/xfce4/doc/C/images/launcher_properties.png -share/xfce4/doc/C/images/panel_manager.png -share/xfce4/doc/C/xfce4-panel.html -share/xfce4/panel-plugins/actions.desktop -share/xfce4/panel-plugins/clock.desktop -share/xfce4/panel-plugins/iconbox.desktop -share/xfce4/panel-plugins/launcher.desktop -share/xfce4/panel-plugins/pager.desktop -share/xfce4/panel-plugins/separator.desktop -share/xfce4/panel-plugins/showdesktop.desktop -share/xfce4/panel-plugins/systray.desktop -share/xfce4/panel-plugins/tasklist.desktop -share/xfce4/panel-plugins/windowlist.desktop -@pkgdir libexec/xfce4/panel-plugins -@pkgdir libexec/xfce4 +share/xfce4/panel/plugins/actions.desktop +share/xfce4/panel/plugins/applicationsmenu.desktop +share/xfce4/panel/plugins/clock.desktop +share/xfce4/panel/plugins/directorymenu.desktop +share/xfce4/panel/plugins/launcher.desktop +share/xfce4/panel/plugins/pager.desktop +share/xfce4/panel/plugins/separator.desktop +share/xfce4/panel/plugins/showdesktop.desktop +share/xfce4/panel/plugins/systray.desktop +share/xfce4/panel/plugins/tasklist.desktop +share/xfce4/panel/plugins/windowmenu.desktop +@comment $NetBSD: PLIST,v 1.25 2015/04/21 08:56:44 jperkin Exp $ diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index 96ba82d73ea..99c4591f246 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,17 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.46 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2015/04/21 08:56:44 jperkin Exp $ BUILDLINK_TREE+= xfce4-panel .if !defined(XFCE4_PANEL_BUILDLINK3_MK) XFCE4_PANEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.6.0 -BUILDLINK_ABI_DEPENDS.xfce4-panel+= xfce4-panel>=4.6.2nb22 +BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.12.0 +BUILDLINK_ABI_DEPENDS.xfce4-panel+= xfce4-panel>=4.12.0 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel -.include "../../devel/glib2/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" .endif # XFCE4_PANEL_BUILDLINK3_MK BUILDLINK_TREE+= -xfce4-panel diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo index 15850563f59..009188aa99c 100644 --- a/x11/xfce4-panel/distinfo +++ b/x11/xfce4-panel/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.22 2012/02/09 12:01:44 drochner Exp $ +$NetBSD: distinfo,v 1.23 2015/04/21 08:56:44 jperkin Exp $ -SHA1 (xfce4-panel-4.6.2.tar.bz2) = 32a5e5b9e8b93c2167077b329cf4d2fcb4323c9e -RMD160 (xfce4-panel-4.6.2.tar.bz2) = 5d981eaffc5aab227a3db66f8d39d0492d02a16d -Size (xfce4-panel-4.6.2.tar.bz2) = 876456 bytes -SHA1 (patch-ab) = 977b38f4e58620b96d28ef2b9992a03169eb7814 -SHA1 (patch-ac) = e2b779735c682e77f3d78343ad6e07e649c76123 -SHA1 (patch-ad) = 967d72a3944160379fdc1d3b94d4bea4fca0ba65 +SHA1 (xfce4-panel-4.12.0.tar.bz2) = 5f0e51c7948bc4e3c46cad93ee772573a23efbc1 +RMD160 (xfce4-panel-4.12.0.tar.bz2) = ff03c14f6f766969498c2c8effc8915c1cbe494d +Size (xfce4-panel-4.12.0.tar.bz2) = 1107470 bytes +SHA1 (patch-migrate_Makefile.in) = dbabd2b875239044ff41a09e5383ba9180d0d1b2 diff --git a/x11/xfce4-panel/patches/patch-ab b/x11/xfce4-panel/patches/patch-ab deleted file mode 100644 index 1f810b9bd5a..00000000000 --- a/x11/xfce4-panel/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:32 reed Exp $ - ---- config/Makefile.in.orig 2009-02-24 21:39:18.000000000 +0000 -+++ config/Makefile.in -@@ -263,7 +263,7 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - confdir = \ -- $(sysconfdir)/xdg/xfce4/panel -+ $(datadir)/examples/xfce4/panel - - conf_in_files = \ - launcher-7.rc.in \ diff --git a/x11/xfce4-panel/patches/patch-ac b/x11/xfce4-panel/patches/patch-ac deleted file mode 100644 index 354b977a752..00000000000 --- a/x11/xfce4-panel/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2010/05/30 19:34:46 drochner Exp $ - ---- libxfce4panel/xfce-panel-window.c.orig 2009-10-16 13:18:49.000000000 +0000 -+++ libxfce4panel/xfce-panel-window.c -@@ -304,14 +304,10 @@ xfce_panel_window_init (XfcePanelWindow - - GTK_WIDGET_SET_FLAGS (GTK_WIDGET (panel_window), GTK_CAN_FOCUS); - -- g_object_set (G_OBJECT (panel_window), -- "type", GTK_WINDOW_TOPLEVEL, -- "decorated", FALSE, -- "resizable", FALSE, -- "type-hint", GDK_WINDOW_TYPE_HINT_DOCK, -- "title", PACKAGE_NAME " " PACKAGE_VERSION, -- NULL); -- -+ gtk_window_set_type_hint (GTK_WINDOW (panel_window), GDK_WINDOW_TYPE_HINT_DOCK); -+ gtk_window_set_decorated (GTK_WINDOW (panel_window), FALSE); -+ gtk_window_set_resizable (GTK_WINDOW (panel_window), FALSE); -+ gtk_window_set_title (GTK_WINDOW (panel_window), PACKAGE_NAME); - gtk_window_stick (GTK_WINDOW (panel_window)); - - priv = XFCE_PANEL_WINDOW_GET_PRIVATE (panel_window); diff --git a/x11/xfce4-panel/patches/patch-ad b/x11/xfce4-panel/patches/patch-ad deleted file mode 100644 index c66cf4aca15..00000000000 --- a/x11/xfce4-panel/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2012/02/09 12:01:44 drochner Exp $ - ---- configure.orig 2009-10-16 13:18:55.000000000 +0000 -+++ configure -@@ -15700,7 +15700,7 @@ fi - $as_echo "#define XFCE_DISABLE_DEPRECATED 1" >>confdefs.h - - --$as_echo "#define G_DISABLE_DEPRECATED 1" >>confdefs.h -+#$as_echo "#define G_DISABLE_DEPRECATED 1" >>confdefs.h - - - # Check whether --enable-debug was given. diff --git a/x11/xfce4-panel/patches/patch-migrate_Makefile.in b/x11/xfce4-panel/patches/patch-migrate_Makefile.in new file mode 100644 index 00000000000..fa2165a90f2 --- /dev/null +++ b/x11/xfce4-panel/patches/patch-migrate_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-migrate_Makefile.in,v 1.1 2015/04/21 08:56:44 jperkin Exp $ + +Adjust config path. +--- migrate/Makefile.in.orig 2012-04-28 20:31:39.000000000 +0000 ++++ migrate/Makefile.in +@@ -375,7 +375,7 @@ INCLUDES = \ + -DXDGCONFIGDIR=\"$(sysconfdir)/xdg\" \ + $(PLATFORM_CPPFLAGS) + +-confdir = $(sysconfdir)/xdg/xfce4/panel ++confdir = $(datadir)/examples/xfce4/panel + conf_DATA = \ + default.xml + diff --git a/x11/xfce4-places-plugin/Makefile b/x11/xfce4-places-plugin/Makefile index 0e569370fab..01248b109ca 100644 --- a/x11/xfce4-places-plugin/Makefile +++ b/x11/xfce4-places-plugin/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.28 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.29 2015/04/21 08:56:45 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 1.0.0 - -DISTNAME= xfce4-places-plugin-${XFCE4_VERSION} -PKGREVISION= 24 +DISTNAME= xfce4-places-plugin-1.6.0 CATEGORIES= x11 -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-places-plugin/ +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.6/ + +HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin COMMENT= Xfce Places plugin -.include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-places-plugin/PLIST b/x11/xfce4-places-plugin/PLIST index 4b06be62a25..9efdfa2de61 100644 --- a/x11/xfce4-places-plugin/PLIST +++ b/x11/xfce4-places-plugin/PLIST @@ -1,12 +1,16 @@ -@comment $NetBSD: PLIST,v 1.2 2007/12/05 07:51:18 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-places-plugin +@comment $NetBSD: PLIST,v 1.3 2015/04/21 08:56:45 jperkin Exp $ +bin/xfce4-popup-places +lib/xfce4/panel/plugins/libplaces.la share/locale/ar/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-places-plugin.mo share/locale/be/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-places-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-places-plugin.mo share/locale/de/LC_MESSAGES/xfce4-places-plugin.mo -share/locale/dz/LC_MESSAGES/xfce4-places-plugin.mo share/locale/el/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-places-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-places-plugin.mo share/locale/eo/LC_MESSAGES/xfce4-places-plugin.mo share/locale/es/LC_MESSAGES/xfce4-places-plugin.mo @@ -16,24 +20,34 @@ share/locale/fi/LC_MESSAGES/xfce4-places-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-places-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-places-plugin.mo share/locale/he/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-places-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-places-plugin.mo share/locale/it/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-places-plugin.mo -share/locale/ka/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ko/LC_MESSAGES/xfce4-places-plugin.mo share/locale/lt/LC_MESSAGES/xfce4-places-plugin.mo -share/locale/mk/LC_MESSAGES/xfce4-places-plugin.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-places-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-places-plugin.mo share/locale/pa/LC_MESSAGES/xfce4-places-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-places-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ro/LC_MESSAGES/xfce4-places-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-places-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-places-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-places-plugin.mo share/locale/tr/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/ug/LC_MESSAGES/xfce4-places-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/ur/LC_MESSAGES/xfce4-places-plugin.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-places-plugin.mo share/locale/zh_CN/LC_MESSAGES/xfce4-places-plugin.mo share/locale/zh_TW/LC_MESSAGES/xfce4-places-plugin.mo -share/xfce4/panel-plugins/places.desktop +share/xfce4/panel/plugins/places.desktop diff --git a/x11/xfce4-places-plugin/buildlink3.mk b/x11/xfce4-places-plugin/buildlink3.mk deleted file mode 100644 index 3050ebca655..00000000000 --- a/x11/xfce4-places-plugin/buildlink3.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.29 2014/05/05 00:48:37 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-places-plugin - -.if !defined(XFCE4_PLACES_PLUGIN_BUILDLINK3_MK) -XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-places-plugin+= xfce4-places-plugin>=1.0.0 -BUILDLINK_ABI_DEPENDS.xfce4-places-plugin+= xfce4-places-plugin>=1.0.0nb24 -BUILDLINK_PKGSRCDIR.xfce4-places-plugin?= ../../x11/xfce4-places-plugin - -.include "../../sysutils/xfce4-thunar/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_PLACES_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-places-plugin diff --git a/x11/xfce4-places-plugin/distinfo b/x11/xfce4-places-plugin/distinfo index 11fbfb907a6..6fa597a37f2 100644 --- a/x11/xfce4-places-plugin/distinfo +++ b/x11/xfce4-places-plugin/distinfo @@ -1,11 +1,9 @@ -$NetBSD: distinfo,v 1.3 2012/04/19 21:12:42 joerg Exp $ +$NetBSD: distinfo,v 1.4 2015/04/21 08:56:45 jperkin Exp $ -SHA1 (xfce4-places-plugin-1.0.0.tar.bz2) = 16cb0b7c3d869010f12656da64277e213bbb8de8 -RMD160 (xfce4-places-plugin-1.0.0.tar.bz2) = 3e8d64745d869e8bcd6a851f14c1dc7b999ecf84 -Size (xfce4-places-plugin-1.0.0.tar.bz2) = 298759 bytes -SHA1 (patch-panel-plugin_cfg.c) = 7f293620a299227631098d76ac4f8642ca8ae2ea -SHA1 (patch-panel-plugin_cfg.h) = 91c537d0f209d7fea4bdb53557af22a107f0a8df -SHA1 (patch-panel-plugin_model.c) = 114a613b80ea8d456aa4b13a487f36eb40c2264b -SHA1 (patch-panel-plugin_model.h) = bc0893c65821c37c5acfdd007b4d66aa321ebadd -SHA1 (patch-panel-plugin_view.c) = c8ceab9e0ecff37dc76f45525eeecd10bb69cfba -SHA1 (patch-panel-plugin_view.h) = bf49a456befa444685bcd97ec7daddbc0a9a1c9e +SHA1 (xfce4-places-plugin-1.6.0.tar.bz2) = 4cee0b16c31116061d28e32f0992ad3f586e7c67 +RMD160 (xfce4-places-plugin-1.6.0.tar.bz2) = a3577208d703f52e826cf31bbc735300edf85190 +Size (xfce4-places-plugin-1.6.0.tar.bz2) = 348333 bytes +SHA1 (patch-panel-plugin_model.c) = 5d54977ad8b94b4f2641f65388ad5c908a051854 +SHA1 (patch-panel-plugin_model.h) = 20f27a1243ff5f2c6556a12037c1213770bcd740 +SHA1 (patch-panel-plugin_model__user.c) = 0b8b0e11b1cfc3a4e04faa5ebcd69ca19819ee19 +SHA1 (patch-panel-plugin_model__volumes.c) = dd004cf548d722ad6b070239f06af486172dde41 diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.c deleted file mode 100644 index fc40c05ef3e..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.c +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-panel-plugin_cfg.c,v 1.1 2012/04/19 21:12:42 joerg Exp $ - ---- panel-plugin/cfg.c.orig 2012-04-19 14:12:44.000000000 +0000 -+++ panel-plugin/cfg.c -@@ -37,31 +37,31 @@ - - /********** PlacesCfgViewIface helpers **********/ - --inline PlacesCfg* -+PlacesCfg* - places_cfg_view_iface_get_cfg(PlacesCfgViewIface *iface) - { - return iface->cfg; - } - --inline void -+void - places_cfg_view_iface_open_dialog(PlacesCfgViewIface *iface) - { - iface->open_dialog(iface->cfg); - } - --inline void -+void - places_cfg_view_iface_load(PlacesCfgViewIface *iface) - { - iface->load(iface->cfg); - } - --inline void -+void - places_cfg_view_iface_save(PlacesCfgViewIface *iface) - { - iface->save(iface->cfg); - } - --inline void -+void - places_cfg_view_iface_finalize(PlacesCfgViewIface *iface) - { - iface->finalize(iface); diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.h deleted file mode 100644 index 512f183bffd..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.h +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-panel-plugin_cfg.h,v 1.1 2012/04/19 21:12:42 joerg Exp $ - ---- panel-plugin/cfg.h.orig 2012-04-19 14:12:42.000000000 +0000 -+++ panel-plugin/cfg.h -@@ -62,19 +62,19 @@ struct _PlacesCfgViewIface { - - }; - --inline PlacesCfg* -+PlacesCfg* - places_cfg_view_iface_get_cfg(PlacesCfgViewIface*); - --inline void -+void - places_cfg_view_iface_open_dialog(PlacesCfgViewIface*); - --inline void -+void - places_cfg_view_iface_load(PlacesCfgViewIface*); - --inline void -+void - places_cfg_view_iface_save(PlacesCfgViewIface*); - --inline void -+void - places_cfg_view_iface_finalize(PlacesCfgViewIface*); - - diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c index d360d43d91c..d3ff7850a25 100644 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c +++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c @@ -1,26 +1,36 @@ -$NetBSD: patch-panel-plugin_model.c,v 1.1 2012/04/19 21:12:42 joerg Exp $ +$NetBSD: patch-panel-plugin_model.c,v 1.2 2015/04/21 08:56:45 jperkin Exp $ ---- panel-plugin/model.c.orig 2007-10-25 22:03:52.000000000 +0000 +Fix inline use. +--- panel-plugin/model.c.orig 2012-09-01 17:20:59.000000000 +0000 +++ panel-plugin/model.c -@@ -27,7 +27,7 @@ +@@ -29,7 +29,7 @@ - #include <libxfce4util/libxfce4util.h> + /********** PlacesBookmarkAction **********/ + +-inline PlacesBookmarkAction* ++PlacesBookmarkAction* + places_bookmark_action_create(gchar *label) + { + PlacesBookmarkAction *action; +@@ -40,7 +40,7 @@ places_bookmark_action_create(gchar *lab + return action; + } -inline void +void - places_bookmark_action_call(PlacesBookmarkAction *act) + places_bookmark_action_destroy(PlacesBookmarkAction *act) { g_assert(act != NULL); -@@ -36,7 +36,7 @@ places_bookmark_action_call(PlacesBookma - act->action(act); +@@ -51,7 +51,7 @@ places_bookmark_action_destroy(PlacesBoo + g_free(act); } -inline void +void - places_bookmark_action_free(PlacesBookmarkAction *act) + places_bookmark_action_call(PlacesBookmarkAction *act) { g_assert(act != NULL); -@@ -62,7 +62,7 @@ places_bookmark_actions_free(GList *acti +@@ -66,7 +66,7 @@ places_bookmark_action_call(PlacesBookma static int bookmarks = 0; #endif @@ -29,23 +39,34 @@ $NetBSD: patch-panel-plugin_model.c,v 1.1 2012/04/19 21:12:42 joerg Exp $ places_bookmark_create(gchar *label) { PlacesBookmark *bookmark; -@@ -77,7 +77,7 @@ places_bookmark_create(gchar *label) +@@ -81,7 +81,7 @@ places_bookmark_create(gchar *label) return bookmark; } +-static inline void ++static void + places_bookmark_actions_destroy(GList *actions) + { + while(actions != NULL){ +@@ -92,7 +92,7 @@ places_bookmark_actions_destroy(GList *a + g_list_free(actions); + } + -inline void +void - places_bookmark_free(PlacesBookmark *bookmark) + places_bookmark_destroy(PlacesBookmark *bookmark) { g_assert(bookmark != NULL); -@@ -104,19 +104,19 @@ places_bookmark_free(PlacesBookmark *boo - g_free(bookmark); - } +@@ -121,7 +121,7 @@ places_bookmark_destroy(PlacesBookmark * + + /********** PlacesBookmarkGroup **********/ -inline GList* +GList* places_bookmark_group_get_bookmarks(PlacesBookmarkGroup *pbg) { + g_assert(pbg->get_bookmarks != NULL); +@@ -129,7 +129,7 @@ places_bookmark_group_get_bookmarks(Plac return pbg->get_bookmarks(pbg); } @@ -53,11 +74,22 @@ $NetBSD: patch-panel-plugin_model.c,v 1.1 2012/04/19 21:12:42 joerg Exp $ +gboolean places_bookmark_group_changed(PlacesBookmarkGroup *pbg) { + g_assert(pbg->changed != NULL); +@@ -137,7 +137,7 @@ places_bookmark_group_changed(PlacesBook return pbg->changed(pbg); } +-inline PlacesBookmarkGroup* ++PlacesBookmarkGroup* + places_bookmark_group_create(void) + { + PlacesBookmarkGroup *bookmark_group; +@@ -146,7 +146,7 @@ places_bookmark_group_create(void) + return bookmark_group; + } + -inline void +void - places_bookmark_group_finalize(PlacesBookmarkGroup *pbg) + places_bookmark_group_destroy(PlacesBookmarkGroup *pbg) { - pbg->finalize(pbg); + if(pbg->finalize != NULL) diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h index 76720a9cdb0..8e1ca247fcd 100644 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h +++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h @@ -1,22 +1,27 @@ -$NetBSD: patch-panel-plugin_model.h,v 1.1 2012/04/19 21:12:42 joerg Exp $ +$NetBSD: patch-panel-plugin_model.h,v 1.2 2015/04/21 08:56:45 jperkin Exp $ ---- panel-plugin/model.h.orig 2007-10-25 22:03:52.000000000 +0000 +Fix inline use. +--- panel-plugin/model.h.orig 2013-11-10 14:34:13.000000000 +0000 +++ panel-plugin/model.h -@@ -35,10 +35,10 @@ struct _PlacesBookmarkAction - +@@ -36,13 +36,13 @@ struct _PlacesBookmarkAction + void (*finalize) (PlacesBookmarkAction *self); }; +-inline PlacesBookmarkAction* ++PlacesBookmarkAction* + places_bookmark_action_create(gchar *label); + -inline void +void - places_bookmark_action_call(PlacesBookmarkAction*); + places_bookmark_action_destroy(PlacesBookmarkAction*); -inline void +void - places_bookmark_action_free(PlacesBookmarkAction*); + places_bookmark_action_call(PlacesBookmarkAction*); /* Places Bookmark */ -@@ -65,10 +65,10 @@ struct _PlacesBookmark - void (*free) (PlacesBookmark *self); +@@ -70,10 +70,10 @@ struct _PlacesBookmark + void (*finalize) (PlacesBookmark *self); }; -inline PlacesBookmark* @@ -25,10 +30,10 @@ $NetBSD: patch-panel-plugin_model.h,v 1.1 2012/04/19 21:12:42 joerg Exp $ -inline void +void - places_bookmark_free(PlacesBookmark *bookmark); + places_bookmark_destroy(PlacesBookmark *bookmark); /* Places Bookmark Group */ -@@ -81,13 +81,13 @@ struct _PlacesBookmarkGroup +@@ -86,16 +86,16 @@ struct _PlacesBookmarkGroup gpointer priv; }; @@ -40,8 +45,12 @@ $NetBSD: patch-panel-plugin_model.h,v 1.1 2012/04/19 21:12:42 joerg Exp $ +gboolean places_bookmark_group_changed(PlacesBookmarkGroup*); +-inline PlacesBookmarkGroup* ++PlacesBookmarkGroup* + places_bookmark_group_create(); + -inline void +void - places_bookmark_group_finalize(PlacesBookmarkGroup*); + places_bookmark_group_destroy(PlacesBookmarkGroup*); #endif diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c new file mode 100644 index 00000000000..5280c84d626 --- /dev/null +++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__user.c @@ -0,0 +1,23 @@ +$NetBSD: patch-panel-plugin_model__user.c,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Fix inline use. +--- panel-plugin/model_user.c.orig 2013-11-10 14:34:13.000000000 +0000 ++++ panel-plugin/model_user.c +@@ -60,7 +60,7 @@ typedef struct + + } PBUserData; + +-static inline time_t ++static time_t + pbuser_get_mtime(const gchar *filename) + { + struct stat buf; +@@ -70,7 +70,7 @@ pbuser_get_mtime(const gchar *filename) + return 1; + } + +-static inline gboolean ++static gboolean + pbuser_dir_exists(const gchar *path) + { + return g_file_test(path, G_FILE_TEST_IS_DIR); diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c new file mode 100644 index 00000000000..d430513ffed --- /dev/null +++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model__volumes.c @@ -0,0 +1,14 @@ +$NetBSD: patch-panel-plugin_model__volumes.c,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Fix inline use. +--- panel-plugin/model_volumes.c.orig 2012-08-28 09:17:10.000000000 +0000 ++++ panel-plugin/model_volumes.c +@@ -383,7 +383,7 @@ pbvol_is_present(GVolume *volume) + return has_media && !is_shadowed; + } + +-static inline gboolean ++static gboolean + pbvol_show_volume(GVolume *volume){ + GMount *mount = g_volume_get_mount(volume); + DBG("Volume: %s [mounted=%x removable=%x present=%x]", g_volume_get_name(volume), diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.c deleted file mode 100644 index 931c7d13c12..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-panel-plugin_view.c,v 1.1 2012/04/19 21:12:42 joerg Exp $ - ---- panel-plugin/view.c.orig 2012-04-19 14:12:11.000000000 +0000 -+++ panel-plugin/view.c -@@ -121,25 +121,25 @@ static void pview_button_update(Plac - - /********** Interface for Cfg's Use **********/ - --inline void -+void - places_view_cfg_iface_update_menu(PlacesViewCfgIface *iface) - { - iface->update_menu(iface->places_view); - } - --inline void -+void - places_view_cfg_iface_update_button(PlacesViewCfgIface *iface) - { - iface->update_button(iface->places_view); - } - --inline void -+void - places_view_cfg_iface_reconfigure_model(PlacesViewCfgIface *iface) - { - iface->reconfigure_model(iface->places_view); - } - --inline GtkWidget* -+GtkWidget* - places_view_cfg_iface_make_empty_cfg_dialog(PlacesViewCfgIface *iface) - { - return iface->make_empty_cfg_dialog(iface->places_view); diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.h deleted file mode 100644 index 8b1a372473d..00000000000 --- a/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.h +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-panel-plugin_view.h,v 1.1 2012/04/19 21:12:42 joerg Exp $ - ---- panel-plugin/view.h.orig 2012-04-19 14:11:58.000000000 +0000 -+++ panel-plugin/view.h -@@ -44,16 +44,16 @@ typedef struct { - - } PlacesViewCfgIface; - --inline void -+void - places_view_cfg_iface_update_menu(PlacesViewCfgIface*); - --inline void -+void - places_view_cfg_iface_update_button(PlacesViewCfgIface*); - --inline void -+void - places_view_cfg_iface_reconfigure_model(PlacesViewCfgIface*); - --inline GtkWidget* -+GtkWidget* - places_view_cfg_iface_make_empty_cfg_dialog(PlacesViewCfgIface*); - - #include "cfg.h" diff --git a/x11/xfce4-screenshooter-plugin/DESCR b/x11/xfce4-screenshooter-plugin/DESCR deleted file mode 100644 index 71562351081..00000000000 --- a/x11/xfce4-screenshooter-plugin/DESCR +++ /dev/null @@ -1 +0,0 @@ -Screenshot plugin for Xfce. diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile deleted file mode 100644 index 13c8df136be..00000000000 --- a/x11/xfce4-screenshooter-plugin/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile,v 1.24 2014/05/05 00:48:37 ryoon Exp $ - -.include "../../meta-pkgs/xfce4/Makefile.common" - -XFCE4_VERSION= 1.0.0 - -DISTNAME= xfce4-screenshooter-plugin-${XFCE4_VERSION} -PKGREVISION= 21 -CATEGORIES= x11 -MASTER_SITES= http://goodies.xfce.org/releases/xfce4-screenshooter-plugin/ -COMMENT= Xfce screenshot plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-screenshooter-plugin/PLIST b/x11/xfce4-screenshooter-plugin/PLIST deleted file mode 100644 index 782de7de716..00000000000 --- a/x11/xfce4-screenshooter-plugin/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ -libexec/xfce4/panel-plugins/xfce4-screenshooter-plugin -share/xfce4/panel-plugins/screenshooter.desktop diff --git a/x11/xfce4-screenshooter-plugin/buildlink3.mk b/x11/xfce4-screenshooter-plugin/buildlink3.mk deleted file mode 100644 index e11db26d3fc..00000000000 --- a/x11/xfce4-screenshooter-plugin/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.25 2014/05/05 00:48:37 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-screenshooter-plugin - -.if !defined(XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK) -XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-screenshooter-plugin+= xfce4-screenshooter-plugin>=1.0.0 -BUILDLINK_ABI_DEPENDS.xfce4-screenshooter-plugin+= xfce4-screenshooter-plugin>=1.0.0nb21 -BUILDLINK_PKGSRCDIR.xfce4-screenshooter-plugin?= ../../x11/xfce4-screenshooter-plugin - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.endif # XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-screenshooter-plugin diff --git a/x11/xfce4-screenshooter-plugin/distinfo b/x11/xfce4-screenshooter-plugin/distinfo deleted file mode 100644 index e89695b962a..00000000000 --- a/x11/xfce4-screenshooter-plugin/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ - -SHA1 (xfce4-screenshooter-plugin-1.0.0.tar.bz2) = c23532f8a0a38f168ac08b3bef0e21474944f5eb -RMD160 (xfce4-screenshooter-plugin-1.0.0.tar.bz2) = f454f968d51e259abc3f0a3d3e55eabc305e7813 -Size (xfce4-screenshooter-plugin-1.0.0.tar.bz2) = 257496 bytes diff --git a/x11/xfce4-screenshooter/DESCR b/x11/xfce4-screenshooter/DESCR new file mode 100644 index 00000000000..54a659b93e5 --- /dev/null +++ b/x11/xfce4-screenshooter/DESCR @@ -0,0 +1,7 @@ +This application allows you to capture the entire screen, the active window or +a selected region. You can set the delay that elapses before the screenshot is +taken and the action that will be done with the screenshot: save it to a PNG +file, copy it to the clipboard, open it using another application, or host it +on ZimageZ, a free online image hosting service. + +A plugin for the Xfce panel is also available. diff --git a/x11/xfce4-screenshooter/Makefile b/x11/xfce4-screenshooter/Makefile new file mode 100644 index 00000000000..9358c6bb81c --- /dev/null +++ b/x11/xfce4-screenshooter/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +.include "../../meta-pkgs/xfce4/Makefile.common" + +DISTNAME= xfce4-screenshooter-1.8.2 +CATEGORIES= misc +MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-screenshooter/1.8/ + +HOMEPAGE= http://archive.xfce.org/src/apps/xfce4-screenshooter/1.8/ +COMMENT= Xfce screenshoot application + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes + +.include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../net/libsoup24/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-screenshooter/PLIST b/x11/xfce4-screenshooter/PLIST new file mode 100644 index 00000000000..bf6451e0241 --- /dev/null +++ b/x11/xfce4-screenshooter/PLIST @@ -0,0 +1,63 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:45 jperkin Exp $ +bin/xfce4-screenshooter +lib/xfce4/panel/plugins/libscreenshooterplugin.la +man/man1/xfce4-screenshooter.1 +share/appdata/xfce4-screenshooter.appdata.xml +share/applications/xfce4-screenshooter.desktop +share/icons/hicolor/48x48/apps/applets-screenshooter.png +share/icons/hicolor/scalable/apps/applets-screenshooter.svg +share/locale/ar/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ast/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/be/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/bg/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ca/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/cs/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/da/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/de/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/el/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/en_AU/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/en_GB/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/es/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/et/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/eu/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/fi/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/fr/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/gl/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/hr/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/hu/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/id/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/is/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/it/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ja/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/kk/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ko/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/lt/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/lv/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ms/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/nb/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/nl/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/nn/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/oc/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/pa/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/pl/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/pt/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ro/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ru/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/si/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/sk/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/sl/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/sq/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/sr/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/sv/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/te/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/th/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/tr/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ug/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/uk/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ur/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/vi/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-screenshooter.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-screenshooter.mo +share/xfce4/panel/plugins/screenshooter.desktop diff --git a/x11/xfce4-screenshooter/distinfo b/x11/xfce4-screenshooter/distinfo new file mode 100644 index 00000000000..b848af04365 --- /dev/null +++ b/x11/xfce4-screenshooter/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +SHA1 (xfce4-screenshooter-1.8.2.tar.bz2) = 786f6de2220d53b61f7ef2ae19ac106b060b275a +RMD160 (xfce4-screenshooter-1.8.2.tar.bz2) = 8cda731953d18e5447f5b1b2183a32a83b505be1 +Size (xfce4-screenshooter-1.8.2.tar.bz2) = 492524 bytes diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index 8daee516215..9de6842b5c5 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.48 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.49 2015/04/21 08:56:45 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfce4-session-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-session-4.10.1 CATEGORIES= x11 +MASTER_SITES+= http://archive.xfce.org/src/xfce/xfce4-session/4.10/ + +HOMEPAGE= http://docs.xfce.org/xfce/xfce4-session/start COMMENT= Xfce session manager PKGCONFIG_OVERRIDE+= libxfsm/xfce4-session-2.0.pc.in @@ -28,18 +30,27 @@ MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images +#CONF_FILES= ${EGDIR}/applications/xfce-session-settings.desktop \ + ${PKG_SYSCONFDIR}/applications/xfce-session-settings.desktop +#CONF_FILES+= ${EGDIR}/applications/xfce4-session-logout.desktop \ + ${PKG_SYSCONFDIR}/applications/xfce4-session-logout.desktop +CONF_FILES= ${EGDIR}/autostart/xscreensaver.desktop \ + ${PKG_SYSCONFDIR}/autostart/xscreensaver.desktop CONF_FILES= ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \ - ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml -CONF_FILES+= ${EGDIR}/autostart/xfce4-tips-autostart.desktop \ - ${PKG_SYSCONFDIR}/autostart/xfce4-tips-autostart.desktop + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +CONF_FILES+= ${EGDIR}/Xft.xrdb \ + ${PKG_SYSCONFDIR}/xfce4/Xft.xrdb +CONF_FILES+= ${EGDIR}/xinitrc \ + ${PKG_SYSCONFDIR}/xfce4/xinitrc + +.if !empty(Darwin-*-*) +.include "../../sysutils/consolekit/buildlink3.mk" +.endif .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../security/policykit/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index 4e087e769d8..2dc7577bdc8 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,25 +1,28 @@ -@comment $NetBSD: PLIST,v 1.15 2009/09/16 01:15:36 reed Exp $ +@comment $NetBSD: PLIST,v 1.16 2015/04/21 08:56:45 jperkin Exp $ +bin/startxfce4 bin/xfce4-session bin/xfce4-session-logout bin/xfce4-session-settings -bin/xfce4-tips +bin/xflock4 include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h lib/libxfsm-4.6.la lib/pkgconfig/xfce4-session-2.0.pc -lib/xfce4/splash/engines/libbalou.la -lib/xfce4/splash/engines/libmice.la -lib/xfce4/splash/engines/libsimple.la -libexec/balou-export-theme -libexec/balou-install-theme -libexec/xfsm-shutdown-helper +lib/xfce4/session/balou-export-theme +lib/xfce4/session/balou-install-theme +lib/xfce4/session/splash-engines/libbalou.la +lib/xfce4/session/splash-engines/libmice.la +lib/xfce4/session/splash-engines/libsimple.la +lib/xfce4/session/xfsm-shutdown-helper man/man1/xfce4-session-logout.1 man/man1/xfce4-session.1 share/applications/xfce-session-settings.desktop -share/examples/xfce4/autostart/xfce4-tips-autostart.desktop +share/applications/xfce4-session-logout.desktop +share/examples/xfce4/Xft.xrdb +share/examples/xfce4/autostart/xscreensaver.desktop share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +share/examples/xfce4/xinitrc share/icons/hicolor/128x128/apps/xfce4-session.png -share/icons/hicolor/48x48/apps/xfce4-autostart-editor.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 @@ -27,15 +30,15 @@ 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/64x64/apps/xfsm-gnome-kde-logo.png -share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png -share/icons/hicolor/72x72/apps/xfsm-trash-normal.png share/icons/hicolor/scalable/apps/xfce4-session.svg share/icons/hicolor/scalable/apps/xfsm-shutdown.svg share/locale/am/LC_MESSAGES/xfce4-session.mo share/locale/ar/LC_MESSAGES/xfce4-session.mo +share/locale/ast/LC_MESSAGES/xfce4-session.mo share/locale/az/LC_MESSAGES/xfce4-session.mo share/locale/be/LC_MESSAGES/xfce4-session.mo +share/locale/bg/LC_MESSAGES/xfce4-session.mo +share/locale/bn/LC_MESSAGES/xfce4-session.mo share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo share/locale/ca/LC_MESSAGES/xfce4-session.mo share/locale/cs/LC_MESSAGES/xfce4-session.mo @@ -56,11 +59,14 @@ share/locale/gl/LC_MESSAGES/xfce4-session.mo share/locale/gu/LC_MESSAGES/xfce4-session.mo share/locale/he/LC_MESSAGES/xfce4-session.mo share/locale/hi/LC_MESSAGES/xfce4-session.mo +share/locale/hr/LC_MESSAGES/xfce4-session.mo share/locale/hu/LC_MESSAGES/xfce4-session.mo share/locale/id/LC_MESSAGES/xfce4-session.mo +share/locale/is/LC_MESSAGES/xfce4-session.mo share/locale/it/LC_MESSAGES/xfce4-session.mo share/locale/ja/LC_MESSAGES/xfce4-session.mo share/locale/ka/LC_MESSAGES/xfce4-session.mo +share/locale/kk/LC_MESSAGES/xfce4-session.mo share/locale/ko/LC_MESSAGES/xfce4-session.mo share/locale/lt/LC_MESSAGES/xfce4-session.mo share/locale/lv/LC_MESSAGES/xfce4-session.mo @@ -69,6 +75,7 @@ share/locale/mr/LC_MESSAGES/xfce4-session.mo share/locale/ms/LC_MESSAGES/xfce4-session.mo share/locale/nb/LC_MESSAGES/xfce4-session.mo share/locale/nl/LC_MESSAGES/xfce4-session.mo +share/locale/nn/LC_MESSAGES/xfce4-session.mo share/locale/pa/LC_MESSAGES/xfce4-session.mo share/locale/pl/LC_MESSAGES/xfce4-session.mo share/locale/pt/LC_MESSAGES/xfce4-session.mo @@ -78,23 +85,17 @@ share/locale/ru/LC_MESSAGES/xfce4-session.mo share/locale/si/LC_MESSAGES/xfce4-session.mo share/locale/sk/LC_MESSAGES/xfce4-session.mo share/locale/sq/LC_MESSAGES/xfce4-session.mo +share/locale/sr/LC_MESSAGES/xfce4-session.mo share/locale/sv/LC_MESSAGES/xfce4-session.mo share/locale/ta/LC_MESSAGES/xfce4-session.mo +share/locale/te/LC_MESSAGES/xfce4-session.mo share/locale/tr/LC_MESSAGES/xfce4-session.mo +share/locale/ug/LC_MESSAGES/xfce4-session.mo share/locale/uk/LC_MESSAGES/xfce4-session.mo share/locale/ur/LC_MESSAGES/xfce4-session.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo share/locale/vi/LC_MESSAGES/xfce4-session.mo share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo share/themes/Default/balou/logo.png share/themes/Default/balou/themerc -share/xfce4/doc/C/images/xfsm-advanced.png -share/xfce4/doc/C/images/xfsm-general.png -share/xfce4/doc/C/images/xfsm-splash.png -share/xfce4/doc/C/xfce4-session.html -share/xfce4/doc/fr/images/xfsm-advanced.png -share/xfce4/doc/fr/images/xfsm-general.png -share/xfce4/doc/fr/images/xfsm-splash.png -share/xfce4/doc/fr/xfce4-session.html -share/xfce4/tips/tips -share/xfce4/tips/tips.dat diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk deleted file mode 100644 index 1809c28e65f..00000000000 --- a/x11/xfce4-session/buildlink3.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.42 2014/05/05 00:48:37 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-session - -.if !defined(XFCE4_SESSION_BUILDLINK3_MK) -XFCE4_SESSION_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.6.0 -BUILDLINK_ABI_DEPENDS.xfce4-session+= xfce4-session>=4.6.1nb21 -BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session - -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.endif # XFCE4_SESSION_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-session diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index bf378ebe382..78ad1ad40dc 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.12 2009/09/16 01:15:36 reed Exp $ +$NetBSD: distinfo,v 1.13 2015/04/21 08:56:45 jperkin Exp $ -SHA1 (xfce4-session-4.6.1.tar.bz2) = 760e05bf73783521b3ce34e91aa187c74018ab8c -RMD160 (xfce4-session-4.6.1.tar.bz2) = 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0 -Size (xfce4-session-4.6.1.tar.bz2) = 1365247 bytes -SHA1 (patch-ab) = f1c7a041a91f91a56ac7c8cf64e74a203be905f5 -SHA1 (patch-ac) = 549dccc70ae31f14291d3bf2c191ad8379139c63 +SHA1 (xfce4-session-4.10.1.tar.bz2) = b33d2ced61a9cbacff4f5709959e02d4d1c3836f +RMD160 (xfce4-session-4.10.1.tar.bz2) = c8c72d954ebb22085e4c4d7d14ab7b9dbfdab6b4 +Size (xfce4-session-4.10.1.tar.bz2) = 1273015 bytes +SHA1 (patch-ac) = 0fc28a4a34455470cd893c3240f184058a31d89e +SHA1 (patch-scripts_Makefile.in) = da968583217fe713de60e8466df8ec602a54453d +SHA1 (patch-scripts_startxfce4.in) = b85727681bf67975d45980656c4312d70d067d9b +SHA1 (patch-settings_xfce4-session.xml) = dcba5873ec78cd822b4bbc19af3677ab10b1cab3 diff --git a/x11/xfce4-session/patches/patch-ab b/x11/xfce4-session/patches/patch-ab deleted file mode 100644 index 59043a5e889..00000000000 --- a/x11/xfce4-session/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:33 reed Exp $ - ---- xfce4-tips/Makefile.in.orig 2009-02-25 20:29:50.000000000 +0000 -+++ xfce4-tips/Makefile.in -@@ -309,7 +309,7 @@ xfce4_tips_CFLAGS = \ - xfce4_tips_LDADD = \ - @LIBXFCEGUI4_LIBS@ - --desktopdir = $(sysconfdir)/xdg/autostart -+desktopdir = $(datadir)/examples/xfce4/autostart - desktop_in_files = xfce4-tips-autostart.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - EXTRA_DIST = \ diff --git a/x11/xfce4-session/patches/patch-ac b/x11/xfce4-session/patches/patch-ac index 019de5feb4d..a0a20a16e9a 100644 --- a/x11/xfce4-session/patches/patch-ac +++ b/x11/xfce4-session/patches/patch-ac @@ -1,8 +1,9 @@ -$NetBSD: patch-ac,v 1.1 2009/09/16 01:15:33 reed Exp $ +$NetBSD: patch-ac,v 1.2 2015/04/21 08:56:45 jperkin Exp $ ---- settings/Makefile.in.orig 2009-02-25 20:29:49.000000000 +0000 +Adjust config path. +--- settings/Makefile.in.orig 2013-05-05 15:33:59.000000000 +0000 +++ settings/Makefile.in -@@ -334,7 +334,7 @@ xfce4_session_settings_LDADD = \ +@@ -418,7 +418,7 @@ xfce4_session_settings_LDADD = \ xfce4_session_settings_DEPENDENCIES = \ $(top_builddir)/libxfsm/libxfsm-4.6.la diff --git a/x11/xfce4-session/patches/patch-scripts_Makefile.in b/x11/xfce4-session/patches/patch-scripts_Makefile.in new file mode 100644 index 00000000000..f92d1f6ccb9 --- /dev/null +++ b/x11/xfce4-session/patches/patch-scripts_Makefile.in @@ -0,0 +1,20 @@ +$NetBSD: patch-scripts_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Adjust config path. +--- scripts/Makefile.in.orig 2013-05-05 15:33:59.000000000 +0000 ++++ scripts/Makefile.in +@@ -329,12 +329,12 @@ edit = $(SED) \ + -e "s,@_docdir_\@,$$(dirname $(docdir)),g" \ + -e "s,@_sysconfdir_\@,$(sysconfdir),g" + +-conffilesdir = @sysconfdir@/xdg/xfce4 ++conffilesdir = $(datadir)/examples/xfce4 + conffiles_DATA = \ + xinitrc \ + Xft.xrdb + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/examples/xfce4/autostart + autostart_in_files = xscreensaver.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ diff --git a/x11/xfce4-session/patches/patch-scripts_startxfce4.in b/x11/xfce4-session/patches/patch-scripts_startxfce4.in new file mode 100644 index 00000000000..45146d587e2 --- /dev/null +++ b/x11/xfce4-session/patches/patch-scripts_startxfce4.in @@ -0,0 +1,23 @@ +$NetBSD: patch-scripts_startxfce4.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Portability fix +--- scripts/startxfce4.in.orig 2013-05-05 15:33:55.000000000 +0000 ++++ scripts/startxfce4.in +@@ -24,7 +24,7 @@ then + OPTS="" + for OPT in $* + do +- if test "x$OPT" == "x--help" ++ if test "x$OPT" = "x--help" + then + # print help and exit + echo "Usage:" +@@ -37,7 +37,7 @@ then + echo + + exit 0 +- elif test "x$OPT" == "x--with-ck-launch" ++ elif test "x$OPT" = "x--with-ck-launch" + then + # try to launch xfce4-session with ck-launch-session in xinitrc + XFCE4_SESSION_WITH_CK="1" diff --git a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml new file mode 100644 index 00000000000..1ae4317dee1 --- /dev/null +++ b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml @@ -0,0 +1,14 @@ +$NetBSD: patch-settings_xfce4-session.xml,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Look for the right thunar binary. +--- settings/xfce4-session.xml.orig 2013-05-05 15:33:55.000000000 +0000 ++++ settings/xfce4-session.xml +@@ -21,7 +21,7 @@ + </property> + <property name="Client2_PerScreen" type="bool" value="false"/> + <property name="Client3_Command" type="array"> +- <value type="string" value="Thunar"/> ++ <value type="string" value="thunar"/> + <value type="string" value="--daemon"/> + </property> + <property name="Client3_PerScreen" type="bool" value="false"/> diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile index aa4e604c039..52c1db57c31 100644 --- a/x11/xfce4-settings/Makefile +++ b/x11/xfce4-settings/Makefile @@ -1,35 +1,35 @@ -# $NetBSD: Makefile,v 1.29 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2015/04/21 08:56:45 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 4.6.5 - DISTNAME= xfce4-settings-${XFCE4_VERSION} -PKGREVISION= 23 CATEGORIES= x11 -COMMENT= Xfce settings manager -MASTER_SITES+= http://archive.xfce.org/src/xfce/xfce4-settings/4.6/ +HOMEPAGE= http://docs.xfce.org/xfce/xfce4-settings/start +COMMENT= Xfce settings manager BUILD_DEFS+= PKG_SYSCONFBASE CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --enable-sound-settings -EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml PKG_SYSCONFSUBDIR= xdg -MAKE_DIRS+= ${XFCE4_EGBASE:Q} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR} - -CONF_FILES= ${EGDIR}/xsettings.xml \ - ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +CONF_FILES= ${XFCE4_EGBASE}/menus/xfce-settings-manager.menu \ + ${PKG_SYSCONFDIR}/menus/xfce-settings-manager.menu \ + ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml/xsettings.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml \ + ${XFCE4_EGBASE}/autostart/xfsettingsd.desktop \ + ${PKG_SYSCONFDIR}/autostart/xfsettingsd.desktop -CONF_FILES+= \ - ${XFCE4_EGBASE:Q}/autostart/xfce4-settings-helper-autostart.desktop \ - ${PKG_SYSCONFDIR}/autostart/xfce4-settings-helper-autostart.desktop +MAKE_DIRS+= ${PKG_SYSCONFDIR}/menus \ + ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml \ + ${XFCE4_EGBASE}/autostart \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml +.include "../../audio/libcanberra/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/libnotify/buildlink3.mk" @@ -37,8 +37,10 @@ CONF_FILES+= \ .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../devel/xfce4-conf/buildlink3.mk" .include "../../x11/libxklavier/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../x11/xfce4-garcon/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-settings/PLIST b/x11/xfce4-settings/PLIST index d13f059ff33..32710e94e43 100644 --- a/x11/xfce4-settings/PLIST +++ b/x11/xfce4-settings/PLIST @@ -1,52 +1,79 @@ -@comment $NetBSD: PLIST,v 1.3 2010/07/14 16:15:19 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/04/21 08:56:45 jperkin Exp $ bin/xfce4-accessibility-settings bin/xfce4-appearance-settings bin/xfce4-display-settings bin/xfce4-keyboard-settings +bin/xfce4-mime-settings bin/xfce4-mouse-settings bin/xfce4-settings-editor -bin/xfce4-settings-helper bin/xfce4-settings-manager bin/xfsettingsd +lib/xfce4/settings/appearance-install-theme share/applications/xfce-display-settings.desktop share/applications/xfce-keyboard-settings.desktop share/applications/xfce-mouse-settings.desktop share/applications/xfce-settings-manager.desktop share/applications/xfce-ui-settings.desktop share/applications/xfce4-accessibility-settings.desktop +share/applications/xfce4-mime-settings.desktop share/applications/xfce4-settings-editor.desktop -share/examples/xfce4/autostart/xfce4-settings-helper-autostart.desktop +share/examples/xfce4/autostart/xfsettingsd.desktop +share/examples/xfce4/menus/xfce-settings-manager.menu share/examples/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml -share/locale/am/LC_MESSAGES/xfce4-settings.mo +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 +share/locale/ar/LC_MESSAGES/xfce4-settings.mo share/locale/ast/LC_MESSAGES/xfce4-settings.mo +share/locale/bg/LC_MESSAGES/xfce4-settings.mo +share/locale/bn/LC_MESSAGES/xfce4-settings.mo share/locale/ca/LC_MESSAGES/xfce4-settings.mo share/locale/cs/LC_MESSAGES/xfce4-settings.mo share/locale/da/LC_MESSAGES/xfce4-settings.mo share/locale/de/LC_MESSAGES/xfce4-settings.mo share/locale/el/LC_MESSAGES/xfce4-settings.mo +share/locale/en_AU/LC_MESSAGES/xfce4-settings.mo +share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo share/locale/es/LC_MESSAGES/xfce4-settings.mo share/locale/eu/LC_MESSAGES/xfce4-settings.mo share/locale/fi/LC_MESSAGES/xfce4-settings.mo share/locale/fr/LC_MESSAGES/xfce4-settings.mo share/locale/gl/LC_MESSAGES/xfce4-settings.mo +share/locale/he/LC_MESSAGES/xfce4-settings.mo +share/locale/hr/LC_MESSAGES/xfce4-settings.mo share/locale/hu/LC_MESSAGES/xfce4-settings.mo share/locale/id/LC_MESSAGES/xfce4-settings.mo +share/locale/is/LC_MESSAGES/xfce4-settings.mo share/locale/it/LC_MESSAGES/xfce4-settings.mo share/locale/ja/LC_MESSAGES/xfce4-settings.mo share/locale/kk/LC_MESSAGES/xfce4-settings.mo +share/locale/ko/LC_MESSAGES/xfce4-settings.mo +share/locale/lt/LC_MESSAGES/xfce4-settings.mo share/locale/lv/LC_MESSAGES/xfce4-settings.mo +share/locale/ms/LC_MESSAGES/xfce4-settings.mo share/locale/nb/LC_MESSAGES/xfce4-settings.mo share/locale/nl/LC_MESSAGES/xfce4-settings.mo +share/locale/nn/LC_MESSAGES/xfce4-settings.mo +share/locale/oc/LC_MESSAGES/xfce4-settings.mo +share/locale/pa/LC_MESSAGES/xfce4-settings.mo share/locale/pl/LC_MESSAGES/xfce4-settings.mo share/locale/pt/LC_MESSAGES/xfce4-settings.mo share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo share/locale/ro/LC_MESSAGES/xfce4-settings.mo share/locale/ru/LC_MESSAGES/xfce4-settings.mo +share/locale/si/LC_MESSAGES/xfce4-settings.mo share/locale/sk/LC_MESSAGES/xfce4-settings.mo +share/locale/sl/LC_MESSAGES/xfce4-settings.mo +share/locale/sr/LC_MESSAGES/xfce4-settings.mo share/locale/sv/LC_MESSAGES/xfce4-settings.mo +share/locale/te/LC_MESSAGES/xfce4-settings.mo +share/locale/th/LC_MESSAGES/xfce4-settings.mo share/locale/tr/LC_MESSAGES/xfce4-settings.mo share/locale/ug/LC_MESSAGES/xfce4-settings.mo share/locale/uk/LC_MESSAGES/xfce4-settings.mo share/locale/ur/LC_MESSAGES/xfce4-settings.mo share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo +share/locale/zh_HK/LC_MESSAGES/xfce4-settings.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo diff --git a/x11/xfce4-settings/buildlink3.mk b/x11/xfce4-settings/buildlink3.mk deleted file mode 100644 index 04d3f398484..00000000000 --- a/x11/xfce4-settings/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $ - -BUILDLINK_TREE+= xfce4-settings - -.if !defined(XFCE4_SETTINGS_BUILDLINK3_MK) -XFCE4_SETTINGS_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-settings+= xfce4-settings>=4.6.0 -BUILDLINK_PKGSRCDIR.xfce4-settings?= ../../x11/xfce4-settings - -.endif # XFCE4_SETTINGS_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-settings diff --git a/x11/xfce4-settings/distinfo b/x11/xfce4-settings/distinfo index 6b6c0549fab..dc70b77e65e 100644 --- a/x11/xfce4-settings/distinfo +++ b/x11/xfce4-settings/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.5 2013/08/16 07:42:55 obache Exp $ +$NetBSD: distinfo,v 1.6 2015/04/21 08:56:45 jperkin Exp $ -SHA1 (xfce4-settings-4.6.5.tar.bz2) = c036cc2f3100a46b2649e678dff7c0106b219263 -RMD160 (xfce4-settings-4.6.5.tar.bz2) = a8155346285921f3087795598989df287be8abb4 -Size (xfce4-settings-4.6.5.tar.bz2) = 522389 bytes -SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10 -SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f -SHA1 (patch-dialogs-keyboard-settings-xfce-keyboard-settings.c) = e011c194084458c65a7f47e27fc03cb8927287b2 -SHA1 (patch-xfce4-settings-helper_accessibility.c) = 190883186f2773ab914ef6be38d387f7aa96e9e4 +SHA1 (xfce4-settings-4.12.0.tar.bz2) = 507a66ed160e44078f81051878c8644d5a5f344e +RMD160 (xfce4-settings-4.12.0.tar.bz2) = e778cdef17523a52d0113831734c597f5b737042 +Size (xfce4-settings-4.12.0.tar.bz2) = 973324 bytes +SHA1 (patch-xfce4-settings-manager_Makefile.in) = 89b91e6ba1cef48dabf8dae8f2cb17c8e983eb1e +SHA1 (patch-xfsettingsd_Makefile.in) = 68b9e1bda69df252a5e910b9b2969dc0b7f45432 +SHA1 (patch-xfsettingsd_xsettings.xml) = 182108ef2739855591ef09856020dbd036c8c5a7 diff --git a/x11/xfce4-settings/patches/patch-aa b/x11/xfce4-settings/patches/patch-aa deleted file mode 100644 index bf41b1d5ab1..00000000000 --- a/x11/xfce4-settings/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $ - ---- xfsettingsd/Makefile.in.orig 2009-03-09 15:03:06.000000000 +0000 -+++ xfsettingsd/Makefile.in -@@ -339,7 +339,7 @@ top_srcdir = @top_srcdir@ - @BUILD_XFSETTINGSD_TRUE@INCLUDES = \ - @BUILD_XFSETTINGSD_TRUE@ -I$(top_srcdir) - --@BUILD_XFSETTINGSD_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml -+@BUILD_XFSETTINGSD_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml - @BUILD_XFSETTINGSD_TRUE@settings_DATA = xsettings.xml - @BUILD_XFSETTINGSD_TRUE@EXTRA_DIST = \ - @BUILD_XFSETTINGSD_TRUE@ $(settings_DATA) diff --git a/x11/xfce4-settings/patches/patch-ab b/x11/xfce4-settings/patches/patch-ab deleted file mode 100644 index daaef69eb1a..00000000000 --- a/x11/xfce4-settings/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $ - ---- xfce4-settings-helper/Makefile.in.orig 2009-03-09 15:03:06.000000000 +0000 -+++ xfce4-settings-helper/Makefile.in -@@ -375,7 +375,7 @@ xfce4_settings_helper_LDADD = $(GTK_LIBS - $(LIBXFCEGUI4_LIBS) $(LIBXFCE4KBD_PRIVATE_LIBS) \ - $(LIBXKLAVIER_LIBS) $(XI_LIBS) $(LIBX11_LIBS) \ - $(LIBNOTIFY_LIBS) $(LIBWNCK_LIBS) $(am__append_3) --autostartdir = $(sysconfdir)/xdg/autostart -+autostartdir = $(datadir)/examples/xfce4/autostart - autostart_DATA = xfce4-settings-helper-autostart.desktop - EXTRA_DIST = \ - xfce4-settings-helper-autostart.desktop diff --git a/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c b/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c deleted file mode 100644 index 2315b0df45c..00000000000 --- a/x11/xfce4-settings/patches/patch-dialogs-keyboard-settings-xfce-keyboard-settings.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dialogs-keyboard-settings-xfce-keyboard-settings.c,v 1.1 2011/09/08 00:22:49 joerg Exp $ - ---- dialogs/keyboard-settings/xfce-keyboard-settings.c.orig 2011-09-07 12:45:30.000000000 +0000 -+++ dialogs/keyboard-settings/xfce-keyboard-settings.c -@@ -1082,8 +1082,8 @@ xfce_keyboard_settings_update_sensitive - GtkWidget *xkb_layout_frame; - gboolean active; - -- g_return_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings)); -- g_return_if_fail (GLADE_IS_XML (settings->priv->glade_xml)); -+ g_return_val_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings), FALSE); -+ g_return_val_if_fail (GLADE_IS_XML (settings->priv->glade_xml), FALSE); - - active = gtk_toggle_button_get_active (toggle); - xkb_model_frame = glade_xml_get_widget (settings->priv->glade_xml, "xkb_model_frame"); diff --git a/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c b/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c deleted file mode 100644 index f4c193266d3..00000000000 --- a/x11/xfce4-settings/patches/patch-xfce4-settings-helper_accessibility.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xfce4-settings-helper_accessibility.c,v 1.1 2013/08/16 07:42:55 obache Exp $ - -* for libnotify-0.7 API change - ---- xfce4-settings-helper/accessibility.c.orig 2010-05-21 17:05:32.000000000 +0000 -+++ xfce4-settings-helper/accessibility.c -@@ -417,7 +417,7 @@ xfce_accessibility_helper_notification_s - if (helper->notification == NULL) - { - /* create a new notification */ -- helper->notification = notify_notification_new (summary, body, "keyboard", NULL); -+ helper->notification = notify_notification_new (summary, body, "keyboard"); - - /* close signal */ - g_signal_connect (G_OBJECT (helper->notification), "closed", G_CALLBACK (xfce_accessibility_helper_notification_closed), helper); diff --git a/x11/xfce4-settings/patches/patch-xfce4-settings-manager_Makefile.in b/x11/xfce4-settings/patches/patch-xfce4-settings-manager_Makefile.in new file mode 100644 index 00000000000..870c44c94df --- /dev/null +++ b/x11/xfce4-settings/patches/patch-xfce4-settings-manager_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-xfce4-settings-manager_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Adjust config path. +--- xfce4-settings-manager/Makefile.in.orig 2015-02-28 19:10:30.000000000 +0000 ++++ xfce4-settings-manager/Makefile.in +@@ -489,7 +489,7 @@ xfce4_settings_manager_LDADD = \ + $(EXO_LIBS) \ + $(GARCON_LIBS) + +-menudir = $(sysconfdir)/xdg/menus ++menudir = $(datadir)/examples/xfce4/menus + menu_DATA = xfce-settings-manager.menu + desktopdir = $(datadir)/applications + desktop_in_files = xfce-settings-manager.desktop.in diff --git a/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in b/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in new file mode 100644 index 00000000000..f090970bf14 --- /dev/null +++ b/x11/xfce4-settings/patches/patch-xfsettingsd_Makefile.in @@ -0,0 +1,17 @@ +$NetBSD: patch-xfsettingsd_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Adjust config path. +--- xfsettingsd/Makefile.in.orig 2015-02-28 19:10:30.000000000 +0000 ++++ xfsettingsd/Makefile.in +@@ -535,9 +535,9 @@ xfsettingsd_LDADD = $(GTK_LIBS) $(GLIB_L + $(LIBXFCE4KBD_PRIVATE_LIBS) $(LIBXKLAVIER_LIBS) $(XI_LIBS) \ + $(LIBX11_LIBS) $(LIBNOTIFY_LIBS) $(FONTCONFIG_LIBS) \ + $(LIBINPUT_LIBS) -lm $(am__append_3) $(am__append_6) +-settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml ++settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml + settings_DATA = xsettings.xml +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/examples/xfce4/autostart + autostart_in_files = xfsettingsd.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ diff --git a/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml b/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml new file mode 100644 index 00000000000..be5064aa619 --- /dev/null +++ b/x11/xfce4-settings/patches/patch-xfsettingsd_xsettings.xml @@ -0,0 +1,16 @@ +$NetBSD: patch-xfsettingsd_xsettings.xml,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Use an Xfce theme and icon theme by default. +--- xfsettingsd/xsettings.xml.orig 2015-02-24 01:33:11.000000000 +0000 ++++ xfsettingsd/xsettings.xml +@@ -6,8 +6,8 @@ + <?xml version="1.0" encoding="UTF-8"?> + <channel name="xsettings" version="1.0"> + <property name="Net" type="empty"> +- <property name="ThemeName" type="empty"/> +- <property name="IconThemeName" type="empty"/> ++ <property name="ThemeName" type="string" value="Xfce-dusk"/> ++ <property name="IconThemeName" type="string" value="elementary-xfce"/> + <property name="DoubleClickTime" type="int" value="400"/> + <property name="DoubleClickDistance" type="int" value="5"/> + <property name="DndDragThreshold" type="int" value="8"/> diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index e6565eec8f3..1a2e2e75694 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -1,25 +1,21 @@ -# $NetBSD: Makefile,v 1.35 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.36 2015/04/21 08:56:45 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.4.2 - -DISTNAME= Terminal-${XFCE4_VERSION} -PKGNAME= xfce4-terminal-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-terminal-0.6.3 CATEGORIES= x11 -COMMENT= Xfce terminal emulator +MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-terminal/0.6/ -MASTER_SITES= http://www.xfce.org/archive/src/apps/terminal/0.4/ +HOMEPAGE= http://docs.xfce.org/apps/terminal/start +COMMENT= Xfce terminal emulator MAKE_JOBS_SAFE= no -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" .include "../../x11/xfce4-exo/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-terminal/PLIST b/x11/xfce4-terminal/PLIST index 0970b1de753..edc457bd09b 100644 --- a/x11/xfce4-terminal/PLIST +++ b/x11/xfce4-terminal/PLIST @@ -1,184 +1,90 @@ -@comment $NetBSD: PLIST,v 1.6 2009/11/29 22:16:34 snj Exp $ -bin/Terminal -bin/terminal -libexec/TerminalHelp -man/man1/Terminal.1 -share/Terminal/Terminal-toolbars.ui -share/Terminal/Terminal.glade -share/applications/Terminal.desktop -share/doc/Terminal/C/advanced.html -share/doc/Terminal/C/copyright.html -share/doc/Terminal/C/faq.html -share/doc/Terminal/C/getting-started.html -share/doc/Terminal/C/images/terminal-compose-shortcut.png -share/doc/Terminal/C/images/terminal-edit-preferences.png -share/doc/Terminal/C/images/terminal-first-time.png -share/doc/Terminal/C/images/terminal-multiple-tabs.png -share/doc/Terminal/C/images/terminal-preferences-advanced.png -share/doc/Terminal/C/images/terminal-preferences-appearance.png -share/doc/Terminal/C/images/terminal-preferences-colors.png -share/doc/Terminal/C/images/terminal-preferences-general.png -share/doc/Terminal/C/images/terminal-preferences-shortcuts.png -share/doc/Terminal/C/images/terminal-set-title.png -share/doc/Terminal/C/images/terminal-toolbars.png -share/doc/Terminal/C/index.html -share/doc/Terminal/C/preferences.html -share/doc/Terminal/C/support.html -share/doc/Terminal/C/usage.html -share/doc/Terminal/da/advanced.html -share/doc/Terminal/da/copyright.html -share/doc/Terminal/da/faq.html -share/doc/Terminal/da/getting-started.html -share/doc/Terminal/da/images/terminal-compose-shortcut.png -share/doc/Terminal/da/images/terminal-edit-preferences.png -share/doc/Terminal/da/images/terminal-first-time.png -share/doc/Terminal/da/images/terminal-multiple-tabs.png -share/doc/Terminal/da/images/terminal-preferences-advanced.png -share/doc/Terminal/da/images/terminal-preferences-appearance.png -share/doc/Terminal/da/images/terminal-preferences-colors.png -share/doc/Terminal/da/images/terminal-preferences-general.png -share/doc/Terminal/da/images/terminal-preferences-shortcuts.png -share/doc/Terminal/da/images/terminal-set-title.png -share/doc/Terminal/da/images/terminal-toolbars.png -share/doc/Terminal/da/index.html -share/doc/Terminal/da/preferences.html -share/doc/Terminal/da/support.html -share/doc/Terminal/da/usage.html -share/doc/Terminal/fr/advanced.html -share/doc/Terminal/fr/copyright.html -share/doc/Terminal/fr/faq.html -share/doc/Terminal/fr/getting-started.html -share/doc/Terminal/fr/images/terminal-compose-shortcut.png -share/doc/Terminal/fr/images/terminal-edit-preferences.png -share/doc/Terminal/fr/images/terminal-first-time.png -share/doc/Terminal/fr/images/terminal-multiple-tabs.png -share/doc/Terminal/fr/images/terminal-preferences-advanced.png -share/doc/Terminal/fr/images/terminal-preferences-appearance.png -share/doc/Terminal/fr/images/terminal-preferences-colors.png -share/doc/Terminal/fr/images/terminal-preferences-general.png -share/doc/Terminal/fr/images/terminal-preferences-shortcuts.png -share/doc/Terminal/fr/images/terminal-set-title.png -share/doc/Terminal/fr/images/terminal-toolbars.png -share/doc/Terminal/fr/index.html -share/doc/Terminal/fr/preferences.html -share/doc/Terminal/fr/support.html -share/doc/Terminal/fr/usage.html -share/doc/Terminal/gl/advanced.html -share/doc/Terminal/gl/copyright.html -share/doc/Terminal/gl/faq.html -share/doc/Terminal/gl/getting-started.html -share/doc/Terminal/gl/images/terminal-compose-shortcut.png -share/doc/Terminal/gl/images/terminal-edit-preferences.png -share/doc/Terminal/gl/images/terminal-first-time.png -share/doc/Terminal/gl/images/terminal-multiple-tabs.png -share/doc/Terminal/gl/images/terminal-preferences-advanced.png -share/doc/Terminal/gl/images/terminal-preferences-appearance.png -share/doc/Terminal/gl/images/terminal-preferences-colors.png -share/doc/Terminal/gl/images/terminal-preferences-general.png -share/doc/Terminal/gl/images/terminal-preferences-shortcuts.png -share/doc/Terminal/gl/images/terminal-set-title.png -share/doc/Terminal/gl/images/terminal-toolbars.png -share/doc/Terminal/gl/index.html -share/doc/Terminal/gl/preferences.html -share/doc/Terminal/gl/support.html -share/doc/Terminal/gl/usage.html -share/doc/Terminal/id/advanced.html -share/doc/Terminal/id/copyright.html -share/doc/Terminal/id/faq.html -share/doc/Terminal/id/getting-started.html -share/doc/Terminal/id/images/terminal-compose-shortcut.png -share/doc/Terminal/id/images/terminal-edit-preferences.png -share/doc/Terminal/id/images/terminal-first-time.png -share/doc/Terminal/id/images/terminal-multiple-tabs.png -share/doc/Terminal/id/images/terminal-preferences-advanced.png -share/doc/Terminal/id/images/terminal-preferences-appearance.png -share/doc/Terminal/id/images/terminal-preferences-colors.png -share/doc/Terminal/id/images/terminal-preferences-general.png -share/doc/Terminal/id/images/terminal-preferences-shortcuts.png -share/doc/Terminal/id/images/terminal-set-title.png -share/doc/Terminal/id/images/terminal-toolbars.png -share/doc/Terminal/id/index.html -share/doc/Terminal/id/preferences.html -share/doc/Terminal/id/support.html -share/doc/Terminal/id/usage.html -share/doc/Terminal/ja/advanced.html -share/doc/Terminal/ja/copyright.html -share/doc/Terminal/ja/faq.html -share/doc/Terminal/ja/getting-started.html -share/doc/Terminal/ja/images/terminal-compose-shortcut.png -share/doc/Terminal/ja/images/terminal-edit-preferences.png -share/doc/Terminal/ja/images/terminal-first-time.png -share/doc/Terminal/ja/images/terminal-multiple-tabs.png -share/doc/Terminal/ja/images/terminal-preferences-advanced.png -share/doc/Terminal/ja/images/terminal-preferences-appearance.png -share/doc/Terminal/ja/images/terminal-preferences-colors.png -share/doc/Terminal/ja/images/terminal-preferences-general.png -share/doc/Terminal/ja/images/terminal-preferences-shortcuts.png -share/doc/Terminal/ja/images/terminal-set-title.png -share/doc/Terminal/ja/images/terminal-toolbars.png -share/doc/Terminal/ja/index.html -share/doc/Terminal/ja/preferences.html -share/doc/Terminal/ja/support.html -share/doc/Terminal/ja/usage.html -share/doc/Terminal/terminal.css -share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png -share/icons/hicolor/16x16/stock/navigation/stock_terminal-closewindow.png -share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png -share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png -share/icons/hicolor/16x16/stock/navigation/stock_terminal-reportbug.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-closetab.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-closewindow.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-newtab.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png -share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png -share/icons/hicolor/48x48/apps/Terminal.png -share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png -share/icons/hicolor/scalable/apps/Terminal.svg -share/locale/ar/LC_MESSAGES/Terminal.mo -share/locale/ast/LC_MESSAGES/Terminal.mo -share/locale/be/LC_MESSAGES/Terminal.mo -share/locale/ca/LC_MESSAGES/Terminal.mo -share/locale/cs/LC_MESSAGES/Terminal.mo -share/locale/da/LC_MESSAGES/Terminal.mo -share/locale/de/LC_MESSAGES/Terminal.mo -share/locale/dz/LC_MESSAGES/Terminal.mo -share/locale/el/LC_MESSAGES/Terminal.mo -share/locale/en_GB/LC_MESSAGES/Terminal.mo -share/locale/eo/LC_MESSAGES/Terminal.mo -share/locale/es/LC_MESSAGES/Terminal.mo -share/locale/et/LC_MESSAGES/Terminal.mo -share/locale/eu/LC_MESSAGES/Terminal.mo -share/locale/fi/LC_MESSAGES/Terminal.mo -share/locale/fr/LC_MESSAGES/Terminal.mo -share/locale/gl/LC_MESSAGES/Terminal.mo -share/locale/he/LC_MESSAGES/Terminal.mo -share/locale/hu/LC_MESSAGES/Terminal.mo -share/locale/id/LC_MESSAGES/Terminal.mo -share/locale/it/LC_MESSAGES/Terminal.mo -share/locale/ja/LC_MESSAGES/Terminal.mo -share/locale/kk/LC_MESSAGES/Terminal.mo -share/locale/ko/LC_MESSAGES/Terminal.mo -share/locale/ku/LC_MESSAGES/Terminal.mo -share/locale/lt/LC_MESSAGES/Terminal.mo -share/locale/lv/LC_MESSAGES/Terminal.mo -share/locale/nb/LC_MESSAGES/Terminal.mo -share/locale/nl/LC_MESSAGES/Terminal.mo -share/locale/pa/LC_MESSAGES/Terminal.mo -share/locale/pl/LC_MESSAGES/Terminal.mo -share/locale/pt/LC_MESSAGES/Terminal.mo -share/locale/pt_BR/LC_MESSAGES/Terminal.mo -share/locale/ro/LC_MESSAGES/Terminal.mo -share/locale/ru/LC_MESSAGES/Terminal.mo -share/locale/sk/LC_MESSAGES/Terminal.mo -share/locale/sq/LC_MESSAGES/Terminal.mo -share/locale/sv/LC_MESSAGES/Terminal.mo -share/locale/tr/LC_MESSAGES/Terminal.mo -share/locale/uk/LC_MESSAGES/Terminal.mo -share/locale/ur/LC_MESSAGES/Terminal.mo -share/locale/ur_PK/LC_MESSAGES/Terminal.mo -share/locale/vi/LC_MESSAGES/Terminal.mo -share/locale/zh_CN/LC_MESSAGES/Terminal.mo -share/locale/zh_TW/LC_MESSAGES/Terminal.mo -share/pixmaps/terminal.xpm +@comment $NetBSD: PLIST,v 1.7 2015/04/21 08:56:45 jperkin Exp $ +bin/xfce4-terminal +man/ar/man1/xfce4-terminal.1 +man/ca/man1/xfce4-terminal.1 +man/da/man1/xfce4-terminal.1 +man/de/man1/xfce4-terminal.1 +man/el/man1/xfce4-terminal.1 +man/es/man1/xfce4-terminal.1 +man/fr/man1/xfce4-terminal.1 +man/gl/man1/xfce4-terminal.1 +man/id/man1/xfce4-terminal.1 +man/it/man1/xfce4-terminal.1 +man/ja/man1/xfce4-terminal.1 +man/ko/man1/xfce4-terminal.1 +man/lt/man1/xfce4-terminal.1 +man/man1/xfce4-terminal.1 +man/pl/man1/xfce4-terminal.1 +man/pt/man1/xfce4-terminal.1 +man/pt_BR/man1/xfce4-terminal.1 +man/ru/man1/xfce4-terminal.1 +man/sr/man1/xfce4-terminal.1 +man/sv/man1/xfce4-terminal.1 +man/tr/man1/xfce4-terminal.1 +man/ug/man1/xfce4-terminal.1 +man/uk/man1/xfce4-terminal.1 +man/zh_CN/man1/xfce4-terminal.1 +share/applications/xfce4-terminal.desktop +share/gnome-control-center/default-apps/xfce4-terminal-default-apps.xml +share/locale/ar/LC_MESSAGES/xfce4-terminal.mo +share/locale/ast/LC_MESSAGES/xfce4-terminal.mo +share/locale/be/LC_MESSAGES/xfce4-terminal.mo +share/locale/bg/LC_MESSAGES/xfce4-terminal.mo +share/locale/ca/LC_MESSAGES/xfce4-terminal.mo +share/locale/cs/LC_MESSAGES/xfce4-terminal.mo +share/locale/da/LC_MESSAGES/xfce4-terminal.mo +share/locale/de/LC_MESSAGES/xfce4-terminal.mo +share/locale/el/LC_MESSAGES/xfce4-terminal.mo +share/locale/en_AU/LC_MESSAGES/xfce4-terminal.mo +share/locale/en_GB/LC_MESSAGES/xfce4-terminal.mo +share/locale/eo/LC_MESSAGES/xfce4-terminal.mo +share/locale/es/LC_MESSAGES/xfce4-terminal.mo +share/locale/et/LC_MESSAGES/xfce4-terminal.mo +share/locale/eu/LC_MESSAGES/xfce4-terminal.mo +share/locale/fi/LC_MESSAGES/xfce4-terminal.mo +share/locale/fr/LC_MESSAGES/xfce4-terminal.mo +share/locale/gl/LC_MESSAGES/xfce4-terminal.mo +share/locale/he/LC_MESSAGES/xfce4-terminal.mo +share/locale/hr/LC_MESSAGES/xfce4-terminal.mo +share/locale/hu/LC_MESSAGES/xfce4-terminal.mo +share/locale/id/LC_MESSAGES/xfce4-terminal.mo +share/locale/is/LC_MESSAGES/xfce4-terminal.mo +share/locale/it/LC_MESSAGES/xfce4-terminal.mo +share/locale/ja/LC_MESSAGES/xfce4-terminal.mo +share/locale/kk/LC_MESSAGES/xfce4-terminal.mo +share/locale/ko/LC_MESSAGES/xfce4-terminal.mo +share/locale/lt/LC_MESSAGES/xfce4-terminal.mo +share/locale/lv/LC_MESSAGES/xfce4-terminal.mo +share/locale/nb/LC_MESSAGES/xfce4-terminal.mo +share/locale/nl/LC_MESSAGES/xfce4-terminal.mo +share/locale/oc/LC_MESSAGES/xfce4-terminal.mo +share/locale/pa/LC_MESSAGES/xfce4-terminal.mo +share/locale/pl/LC_MESSAGES/xfce4-terminal.mo +share/locale/pt/LC_MESSAGES/xfce4-terminal.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-terminal.mo +share/locale/ro/LC_MESSAGES/xfce4-terminal.mo +share/locale/ru/LC_MESSAGES/xfce4-terminal.mo +share/locale/si/LC_MESSAGES/xfce4-terminal.mo +share/locale/sk/LC_MESSAGES/xfce4-terminal.mo +share/locale/sq/LC_MESSAGES/xfce4-terminal.mo +share/locale/sr/LC_MESSAGES/xfce4-terminal.mo +share/locale/sv/LC_MESSAGES/xfce4-terminal.mo +share/locale/te/LC_MESSAGES/xfce4-terminal.mo +share/locale/th/LC_MESSAGES/xfce4-terminal.mo +share/locale/tr/LC_MESSAGES/xfce4-terminal.mo +share/locale/ug/LC_MESSAGES/xfce4-terminal.mo +share/locale/uk/LC_MESSAGES/xfce4-terminal.mo +share/locale/ur/LC_MESSAGES/xfce4-terminal.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-terminal.mo +share/locale/vi/LC_MESSAGES/xfce4-terminal.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-terminal.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-terminal.mo +share/xfce4/terminal/colorschemes/black-on-white.theme +share/xfce4/terminal/colorschemes/dark-pastels.theme +share/xfce4/terminal/colorschemes/green-on-black.theme +share/xfce4/terminal/colorschemes/solarized-dark.theme +share/xfce4/terminal/colorschemes/solarized-light.theme +share/xfce4/terminal/colorschemes/tango.theme +share/xfce4/terminal/colorschemes/white-on-black.theme +share/xfce4/terminal/colorschemes/xterm.theme +share/xfce4/terminal/terminal-preferences.ui diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk deleted file mode 100644 index 6af90d16431..00000000000 --- a/x11/xfce4-terminal/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/09/16 01:15:36 reed Exp $ - -BUILDLINK_TREE+= xfce4-terminal - -.if !defined(XFCE4_TERMINAL_BUILDLINK3_MK) -XFCE4_TERMINAL_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.10 -BUILDLINK_PKGSRCDIR.xfce4-terminal?= ../../x11/xfce4-terminal - -.endif # XFCE4_TERMINAL_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-terminal diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo index ba9d679c269..a0875d79842 100644 --- a/x11/xfce4-terminal/distinfo +++ b/x11/xfce4-terminal/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2013/01/08 01:23:19 marino Exp $ +$NetBSD: distinfo,v 1.8 2015/04/21 08:56:45 jperkin Exp $ -SHA1 (Terminal-0.4.2.tar.bz2) = bf4510e331284d7f68ba193fe1d6f2e57b7815bb -RMD160 (Terminal-0.4.2.tar.bz2) = 8e6364673d6b0d8eddfd59f3f82d3944fca45684 -Size (Terminal-0.4.2.tar.bz2) = 1981158 bytes -SHA1 (patch-terminal_terminal-screen.c) = dcfa62798ea47e26ed65df031c09991f24d4fa7c +SHA1 (xfce4-terminal-0.6.3.tar.bz2) = 4dd4d2bef8101f563487b0230346070930ff689f +RMD160 (xfce4-terminal-0.6.3.tar.bz2) = 2d369f99c4eb45b19c5348e5520d14c43160a9f6 +Size (xfce4-terminal-0.6.3.tar.bz2) = 815207 bytes diff --git a/x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c b/x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c deleted file mode 100644 index 98868ba7c00..00000000000 --- a/x11/xfce4-terminal/patches/patch-terminal_terminal-screen.c +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-terminal_terminal-screen.c,v 1.1 2013/01/08 01:23:19 marino Exp $ - -Fix for 100% CPU usage on XFce4 Terminal (Dave Tyson) -PR# pkg/45448 -PR# pkg/46926 - ---- terminal/terminal-screen.c.orig 2009-10-06 15:07:01.000000000 +0000 -+++ terminal/terminal-screen.c -@@ -87,6 +87,7 @@ static gboolean terminal_screen_get_ch - GError **error); - static gchar **terminal_screen_get_child_environment (TerminalScreen *screen); - static void terminal_screen_update_background (TerminalScreen *screen); -+static void terminal_screen_update_background_fast (TerminalScreen *screen); - static void terminal_screen_update_binding_backspace (TerminalScreen *screen); - static void terminal_screen_update_binding_delete (TerminalScreen *screen); - static void terminal_screen_update_colors (TerminalScreen *screen); -@@ -132,6 +133,8 @@ struct _TerminalScreen - GtkWidget *scrollbar; - GtkWidget *tab_label; - -+ gulong background_signal_id; -+ - GPid pid; - gchar *working_directory; - -@@ -231,7 +234,6 @@ terminal_screen_init (TerminalScreen *sc - "signal::context-menu", G_CALLBACK (terminal_screen_vte_get_context_menu), screen, - "signal::selection-changed", G_CALLBACK (terminal_screen_vte_selection_changed), screen, - "signal::window-title-changed", G_CALLBACK (terminal_screen_vte_window_title_changed), screen, -- "swapped-signal::size-allocate", G_CALLBACK (terminal_screen_timer_background), screen, - "swapped-signal::style-set", G_CALLBACK (terminal_screen_update_colors), screen, - NULL); - gtk_box_pack_start (GTK_BOX (screen), screen->terminal, TRUE, TRUE, 0); -@@ -573,6 +575,18 @@ terminal_screen_get_child_environment (T - - - static void -+terminal_screen_update_background_fast (TerminalScreen *screen) -+{ -+ if (G_UNLIKELY (screen->background_timer_id == 0)) -+ { -+ screen->background_timer_id = g_idle_add_full (G_PRIORITY_LOW, terminal_screen_timer_background, -+ screen, terminal_screen_timer_background_destroy); -+ } -+} -+ -+ -+ -+static void - terminal_screen_update_background (TerminalScreen *screen) - { - if (G_UNLIKELY (screen->background_timer_id != 0)) -@@ -1015,9 +1029,25 @@ terminal_screen_timer_background (gpoint - if (G_LIKELY (image != NULL)) - g_object_unref (G_OBJECT (image)); - g_object_unref (G_OBJECT (loader)); -+ -+ /* refresh background on size changes */ -+ if (screen->background_signal_id == 0) -+ { -+ screen->background_signal_id = -+ g_signal_connect_swapped (G_OBJECT (screen->terminal), "size-allocate", -+ G_CALLBACK (terminal_screen_update_background_fast), screen); -+ } - } - else - { -+ /* stop updating on size changes */ -+ if (screen->background_signal_id != 0) -+ { -+ g_signal_handler_disconnect (G_OBJECT (screen->terminal), screen->background_signal_id); -+ screen->background_signal_id = 0; -+ } -+ -+ /* WARNING: the causes a resize too! */ - vte_terminal_set_background_image (VTE_TERMINAL (screen->terminal), NULL); - } - diff --git a/x11/xfce4-tumbler/DESCR b/x11/xfce4-tumbler/DESCR new file mode 100644 index 00000000000..ff8f4d2d8eb --- /dev/null +++ b/x11/xfce4-tumbler/DESCR @@ -0,0 +1,11 @@ +Tumbler is a D-Bus service for applications to request thumbnails for +various URI schemes and MIME types. It is an implementation of the +thumbnail management D-Bus specification described on +http://live.gnome.org/ThumbnailerSpec written in an object-oriented +fashion using GLib and GObject. Its modular architecture makes it very +flexible and useful in many situations. It provides plugin interfaces +for extending the URI schemes and MIME types for which thumbnails can be +generated as well as for replacing the storage backend that is used to +store the thumbnails on disk. Tumbler's functionality can also be +extended via specialized thumbnailer services implemented in accordance +to the thumbnail management D-Bus specification. diff --git a/x11/xfce4-tumbler/Makefile b/x11/xfce4-tumbler/Makefile new file mode 100644 index 00000000000..44468d7b9af --- /dev/null +++ b/x11/xfce4-tumbler/Makefile @@ -0,0 +1,47 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:45 jperkin Exp $ +# +# + +.include "../../meta-pkgs/xfce4/Makefile.common" + +VERSION= 0.1.31 +DISTNAME= tumbler-${VERSION} +PKGNAME= xfce4-tumbler-${VERSION} +CATEGORIES= x11 +MASTER_SITES= http://archive.xfce.org/src/xfce/tumbler/0.1/ + +HOMEPAGE= http://docs.xfce.org/xfce/thunar/tumbler +COMMENT= D-Bus thumbnailing service + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config + +CONFIGURE_ARGS = --disable-raw-thumbnailer \ + --disable-gstreamer-thumbnailer + +PKGCONFIG_OVERRIDE+= tumbler/tumbler-1.pc.in + +EGDIR= ${XFCE4_EGBASE} +PKG_SYSCONFSUBDIR= xdg + +MAKE_DIRS+= ${PKG_SYSCONFDIR}/tumbler + +CONF_FILES= ${EGDIR}/tumbler.rc \ + ${PKG_SYSCONFDIR}/tumbler/tumbler.rc + +INSTALL_UNSTRIPPED= yes +CFLAGS+= -g + +.include "options.mk" + +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/openjpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/gdk-pixbuf2/buildlink3.mk" +.include "../../multimedia/ffmpeg1/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-tumbler/PLIST b/x11/xfce4-tumbler/PLIST new file mode 100644 index 00000000000..da2861e4ce3 --- /dev/null +++ b/x11/xfce4-tumbler/PLIST @@ -0,0 +1,112 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:45 jperkin Exp $ +include/tumbler-1/tumbler/tumbler-abstract-thumbnailer.h +include/tumbler-1/tumbler/tumbler-cache-plugin.h +include/tumbler-1/tumbler/tumbler-cache.h +include/tumbler-1/tumbler/tumbler-config.h +include/tumbler-1/tumbler/tumbler-enum-types.h +include/tumbler-1/tumbler/tumbler-error.h +include/tumbler-1/tumbler/tumbler-file-info.h +include/tumbler-1/tumbler/tumbler-glib-extensions.h +include/tumbler-1/tumbler/tumbler-marshal.h +include/tumbler-1/tumbler/tumbler-provider-factory.h +include/tumbler-1/tumbler/tumbler-provider-plugin.h +include/tumbler-1/tumbler/tumbler-thumbnail-flavor.h +include/tumbler-1/tumbler/tumbler-thumbnail.h +include/tumbler-1/tumbler/tumbler-thumbnailer-provider.h +include/tumbler-1/tumbler/tumbler-thumbnailer.h +include/tumbler-1/tumbler/tumbler-util.h +include/tumbler-1/tumbler/tumbler.h +lib/libtumbler-1.la +lib/pkgconfig/tumbler-1.pc +lib/tumbler-1/plugins/cache/tumbler-cache-plugin.so +lib/tumbler-1/plugins/cache/tumbler-xdg-cache.la +lib/tumbler-1/plugins/tumbler-cover-thumbnailer.la +lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.la +lib/tumbler-1/plugins/tumbler-font-thumbnailer.la +lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.la +lib/tumbler-1/plugins/tumbler-odf-thumbnailer.la +lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.la +lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.la +lib/tumbler-1/tumblerd +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 +share/examples/xfce4/tumbler.rc +share/gtk-doc/html/tumbler/TumblerAbstractThumbnailer.html +share/gtk-doc/html/tumbler/TumblerCache.html +share/gtk-doc/html/tumbler/TumblerThumbnail.html +share/gtk-doc/html/tumbler/TumblerThumbnailerProvider.html +share/gtk-doc/html/tumbler/api-index-full.html +share/gtk-doc/html/tumbler/extension-api.html +share/gtk-doc/html/tumbler/extension-tutorial.html +share/gtk-doc/html/tumbler/home.png +share/gtk-doc/html/tumbler/index.html +share/gtk-doc/html/tumbler/index.sgml +share/gtk-doc/html/tumbler/left-insensitive.png +share/gtk-doc/html/tumbler/left.png +share/gtk-doc/html/tumbler/miscellaneous.html +share/gtk-doc/html/tumbler/object-tree.html +share/gtk-doc/html/tumbler/pt01.html +share/gtk-doc/html/tumbler/right-insensitive.png +share/gtk-doc/html/tumbler/right.png +share/gtk-doc/html/tumbler/style.css +share/gtk-doc/html/tumbler/thumbnails.html +share/gtk-doc/html/tumbler/tumbler-Error-Domain-and-Types.html +share/gtk-doc/html/tumbler/tumbler-Various-Enumeration-Types.html +share/gtk-doc/html/tumbler/tumbler-Version-Information-and-Compatibility-Checks.html +share/gtk-doc/html/tumbler/tumbler-tumbler-file-info.html +share/gtk-doc/html/tumbler/tumbler-tumbler-provider-factory.html +share/gtk-doc/html/tumbler/tumbler-tumbler-provider-plugin.html +share/gtk-doc/html/tumbler/tumbler.devhelp2 +share/gtk-doc/html/tumbler/up-insensitive.png +share/gtk-doc/html/tumbler/up.png +share/locale/ar/LC_MESSAGES/tumbler.mo +share/locale/ast/LC_MESSAGES/tumbler.mo +share/locale/bg/LC_MESSAGES/tumbler.mo +share/locale/bn/LC_MESSAGES/tumbler.mo +share/locale/ca/LC_MESSAGES/tumbler.mo +share/locale/cs/LC_MESSAGES/tumbler.mo +share/locale/da/LC_MESSAGES/tumbler.mo +share/locale/de/LC_MESSAGES/tumbler.mo +share/locale/el/LC_MESSAGES/tumbler.mo +share/locale/en_AU/LC_MESSAGES/tumbler.mo +share/locale/en_GB/LC_MESSAGES/tumbler.mo +share/locale/es/LC_MESSAGES/tumbler.mo +share/locale/eu/LC_MESSAGES/tumbler.mo +share/locale/fi/LC_MESSAGES/tumbler.mo +share/locale/fr/LC_MESSAGES/tumbler.mo +share/locale/gl/LC_MESSAGES/tumbler.mo +share/locale/he/LC_MESSAGES/tumbler.mo +share/locale/hr/LC_MESSAGES/tumbler.mo +share/locale/hu/LC_MESSAGES/tumbler.mo +share/locale/id/LC_MESSAGES/tumbler.mo +share/locale/is/LC_MESSAGES/tumbler.mo +share/locale/it/LC_MESSAGES/tumbler.mo +share/locale/ja/LC_MESSAGES/tumbler.mo +share/locale/kk/LC_MESSAGES/tumbler.mo +share/locale/ko/LC_MESSAGES/tumbler.mo +share/locale/lt/LC_MESSAGES/tumbler.mo +share/locale/lv/LC_MESSAGES/tumbler.mo +share/locale/ms/LC_MESSAGES/tumbler.mo +share/locale/nb/LC_MESSAGES/tumbler.mo +share/locale/nl/LC_MESSAGES/tumbler.mo +share/locale/nn/LC_MESSAGES/tumbler.mo +share/locale/oc/LC_MESSAGES/tumbler.mo +share/locale/pa/LC_MESSAGES/tumbler.mo +share/locale/pl/LC_MESSAGES/tumbler.mo +share/locale/pt/LC_MESSAGES/tumbler.mo +share/locale/pt_BR/LC_MESSAGES/tumbler.mo +share/locale/ro/LC_MESSAGES/tumbler.mo +share/locale/ru/LC_MESSAGES/tumbler.mo +share/locale/si/LC_MESSAGES/tumbler.mo +share/locale/sk/LC_MESSAGES/tumbler.mo +share/locale/sr/LC_MESSAGES/tumbler.mo +share/locale/sv/LC_MESSAGES/tumbler.mo +share/locale/te/LC_MESSAGES/tumbler.mo +share/locale/th/LC_MESSAGES/tumbler.mo +share/locale/tr/LC_MESSAGES/tumbler.mo +share/locale/ug/LC_MESSAGES/tumbler.mo +share/locale/uk/LC_MESSAGES/tumbler.mo +share/locale/zh_CN/LC_MESSAGES/tumbler.mo +share/locale/zh_HK/LC_MESSAGES/tumbler.mo +share/locale/zh_TW/LC_MESSAGES/tumbler.mo diff --git a/x11/xfce4-tumbler/distinfo b/x11/xfce4-tumbler/distinfo new file mode 100644 index 00000000000..8b3a3c45bc5 --- /dev/null +++ b/x11/xfce4-tumbler/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +SHA1 (tumbler-0.1.31.tar.bz2) = cba7b81f8269f30dd6412d133767b6044c470f2c +RMD160 (tumbler-0.1.31.tar.bz2) = 35dc77a7e2834b57a93425e869549280d15ee4f8 +Size (tumbler-0.1.31.tar.bz2) = 550650 bytes +SHA1 (patch-tumblerd_Makefile.in) = 0e8b939381a7bbd38603a7bd79c2ddedeb33f6a7 diff --git a/x11/xfce4-tumbler/options.mk b/x11/xfce4-tumbler/options.mk new file mode 100644 index 00000000000..c2d54b54deb --- /dev/null +++ b/x11/xfce4-tumbler/options.mk @@ -0,0 +1,26 @@ +# $NetBSD: options.mk,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.tumbler +PKG_SUPPORTED_OPTIONS= jpeg ffmpegthumbnailer pdf odf +PKG_SUGGESTED_OPTIONS= jpeg ffmpegthumbnailer pdf odf + +PLIST_VARS+= jpeg ffmpegthumbnailer pdf odf + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mjpeg) +.include "../../mk/jpeg.buildlink3.mk" +PLIST.jpeg= yes +.endif +.if !empty(PKG_OPTIONS:Mffmpegthumbnailer) +.include "../../multimedia/ffmpegthumbnailer/buildlink3.mk" +PLIST.ffmpegthumbnailer= yes +.endif +.if !empty(PKG_OPTIONS:Mpdf) +.include "../../print/poppler-glib/buildlink3.mk" +PLIST.pdf= yes +.endif +.if !empty(PKG_OPTIONS:Modf) +.include "../../devel/libgsf/buildlink3.mk" +PLIST.odf= yes +.endif diff --git a/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in b/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in new file mode 100644 index 00000000000..dd3e2e6961d --- /dev/null +++ b/x11/xfce4-tumbler/patches/patch-tumblerd_Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-tumblerd_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Adjust config path +--- tumblerd/Makefile.in.orig 2013-01-12 11:14:34.000000000 +0000 ++++ tumblerd/Makefile.in +@@ -471,7 +471,7 @@ service_in_files = \ + org.xfce.Tumbler.Thumbnailer1.service.in + + service_DATA = $(service_in_files:.service.in=.service) +-confdir = $(sysconfdir)/xdg/tumbler ++confdir = $(datadir)/examples/xfce4 + conf_DATA = \ + tumbler.rc + diff --git a/x11/xfce4-utils/DESCR b/x11/xfce4-utils/DESCR deleted file mode 100644 index e258135e72b..00000000000 --- a/x11/xfce4-utils/DESCR +++ /dev/null @@ -1 +0,0 @@ -Utilities for Xfce. diff --git a/x11/xfce4-utils/MESSAGE b/x11/xfce4-utils/MESSAGE deleted file mode 100644 index 08929999385..00000000000 --- a/x11/xfce4-utils/MESSAGE +++ /dev/null @@ -1,11 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2007/04/12 09:55:26 martti Exp $ - -You may want to install one of these packages: - - xscreensaver - xlockmore - xlockmore-lite - -Otherwise you might be unable to lock your screen. -=========================================================================== diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile deleted file mode 100644 index 760c3524532..00000000000 --- a/x11/xfce4-utils/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: Makefile,v 1.58 2014/05/29 23:38:20 wiz Exp $ - -.include "../../meta-pkgs/xfce4/Makefile.common" - -DISTNAME= xfce-utils-${XFCE4_VERSION} -PKGNAME= xfce4-utils-${XFCE4_VERSION} -PKGREVISION= 23 -CATEGORIES= x11 -COMMENT= Xfce utilities - -DEPENDS+= p5-XML-Parser>=2.36:../../textproc/p5-XML-Parser - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} -CONFIGURE_ARGS+= --with-xsession-prefix=${PREFIX} - -BUILD_DEFS+= PKG_SYSCONFBASE -USE_TOOLS+= xinit:run - -PKG_SYSCONFSUBDIR= xdg -EGDIR= ${XFCE4_EGBASE} - -MAKE_DIRS+= ${PREFIX}/libexec/xfce4 ${EGDIR} ${EGDIR}/autostart -MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images -MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/it -MAKE_DIRS+= ${PREFIX}/share/xsessions - -CONF_FILES= ${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xfce4/xinitrc -CONF_FILES+= ${EGDIR}/autostart/xfconf-migration-4.6.desktop \ - ${PKG_SYSCONFDIR}/autostart/xfconf-migration-4.6.desktop - -.include "options.mk" - -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST deleted file mode 100644 index 2563d39250a..00000000000 --- a/x11/xfce4-utils/PLIST +++ /dev/null @@ -1,111 +0,0 @@ -@comment $NetBSD: PLIST,v 1.19 2009/09/16 01:15:36 reed Exp $ -bin/startxfce4 -bin/xfbrowser4 -bin/xfce4-about -bin/xfhelp4 -bin/xflock4 -bin/xfmountdev4 -bin/xfrun4 -bin/xfterm4 -libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl -share/dbus-1/services/org.xfce.RunDialog.service -share/examples/xfce4/Xft.xrdb -share/examples/xfce4/autostart/xfconf-migration-4.6.desktop -share/examples/xfce4/xinitrc -share/icons/hicolor/48x48/apps/xfce4-logo.png -share/locale/af/LC_MESSAGES/xfce-utils.mo -share/locale/am/LC_MESSAGES/xfce-utils.mo -share/locale/ar/LC_MESSAGES/xfce-utils.mo -share/locale/az/LC_MESSAGES/xfce-utils.mo -share/locale/be/LC_MESSAGES/xfce-utils.mo -share/locale/bg/LC_MESSAGES/xfce-utils.mo -share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo -share/locale/ca/LC_MESSAGES/xfce-utils.mo -share/locale/cs/LC_MESSAGES/xfce-utils.mo -share/locale/da/LC_MESSAGES/xfce-utils.mo -share/locale/de/LC_MESSAGES/xfce-utils.mo -share/locale/dz/LC_MESSAGES/xfce-utils.mo -share/locale/el/LC_MESSAGES/xfce-utils.mo -share/locale/en_GB/LC_MESSAGES/xfce-utils.mo -share/locale/eo/LC_MESSAGES/xfce-utils.mo -share/locale/es/LC_MESSAGES/xfce-utils.mo -share/locale/es_MX/LC_MESSAGES/xfce-utils.mo -share/locale/et/LC_MESSAGES/xfce-utils.mo -share/locale/eu/LC_MESSAGES/xfce-utils.mo -share/locale/fa/LC_MESSAGES/xfce-utils.mo -share/locale/fi/LC_MESSAGES/xfce-utils.mo -share/locale/fr/LC_MESSAGES/xfce-utils.mo -share/locale/gl/LC_MESSAGES/xfce-utils.mo -share/locale/gu/LC_MESSAGES/xfce-utils.mo -share/locale/he/LC_MESSAGES/xfce-utils.mo -share/locale/hi/LC_MESSAGES/xfce-utils.mo -share/locale/hu/LC_MESSAGES/xfce-utils.mo -share/locale/hy/LC_MESSAGES/xfce-utils.mo -share/locale/id/LC_MESSAGES/xfce-utils.mo -share/locale/it/LC_MESSAGES/xfce-utils.mo -share/locale/ja/LC_MESSAGES/xfce-utils.mo -share/locale/ka/LC_MESSAGES/xfce-utils.mo -share/locale/ko/LC_MESSAGES/xfce-utils.mo -share/locale/ku/LC_MESSAGES/xfce-utils.mo -share/locale/lt/LC_MESSAGES/xfce-utils.mo -share/locale/lv/LC_MESSAGES/xfce-utils.mo -share/locale/mk/LC_MESSAGES/xfce-utils.mo -share/locale/mr/LC_MESSAGES/xfce-utils.mo -share/locale/ms/LC_MESSAGES/xfce-utils.mo -share/locale/nb/LC_MESSAGES/xfce-utils.mo -share/locale/nl/LC_MESSAGES/xfce-utils.mo -share/locale/pa/LC_MESSAGES/xfce-utils.mo -share/locale/pl/LC_MESSAGES/xfce-utils.mo -share/locale/pt/LC_MESSAGES/xfce-utils.mo -share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo -share/locale/ro/LC_MESSAGES/xfce-utils.mo -share/locale/ru/LC_MESSAGES/xfce-utils.mo -share/locale/si/LC_MESSAGES/xfce-utils.mo -share/locale/sk/LC_MESSAGES/xfce-utils.mo -share/locale/sq/LC_MESSAGES/xfce-utils.mo -share/locale/sv/LC_MESSAGES/xfce-utils.mo -share/locale/ta/LC_MESSAGES/xfce-utils.mo -share/locale/tr/LC_MESSAGES/xfce-utils.mo -share/locale/uk/LC_MESSAGES/xfce-utils.mo -share/locale/ur/LC_MESSAGES/xfce-utils.mo -share/locale/vi/LC_MESSAGES/xfce-utils.mo -share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo -share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo -share/xfce4/AUTHORS -share/xfce4/BSD -share/xfce4/COPYING -share/xfce4/GPL -share/xfce4/INFO -share/xfce4/INFO.ca -share/xfce4/INFO.de -share/xfce4/INFO.es -share/xfce4/INFO.fi -share/xfce4/INFO.fr -share/xfce4/INFO.it -share/xfce4/INFO.ja -share/xfce4/INFO.ru -share/xfce4/INFO.uk -share/xfce4/INFO.vi -share/xfce4/LGPL -share/xfce4/doc/C/BSD.html -share/xfce4/doc/C/GPL.html -share/xfce4/doc/C/LGPL.html -share/xfce4/doc/C/images/about-dialog.png -share/xfce4/doc/C/images/default-session.png -share/xfce4/doc/C/images/link_xfce.jpg -share/xfce4/doc/C/images/run-dialog.png -share/xfce4/doc/C/images/taskbar_settings.png -share/xfce4/doc/C/index.html -share/xfce4/doc/C/xfce-utils.html -share/xfce4/doc/C/xfce4-components.html -share/xfce4/doc/C/xfce4-copyright.html -share/xfce4/doc/C/xfce4-install.html -share/xfce4/doc/C/xfce4-intro.html -share/xfce4/doc/C/xfce4-use.html -share/xfce4/doc/C/xfce4-user-guide.html -share/xfce4/doc/fr/index.html -share/xfce4/doc/it/index.html -share/xfce4/doc/xfce-chunk.css -share/xfce4/doc/xfce-mouse.png -share/xfce4/doc/xfce.css -share/xsessions/xfce.desktop diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk deleted file mode 100644 index 52a0601f0c1..00000000000 --- a/x11/xfce4-utils/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.28 2009/09/16 01:15:36 reed Exp $ - -BUILDLINK_TREE+= xfce4-utils - -.if !defined(XFCE4_UTILS_BUILDLINK3_MK) -XFCE4_UTILS_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.6.0 -BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils - -.endif # XFCE4_UTILS_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-utils diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo deleted file mode 100644 index dc319a11a57..00000000000 --- a/x11/xfce4-utils/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.20 2009/09/16 01:15:36 reed Exp $ - -SHA1 (xfce-utils-4.6.1.tar.bz2) = 0bdb5b6e494f15372d8c0826ac93baca476c9f16 -RMD160 (xfce-utils-4.6.1.tar.bz2) = 4446c3882716e841c00e398df62b9d54046b9d26 -Size (xfce-utils-4.6.1.tar.bz2) = 614143 bytes -SHA1 (patch-aa) = 0bcfc2173ddb61d8ee04260fb99d57cd7f0704ba diff --git a/x11/xfce4-utils/options.mk b/x11/xfce4-utils/options.mk deleted file mode 100644 index f44475048a5..00000000000 --- a/x11/xfce4-utils/options.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2005/08/31 15:23:09 hira Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-utils -PKG_SUPPORTED_OPTIONS= dbh -PKG_SUGGESTED_OPTIONS= dbh - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mdbh) -CONFIGURE_ARGS+= --enable-dbh -.else -CONFIGURE_ARGS+= --disable-dbh -.endif diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa deleted file mode 100644 index 221c9fa330d..00000000000 --- a/x11/xfce4-utils/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2009/09/16 01:15:36 reed Exp $ - ---- scripts/Makefile.in.orig 2009-02-25 22:27:44.000000000 +0000 -+++ scripts/Makefile.in -@@ -268,7 +268,7 @@ edit = sed \ - -e "s,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g" \ - -e "s,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g" - --conffilesdir = @sysconfdir@/xdg/xfce4 -+conffilesdir = @datadir@/examples/xfce4 - conffiles_DATA = \ - xinitrc \ - Xft.xrdb -@@ -276,7 +276,7 @@ conffiles_DATA = \ - @XFCONF_MIGRATION_TRUE@migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration - @XFCONF_MIGRATION_TRUE@migrationscript_in_files = xfconf-migration-4.6.pl.in - @XFCONF_MIGRATION_TRUE@migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl) --@XFCONF_MIGRATION_TRUE@autostartdir = $(sysconfdir)/xdg/autostart -+@XFCONF_MIGRATION_TRUE@autostartdir = $(datadir)/examples/xfce4/autostart - @XFCONF_MIGRATION_TRUE@autostart_in_files = xfconf-migration-4.6.desktop.in - @XFCONF_MIGRATION_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) - EXTRA_DIST = \ diff --git a/x11/xfce4-whiskermenu-plugin/DESCR b/x11/xfce4-whiskermenu-plugin/DESCR new file mode 100644 index 00000000000..310cef9117f --- /dev/null +++ b/x11/xfce4-whiskermenu-plugin/DESCR @@ -0,0 +1,7 @@ +Whisker Menu is an alternate application launcher for Xfce. +When you open it you are shown a list of applications you +have marked as favorites. You can browse through all of your +installed applications by clicking on the category buttons on +the side. Top level categories make browsing fast, and simple +to switch between. Additionally, Whisker Menu keeps a list of +the last ten applications that you launched from it. diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile new file mode 100644 index 00000000000..7bc8f9daf52 --- /dev/null +++ b/x11/xfce4-whiskermenu-plugin/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1 2015/04/21 08:56:46 jperkin Exp $ + +DISTNAME= xfce4-whiskermenu-plugin-1.5.0 +CATEGORIES= x11 +MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/1.5/ +EXTRACT_SUFX= .tar.bz2 +LICENSE= gnu-gpl-v2 + +MAINTAINER= youri.mout@gmail.com +HOMEPAGE= http://gottcode.org/xfce4-whiskermenu-plugin/ +COMMENT= Alternate application launcher for Xfce + +USE_CMAKE= yes +USE_LANGUAGES= c c++ +USE_TOOLS+= gmake pkg-config msgfmt perl intltool + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" +BUILDLINK_TRANSFORM+= rm:-Wl,-O1 +BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed +.endif + +.include "../../x11/xfce4-garcon/buildlink3.mk" +.include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../x11/xfce4-exo/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-whiskermenu-plugin/PLIST b/x11/xfce4-whiskermenu-plugin/PLIST new file mode 100644 index 00000000000..02065b863b0 --- /dev/null +++ b/x11/xfce4-whiskermenu-plugin/PLIST @@ -0,0 +1,58 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/21 08:56:46 jperkin Exp $ +bin/xfce4-popup-whiskermenu +lib/xfce4/panel/plugins/libwhiskermenu.so +man/man1/xfce4-popup-whiskermenu.1 +share/icons/hicolor/128x128/apps/xfce4-whiskermenu.png +share/icons/hicolor/16x16/apps/xfce4-whiskermenu.png +share/icons/hicolor/22x22/apps/xfce4-whiskermenu.png +share/icons/hicolor/24x24/apps/xfce4-whiskermenu.png +share/icons/hicolor/256x256/apps/xfce4-whiskermenu.png +share/icons/hicolor/32x32/apps/xfce4-whiskermenu.png +share/icons/hicolor/48x48/apps/xfce4-whiskermenu.png +share/icons/hicolor/64x64/apps/xfce4-whiskermenu.png +share/icons/hicolor/scalable/apps/xfce4-whiskermenu.svg +share/locale/ar/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ast/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ca/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/da/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/el/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/en_GB/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/es/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/et/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/fa/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/fi/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/fr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/he/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/id/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/it/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/kk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/lv/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/nb/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ne/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/pl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/pt/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ro/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/ru/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/sk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/sl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/sr@latin/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/sv/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/tr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/uk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/uz/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/vi/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/zh_CN/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-whiskermenu-plugin.mo +share/xfce4/panel/plugins/whiskermenu.desktop diff --git a/x11/xfce4-whiskermenu-plugin/distinfo b/x11/xfce4-whiskermenu-plugin/distinfo new file mode 100644 index 00000000000..562a1edb6b5 --- /dev/null +++ b/x11/xfce4-whiskermenu-plugin/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2015/04/21 08:56:46 jperkin Exp $ + +SHA1 (xfce4-whiskermenu-plugin-1.5.0.tar.bz2) = 16d5231e2b4712bda93989e76abc7a8a363d1366 +RMD160 (xfce4-whiskermenu-plugin-1.5.0.tar.bz2) = 54b036fa821bccc041bdcf63ee25293e52eb00d4 +Size (xfce4-whiskermenu-plugin-1.5.0.tar.bz2) = 145549 bytes |