pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Import Cinnamon 3.8.2 in wip:
Module Name: pkgsrc-wip
Committed By: Youri Mouton <youri%NetBSD.org@localhost>
Pushed By: youri
Date: Thu Jun 21 11:34:40 2018 +0200
Changeset: f73d706b373c2ddcd7a4fc07004d244086925187
Modified Files:
cinnamon-desktop/Makefile
cinnamon-desktop/PLIST
cinnamon-desktop/buildlink3.mk
cinnamon-desktop/distinfo
cinnamon-menus/Makefile
cinnamon-menus/PLIST
cinnamon-menus/distinfo
cinnamon-settings-daemon/Makefile
cinnamon-settings-daemon/PLIST
cinnamon-settings-daemon/buildlink3.mk
cinnamon-settings-daemon/distinfo
cjs/Makefile
cjs/PLIST
cjs/buildlink3.mk
cjs/distinfo
nemo/DESCR
nemo/Makefile
nemo/PLIST
nemo/distinfo
Added Files:
cinnamon-control-center/DESCR
cinnamon-control-center/Makefile
cinnamon-control-center/PLIST
cinnamon-control-center/buildlink3.mk
cinnamon-control-center/distinfo
cinnamon-control-center/patches/patch-shell_Makefile.am
cinnamon-desktop/patches/patch-libcinnamon-desktop_cdesktop-enums.h
cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
cinnamon-screensaver/DESCR
cinnamon-screensaver/Makefile
cinnamon-screensaver/PLIST
cinnamon-screensaver/buildlink3.mk
cinnamon-screensaver/distinfo
cinnamon-screensaver/files/cinnamon-screensaver.pam
cinnamon-screensaver/patches/patch-files_Makefile.in
cinnamon-session/DESCR
cinnamon-session/Makefile
cinnamon-session/PLIST
cinnamon-session/buildlink3.mk
cinnamon-session/distinfo
cinnamon-session/patches/patch-cinnamon-session_csm-manager.c
cinnamon-session/patches/patch-meson.build
cinnamon-settings-daemon/patches/patch-configure.ac
cinnamon-settings-daemon/patches/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
cinnamon-settings-daemon/patches/patch-files_Makefile.in
cinnamon-settings-daemon/patches/patch-plugins_Makefile.am
cinnamon-settings-daemon/patches/patch-plugins_background_csd-background-manager.c
cinnamon-settings-daemon/patches/patch-plugins_power_csd-power-manager.c
cinnamon/DESCR
cinnamon/Makefile
cinnamon/PLIST
cinnamon/distinfo
cinnamon/files/desktop.rules
cinnamon/patches/patch-configure.ac
cinnamon/patches/patch-data_org.cinnamon.gschema.xml.in
cinnamon/patches/patch-files_Makefile.in
cinnamon/patches/patch-files_usr_share_cinnamon-session_sessions_cinnamon.session
cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__backgrounds.py
cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
cinnamon/patches/patch-src_Makefile.am
muffin/DESCR
muffin/Makefile
muffin/PLIST
muffin/buildlink3.mk
muffin/distinfo
nemo/buildlink3.mk
nemo/patches/patch-files_Makefile.in
py-pam/DESCR
py-pam/Makefile
py-pam/PLIST
py-pam/distinfo
py-xapp/DESCR
py-xapp/Makefile
py-xapp/PLIST
py-xapp/distinfo
system-config-printer/DESCR
system-config-printer/Makefile
system-config-printer/PLIST
system-config-printer/distinfo
system-config-printer/patches/patch-configure.ac
xapps/DESCR
xapps/Makefile
xapps/PLIST
xapps/buildlink3.mk
xapps/distinfo
xapps/patches/patch-files_meson.build
xapps/patches/patch-pygobject_meson.build
Removed Files:
cinnamon-desktop/options.mk
cinnamon-desktop/patches/patch-files_Makefile.am
cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am
cinnamon-menus/options.mk
cinnamon-nemo/DESCR
cinnamon-nemo/Makefile
cinnamon-nemo/PLIST
cinnamon-nemo/buildlink3.mk
cinnamon-nemo/distinfo
cinnamon-nemo/patches/patch-files_Makefile.in
cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.c
cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.h
cinnamon-nemo/patches/patch-src_nemo-action-config-widget.c
cinnamon-nemo/patches/patch-src_nemo-application.c
cinnamon-nemo/patches/patch-src_nemo-desktop-icon-view.c
cinnamon-nemo/patches/patch-src_nemo-file-management-properties.c
cinnamon-nemo/patches/patch-src_nemo-icon-view.c
cinnamon-nemo/patches/patch-src_nemo-places-sidebar.c
cinnamon-nemo/patches/patch-src_nemo-view.c
nemo/patches/patch-aa
nemo/patches/patch-ab
nemo/patches/patch-ac
Log Message:
Import Cinnamon 3.8.2 in wip:
Issues / Bugs:
- xapps and cinnamon-desktop still sometimes fail to build (g-ir issue)
- users need to be in wheel to have a graphically accelerated desktop
- the ntp utility to use network time isn't supported on netbsd yet
- the gvfs package needs the hal option (until gvfs is updated)
- building the Cinnamon packages requires gtk-doc which depends on
boost,
in the future, pre-configured tarballs will be made available on TNF
servers
- a reinstall of databases/shared-mime-info is required after installing
Cinnamon
- No support for translations, network, bluetooth, media-keys,
automount, tablet
- The login screen / screensaver takes a long time to log-in unless a
control or alt key is pressed, weird
- Caribou, the on-screen keyboard works but spews a lot of warning
messages
How to run:
Once you've installed cinnamon, run it with:
$ XDG_SESSION_DESKTOP=cinnamon exec ck-launch-session dbus-launch \
--exit-with-session cinnamon-session
To have the ability to shutdown/reboot from Cinnamon, the user has to be
in the operator group.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f73d706b373c2ddcd7a4fc07004d244086925187
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cinnamon-control-center/DESCR | 1 +
cinnamon-control-center/Makefile | 62 ++
cinnamon-control-center/PLIST | 204 ++++++
cinnamon-control-center/buildlink3.mk | 14 +
cinnamon-control-center/distinfo | 7 +
.../patches/patch-shell_Makefile.am | 15 +
cinnamon-desktop/Makefile | 39 +-
cinnamon-desktop/PLIST | 22 +-
cinnamon-desktop/buildlink3.mk | 2 +-
cinnamon-desktop/distinfo | 12 +-
cinnamon-desktop/options.mk | 18 -
cinnamon-desktop/patches/patch-files_Makefile.am | 14 -
.../patches/patch-libcinnamon-desktop_Makefile.am | 16 -
.../patch-libcinnamon-desktop_cdesktop-enums.h | 126 ++++
..._org.cinnamon.desktop.session.gschema.xml.in.in | 21 +
cinnamon-menus/Makefile | 20 +-
cinnamon-menus/PLIST | 4 +-
cinnamon-menus/distinfo | 8 +-
cinnamon-menus/options.mk | 18 -
cinnamon-nemo/DESCR | 1 -
cinnamon-nemo/Makefile | 38 --
cinnamon-nemo/PLIST | 79 ---
cinnamon-nemo/buildlink3.mk | 17 -
cinnamon-nemo/distinfo | 16 -
cinnamon-nemo/patches/patch-files_Makefile.in | 14 -
...patch-libnemo-private_nemo-global-preferences.c | 25 -
...patch-libnemo-private_nemo-global-preferences.h | 40 --
.../patches/patch-src_nemo-action-config-widget.c | 12 -
cinnamon-nemo/patches/patch-src_nemo-application.c | 16 -
.../patches/patch-src_nemo-desktop-icon-view.c | 14 -
.../patch-src_nemo-file-management-properties.c | 15 -
cinnamon-nemo/patches/patch-src_nemo-icon-view.c | 13 -
.../patches/patch-src_nemo-places-sidebar.c | 14 -
cinnamon-nemo/patches/patch-src_nemo-view.c | 13 -
cinnamon-screensaver/DESCR | 1 +
cinnamon-screensaver/Makefile | 70 ++
cinnamon-screensaver/PLIST | 175 +++++
cinnamon-screensaver/buildlink3.mk | 13 +
cinnamon-screensaver/distinfo | 7 +
.../files/cinnamon-screensaver.pam | 18 +
.../patches/patch-files_Makefile.in | 16 +
cinnamon-session/DESCR | 1 +
cinnamon-session/Makefile | 37 ++
cinnamon-session/PLIST | 17 +
cinnamon-session/buildlink3.mk | 13 +
cinnamon-session/distinfo | 8 +
.../patches/patch-cinnamon-session_csm-manager.c | 22 +
cinnamon-session/patches/patch-meson.build | 15 +
cinnamon-settings-daemon/Makefile | 77 ++-
cinnamon-settings-daemon/PLIST | 288 ++++----
cinnamon-settings-daemon/buildlink3.mk | 13 -
cinnamon-settings-daemon/distinfo | 14 +-
.../patches/patch-configure.ac | 15 +
...settings-daemon.plugins.power.gschema.xml.in.in | 15 +
.../patches/patch-files_Makefile.in | 16 +
.../patches/patch-plugins_Makefile.am | 14 +
...tch-plugins_background_csd-background-manager.c | 26 +
.../patch-plugins_power_csd-power-manager.c | 42 ++
cinnamon/DESCR | 6 +
cinnamon/Makefile | 131 ++++
cinnamon/PLIST | 723 +++++++++++++++++++++
cinnamon/distinfo | 14 +
cinnamon/files/desktop.rules | 95 +++
cinnamon/patches/patch-configure.ac | 15 +
.../patches/patch-data_org.cinnamon.gschema.xml.in | 24 +
cinnamon/patches/patch-files_Makefile.in | 19 +
...hare_cinnamon-session_sessions_cinnamon.session | 14 +
...namon-settings-users_cinnamon-settings-users.py | 125 ++++
...on_cinnamon-settings_modules_cs__backgrounds.py | 15 +
..._cinnamon_cinnamon-settings_modules_cs__info.py | 53 ++
cinnamon/patches/patch-src_Makefile.am | 15 +
cjs/Makefile | 23 +-
cjs/PLIST | 29 +-
cjs/buildlink3.mk | 7 +-
cjs/distinfo | 8 +-
muffin/DESCR | 1 +
muffin/Makefile | 36 +
muffin/PLIST | 170 +++++
muffin/buildlink3.mk | 13 +
muffin/distinfo | 6 +
nemo/DESCR | 9 +-
nemo/Makefile | 71 +-
nemo/PLIST | 123 +++-
nemo/buildlink3.mk | 13 +
nemo/distinfo | 12 +-
nemo/patches/patch-aa | 13 -
nemo/patches/patch-ab | 10 -
nemo/patches/patch-ac | 9 -
nemo/patches/patch-files_Makefile.in | 15 +
py-pam/DESCR | 1 +
py-pam/Makefile | 19 +
py-pam/PLIST | 8 +
py-pam/distinfo | 6 +
py-xapp/DESCR | 1 +
py-xapp/Makefile | 25 +
py-xapp/PLIST | 8 +
py-xapp/distinfo | 6 +
system-config-printer/DESCR | 1 +
system-config-printer/Makefile | 39 ++
system-config-printer/PLIST | 173 +++++
system-config-printer/distinfo | 7 +
system-config-printer/patches/patch-configure.ac | 21 +
xapps/DESCR | 1 +
xapps/Makefile | 44 ++
xapps/PLIST | 37 ++
xapps/buildlink3.mk | 13 +
xapps/distinfo | 8 +
xapps/patches/patch-files_meson.build | 19 +
xapps/patches/patch-pygobject_meson.build | 15 +
109 files changed, 3405 insertions(+), 747 deletions(-)
diffs:
diff --git a/cinnamon-control-center/DESCR b/cinnamon-control-center/DESCR
new file mode 100644
index 0000000000..ddc428e3dd
--- /dev/null
+++ b/cinnamon-control-center/DESCR
@@ -0,0 +1 @@
+Replacement of the GNOME 3 control center for the Cinnamon User Interface.
diff --git a/cinnamon-control-center/Makefile b/cinnamon-control-center/Makefile
new file mode 100644
index 0000000000..937b10474f
--- /dev/null
+++ b/cinnamon-control-center/Makefile
@@ -0,0 +1,62 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= cinnamon-control-center-3.8.0
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cinnamon-control-center
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/cinnamon-control-center
+COMMENT= Cinnamon control-center
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
+
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
+USE_TOOLS+= gmake pkg-config automake intltool msgfmt
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-networkmanager \
+ --disable-onlineaccounts \
+ --disable-modemmanager \
+ --disable-wacom # needs libgudev
+
+PKG_SYSCONFSUBDIR= xdg
+MAKE_DIRS= ${PKG_SYSCONFDIR}/menus
+
+CONF_FILES= share/examples/menus/cinnamoncc.menu \
+ ${PKG_SYSCONFDIR}/menus/cinnamoncc.menu
+
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+
+#DEPENDS+= cheese-[0-9]*:../../graphics/cheese
+
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../security/polkit/buildlink3.mk"
+.include "../../security/mate-polkit/buildlink3.mk"
+#.include "../../net/gnome-online-accounts/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../textproc/libcroco/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../graphics/colord/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+
+.include "../../wip/cinnamon-desktop/buildlink3.mk"
+.include "../../wip/cjs/buildlink3.mk"
+.include "../../wip/cinnamon-menus/buildlink3.mk"
+.include "../../wip/cinnamon-settings-daemon/buildlink3.mk"
+.include "../../wip/xapps/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-control-center/PLIST b/cinnamon-control-center/PLIST
new file mode 100644
index 0000000000..73d63281f7
--- /dev/null
+++ b/cinnamon-control-center/PLIST
@@ -0,0 +1,204 @@
+@comment $NetBSD$
+bin/cinnamon-control-center
+include/cinnamon-control-center-1/libcinnamon-control-center/cc-editable-entry.h
+include/cinnamon-control-center-1/libcinnamon-control-center/cc-panel.h
+include/cinnamon-control-center-1/libcinnamon-control-center/cc-shell.h
+lib/cinnamon-control-center-1/panels/libcolor.la
+lib/cinnamon-control-center-1/panels/libdate_time.la
+lib/cinnamon-control-center-1/panels/libdisplay.la
+lib/cinnamon-control-center-1/panels/libregion.la
+lib/libcinnamon-control-center.la
+lib/pkgconfig/libcinnamon-control-center.pc
+share/applications/cinnamon-color-panel.desktop
+share/applications/cinnamon-control-center.desktop
+share/applications/cinnamon-display-panel.desktop
+share/applications/cinnamon-region-panel.desktop
+share/cinnamon-control-center/datetime/backward
+share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
+share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
+share/cinnamon-control-center/ui/cinnamon-region-panel.ui
+share/cinnamon-control-center/ui/color.ui
+share/cinnamon-control-center/ui/datetime/bg.png
+share/cinnamon-control-center/ui/datetime/bg_dim.png
+share/cinnamon-control-center/ui/datetime/cc.png
+share/cinnamon-control-center/ui/datetime/datetime.ui
+share/cinnamon-control-center/ui/datetime/pin.png
+share/cinnamon-control-center/ui/datetime/timezone_-1.png
+share/cinnamon-control-center/ui/datetime/timezone_-10.png
+share/cinnamon-control-center/ui/datetime/timezone_-10_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-11.png
+share/cinnamon-control-center/ui/datetime/timezone_-11_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-1_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-2.png
+share/cinnamon-control-center/ui/datetime/timezone_-2_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-3.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-3.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-3.png
+share/cinnamon-control-center/ui/datetime/timezone_-3_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-4.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-4.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-4.png
+share/cinnamon-control-center/ui/datetime/timezone_-4_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-5.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-5.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-5.png
+share/cinnamon-control-center/ui/datetime/timezone_-5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-6.png
+share/cinnamon-control-center/ui/datetime/timezone_-6_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-7.png
+share/cinnamon-control-center/ui/datetime/timezone_-7_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-8.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-8.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-8.png
+share/cinnamon-control-center/ui/datetime/timezone_-8_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-9.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-9.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-9.png
+share/cinnamon-control-center/ui/datetime/timezone_-9_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_0.png
+share/cinnamon-control-center/ui/datetime/timezone_0_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_1.png
+share/cinnamon-control-center/ui/datetime/timezone_10.5.png
+share/cinnamon-control-center/ui/datetime/timezone_10.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_10.png
+share/cinnamon-control-center/ui/datetime/timezone_10_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_11.5.png
+share/cinnamon-control-center/ui/datetime/timezone_11.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_11.png
+share/cinnamon-control-center/ui/datetime/timezone_11_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_12.75.png
+share/cinnamon-control-center/ui/datetime/timezone_12.75_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_12.png
+share/cinnamon-control-center/ui/datetime/timezone_12_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_13.png
+share/cinnamon-control-center/ui/datetime/timezone_13_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_14.png
+share/cinnamon-control-center/ui/datetime/timezone_14_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_1_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_2.png
+share/cinnamon-control-center/ui/datetime/timezone_2_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_3.5.png
+share/cinnamon-control-center/ui/datetime/timezone_3.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_3.png
+share/cinnamon-control-center/ui/datetime/timezone_3_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_4.5.png
+share/cinnamon-control-center/ui/datetime/timezone_4.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_4.png
+share/cinnamon-control-center/ui/datetime/timezone_4_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_5.5.png
+share/cinnamon-control-center/ui/datetime/timezone_5.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_5.75.png
+share/cinnamon-control-center/ui/datetime/timezone_5.75_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_5.png
+share/cinnamon-control-center/ui/datetime/timezone_5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_6.5.png
+share/cinnamon-control-center/ui/datetime/timezone_6.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_6.png
+share/cinnamon-control-center/ui/datetime/timezone_6_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_7.png
+share/cinnamon-control-center/ui/datetime/timezone_7_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_8.5.png
+share/cinnamon-control-center/ui/datetime/timezone_8.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_8.75.png
+share/cinnamon-control-center/ui/datetime/timezone_8.75_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_8.png
+share/cinnamon-control-center/ui/datetime/timezone_8_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_9.5.png
+share/cinnamon-control-center/ui/datetime/timezone_9.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_9.png
+share/cinnamon-control-center/ui/datetime/timezone_9_dim.png
+share/cinnamon-control-center/ui/display-capplet.ui
+share/cinnamon-control-center/ui/language-chooser.ui
+share/cinnamon-control-center/ui/shell.ui
+share/desktop-directories/cinnamoncc.directory
+share/examples/menus/cinnamoncc.menu
+share/icons/hicolor/16x16/apps/cinnamon-preferences-color.png
+share/icons/hicolor/16x16/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/16x16/apps/cinnamon-preferences-system-time.png
+share/icons/hicolor/22x22/apps/cinnamon-preferences-color.png
+share/icons/hicolor/22x22/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/22x22/apps/cinnamon-preferences-system-time.png
+share/icons/hicolor/24x24/apps/cinnamon-preferences-color.png
+share/icons/hicolor/24x24/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/256x256/apps/cinnamon-preferences-color.png
+share/icons/hicolor/256x256/apps/cinnamon-preferences-system-time.png
+share/icons/hicolor/32x32/apps/cinnamon-preferences-color.png
+share/icons/hicolor/32x32/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/32x32/apps/cinnamon-preferences-system-time.png
+share/icons/hicolor/48x48/apps/cinnamon-preferences-color.png
+share/icons/hicolor/48x48/apps/cinnamon-preferences-system-time.png
+share/icons/hicolor/64x64/apps/cinnamon-preferences-color.png
+share/icons/hicolor/scalable/apps/cinnamon-preferences-color.svg
+share/icons/hicolor/scalable/apps/cinnamon-preferences-desktop-display.svg
+share/icons/hicolor/scalable/apps/cinnamon-preferences-system-time.svg
+share/locale/am/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ar/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/as/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ast/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bg/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bn/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bs/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ca/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/cs/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/cy/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/da/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/de/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/el/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/es/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/et/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/fa/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/fi/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/fr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/gl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/gu/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/he/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/hi/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/hr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/hu/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/id/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ilo/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/is/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/it/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ja/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ka/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/kn/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ko/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ku/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/lo/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/lt/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/lv/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/mai/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/mk/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ml/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/mr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ms/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nb/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nds/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nn/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/or/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pa/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pt/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ro/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ru/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/si/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sk/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sq/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sv/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ta/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/te/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/tr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/uk/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ur/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/vi/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/polkit-1/actions/org.cinnamon.controlcenter.datetime.policy
+share/polkit-1/rules.d/cinnamon-control-center.rules
diff --git a/cinnamon-control-center/buildlink3.mk b/cinnamon-control-center/buildlink3.mk
new file mode 100644
index 0000000000..b06c3320f3
--- /dev/null
+++ b/cinnamon-control-center/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+BUILDLINK_TREE+= cinnamon-control-center
+
+.if !defined(CINNAMON_CONTROL_CENTER_BUILDLINK3_MK)
+CINNAMON_CONTROL_CENTER_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cinnamon-control-center+= cinnamon-control-center>=2.2.0
+BUILDLINK_PKGSRCDIR.cinnamon-control-center?= ../../wip/cinnamon-control-center
+
+.include "../../devel/glib2/buildlink3.mk"
+.endif # CINNAMON_CONTROL_CENTER_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -cinnamon-control-center
diff --git a/cinnamon-control-center/distinfo b/cinnamon-control-center/distinfo
new file mode 100644
index 0000000000..0f2ac13246
--- /dev/null
+++ b/cinnamon-control-center/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+SHA1 (cinnamon-control-center-3.8.0.tar.gz) = 4aba81086412b6d642b48f91f5f97ff695d7debf
+RMD160 (cinnamon-control-center-3.8.0.tar.gz) = 2a41dc017318a35c4ec2dee0e858b72e1a5d8745
+SHA512 (cinnamon-control-center-3.8.0.tar.gz) = 76f85a3d17fb91d5f0d14c784b4a3c5798e9cc74f22990737684808d1e43c6c8cd6e42ca5dcadb4788dc365f7c06dcc945aa13be2a9ecd1c6cbc8ddac550f5e1
+Size (cinnamon-control-center-3.8.0.tar.gz) = 3870700 bytes
+SHA1 (patch-shell_Makefile.am) = 53c367bb2ff2a10d7963f9faf648a84bfe067443
diff --git a/cinnamon-control-center/patches/patch-shell_Makefile.am b/cinnamon-control-center/patches/patch-shell_Makefile.am
new file mode 100644
index 0000000000..23e00018b2
--- /dev/null
+++ b/cinnamon-control-center/patches/patch-shell_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adapt for CONF_FILES.
+
+--- shell/Makefile.am.orig 2018-04-17 11:44:10.000000000 +0000
++++ shell/Makefile.am
+@@ -79,7 +79,7 @@ AM_CPPFLAGS += \
+ -DMENUDIR="\"$(menudir)\"" \
+ -DPANELS_DIR="\"$(PANELS_DIR)\""
+
+-menudir = $(sysconfdir)/xdg/menus
++menudir = $(datadir)/examples/menus
+ menu_DATA = cinnamoncc.menu
+
+ cinnamoncc.menu: cinnamoncc.menu.in
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index fa54d8a60d..d5eb2d5bc0 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -1,40 +1,45 @@
# $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
-DISTNAME= 3.0.2
-PKGNAME= cinnamon-desktop-3.0.2
+DISTNAME= cinnamon-desktop-3.8.1
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/cinnamon-desktop/archive/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cinnamon-desktop
+GITHUB_TAG= ${PKGVERSION_NOREV}
-MAINTAINER= pkgsrc.gnome%gmail.com@localhost
+
+MAINTAINER= youri%NetBSD.org@localhost
HOMEPAGE= https://github.com/linuxmint/cinnamon-desktop
COMMENT= Additional UI API for cinnamon
LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+#USE_LIBTOOL= yes
+#GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config automake autoreconf intltool msgfmt
-BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
+REPLACE_PYTHON= install-scripts/meson_install_schemas.py \
+ files/usr/bin/cinnamon-desktop-migrate-mediakeys
PKGCONFIG_OVERRIDE+= libcinnamon-desktop/cinnamon-desktop.pc.in
-pre-configure:
- cd ${WRKSRC} && ${SH} ./autogen.sh
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
-
-.include "options.mk"
+.include "../../devel/py-meson/build.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../lang/python/application.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
-.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-desktop/PLIST b/cinnamon-desktop/PLIST
index 97c1d87a72..cd7cfcaec9 100644
--- a/cinnamon-desktop/PLIST
+++ b/cinnamon-desktop/PLIST
@@ -1,4 +1,5 @@
@comment $NetBSD$
+bin/cinnamon-desktop-migrate-mediakeys
include/cinnamon-desktop/libcinnamon-desktop/cdesktop-enums.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h
@@ -19,17 +20,20 @@ include/cinnamon-desktop/libcvc/gvc-mixer-source-output.h
include/cinnamon-desktop/libcvc/gvc-mixer-source.h
include/cinnamon-desktop/libcvc/gvc-mixer-stream.h
include/cinnamon-desktop/libcvc/gvc-mixer-ui-device.h
-${PLIST.introspection}lib/girepository-1.0/CDesktopEnums-3.0.typelib
-${PLIST.introspection}lib/girepository-1.0/CinnamonDesktop-3.0.typelib
-${PLIST.introspection}lib/girepository-1.0/Cvc-1.0.typelib
-lib/libcinnamon-desktop.la
-lib/libcvc.la
+lib/girepository-1.0/CDesktopEnums-3.0.typelib
+lib/girepository-1.0/CinnamonDesktop-3.0.typelib
+lib/girepository-1.0/Cvc-1.0.typelib
+lib/libcinnamon-desktop.so
+lib/libcinnamon-desktop.so.4
+lib/libcinnamon-desktop.so.4.0.0
+lib/libcvc.so
+lib/libcvc.so.0
+lib/libcvc.so.0.0.0
lib/pkgconfig/cinnamon-desktop.pc
lib/pkgconfig/cvc.pc
-libexec/cinnamon-rr-debug
-${PLIST.introspection}share/gir-1.0/CDesktopEnums-3.0.gir
-${PLIST.introspection}share/gir-1.0/CinnamonDesktop-3.0.gir
-${PLIST.introspection}share/gir-1.0/Cvc-1.0.gir
+share/gir-1.0/CDesktopEnums-3.0.gir
+share/gir-1.0/CinnamonDesktop-3.0.gir
+share/gir-1.0/Cvc-1.0.gir
share/glib-2.0/schemas/org.cinnamon.desktop.a11y.applications.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.a11y.keyboard.gschema.xml
share/glib-2.0/schemas/org.cinnamon.desktop.a11y.magnifier.gschema.xml
diff --git a/cinnamon-desktop/buildlink3.mk b/cinnamon-desktop/buildlink3.mk
index 408dfd4f0c..bd1d83ff41 100644
--- a/cinnamon-desktop/buildlink3.mk
+++ b/cinnamon-desktop/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= cinnamon-desktop
.if !defined(CINNAMON_DESKTOP_BUILDLINK3_MK)
CINNAMON_DESKTOP_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.cinnamon-desktop+= cinnamon-desktop>=3.0.2
+BUILDLINK_API_DEPENDS.cinnamon-desktop+= cinnamon-desktop>=3.6.1
BUILDLINK_PKGSRCDIR.cinnamon-desktop?= ../../wip/cinnamon-desktop
.include "../../x11/gtk3/buildlink3.mk"
diff --git a/cinnamon-desktop/distinfo b/cinnamon-desktop/distinfo
index 92803c424b..a92071f2b5 100644
--- a/cinnamon-desktop/distinfo
+++ b/cinnamon-desktop/distinfo
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
-SHA1 (3.0.2.tar.gz) = a79595448e846eae28df5cfc8a98daac0c6239f9
-RMD160 (3.0.2.tar.gz) = e999e426269ac985dcb5b389893186b5b59a17a4
-SHA512 (3.0.2.tar.gz) = 0adcc7bd9f9dace245a7d7528893f729947228e4c454e423cdb1d3ac2ae3c04d010226e340d5d9315cc45a84f96f7b0bb173ee1589169ddcfbfadba59e0787a6
-Size (3.0.2.tar.gz) = 577776 bytes
-SHA1 (patch-files_Makefile.am) = 349724eb13da390de2603bcbe2679171a879ee1c
-SHA1 (patch-libcinnamon-desktop_Makefile.am) = 9739ba04d803e41dd0b9ce0aa21e9cbb9634010b
+SHA1 (cinnamon-desktop-3.8.1.tar.gz) = 77de9f9a141de17471f1c7263e51231093407cb3
+RMD160 (cinnamon-desktop-3.8.1.tar.gz) = a4b973e837d403423b01357f51413819435ef6e6
+SHA512 (cinnamon-desktop-3.8.1.tar.gz) = d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
+Size (cinnamon-desktop-3.8.1.tar.gz) = 489295 bytes
+SHA1 (patch-libcinnamon-desktop_cdesktop-enums.h) = de429f814c46e767abc023d2dafada44b90e76e3
+SHA1 (patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in) = 5a7c99cacc2ec7964f07ec762a9e628948b6eeed
diff --git a/cinnamon-desktop/options.mk b/cinnamon-desktop/options.mk
deleted file mode 100644
index 3661a47446..0000000000
--- a/cinnamon-desktop/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cinnamon-desktop
-PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= introspection
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection+= build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-introspection
-PLIST.introspection= yes
-.else
-CONFIGURE_ARGS+= --disable-introspection
-.endif
diff --git a/cinnamon-desktop/patches/patch-files_Makefile.am b/cinnamon-desktop/patches/patch-files_Makefile.am
deleted file mode 100644
index 19727ef566..0000000000
--- a/cinnamon-desktop/patches/patch-files_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-More portable find usage.
-
---- files/Makefile.am.orig 2016-05-20 11:00:41.000000000 +0000
-+++ files/Makefile.am
-@@ -1,5 +1,5 @@
- install-data-hook:
-- find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
-+ find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
-
- uninstall-hook:
-- find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
-+ find . -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am b/cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am
deleted file mode 100644
index 5981eb9cd0..0000000000
--- a/cinnamon-desktop/patches/patch-libcinnamon-desktop_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix build.
-
---- libcinnamon-desktop/Makefile.am.orig 2016-05-20 11:00:41.000000000 +0000
-+++ libcinnamon-desktop/Makefile.am
-@@ -50,8 +50,7 @@ libcinnamon_desktop_la_LIBADD = \
- $(XLIB_LIBS) \
- $(LIBM) \
- $(CINNAMON_DESKTOP_LIBS) \
-- libgsystem.la \
-- -lrt
-+ libgsystem.la
-
- libcinnamon_desktop_la_LDFLAGS = \
- -version-info $(LT_VERSION) \
diff --git a/cinnamon-desktop/patches/patch-libcinnamon-desktop_cdesktop-enums.h b/cinnamon-desktop/patches/patch-libcinnamon-desktop_cdesktop-enums.h
new file mode 100644
index 0000000000..bc6cca757b
--- /dev/null
+++ b/cinnamon-desktop/patches/patch-libcinnamon-desktop_cdesktop-enums.h
@@ -0,0 +1,126 @@
+$NetBSD$
+
+Fix ninja build.
+
+--- libcinnamon-desktop/cdesktop-enums.h.orig 2018-05-18 19:35:15.000000000 +0000
++++ libcinnamon-desktop/cdesktop-enums.h
+@@ -219,64 +219,64 @@ typedef enum
+ } CDesktopMediaKeyType;
+
+ __attribute__((unused)) static const char *media_keys[] = {
+- [C_DESKTOP_MEDIA_KEY_MUTE] = "volume-mute",
+- [C_DESKTOP_MEDIA_KEY_MUTE_QUIET] = "mute-quiet",
+- [C_DESKTOP_MEDIA_KEY_VOLUME_UP] = "volume-up",
+- [C_DESKTOP_MEDIA_KEY_VOLUME_UP_QUIET] = "volume-up-quiet",
+- [C_DESKTOP_MEDIA_KEY_VOLUME_DOWN] = "volume-down",
+- [C_DESKTOP_MEDIA_KEY_VOLUME_DOWN_QUIET] = "volume-down-quiet",
+- [C_DESKTOP_MEDIA_KEY_MIC_MUTE] = "mic-mute",
+- [C_DESKTOP_MEDIA_KEY_EJECT] = "eject",
+- [C_DESKTOP_MEDIA_KEY_MEDIA] = "media",
+- [C_DESKTOP_MEDIA_KEY_SCREENSHOT] = "screenshot",
+- [C_DESKTOP_MEDIA_KEY_WINDOW_SCREENSHOT] = "window-screenshot",
+- [C_DESKTOP_MEDIA_KEY_PLAY] = "play",
+- [C_DESKTOP_MEDIA_KEY_PAUSE] = "pause",
+- [C_DESKTOP_MEDIA_KEY_STOP] = "stop",
+- [C_DESKTOP_MEDIA_KEY_PREVIOUS] = "previous",
+- [C_DESKTOP_MEDIA_KEY_NEXT] = "next",
+- [C_DESKTOP_MEDIA_KEY_REWIND] = "audio-rewind",
+- [C_DESKTOP_MEDIA_KEY_FORWARD] = "audio-forward",
+- [C_DESKTOP_MEDIA_KEY_REPEAT] = "audio-repeat",
+- [C_DESKTOP_MEDIA_KEY_RANDOM] = "audio-random",
+- [C_DESKTOP_MEDIA_KEY_AREA_SCREENSHOT] = "area-screenshot",
+- [C_DESKTOP_MEDIA_KEY_SCREENSHOT_CLIP] = "screenshot-clip",
+- [C_DESKTOP_MEDIA_KEY_WINDOW_SCREENSHOT_CLIP] = "window-screenshot-clip",
+- [C_DESKTOP_MEDIA_KEY_AREA_SCREENSHOT_CLIP] = "area-screenshot-clip",
++ "volume-mute",
++ "mute-quiet",
++ "volume-up",
++ "volume-up-quiet",
++ "volume-down",
++ "volume-down-quiet",
++ "mic-mute",
++ "eject",
++ "media",
++ "screenshot",
++ "window-screenshot",
++ "play",
++ "pause",
++ "stop",
++ "previous",
++ "next",
++ "audio-rewind",
++ "audio-forward",
++ "audio-repeat",
++ "audio-random",
++ "area-screenshot",
++ "screenshot-clip",
++ "window-screenshot-clip",
++ "area-screenshot-clip",
+
+- [C_DESKTOP_MEDIA_KEY_SEPARATOR] = "",
++ "",
+
+- [C_DESKTOP_MEDIA_KEY_TOUCHPAD] = "touchpad-toggle",
+- [C_DESKTOP_MEDIA_KEY_TOUCHPAD_ON] = "touchpad-on",
+- [C_DESKTOP_MEDIA_KEY_TOUCHPAD_OFF] = "touchpad-off",
+- [C_DESKTOP_MEDIA_KEY_LOGOUT] = "logout",
+- [C_DESKTOP_MEDIA_KEY_SHUTDOWN] = "shutdown",
+- [C_DESKTOP_MEDIA_KEY_HOME] = "home",
+- [C_DESKTOP_MEDIA_KEY_CALCULATOR] = "calculator",
+- [C_DESKTOP_MEDIA_KEY_SEARCH] = "search",
+- [C_DESKTOP_MEDIA_KEY_EMAIL] = "email",
+- [C_DESKTOP_MEDIA_KEY_SCREENSAVER] = "screensaver",
+- [C_DESKTOP_MEDIA_KEY_HELP] = "help",
+- [C_DESKTOP_MEDIA_KEY_TERMINAL] = "terminal",
+- [C_DESKTOP_MEDIA_KEY_WWW] = "www",
+- [C_DESKTOP_MEDIA_KEY_VIDEO_OUT] = "video-outputs",
+- [C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO] = "video-rotation",
+- [C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO_LOCK] = "video-rotation-lock",
+- [C_DESKTOP_MEDIA_KEY_SCREENREADER] = "screenreader",
+- [C_DESKTOP_MEDIA_KEY_ON_SCREEN_KEYBOARD] = "on-screen-keyboard",
+- [C_DESKTOP_MEDIA_KEY_INCREASE_TEXT] = "increase-text-size",
+- [C_DESKTOP_MEDIA_KEY_DECREASE_TEXT] = "decrease-text-size",
+- [C_DESKTOP_MEDIA_KEY_TOGGLE_CONTRAST] = "toggle-contrast",
+- [C_DESKTOP_MEDIA_KEY_SUSPEND] = "suspend",
+- [C_DESKTOP_MEDIA_KEY_HIBERNATE] = "hibernate",
+- [C_DESKTOP_MEDIA_KEY_SCREEN_BRIGHTNESS_UP] = "screen-brightness-up",
+- [C_DESKTOP_MEDIA_KEY_SCREEN_BRIGHTNESS_DOWN] = "screen-brightness-down",
+- [C_DESKTOP_MEDIA_KEY_KEYBOARD_BRIGHTNESS_UP] = "kbd-brightness-up",
+- [C_DESKTOP_MEDIA_KEY_KEYBOARD_BRIGHTNESS_DOWN] = "kbd-brightness-down",
+- [C_DESKTOP_MEDIA_KEY_KEYBOARD_BRIGHTNESS_TOGGLE] = "kbd-brightness-toggle",
+- [C_DESKTOP_MEDIA_KEY_BATTERY] = "battery",
++ "touchpad-toggle",
++ "touchpad-on",
++ "touchpad-off",
++ "logout",
++ "shutdown",
++ "home",
++ "calculator",
++ "search",
++ "email",
++ "screensaver",
++ "help",
++ "terminal",
++ "www",
++ "video-outputs",
++ "video-rotation",
++ "video-rotation-lock",
++ "screenreader",
++ "on-screen-keyboard",
++ "increase-text-size",
++ "decrease-text-size",
++ "toggle-contrast",
++ "suspend",
++ "hibernate",
++ "screen-brightness-up",
++ "screen-brightness-down",
++ "kbd-brightness-up",
++ "kbd-brightness-down",
++ "kbd-brightness-toggle",
++ "battery",
+
+- [C_DESKTOP_MEDIA_KEY_LAST] = ""
++ ""
+ };
+
+ #endif /* __CDesktop_enums_h__ */
diff --git a/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in b/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
new file mode 100644
index 0000000000..f5ac870a7a
--- /dev/null
+++ b/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Disable systemd features.
+
+--- schemas/org.cinnamon.desktop.session.gschema.xml.in.in.orig 2018-05-06 14:37:39.000000000 +0000
++++ schemas/org.cinnamon.desktop.session.gschema.xml.in.in
+@@ -12,12 +12,12 @@
+ "gnome" and "gnome-fallback".</description>
+ </key>
+ <key name="session-manager-uses-logind" type="b">
+- <default>true</default>
++ <default>false</default>
+ <_summary>Whether or not cinnamon-session uses logind to suspend/hibernate/shutdown/restart (usually from the shutdown dialog)</_summary>
+ <_description>If true, it uses logind. Otherwise it uses consolekit to shutdown/restart and upower to suspend/hibernate. It is only compatible with upower 0.9 and lower versions (not 0.99 or later).</_description>
+ </key>
+ <key name="settings-daemon-uses-logind" type="b">
+- <default>true</default>
++ <default>false</default>
+ <_summary>Whether or not cinnamon-settings-daemon uses logind to suspend/hibernate/shutdown (either from media-keys or power-manager)</_summary>
+ <_description>If true, it uses logind for all three actions. Otherwise it uses consolekit for shutdown and upower for suspend/hibernate.</_description>
+ </key>
diff --git a/cinnamon-menus/Makefile b/cinnamon-menus/Makefile
index cca64fb96c..7eef784191 100644
--- a/cinnamon-menus/Makefile
+++ b/cinnamon-menus/Makefile
@@ -1,29 +1,27 @@
# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-DISTNAME= 3.0.2
-PKGNAME= cinnamon-menus-3.0.2
+DISTNAME= cinnamon-menus-3.8.1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=/linuxmint/cinnamon-menus/archive/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cinnamon-menus
+GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= youri%NetBSD.org@localhost
HOMEPAGE= https://github.com/linuxmint/cinnamon-menus
COMMENT= Additional UI API for cinnamon
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config automake autoreconf intltool msgfmt
+GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= libmenu/libcinnamon-menu-3.0.pc.in
-pre-configure:
- cd ${WRKSRC} && ${SH} ./autogen.sh
-
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-.include "options.mk"
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-menus/PLIST b/cinnamon-menus/PLIST
index 53e3ffcab6..651abdb39d 100644
--- a/cinnamon-menus/PLIST
+++ b/cinnamon-menus/PLIST
@@ -1,6 +1,6 @@
@comment $NetBSD$
include/cinnamon-menus-3.0/gmenu-tree.h
-${PLIST.introspection}lib/girepository-1.0/CMenu-3.0.typelib
+lib/girepository-1.0/CMenu-3.0.typelib
lib/libcinnamon-menu-3.la
lib/pkgconfig/libcinnamon-menu-3.0.pc
-${PLIST.introspection}share/gir-1.0/CMenu-3.0.gir
+share/gir-1.0/CMenu-3.0.gir
diff --git a/cinnamon-menus/distinfo b/cinnamon-menus/distinfo
index ea3443b1e1..0cb6dcebf3 100644
--- a/cinnamon-menus/distinfo
+++ b/cinnamon-menus/distinfo
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-SHA1 (3.0.2.tar.gz) = feaa56959fc35d9b25c361667bf4524691af3dca
-RMD160 (3.0.2.tar.gz) = bbdaf578535819cef16f2b6cd563bfa55ac56d14
-SHA512 (3.0.2.tar.gz) = a309c10e21be1f5fe7e558017cc0573e7ae421ef860465411190bb071eb42caa8013f52ec71257322ec3dd37de998c78cd9014c4f4daca1edde413db6bed6b7f
-Size (3.0.2.tar.gz) = 211077 bytes
+SHA1 (cinnamon-menus-3.8.1.tar.gz) = 1879f64927747d75a5ac7ca0257ece95a62231a0
+RMD160 (cinnamon-menus-3.8.1.tar.gz) = 5a0d4c609e0cc9990e3d5b3181c5689f04c6c79e
+SHA512 (cinnamon-menus-3.8.1.tar.gz) = 5766dba26f4a4c88ad4475bc8d364e3c648d584a774caf71c11b90bf8d0bd1b4d2ca65f4007ef7f38a03a0ba2d39eeb73ec9222cdef1b03f05604511da4fd439
+Size (cinnamon-menus-3.8.1.tar.gz) = 181134 bytes
diff --git a/cinnamon-menus/options.mk b/cinnamon-menus/options.mk
deleted file mode 100644
index 1fb02838c3..0000000000
--- a/cinnamon-menus/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cinnamon-menus
-PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= introspection
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection+= build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-introspection
-PLIST.introspection= yes
-.else
-CONFIGURE_ARGS+= --disable-introspection
-.endif
diff --git a/cinnamon-nemo/DESCR b/cinnamon-nemo/DESCR
deleted file mode 100644
index b8462a1d25..0000000000
--- a/cinnamon-nemo/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Nemo is the file manager for the Cinnamon desktop environment.
diff --git a/cinnamon-nemo/Makefile b/cinnamon-nemo/Makefile
deleted file mode 100644
index 1d4739dd18..0000000000
--- a/cinnamon-nemo/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-
-DISTNAME= 3.0.6
-PKGNAME= cinnamon-nemo-${DISTNAME}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=/linuxmint/nemo/archive/}
-
-MAINTAINER= youri%NetBSD.org@localhost
-HOMEPAGE= https://github.com/linuxmint/nemo
-COMMENT= File Manager for Cinnamon
-LICENSE= gnu-gpl-v2
-
-WRKSRC= ${WRKDIR}/nemo-${DISTNAME}
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake bash pkg-config automake intltool
-
-SUBST_CLASSES+= python
-SUBST_MESSAGE.python= Fix python shebang
-SUBST_FILES.python= data/merge_action_strings
-SUBST_STAGE.python= pre-install
-SUBST_SED.python+= -e 's|/usr/bin/python2|${PYTHONBIN}|g'
-
-pre-configure:
- ${RUN} cd ${WRKSRC} && ./autogen.sh
-
-DEPENDS+= ${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
-
-.include "../../lang/python/application.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../wip/cinnamon-desktop/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-nemo/PLIST b/cinnamon-nemo/PLIST
deleted file mode 100644
index 000604fff2..0000000000
--- a/cinnamon-nemo/PLIST
+++ /dev/null
@@ -1,79 +0,0 @@
-@comment $NetBSD$
-bin/nemo
-bin/nemo-autorun-software
-bin/nemo-connect-server
-bin/nemo-open-with
-include/nemo/libnemo-extension/nemo-column-provider.h
-include/nemo/libnemo-extension/nemo-column.h
-include/nemo/libnemo-extension/nemo-extension-types.h
-include/nemo/libnemo-extension/nemo-file-info.h
-include/nemo/libnemo-extension/nemo-info-provider.h
-include/nemo/libnemo-extension/nemo-location-widget-provider.h
-include/nemo/libnemo-extension/nemo-menu-item.h
-include/nemo/libnemo-extension/nemo-menu-provider.h
-include/nemo/libnemo-extension/nemo-menu.h
-include/nemo/libnemo-extension/nemo-name-and-desc-provider.h
-include/nemo/libnemo-extension/nemo-property-page-provider.h
-include/nemo/libnemo-extension/nemo-property-page.h
-include/nemo/libnemo-extension/nemo-simple-button.h
-lib/libnemo-extension.la
-lib/pkgconfig/libnemo-extension.pc
-libexec/nemo-convert-metadata
-libexec/nemo-extensions-list
-man/man1/nemo-connect-server.1
-man/man1/nemo.1
-share/applications/nemo-autorun-software.desktop
-share/applications/nemo-autostart.desktop
-share/applications/nemo.desktop
-share/dbus-1/services/org.Nemo.service
-share/dbus-1/services/org.nemo.freedesktop.FileManager1.service
-share/glib-2.0/schemas/org.nemo.gschema.xml
-share/icons/hicolor/16x16/actions/nemo-eject.png
-share/icons/hicolor/16x16/apps/nemo.png
-share/icons/hicolor/22x22/apps/nemo.png
-share/icons/hicolor/24x24/apps/nemo.png
-share/icons/hicolor/32x32/actions/nemo-eject.png
-share/icons/hicolor/32x32/apps/nemo.png
-share/icons/hicolor/48x48/status/progress-0.png
-share/icons/hicolor/48x48/status/progress-10.png
-share/icons/hicolor/48x48/status/progress-100.png
-share/icons/hicolor/48x48/status/progress-20.png
-share/icons/hicolor/48x48/status/progress-30.png
-share/icons/hicolor/48x48/status/progress-40.png
-share/icons/hicolor/48x48/status/progress-50.png
-share/icons/hicolor/48x48/status/progress-60.png
-share/icons/hicolor/48x48/status/progress-70.png
-share/icons/hicolor/48x48/status/progress-80.png
-share/icons/hicolor/48x48/status/progress-90.png
-share/icons/hicolor/scalable/actions/collapse-menu-hover-symbolic.svg
-share/icons/hicolor/scalable/actions/collapse-menu-symbolic.svg
-share/icons/hicolor/scalable/actions/expand-menu-hover-symbolic.svg
-share/icons/hicolor/scalable/actions/expand-menu-symbolic.svg
-share/icons/hicolor/scalable/actions/location-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
-share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
-share/icons/hicolor/scalable/apps/nemo.svg
-share/mime/XMLnamespaces
-share/mime/aliases
-share/mime/application/nemo-action.xml
-share/mime/application/x-gnome-saved-search.xml
-share/mime/generic-icons
-share/mime/globs
-share/mime/globs2
-share/mime/icons
-share/mime/magic
-share/mime/mime.cache
-share/mime/packages/nemo.xml
-share/mime/subclasses
-share/mime/treemagic
-share/mime/types
-share/mime/version
-share/nemo/icons/hicolor/16x16/emblems/emblem-note.png
-share/nemo/icons/hicolor/24x24/emblems/emblem-note.png
-share/nemo/icons/hicolor/48x48/emblems/emblem-note.png
-share/nemo/nemo-extras.placeholder
-share/nemo/nemo-suggested.placeholder
-share/polkit-1/actions/org.nemo.root.policy
diff --git a/cinnamon-nemo/buildlink3.mk b/cinnamon-nemo/buildlink3.mk
deleted file mode 100644
index b65544e51f..0000000000
--- a/cinnamon-nemo/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= cinnamon-nemo
-
-.if !defined(CINNAMON_NEMO_BUILDLINK3_MK)
-CINNAMON_NEMO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cinnamon-nemo+= cinnamon-nemo>=3.0.6
-BUILDLINK_PKGSRCDIR.cinnamon-nemo?= ../../wip/cinnamon-nemo
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../wip/cinnamon-desktop/buildlink3.mk"
-.endif # CINNAMON_NEMO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -cinnamon-nemo
diff --git a/cinnamon-nemo/distinfo b/cinnamon-nemo/distinfo
deleted file mode 100644
index e55007b5ee..0000000000
--- a/cinnamon-nemo/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-
-SHA1 (3.0.6.tar.gz) = 5a56afe3f3b231f753686e6c69aeb24674a73760
-RMD160 (3.0.6.tar.gz) = c3322c9edf93d20393d467aa06e333d6b367c1b2
-SHA512 (3.0.6.tar.gz) = a2741b13dd258c843a2b9096f6b3aca3cb22647e2d5e6b18013857bbbb4e9aceccbc80713365aff0d25faa31727ff86ec4a86dac2dd8a556cb0a6dc3346f7be2
-Size (3.0.6.tar.gz) = 1363302 bytes
-SHA1 (patch-files_Makefile.in) = 08a65f7ecfef2da87121f78abb3a234b5c6585f2
-SHA1 (patch-libnemo-private_nemo-global-preferences.c) = bbd46b896ad02c0dcb01e2c6976565a2cb8d73ea
-SHA1 (patch-libnemo-private_nemo-global-preferences.h) = d81fadd8212c969d950b3dde9838a170860348ee
-SHA1 (patch-src_nemo-action-config-widget.c) = 7df7d0cfc662e2ab52b48a0b65d252d4db6e227c
-SHA1 (patch-src_nemo-application.c) = cba81933351c4bb5e2f95ac2b10adc4b6b3ff9ae
-SHA1 (patch-src_nemo-desktop-icon-view.c) = 11d7e39a9bc318284e01e6819d17255d584e1874
-SHA1 (patch-src_nemo-file-management-properties.c) = 96f40cee3d080eb0f31692f11c5931b5734042a2
-SHA1 (patch-src_nemo-icon-view.c) = d5326deb9310231c536f3d0916ac77335b701b16
-SHA1 (patch-src_nemo-places-sidebar.c) = ed08952f34b49705c08638a155b6c8da58b6ecff
-SHA1 (patch-src_nemo-view.c) = 4b70ddd7adf82b83ce015b26206aa24dd4b9b70c
diff --git a/cinnamon-nemo/patches/patch-files_Makefile.in b/cinnamon-nemo/patches/patch-files_Makefile.in
deleted file mode 100644
index b0219b292c..0000000000
--- a/cinnamon-nemo/patches/patch-files_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- files/Makefile.in.orig 2016-06-23 12:33:15.000000000 +0000
-+++ files/Makefile.in
-@@ -7,7 +7,7 @@ distclean:
- check:
-
- install:
-- find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
-+ find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
-
- uninstall:
-- find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
-+ find . -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.c b/cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.c
deleted file mode 100644
index a748d95d9d..0000000000
--- a/cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- libnemo-private/nemo-global-preferences.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ libnemo-private/nemo-global-preferences.c
-@@ -36,6 +36,20 @@
-
- static gboolean ignore_view_metadata = FALSE;
-
-+GSettings *cinnamon_privacy_preferences;
-+GSettings *gnome_background_preferences;
-+GSettings *gnome_lockdown_preferences;
-+GSettings *gnome_media_handling_preferences;
-+GSettings *gnome_terminal_preferences;
-+GSettings *nemo_compact_view_preferences;
-+GSettings *nemo_desktop_preferences;
-+GSettings *nemo_icon_view_preferences;
-+GSettings *nemo_list_view_preferences;
-+GSettings *nemo_preferences;
-+GSettings *nemo_tree_sidebar_preferences;
-+GSettings *nemo_window_state;
-+GSettings *nemo_plugin_preferences;
-+
- /*
- * Public functions
- */
diff --git a/cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.h b/cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.h
deleted file mode 100644
index 876331a7f8..0000000000
--- a/cinnamon-nemo/patches/patch-libnemo-private_nemo-global-preferences.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- libnemo-private/nemo-global-preferences.h.orig 2016-06-23 12:33:15.000000000 +0000
-+++ libnemo-private/nemo-global-preferences.h
-@@ -259,21 +259,21 @@ gboolean nemo_global_preferences_get_ign
- gint nemo_global_preferences_get_tooltip_flags (void);
- gboolean nemo_global_preferences_should_load_plugin (const gchar *name, const gchar *key);
-
--GSettings *nemo_preferences;
--GSettings *nemo_icon_view_preferences;
--GSettings *nemo_list_view_preferences;
--GSettings *nemo_compact_view_preferences;
--GSettings *nemo_desktop_preferences;
--GSettings *nemo_tree_sidebar_preferences;
--GSettings *nemo_window_state;
--GSettings *nemo_plugin_preferences;
--GSettings *gnome_lockdown_preferences;
--GSettings *gnome_background_preferences;
--GSettings *gnome_media_handling_preferences;
--GSettings *gnome_terminal_preferences;
--GSettings *cinnamon_privacy_preferences;
-+extern GSettings *nemo_preferences;
-+extern GSettings *nemo_icon_view_preferences;
-+extern GSettings *nemo_list_view_preferences;
-+extern GSettings *nemo_compact_view_preferences;
-+extern GSettings *nemo_desktop_preferences;
-+extern GSettings *nemo_tree_sidebar_preferences;
-+extern GSettings *nemo_window_state;
-+extern GSettings *nemo_plugin_preferences;
-+extern GSettings *gnome_lockdown_preferences;
-+extern GSettings *gnome_background_preferences;
-+extern GSettings *gnome_media_handling_preferences;
-+extern GSettings *gnome_terminal_preferences;
-+extern GSettings *cinnamon_privacy_preferences;
-
--gint64 nemo_startup_time;
-+extern gint64 nemo_startup_time;
-
- G_END_DECLS
-
diff --git a/cinnamon-nemo/patches/patch-src_nemo-action-config-widget.c b/cinnamon-nemo/patches/patch-src_nemo-action-config-widget.c
deleted file mode 100644
index 60b53c1452..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-action-config-widget.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/nemo-action-config-widget.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ src/nemo-action-config-widget.c
-@@ -16,6 +16,7 @@
-
- G_DEFINE_TYPE (NemoActionConfigWidget, nemo_action_config_widget, NEMO_TYPE_CONFIG_BASE_WIDGET);
-
-+GSettings *nemo_plugin_preferences;
-
- typedef struct {
- NemoActionConfigWidget *widget;
diff --git a/cinnamon-nemo/patches/patch-src_nemo-application.c b/cinnamon-nemo/patches/patch-src_nemo-application.c
deleted file mode 100644
index 3a8e3c7c2a..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-application.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- src/nemo-application.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ src/nemo-application.c
-@@ -87,6 +87,11 @@
-
- #include <libcinnamon-desktop/gnome-desktop-thumbnail.h>
-
-+GSettings *nemo_desktop_preferences;
-+GSettings *nemo_preferences;
-+gint64 nemo_startup_time;
-+GSettings *nemo_window_state;
-+
- /* Keep window from shrinking down ridiculously small; numbers are somewhat arbitrary */
- #define APPLICATION_WINDOW_MIN_WIDTH 300
- #define APPLICATION_WINDOW_MIN_HEIGHT 100
diff --git a/cinnamon-nemo/patches/patch-src_nemo-desktop-icon-view.c b/cinnamon-nemo/patches/patch-src_nemo-desktop-icon-view.c
deleted file mode 100644
index cce4b62ed8..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-desktop-icon-view.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- src/nemo-desktop-icon-view.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ src/nemo-desktop-icon-view.c
-@@ -61,6 +61,9 @@
- #include <sys/types.h>
- #include <unistd.h>
-
-+GSettings *gnome_lockdown_preferences;
-+GSettings *nemo_icon_view_preferences;
-+
- /* Timeout to check the desktop directory for updates */
- #define RESCAN_TIMEOUT 4
-
diff --git a/cinnamon-nemo/patches/patch-src_nemo-file-management-properties.c b/cinnamon-nemo/patches/patch-src_nemo-file-management-properties.c
deleted file mode 100644
index 63337df1ae..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-file-management-properties.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- src/nemo-file-management-properties.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ src/nemo-file-management-properties.c
-@@ -40,6 +40,10 @@
- #include <libnemo-private/nemo-global-preferences.h>
- #include <libnemo-private/nemo-module.h>
-
-+GSettings *gnome_media_handling_preferences;
-+GSettings *nemo_list_view_preferences;
-+GSettings *nemo_tree_sidebar_preferences;
-+
- /* string enum preferences */
- #define NEMO_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET "default_view_combobox"
- #define NEMO_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET "icon_view_zoom_combobox"
diff --git a/cinnamon-nemo/patches/patch-src_nemo-icon-view.c b/cinnamon-nemo/patches/patch-src_nemo-icon-view.c
deleted file mode 100644
index ca7f36f82f..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-icon-view.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/nemo-icon-view.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ src/nemo-icon-view.c
-@@ -69,6 +69,8 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
-+GSettings *nemo_compact_view_preferences;
-+
- #define POPUP_PATH_ICON_APPEARANCE "/selection/Icon Appearance Items"
-
- enum
diff --git a/cinnamon-nemo/patches/patch-src_nemo-places-sidebar.c b/cinnamon-nemo/patches/patch-src_nemo-places-sidebar.c
deleted file mode 100644
index d6b8f7d715..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-places-sidebar.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- src/nemo-places-sidebar.c.orig 2016-07-12 16:40:07.000000000 +0000
-+++ src/nemo-places-sidebar.c
-@@ -61,6 +61,9 @@
-
- #include <libnotify/notify.h>
-
-+GSettings *cinnamon_privacy_preferences;
-+GSettings *gnome_background_preferences;
-+
- #define DEBUG_FLAG NEMO_DEBUG_PLACES
- #include <libnemo-private/nemo-debug.h>
-
diff --git a/cinnamon-nemo/patches/patch-src_nemo-view.c b/cinnamon-nemo/patches/patch-src_nemo-view.c
deleted file mode 100644
index 7221ef0a84..0000000000
--- a/cinnamon-nemo/patches/patch-src_nemo-view.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/nemo-view.c.orig 2016-06-23 12:33:15.000000000 +0000
-+++ src/nemo-view.c
-@@ -92,6 +92,8 @@
- #include <libnemo-private/nemo-action-manager.h>
- #include <libnemo-private/nemo-mime-application-chooser.h>
-
-+GSettings *gnome_terminal_preferences;
-+
- #define DEBUG_FLAG NEMO_DEBUG_DIRECTORY_VIEW
- #include <libnemo-private/nemo-debug.h>
-
diff --git a/cinnamon-screensaver/DESCR b/cinnamon-screensaver/DESCR
new file mode 100644
index 0000000000..0da69fe254
--- /dev/null
+++ b/cinnamon-screensaver/DESCR
@@ -0,0 +1 @@
+Screensaver for the Cinnamon desktop.
diff --git a/cinnamon-screensaver/Makefile b/cinnamon-screensaver/Makefile
new file mode 100644
index 0000000000..8abdf0c8e4
--- /dev/null
+++ b/cinnamon-screensaver/Makefile
@@ -0,0 +1,70 @@
+# $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
+
+DISTNAME= cinnamon-screensaver-3.8.1
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cinnamon-screensaver
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%gmail.com@localhost
+HOMEPAGE= https://github.com/linuxmint/cinnamon-screensaver
+COMMENT= Cinnamon screensaver
+LICENSE= gnu-gpl-v2
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake pkg-config automake autoreconf intltool msgfmt
+
+CONFIGURE_ARGS+= --with-pam-prefix=/etc/pam.d \
+ --without-systemd
+
+DEPENDS+= pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid
+
+INSTALLATION_DIRS+= ${PREFIX}/share/examples/pam.d
+post-extract:
+ ${CP} ${FILESDIR}/cinnamon-screensaver.pam ${WRKDIR}
+
+SUBST_CLASSES+= pam-conf
+SUBST_STAGE.pam-conf= post-configure
+SUBST_FILES.pam-conf= ${WRKDIR}/cinnamon-screensaver.pam
+SUBST_VARS.pam-conf= PREFIX
+
+post-install: pamd
+.PHONY: pamd
+pamd:
+ ${TEST} -f ${DESTDIR}${PREFIX}/share/examples/pam.d/cinnamon-screensaver || \
+ ${INSTALL_DATA} ${WRKDIR}/cinnamon-screensaver.pam ${DESTDIR}${PREFIX}/share/examples/pam.d/cinnamon-screensaver
+
+MAKE_DIRS+= /etc/pam.d
+CONF_FILES+= ${PREFIX}/share/examples/pam.d/cinnamon-screensaver \
+ /etc/pam.d/cinnamon-screensaver
+
+
+BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+
+DEPENDS+= ${PYPKGPREFIX}-xapp>=1.2.0:../../cinnamon/py-xapp
+DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
+
+
+REPLACE_PYTHON= "screensavers/xscreensaver%cinnamon.org@localhost/main" \
+ "screensavers/xscreensaver%cinnamon.org@localhost/safechild" \
+ "screensavers/webkit%cinnamon.org@localhost/main" \
+ "src/cinnamon-screensaver-command.py" \
+ "src/cinnamon-screensaver-main.py"
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+
+.include "../../lang/python/application.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
+
+.include "../../wip/cinnamon-desktop/buildlink3.mk"
+.include "../../wip/xapps/buildlink3.mk"
+
+.include "../../mk/pam.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-screensaver/PLIST b/cinnamon-screensaver/PLIST
new file mode 100644
index 0000000000..27ba992ea1
--- /dev/null
+++ b/cinnamon-screensaver/PLIST
@@ -0,0 +1,175 @@
+@comment $NetBSD$
+bin/cinnamon-screensaver
+bin/cinnamon-screensaver-command
+include/cinnamon-screensaver/libcscreensaver/cs-auth.h
+include/cinnamon-screensaver/libcscreensaver/setuid.h
+lib/girepository-1.0/CScreensaver-1.0.typelib
+lib/libcscreensaver.la
+lib/pkgconfig/cscreensaver.pc
+libexec/cinnamon-screensaver-pam-helper
+share/applications/cinnamon-screensaver.desktop
+share/cinnamon-screensaver/__init__.py
+share/cinnamon-screensaver/__pycache__/__init__.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/__init__.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/albumArt.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/albumArt.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/audioPanel.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/audioPanel.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/baseWindow.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/baseWindow.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/clock.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/clock.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/config.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/config.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/constants.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/constants.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/floating.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/floating.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/infoPanel.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/infoPanel.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/manager.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/manager.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/monitorView.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/monitorView.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/passwordEntry.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/passwordEntry.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/playerControl.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/playerControl.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/service.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/service.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/singletons.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/singletons.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/stage.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/stage.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/status.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/status.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/unlock.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/unlock.cpython-36.pyc
+share/cinnamon-screensaver/__pycache__/volumeControl.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/__pycache__/volumeControl.cpython-36.pyc
+share/cinnamon-screensaver/albumArt.py
+share/cinnamon-screensaver/audioPanel.py
+share/cinnamon-screensaver/baseWindow.py
+share/cinnamon-screensaver/cinnamon-screensaver-command.py
+share/cinnamon-screensaver/cinnamon-screensaver-gtk3.14.css
+share/cinnamon-screensaver/cinnamon-screensaver-gtk3.18.css
+share/cinnamon-screensaver/cinnamon-screensaver-gtk3.20.css
+share/cinnamon-screensaver/cinnamon-screensaver-main.py
+share/cinnamon-screensaver/clock.py
+share/cinnamon-screensaver/config.py
+share/cinnamon-screensaver/constants.py
+share/cinnamon-screensaver/dbusdepot/__init__.py
+share/cinnamon-screensaver/dbusdepot/__pycache__/__init__.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/__init__.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/accountsServiceClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/accountsServiceClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/baseClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/baseClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/cinnamonClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/cinnamonClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/consoleKitClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/consoleKitClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/keybindingHandlerClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/keybindingHandlerClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/loginInterface.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/loginInterface.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/logindClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/logindClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/mediaPlayerWatcher.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/mediaPlayerWatcher.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/nameBlocker.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/nameBlocker.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/screensaverClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/screensaverClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/sessionClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/sessionClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/uPowerClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/dbusdepot/__pycache__/uPowerClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/accountsServiceClient.py
+share/cinnamon-screensaver/dbusdepot/baseClient.py
+share/cinnamon-screensaver/dbusdepot/cinnamonClient.py
+share/cinnamon-screensaver/dbusdepot/consoleKitClient.py
+share/cinnamon-screensaver/dbusdepot/keybindingHandlerClient.py
+share/cinnamon-screensaver/dbusdepot/loginInterface.py
+share/cinnamon-screensaver/dbusdepot/logindClient.py
+share/cinnamon-screensaver/dbusdepot/mediaPlayerWatcher.py
+share/cinnamon-screensaver/dbusdepot/nameBlocker.py
+share/cinnamon-screensaver/dbusdepot/screensaverClient.py
+share/cinnamon-screensaver/dbusdepot/sessionClient.py
+share/cinnamon-screensaver/dbusdepot/uPowerClient.py
+share/cinnamon-screensaver/floating.py
+share/cinnamon-screensaver/infoPanel.py
+share/cinnamon-screensaver/manager.py
+share/cinnamon-screensaver/monitorView.py
+share/cinnamon-screensaver/pamhelper/__pycache__/authClient.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/pamhelper/__pycache__/authClient.cpython-36.pyc
+share/cinnamon-screensaver/pamhelper/authClient.py
+share/cinnamon-screensaver/passwordEntry.py
+share/cinnamon-screensaver/playerControl.py
+share/cinnamon-screensaver/screensavers/webkit%cinnamon.org@localhost/main
+share/cinnamon-screensaver/screensavers/webkit%cinnamon.org@localhost/webkit-stars%cinnamon.org@localhost/index.html
+share/cinnamon-screensaver/screensavers/webkit%cinnamon.org@localhost/webkit-stars%cinnamon.org@localhost/metadata.json
+share/cinnamon-screensaver/screensavers/xscreensaver%cinnamon.org@localhost/main
+share/cinnamon-screensaver/screensavers/xscreensaver%cinnamon.org@localhost/safechild
+share/cinnamon-screensaver/service.py
+share/cinnamon-screensaver/singletons.py
+share/cinnamon-screensaver/stage.py
+share/cinnamon-screensaver/status.py
+share/cinnamon-screensaver/unlock.py
+share/cinnamon-screensaver/util/__init__.py
+share/cinnamon-screensaver/util/__pycache__/__init__.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/__init__.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/eventHandler.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/eventHandler.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/fader.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/fader.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/focusNavigator.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/focusNavigator.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/grabHelper.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/grabHelper.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/keybindings.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/keybindings.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/settings.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/settings.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/trackers.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/trackers.cpython-36.pyc
+share/cinnamon-screensaver/util/__pycache__/utils.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/util/__pycache__/utils.cpython-36.pyc
+share/cinnamon-screensaver/util/eventHandler.py
+share/cinnamon-screensaver/util/fader.py
+share/cinnamon-screensaver/util/focusNavigator.py
+share/cinnamon-screensaver/util/grabHelper.py
+share/cinnamon-screensaver/util/keybindings.py
+share/cinnamon-screensaver/util/settings.py
+share/cinnamon-screensaver/util/trackers.py
+share/cinnamon-screensaver/util/utils.py
+share/cinnamon-screensaver/volumeControl.py
+share/cinnamon-screensaver/widgets/__init__.py
+share/cinnamon-screensaver/widgets/__pycache__/__init__.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/__init__.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__pycache__/framedImage.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/framedImage.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__pycache__/marqueeLabel.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/marqueeLabel.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__pycache__/notificationWidget.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/notificationWidget.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__pycache__/powerWidget.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/powerWidget.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__pycache__/transparentButton.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/transparentButton.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__pycache__/volumeSlider.cpython-36.opt-1.pyc
+share/cinnamon-screensaver/widgets/__pycache__/volumeSlider.cpython-36.pyc
+share/cinnamon-screensaver/widgets/framedImage.py
+share/cinnamon-screensaver/widgets/marqueeLabel.py
+share/cinnamon-screensaver/widgets/notificationWidget.py
+share/cinnamon-screensaver/widgets/powerWidget.py
+share/cinnamon-screensaver/widgets/transparentButton.py
+share/cinnamon-screensaver/widgets/volumeSlider.py
+share/dbus-1/services/org.cinnamon.ScreenSaver.service
+share/examples/pam.d/cinnamon-screensaver
+share/gir-1.0/CScreensaver-1.0.gir
+share/icons/hicolor/scalable/actions/screensaver-switch-users-symbolic.svg
+share/icons/hicolor/scalable/actions/screensaver-unlock-symbolic.svg
+share/icons/hicolor/scalable/status/screensaver-blank.svg
+share/icons/hicolor/scalable/status/screensaver-notification-symbolic.svg
+@pkgdir etc/pam.d
diff --git a/cinnamon-screensaver/buildlink3.mk b/cinnamon-screensaver/buildlink3.mk
new file mode 100644
index 0000000000..964e54b14e
--- /dev/null
+++ b/cinnamon-screensaver/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= cinnamon-screensaver
+
+.if !defined(CINNAMON_SCREENSAVER_BUILDLINK3_MK)
+CINNAMON_SCREENSAVER_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cinnamon-screensaver+= cinnamon-screensaver>=3.8.1
+BUILDLINK_PKGSRCDIR.cinnamon-screensaver?= ../../wip/cinnamon-screensaver
+
+.endif # CINNAMON_SCREENSAVER_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -cinnamon-screensaver
diff --git a/cinnamon-screensaver/distinfo b/cinnamon-screensaver/distinfo
new file mode 100644
index 0000000000..a00c431316
--- /dev/null
+++ b/cinnamon-screensaver/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
+
+SHA1 (cinnamon-screensaver-3.8.1.tar.gz) = 5a12a7d7848f94556f0bd90917bcb28ad1d9a5f3
+RMD160 (cinnamon-screensaver-3.8.1.tar.gz) = 83794bc879d580cdf00de7351ef12e466033f3ab
+SHA512 (cinnamon-screensaver-3.8.1.tar.gz) = a8ec1473b8931c5a6a5af410080f7857f655b9fced4be952a64cf05e9176e79e131fcc5cc2365054f086d570d843e127bfb1a2a98be62d8ba72835ebb98b753c
+Size (cinnamon-screensaver-3.8.1.tar.gz) = 161303 bytes
+SHA1 (patch-files_Makefile.in) = 3124d41563de9c5a158a32c3d849bb1538e2fee8
diff --git a/cinnamon-screensaver/files/cinnamon-screensaver.pam b/cinnamon-screensaver/files/cinnamon-screensaver.pam
new file mode 100644
index 0000000000..8853a59537
--- /dev/null
+++ b/cinnamon-screensaver/files/cinnamon-screensaver.pam
@@ -0,0 +1,18 @@
+# $NetBSD: cinnamon-screensaver.pam,v 1.1 2016/05/21 19:14:20 youri Exp $
+#
+# PAM configuration for the "cinnamon-screensaver" service
+#
+
+# auth
+auth sufficient @PREFIX@/lib/security/pam_pwauth_suid.so
+auth include system
+
+# account
+account include system
+
+# session
+session include system
+
+# password
+password include system
+
diff --git a/cinnamon-screensaver/patches/patch-files_Makefile.in b/cinnamon-screensaver/patches/patch-files_Makefile.in
new file mode 100644
index 0000000000..0561e7d9ec
--- /dev/null
+++ b/cinnamon-screensaver/patches/patch-files_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Portability fix.
+
+--- files/Makefile.in.orig 2018-05-06 14:20:45.000000000 +0000
++++ files/Makefile.in
+@@ -5,7 +5,7 @@ clean:
+ distclean:
+
+ install:
+- find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
++ find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)$(PREFIX)/ \;
+
+ uninstall:
+- find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
++ find . -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/cinnamon-session/DESCR b/cinnamon-session/DESCR
new file mode 100644
index 0000000000..0c0d162368
--- /dev/null
+++ b/cinnamon-session/DESCR
@@ -0,0 +1 @@
+The Cinnamon session manager.
diff --git a/cinnamon-session/Makefile b/cinnamon-session/Makefile
new file mode 100644
index 0000000000..7b7ff757a4
--- /dev/null
+++ b/cinnamon-session/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= cinnamon-session-3.8.1
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cinnamon-session
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/cinnamon-session
+COMMENT= Cinnamon session
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
+
+USE_TOOLS+= gmake pkg-config intltool msgfmt
+
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+
+.include "../../wip/xapps/buildlink3.mk"
+
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../devel/py-meson/build.mk"
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-session/PLIST b/cinnamon-session/PLIST
new file mode 100644
index 0000000000..88f0d2a9de
--- /dev/null
+++ b/cinnamon-session/PLIST
@@ -0,0 +1,17 @@
+@comment $NetBSD$
+bin/cinnamon-session
+bin/cinnamon-session-quit
+libexec/cinnamon-session-check-accelerated
+libexec/cinnamon-session-check-accelerated-helper
+man/man1/cinnamon-session-quit.1
+man/man1/cinnamon-session.1
+share/cinnamon-session/csm-inhibit-dialog.glade
+share/cinnamon-session/hardware-compatibility
+share/doc/cinnamon-session/dbus/cinnamon-session.html
+share/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml
+share/icons/hicolor/16x16/apps/cinnamon-session-properties.png
+share/icons/hicolor/22x22/apps/cinnamon-session-properties.png
+share/icons/hicolor/24x24/apps/cinnamon-session-properties.png
+share/icons/hicolor/32x32/apps/cinnamon-session-properties.png
+share/icons/hicolor/48x48/apps/cinnamon-session-properties.png
+share/icons/hicolor/scalable/apps/cinnamon-session-properties.svg
diff --git a/cinnamon-session/buildlink3.mk b/cinnamon-session/buildlink3.mk
new file mode 100644
index 0000000000..5c154b983c
--- /dev/null
+++ b/cinnamon-session/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= cinnamon-session
+
+.if !defined(CINNAMON_SESSION_BUILDLINK3_MK)
+CINNAMON_SESSION_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cinnamon-session+= cinnamon-session>=3.8.1
+BUILDLINK_PKGSRCDIR.cinnamon-session?= ../../wip/cinnamon-session
+
+.endif # CINNAMON_SESSION_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -cinnamon-session
diff --git a/cinnamon-session/distinfo b/cinnamon-session/distinfo
new file mode 100644
index 0000000000..572dd3c0c9
--- /dev/null
+++ b/cinnamon-session/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+SHA1 (cinnamon-session-3.8.1.tar.gz) = 14aefe40d345b8e25f1b25969c61997efddc56d3
+RMD160 (cinnamon-session-3.8.1.tar.gz) = eafab91839723a733bbfea85d2b9e4667dd1efb8
+SHA512 (cinnamon-session-3.8.1.tar.gz) = df7d153b8247155476d216ef97e09951e0343c3afccc1dec9f7e6dca3c69d6a78a5667a935b150a002df6260ec28a986619e43fc152965d13d285437b2b3c390
+Size (cinnamon-session-3.8.1.tar.gz) = 198058 bytes
+SHA1 (patch-cinnamon-session_csm-manager.c) = c0410e4147f428b335958d77fee70778d6baa1ed
+SHA1 (patch-meson.build) = 88c3bab34753cdec1d8feee0cb1c992df2ebf10f
diff --git a/cinnamon-session/patches/patch-cinnamon-session_csm-manager.c b/cinnamon-session/patches/patch-cinnamon-session_csm-manager.c
new file mode 100644
index 0000000000..4526c2f4fc
--- /dev/null
+++ b/cinnamon-session/patches/patch-cinnamon-session_csm-manager.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Fix log-out.
+
+--- cinnamon-session/csm-manager.c.orig 2018-04-19 11:06:26.000000000 +0000
++++ cinnamon-session/csm-manager.c
+@@ -957,6 +957,7 @@ maybe_restart_user_bus (CsmManager *mana
+ if (!csm_system_is_last_session_for_user (system))
+ return;
+
++#if 0
+ reply = g_dbus_connection_call_sync (manager->priv->connection,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+@@ -968,6 +969,7 @@ maybe_restart_user_bus (CsmManager *mana
+ -1,
+ NULL,
+ &error);
++#endif
+
+ if (error != NULL) {
+ g_debug ("CsmManager: reloading user bus failed: %s", error->message);
diff --git a/cinnamon-session/patches/patch-meson.build b/cinnamon-session/patches/patch-meson.build
new file mode 100644
index 0000000000..b01b6dfdc8
--- /dev/null
+++ b/cinnamon-session/patches/patch-meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix logout dialog.
+
+--- meson.build.orig 2018-05-31 01:51:39.000000000 +0000
++++ meson.build
+@@ -145,7 +145,7 @@ rootInclude = include_directories('.')
+
+ pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
+
+-conf.set_quoted('GTKBUILDER_DIR', pkgdatadir)
++conf.set_quoted('GTKBUILDER_DIR', join_paths(get_option('prefix'), pkgdatadir))
+ conf.set_quoted('DATA_DIR', pkgdatadir)
+ conf.set_quoted('PKGDATADIR', pkgdatadir)
+ conf.set_quoted('LIBEXECDIR', get_option('libexecdir'))
diff --git a/cinnamon-settings-daemon/Makefile b/cinnamon-settings-daemon/Makefile
index 7298940e36..d8ed18754a 100644
--- a/cinnamon-settings-daemon/Makefile
+++ b/cinnamon-settings-daemon/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
-DISTNAME= 3.0.1
-PKGNAME= cinnamon-settings-daemon-3.0.1
-PKGREVISION= 1
+DISTNAME= cinnamon-settings-daemon-3.8.2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/cinnamon-settings-daemon/archive/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cinnamon-settings-daemon
+GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= youri%NetBSD.org@localhost
HOMEPAGE= https://github.com/linuxmint/cinnamon-settings-daemon
@@ -13,31 +13,82 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config automake autoreconf intltool msgfmt
+GNU_CONFIGURE= yes
+
+CONFIGURE_ARGS+= --disable-smartcard-support
+
+SUBST_CLASSES= egdir
+SUBST_MESSAGE.egdir= Adapting Makefiles for CONF_FILES.
+SUBST_FILES.egdir= plugins/*/Makefile.am
+SUBST_STAGE.egdir= post-patch
+SUBST_SED.egdir= -e 's,.(sysconfdir)/xdg,$$(datadir)/examples/cinnamon-settings-daemon,'
+SUBST_SED.egdir+= -e 's,.(sysconfdir)/dbus-1,$$(datadir)/examples/dbus-1,'
+
+EGDIR= ${PREFIX}/share/examples/cinnamon-settings-daemon/autostart
+AUDIR= ${PKG_SYSCONFDIR}/xdg/autostart
+
+CONF_FILES+= ${EGDIR}/cinnamon-settings-daemon-a11y-keyboard.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-a11y-keyboard.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-a11y-settings.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-a11y-settings.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-automount.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-automount.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-background.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-background.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-clipboard.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-clipboard.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-color.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-color.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-cursor.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-cursor.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-housekeeping.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-housekeeping.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-keyboard.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-keyboard.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-mouse.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-mouse.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-orientation.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-orientation.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-power.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-power.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-screensaver-proxy.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-screensaver-proxy.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-sound.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-sound.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-xrandr.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-xrandr.desktop \
+ ${EGDIR}/cinnamon-settings-daemon-xsettings.desktop \
+ ${AUDIR}/cinnamon-settings-daemon-xsettings.desktop \
+ share/examples/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf \
+ ${PKG_SYSCONFDIR}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
pre-configure:
- cd ${WRKSRC} && ${SH} ./autogen.sh
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+.include "../../devel/glib2/schemas.mk"
.include "../../print/cups-base/buildlink3.mk"
.include "../../audio/libcanberra/buildlink3.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../security/polkit/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../sysutils/upower/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../security/polkit/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
+.include "../../graphics/colord/buildlink3.mk"
-.include "../../wip/libgnomekbd/buildlink3.mk"
-.include "../../wip/colord/buildlink3.mk"
.include "../../wip/cinnamon-desktop/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-settings-daemon/PLIST b/cinnamon-settings-daemon/PLIST
index 1f34343936..b4ac75c828 100644
--- a/cinnamon-settings-daemon/PLIST
+++ b/cinnamon-settings-daemon/PLIST
@@ -1,59 +1,30 @@
@comment $NetBSD$
-include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/cinnamon-settings-plugin.h
include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/csd-enums.h
-lib/cinnamon-settings-daemon-3.0/a11y-keyboard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/a11y-settings.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/automount.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/background.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/clipboard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/color.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/cursor.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/housekeeping.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/keyboard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/liba11y-keyboard.la
-lib/cinnamon-settings-daemon-3.0/liba11y-settings.la
-lib/cinnamon-settings-daemon-3.0/libautomount.la
-lib/cinnamon-settings-daemon-3.0/libbackground.la
-lib/cinnamon-settings-daemon-3.0/libclipboard.la
-lib/cinnamon-settings-daemon-3.0/libcolor.la
lib/cinnamon-settings-daemon-3.0/libcsd.la
-lib/cinnamon-settings-daemon-3.0/libcursor.la
-lib/cinnamon-settings-daemon-3.0/libhousekeeping.la
-lib/cinnamon-settings-daemon-3.0/libkeyboard.la
-lib/cinnamon-settings-daemon-3.0/libmedia-keys.la
-lib/cinnamon-settings-daemon-3.0/libmouse.la
-lib/cinnamon-settings-daemon-3.0/libpower.la
-lib/cinnamon-settings-daemon-3.0/libprint-notifications.la
-lib/cinnamon-settings-daemon-3.0/libscreensaver-proxy.la
-lib/cinnamon-settings-daemon-3.0/libsound.la
-lib/cinnamon-settings-daemon-3.0/libxrandr.la
-lib/cinnamon-settings-daemon-3.0/libxsettings.la
-lib/cinnamon-settings-daemon-3.0/media-keys.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/mouse.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/power.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/print-notifications.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/screensaver-proxy.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/sound.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/xrandr.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/xsettings.cinnamon-settings-plugin
lib/pkgconfig/cinnamon-settings-daemon.pc
-libexec/cinnamon-settings-daemon
+libexec/csd-a11y-keyboard
+libexec/csd-a11y-settings
+libexec/csd-automount
+libexec/csd-background
+libexec/csd-clipboard
+libexec/csd-color
+libexec/csd-cursor
+libexec/csd-datetime-mechanism
+libexec/csd-dummy
+libexec/csd-housekeeping
+libexec/csd-input-helper
+libexec/csd-keyboard
libexec/csd-locate-pointer
+libexec/csd-mouse
+libexec/csd-orientation
+libexec/csd-power
+libexec/csd-print-notifications
libexec/csd-printer
-libexec/csd-test-a11y-keyboard
-libexec/csd-test-a11y-settings
-libexec/csd-test-automount
-libexec/csd-test-background
-libexec/csd-test-input-helper
-libexec/csd-test-media-keys
-libexec/csd-test-mouse
-libexec/csd-test-power
-libexec/csd-test-print-notifications
-libexec/csd-test-screensaver-proxy
-libexec/csd-test-sound
-libexec/csd-test-xsettings
-man/man1/cinnamon-settings-daemon.1
-share/applications/cinnamon-settings-daemon.desktop
+libexec/csd-screensaver-proxy
+libexec/csd-sound
+libexec/csd-xrandr
+libexec/csd-xsettings
+share/applications/csd-automount.desktop
share/cinnamon-settings-daemon-3.0/input-device-example.sh
share/cinnamon-settings-daemon/csd-a11y-preferences-dialog.ui
share/cinnamon-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-off.png
@@ -62,115 +33,140 @@ share/cinnamon-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-off.png
share/cinnamon-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-on.png
share/cinnamon-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
share/cinnamon-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
+share/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-a11y-settings.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-automount.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-background.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-clipboard.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-color.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-cursor.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-housekeeping.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-keyboard.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-mouse.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-orientation.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-power.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-print-notifications.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-sound.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-xrandr.desktop
+share/examples/cinnamon-settings-daemon/autostart/cinnamon-settings-daemon-xsettings.desktop
+share/examples/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
share/glib-2.0/schemas/org.cinnamon.settings-daemon.enums.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.peripherals.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml
-share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.background.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.color.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.housekeeping.gschema.xml
-share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.keyboard.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml
-share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.orientation.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.power.gschema.xml
-share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.print-notifications.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml
share/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml
+share/icons/hicolor/16x16/apps/csd-a11y-keyboard.png
+share/icons/hicolor/16x16/apps/csd-a11y-settings.png
+share/icons/hicolor/16x16/apps/csd-automount.png
+share/icons/hicolor/16x16/apps/csd-background.png
+share/icons/hicolor/16x16/apps/csd-clipboard.png
+share/icons/hicolor/16x16/apps/csd-color.png
+share/icons/hicolor/16x16/apps/csd-cursor.png
+share/icons/hicolor/16x16/apps/csd-datetime.png
+share/icons/hicolor/16x16/apps/csd-housekeeping.png
+share/icons/hicolor/16x16/apps/csd-keyboard.png
+share/icons/hicolor/16x16/apps/csd-media-keys.png
+share/icons/hicolor/16x16/apps/csd-mouse.png
+share/icons/hicolor/16x16/apps/csd-orientation.png
+share/icons/hicolor/16x16/apps/csd-power.png
+share/icons/hicolor/16x16/apps/csd-print-notifications.png
+share/icons/hicolor/16x16/apps/csd-printer.png
+share/icons/hicolor/16x16/apps/csd-screensaver-proxy.png
+share/icons/hicolor/16x16/apps/csd-sound.png
+share/icons/hicolor/16x16/apps/csd-wacom.png
share/icons/hicolor/16x16/apps/csd-xrandr.png
+share/icons/hicolor/16x16/apps/csd-xsettings.png
+share/icons/hicolor/22x22/apps/csd-a11y-keyboard.png
+share/icons/hicolor/22x22/apps/csd-a11y-settings.png
+share/icons/hicolor/22x22/apps/csd-automount.png
+share/icons/hicolor/22x22/apps/csd-background.png
+share/icons/hicolor/22x22/apps/csd-clipboard.png
+share/icons/hicolor/22x22/apps/csd-color.png
+share/icons/hicolor/22x22/apps/csd-cursor.png
+share/icons/hicolor/22x22/apps/csd-datetime.png
+share/icons/hicolor/22x22/apps/csd-housekeeping.png
+share/icons/hicolor/22x22/apps/csd-keyboard.png
+share/icons/hicolor/22x22/apps/csd-media-keys.png
+share/icons/hicolor/22x22/apps/csd-mouse.png
+share/icons/hicolor/22x22/apps/csd-orientation.png
+share/icons/hicolor/22x22/apps/csd-power.png
+share/icons/hicolor/22x22/apps/csd-print-notifications.png
+share/icons/hicolor/22x22/apps/csd-printer.png
+share/icons/hicolor/22x22/apps/csd-screensaver-proxy.png
+share/icons/hicolor/22x22/apps/csd-sound.png
+share/icons/hicolor/22x22/apps/csd-wacom.png
share/icons/hicolor/22x22/apps/csd-xrandr.png
+share/icons/hicolor/22x22/apps/csd-xsettings.png
+share/icons/hicolor/24x24/apps/csd-a11y-keyboard.png
+share/icons/hicolor/24x24/apps/csd-a11y-settings.png
+share/icons/hicolor/24x24/apps/csd-automount.png
+share/icons/hicolor/24x24/apps/csd-background.png
+share/icons/hicolor/24x24/apps/csd-clipboard.png
+share/icons/hicolor/24x24/apps/csd-color.png
+share/icons/hicolor/24x24/apps/csd-cursor.png
+share/icons/hicolor/24x24/apps/csd-datetime.png
+share/icons/hicolor/24x24/apps/csd-housekeeping.png
+share/icons/hicolor/24x24/apps/csd-keyboard.png
+share/icons/hicolor/24x24/apps/csd-media-keys.png
+share/icons/hicolor/24x24/apps/csd-mouse.png
+share/icons/hicolor/24x24/apps/csd-orientation.png
+share/icons/hicolor/24x24/apps/csd-power.png
+share/icons/hicolor/24x24/apps/csd-print-notifications.png
+share/icons/hicolor/24x24/apps/csd-printer.png
+share/icons/hicolor/24x24/apps/csd-screensaver-proxy.png
+share/icons/hicolor/24x24/apps/csd-sound.png
+share/icons/hicolor/24x24/apps/csd-wacom.png
share/icons/hicolor/24x24/apps/csd-xrandr.png
+share/icons/hicolor/24x24/apps/csd-xsettings.png
+share/icons/hicolor/32x32/apps/csd-a11y-keyboard.png
+share/icons/hicolor/32x32/apps/csd-a11y-settings.png
+share/icons/hicolor/32x32/apps/csd-automount.png
+share/icons/hicolor/32x32/apps/csd-background.png
+share/icons/hicolor/32x32/apps/csd-clipboard.png
+share/icons/hicolor/32x32/apps/csd-color.png
+share/icons/hicolor/32x32/apps/csd-cursor.png
+share/icons/hicolor/32x32/apps/csd-datetime.png
+share/icons/hicolor/32x32/apps/csd-housekeeping.png
+share/icons/hicolor/32x32/apps/csd-keyboard.png
+share/icons/hicolor/32x32/apps/csd-media-keys.png
+share/icons/hicolor/32x32/apps/csd-mouse.png
+share/icons/hicolor/32x32/apps/csd-orientation.png
+share/icons/hicolor/32x32/apps/csd-power.png
+share/icons/hicolor/32x32/apps/csd-print-notifications.png
+share/icons/hicolor/32x32/apps/csd-printer.png
+share/icons/hicolor/32x32/apps/csd-screensaver-proxy.png
+share/icons/hicolor/32x32/apps/csd-sound.png
+share/icons/hicolor/32x32/apps/csd-wacom.png
share/icons/hicolor/32x32/apps/csd-xrandr.png
+share/icons/hicolor/32x32/apps/csd-xsettings.png
+share/icons/hicolor/scalable/apps/csd-a11y-keyboard.svg
+share/icons/hicolor/scalable/apps/csd-a11y-settings.svg
+share/icons/hicolor/scalable/apps/csd-automount.svg
+share/icons/hicolor/scalable/apps/csd-background.svg
+share/icons/hicolor/scalable/apps/csd-clipboard.svg
+share/icons/hicolor/scalable/apps/csd-color.svg
+share/icons/hicolor/scalable/apps/csd-cursor.svg
+share/icons/hicolor/scalable/apps/csd-datetime.svg
+share/icons/hicolor/scalable/apps/csd-housekeeping.svg
+share/icons/hicolor/scalable/apps/csd-keyboard.svg
+share/icons/hicolor/scalable/apps/csd-media-keys.svg
+share/icons/hicolor/scalable/apps/csd-mouse.svg
+share/icons/hicolor/scalable/apps/csd-orientation.svg
+share/icons/hicolor/scalable/apps/csd-power.svg
+share/icons/hicolor/scalable/apps/csd-print-notifications.svg
+share/icons/hicolor/scalable/apps/csd-printer.svg
+share/icons/hicolor/scalable/apps/csd-screensaver-proxy.svg
+share/icons/hicolor/scalable/apps/csd-sound.svg
+share/icons/hicolor/scalable/apps/csd-wacom.svg
share/icons/hicolor/scalable/apps/csd-xrandr.svg
-share/locale/af/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/am/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ar/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/as/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ast/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/az/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/be/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/be@latin/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bg/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/br/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bs/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ca/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ca@valencia/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/crh/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/cs/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/cy/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/da/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/de/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/dz/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/el/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/en@shaw/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/en_CA/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/eo/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/es/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/et/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/eu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/fa/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/fi/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/fr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ga/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/gl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/gu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/he/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/hi/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/hr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/hu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/id/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/is/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/it/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ja/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ka/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/km/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/kn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ko/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ku/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/lt/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/lv/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mai/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mg/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mk/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ml/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ms/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nb/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nds/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ne/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nso/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/oc/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/or/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pa/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pt/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ro/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ru/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/rw/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/si/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sk/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sq/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sv/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ta/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/te/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/th/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/tr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ug/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/uk/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/vi/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/wa/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/xh/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zh_HK/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zu/LC_MESSAGES/cinnamon-settings-daemon.mo
+share/icons/hicolor/scalable/apps/csd-xsettings.svg
share/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy
+share/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
+@pkgdir etc/cinnamon-settings-daemon/xrandr
diff --git a/cinnamon-settings-daemon/buildlink3.mk b/cinnamon-settings-daemon/buildlink3.mk
index a8f31794c2..13f7c4e37c 100644
--- a/cinnamon-settings-daemon/buildlink3.mk
+++ b/cinnamon-settings-daemon/buildlink3.mk
@@ -8,19 +8,6 @@ CINNAMON_SETTINGS_DAEMON_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cinnamon-settings-daemon+= cinnamon-settings-daemon>=3.0.1
BUILDLINK_PKGSRCDIR.cinnamon-settings-daemon?= ../../wip/cinnamon-settings-daemon
-.include "../../print/cups-base/buildlink3.mk"
-.include "../../audio/libcanberra/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
-.include "../../wip/cinnamon-desktop/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../graphics/lcms2/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../sysutils/upower/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../wip/libgnomekbd/buildlink3.mk"
-.include "../../wip/colord/buildlink3.mk"
.endif # CINNAMON_SETTINGS_DAEMON_BUILDLINK3_MK
BUILDLINK_TREE+= -cinnamon-settings-daemon
diff --git a/cinnamon-settings-daemon/distinfo b/cinnamon-settings-daemon/distinfo
index 72b14aef6f..c6e69cf58c 100644
--- a/cinnamon-settings-daemon/distinfo
+++ b/cinnamon-settings-daemon/distinfo
@@ -1,6 +1,12 @@
$NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
-SHA1 (3.0.1.tar.gz) = a06765cec0037d302d0798108674a76ac93dd8ca
-RMD160 (3.0.1.tar.gz) = 995f5108b54984b58fe77a3dc8c4814c0d6e1f33
-SHA512 (3.0.1.tar.gz) = 848f1bc38e84edf9a8af48e55b7581881fbc9920dce9a4fc38627456dea7cbfe330bebba4bb46d1c231dd85bd3445d365b5e415485ac202e72335fe337a800e8
-Size (3.0.1.tar.gz) = 2912459 bytes
+SHA1 (cinnamon-settings-daemon-3.8.2.tar.gz) = 25754ac46c11367a3cd12574f57147918b36fba8
+RMD160 (cinnamon-settings-daemon-3.8.2.tar.gz) = 4f7678c046686cf9e48968536dbfe44b34b72649
+SHA512 (cinnamon-settings-daemon-3.8.2.tar.gz) = 44cbdfc65006a99a40ec44bc4288269cd19b9b5f7c79f615cca5f6e0b0abf97c0f2956ac0b1ad88d38afd63b78a85487a78af4ee038cbe200c05cba41f8e7d82
+Size (cinnamon-settings-daemon-3.8.2.tar.gz) = 660135 bytes
+SHA1 (patch-configure.ac) = 0ab4cb7368487fae951d68d5bc2a5d6c7f40f4f1
+SHA1 (patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in) = 5da78c10161554521bba6ff19215763ddbe93e25
+SHA1 (patch-files_Makefile.in) = 1a100b728e963ffa354502913ef77b4d023e6acf
+SHA1 (patch-plugins_Makefile.am) = 492237b848baf9da31f78e705374f8e8ec6a2432
+SHA1 (patch-plugins_background_csd-background-manager.c) = 03549c68025e2fd31ea6cbae0346a1124c7a9a70
+SHA1 (patch-plugins_power_csd-power-manager.c) = 86ec01c3b9d3b5811c8581d2366033c3806c6942
diff --git a/cinnamon-settings-daemon/patches/patch-configure.ac b/cinnamon-settings-daemon/patches/patch-configure.ac
new file mode 100644
index 0000000000..28551e1c2d
--- /dev/null
+++ b/cinnamon-settings-daemon/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix build with our older cinnamon-desktop.
+And disable colord support for now.
+
+--- configure.ac.orig 2018-05-16 17:41:09.000000000 +0000
++++ configure.ac
+@@ -183,6 +183,7 @@ dnl - background
+ dnl ---------------------------------------------------------------------------
+
+ PKG_CHECK_MODULES(BACKGROUND, x11 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
++AC_SEARCH_LIBS(gnome_bg_set_accountsservice_background, cinnamon-desktop, AC_DEFINE([ACCOUNTSERVICE_BG],1, [Build with accountsservice background support]))
+
+ dnl ---------------------------------------------------------------------------
+ dnl - mouse
diff --git a/cinnamon-settings-daemon/patches/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in b/cinnamon-settings-daemon/patches/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
new file mode 100644
index 0000000000..4e28b1f558
--- /dev/null
+++ b/cinnamon-settings-daemon/patches/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Disable systemd-logind lid switch inhibition.
+
+--- data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in.orig 2018-05-16 17:41:09.000000000 +0000
++++ data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
+@@ -147,7 +147,7 @@
+ multiple interfaces. If you are having problems, try setting 'raw' to a higher priority.</_description>
+ </key>
+ <key name="inhibit-lid-switch" type="b">
+- <default>true</default>
++ <default>false</default>
+ <_summary>Whether or not cinnamon-settings-daemon inhibits logind's handling of lid switch</_summary>
+ <_description>This setting should be true in all distributions and for all users. Only set it to false, if you want to prevent Cinnamon from handling lid switch events. In this case, you should not rely on Cinnamon's lid actions and use the logind ones instead.</_description>
+ </key>
diff --git a/cinnamon-settings-daemon/patches/patch-files_Makefile.in b/cinnamon-settings-daemon/patches/patch-files_Makefile.in
new file mode 100644
index 0000000000..1db3b157d7
--- /dev/null
+++ b/cinnamon-settings-daemon/patches/patch-files_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Install to prefix.
+
+--- files/Makefile.in.orig 2018-05-16 17:41:09.000000000 +0000
++++ files/Makefile.in
+@@ -7,7 +7,7 @@ distclean:
+ maintainer-clean:
+
+ install:
+- find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
++ cd usr && find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)$(PREFIX)/ \;
+
+ uninstall:
+- find . -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
++ find . -mindepth 1 -type f -exec rm $(DESTDIR)$(PREFIX)/{} \;
diff --git a/cinnamon-settings-daemon/patches/patch-plugins_Makefile.am b/cinnamon-settings-daemon/patches/patch-plugins_Makefile.am
new file mode 100644
index 0000000000..69896682a9
--- /dev/null
+++ b/cinnamon-settings-daemon/patches/patch-plugins_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Disable systemd media key manager.
+
+--- plugins/Makefile.am.orig 2018-05-16 17:41:09.000000000 +0000
++++ plugins/Makefile.am
+@@ -13,7 +13,6 @@ enabled_plugins = \
+ power \
+ housekeeping \
+ keyboard \
+- media-keys \
+ mouse \
+ orientation \
+ screensaver-proxy \
diff --git a/cinnamon-settings-daemon/patches/patch-plugins_background_csd-background-manager.c b/cinnamon-settings-daemon/patches/patch-plugins_background_csd-background-manager.c
new file mode 100644
index 0000000000..5d5f9c2e5a
--- /dev/null
+++ b/cinnamon-settings-daemon/patches/patch-plugins_background_csd-background-manager.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Fix with our accountsservice.
+
+--- plugins/background/csd-background-manager.c.orig 2018-05-16 17:41:09.000000000 +0000
++++ plugins/background/csd-background-manager.c
+@@ -136,7 +136,9 @@ settings_change_event_cb (GSettings
+ gnome_bg_load_from_preferences (manager->priv->bg,
+ manager->priv->settings);
+
++#if ACCOUNTSERVICE_BG
+ gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
++#endif
+
+ return FALSE;
+ }
+@@ -187,7 +189,9 @@ setup_bg (CsdBackgroundManager *manager)
+ gnome_bg_load_from_preferences (manager->priv->bg,
+ manager->priv->settings);
+
++#if ACCOUNTSERVICE_BG
+ gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
++#endif
+ }
+
+ static void
diff --git a/cinnamon-settings-daemon/patches/patch-plugins_power_csd-power-manager.c b/cinnamon-settings-daemon/patches/patch-plugins_power_csd-power-manager.c
new file mode 100644
index 0000000000..ffb5a81c60
--- /dev/null
+++ b/cinnamon-settings-daemon/patches/patch-plugins_power_csd-power-manager.c
@@ -0,0 +1,42 @@
+$NetBSD$
+
+Disable systemd-logind suspend inhibition
+
+--- plugins/power/csd-power-manager.c.orig 2018-05-16 17:41:09.000000000 +0000
++++ plugins/power/csd-power-manager.c
+@@ -3938,6 +3938,7 @@ inhibit_suspend_done (GObject *sour
+ * PrepareToSleep signal, which gives us a chance to lock the screen
+ * and do some other preparations.
+ */
++#ifndef __NetBSD__
+ static void
+ inhibit_suspend (CsdPowerManager *manager)
+ {
+@@ -3961,6 +3962,7 @@ inhibit_suspend (CsdPowerManager *manage
+ inhibit_suspend_done,
+ manager);
+ }
++#endif
+
+ static void
+ uninhibit_suspend (CsdPowerManager *manager)
+@@ -4024,7 +4026,9 @@ handle_resume_actions (CsdPowerManager *
+ }
+
+ /* set up the delay again */
++#ifndef __NetBSD__
+ inhibit_suspend (manager);
++#endif
+ }
+
+ #if ! UP_CHECK_VERSION(0,99,0)
+@@ -4145,7 +4149,9 @@ csd_power_manager_start (CsdPowerManager
+ manager);
+
+ /* Set up a delay inhibitor to be informed about suspend attempts */
++#ifndef __NetBSD__
+ inhibit_suspend (manager);
++#endif
+
+ /* track the active session */
+ manager->priv->session = cinnamon_settings_session_new ();
diff --git a/cinnamon/DESCR b/cinnamon/DESCR
new file mode 100644
index 0000000000..76554b630a
--- /dev/null
+++ b/cinnamon/DESCR
@@ -0,0 +1,6 @@
+Cinnamon is a Linux desktop which provides advanced innovative features and a
+traditional user experience.
+
+The desktop layout is similar to Gnome 2. The underlying technology is forked
+from Gnome Shell. The emphasis is put on making users feel at home and
+providing them with an easy to use and comfortable desktop experience.
diff --git a/cinnamon/Makefile b/cinnamon/Makefile
new file mode 100644
index 0000000000..958750caab
--- /dev/null
+++ b/cinnamon/Makefile
@@ -0,0 +1,131 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= cinnamon-3.8.2
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= Cinnamon
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/cinnamon
+COMMENT= Javascript bindings based on gobject-introspection
+LICENSE= gnu-gpl-v2
+
+NOT_PAX_MPROTECT_SAFE= bin/cinnamon
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake bash pkg-config automake intltool
+USE_LANGUAGES= c c++
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-ca-certificates=/etc/openssl/certs/ca-certificates.crt \
+ --prefix=${PREFIX} \
+ --mandir=${PKGMANDIR}
+
+PKGCONFIG_OVERRIDE+= cinnamon-1.0.pc.in
+
+SUBST_CLASSES= prefix
+SUBST_MESSAGE.prefix= Fixing prefix references
+SUBST_STAGE.prefix= pre-configure
+SUBST_FILES.prefix= src/st/st-background-effect.c
+SUBST_FILES.prefix+= src/st/st-texture-cache.c
+SUBST_FILES.prefix+= files/usr/bin/*
+SUBST_FILES.prefix+= files/usr/share/cinnamon/applets/*/*
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-menu-editor/cme/config.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-settings/*/*.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-settings/*.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/desklets/launcher%cinnamon.org@localhost/editorDialog.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon/desklets/launcher%cinnamon.org@localhost/desklet.js
+SUBST_FILES.prefix+= files/usr/share/cinnamon/thumbnails/gtk-3.0/README
+SUBST_FILES.prefix+= files/usr/share/cinnamon/thumbnails/metacity-1/README
+SUBST_FILES.prefix+= files/usr/share/dbus-1/services/org.Cinnamon.Melange.service
+SUBST_FILES.prefix+= files/usr/share/dbus-1/services/org.Cinnamon.Slideshow.service
+SUBST_FILES.prefix+= files/usr/share/polkit-1/actions/*
+SUBST_FILES.prefix+= files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+SUBST_FILES.prefix+= files/usr/share/cinnamon-session/sessions/*
+SUBST_FILES.prefix+= files/usr/share/xsessions/*.desktop
+SUBST_FILES.prefix+= js/ui/expo.js
+SUBST_FILES.prefix+= js/ui/main.js
+SUBST_SED.prefix= -e 's,/usr/share,${PREFIX}/share,g'
+SUBST_SED.prefix+= -e 's,/usr/lib,${PREFIX}/lib,g'
+SUBST_SED.prefix+= -e 's,/etc/xdg,${PKG_SYSCONFDIR},g'
+SUBST_SED.prefix+= -e 's,/usr/bin,${PREFIX}/bin,g'
+SUBST_SED.prefix+= -e 's,nm-applet;,,g'
+
+REPLACE_BASH= files/usr/bin/cinnamon2d
+
+REPLACE_PYTHON= docs/reference/cinnamon-js/gen_doc.py \
+ files/usr/bin/* \
+ files/usr/share/cinnamon/*/*.py \
+ files/usr/share/cinnamon/*/*/*.py
+
+CONF_FILES+= share/examples/menus/cinnamon-applications.menu \
+ ${PKG_SYSCONFDIR}/xdg/menus/cinnamon-applications.menu
+
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh && \
+ ${RM} -r ./files/usr/share/cinnamon/applets/network%cinnamon.org@localhost
+
+
+INSTALLATION_DIRS+= share/polkit-1/rules.d
+post-install:
+ ${INSTALL_DATA} ${FILESDIR}/desktop.rules \
+ ${DESTDIR}${PREFIX}/share/polkit-1/rules.d/desktop.rules
+
+DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
+DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
+DEPENDS+= ${PYPKGPREFIX}-pyinotify-[0-9]*:../../sysutils/py-pyinotify
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+= ${PYPKGPREFIX}-pam-[0-9]*:../../cinnamon/py-pam
+DEPENDS+= caribou-[0-9]*:../../x11/caribou
+DEPENDS+= keybinder3-[0-9]*:../../x11/keybinder3
+DEPENDS+= gst-plugins1-vpx-[0-9]*:../../multimedia/gst-plugins1-vpx
+#DEPENDS+= gnome-screenshot>=3.26:../../cinnamon/gnome-screenshot
+DEPENDS+= gnome-backgrounds>=3.26:../../graphics/gnome-backgrounds
+DEPENDS+= gnome-themes-standard>=3.20.0:../../graphics/gnome-themes-standard
+DEPENDS+= gnome-icon-theme-[0-9]*:../../graphics/gnome-icon-theme
+#DEPENDS+= gnome-terminal->=3.0.0:../../cinnamon/gnome-terminal
+DEPENDS+= mate-polkit-[0-9]*:../../security/mate-polkit
+DEPENDS+= mozilla-rootcerts-openssl-[0-9]*:../../security/mozilla-rootcerts-openssl
+
+.include "../../lang/python/application.mk"
+.include "../../devel/glib2/schemas.mk"
+
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../graphics/clutter-gtk/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../security/polkit/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
+.include "../../sysutils/py-dbus/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libcroco/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+
+.include "../../wip/cjs/buildlink3.mk"
+.include "../../wip/cinnamon-menus/buildlink3.mk"
+.include "../../wip/cinnamon-desktop/buildlink3.mk"
+.include "../../wip/cinnamon-session/buildlink3.mk"
+.include "../../wip/cinnamon-screensaver/buildlink3.mk"
+.include "../../wip/cinnamon-control-center/buildlink3.mk"
+.include "../../wip/cinnamon-settings-daemon/buildlink3.mk"
+.include "../../wip/muffin/buildlink3.mk"
+.include "../../wip/nemo/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon/PLIST b/cinnamon/PLIST
new file mode 100644
index 0000000000..1c93db1e38
--- /dev/null
+++ b/cinnamon/PLIST
@@ -0,0 +1,723 @@
+@comment $NetBSD$
+bin/cinnamon
+bin/cinnamon-desktop-editor
+bin/cinnamon-file-dialog
+bin/cinnamon-install-spice
+bin/cinnamon-json-makepot
+bin/cinnamon-killer-daemon
+bin/cinnamon-launcher
+bin/cinnamon-looking-glass
+bin/cinnamon-menu-editor
+bin/cinnamon-preview-gtk-theme
+bin/cinnamon-schema-install
+bin/cinnamon-schema-remove
+bin/cinnamon-screensaver-lock-dialog
+bin/cinnamon-session-cinnamon
+bin/cinnamon-session-cinnamon2d
+bin/cinnamon-settings
+bin/cinnamon-settings-users
+bin/cinnamon-slideshow
+bin/cinnamon-subprocess-wrapper
+bin/cinnamon-xlet-makepot
+bin/cinnamon2d
+bin/xlet-settings
+lib/cinnamon/Cinnamon-0.1.typelib
+lib/cinnamon/St-1.0.typelib
+lib/cinnamon/libcinnamon.la
+libexec/cinnamon/cinnamon-hotplug-sniffer
+libexec/cinnamon/cinnamon-perf-helper
+man/man1/cinnamon-launcher.1
+man/man1/cinnamon-menu-editor.1
+man/man1/cinnamon-settings.1
+man/man1/cinnamon.1
+man/man1/cinnamon2d.1
+man/man1/gnome-session-cinnamon.1
+man/man1/gnome-session-cinnamon2d.1
+share/applications/cinnamon-killer-daemon.desktop
+share/applications/cinnamon-menu-editor.desktop
+share/applications/cinnamon-onscreen-keyboard.desktop
+share/applications/cinnamon-settings-applets.desktop
+share/applications/cinnamon-settings-backgrounds.desktop
+share/applications/cinnamon-settings-calendar.desktop
+share/applications/cinnamon-settings-default.desktop
+share/applications/cinnamon-settings-desklets.desktop
+share/applications/cinnamon-settings-desktop.desktop
+share/applications/cinnamon-settings-effects.desktop
+share/applications/cinnamon-settings-extensions.desktop
+share/applications/cinnamon-settings-fonts.desktop
+share/applications/cinnamon-settings-general.desktop
+share/applications/cinnamon-settings-hotcorner.desktop
+share/applications/cinnamon-settings-info.desktop
+share/applications/cinnamon-settings-keyboard.desktop
+share/applications/cinnamon-settings-mouse.desktop
+share/applications/cinnamon-settings-notifications.desktop
+share/applications/cinnamon-settings-panel.desktop
+share/applications/cinnamon-settings-power.desktop
+share/applications/cinnamon-settings-privacy.desktop
+share/applications/cinnamon-settings-screensaver.desktop
+share/applications/cinnamon-settings-sound.desktop
+share/applications/cinnamon-settings-startup.desktop
+share/applications/cinnamon-settings-themes.desktop
+share/applications/cinnamon-settings-tiling.desktop
+share/applications/cinnamon-settings-universal-access.desktop
+share/applications/cinnamon-settings-user.desktop
+share/applications/cinnamon-settings-users.desktop
+share/applications/cinnamon-settings-windows.desktop
+share/applications/cinnamon-settings-workspaces.desktop
+share/applications/cinnamon-settings.desktop
+share/applications/cinnamon.desktop
+share/applications/cinnamon2d.desktop
+share/cinnamon-session/sessions/cinnamon.session
+share/cinnamon-session/sessions/cinnamon2d.session
+share/cinnamon/applets/a11y%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/a11y%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/calendar%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/calendar%cinnamon.org@localhost/calendar.js
+share/cinnamon/applets/calendar%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/calendar%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/expo%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/expo%cinnamon.org@localhost/icons/cinnamon-expo-symbolic.svg
+share/cinnamon/applets/expo%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/expo%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/inhibit%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/inhibit%cinnamon.org@localhost/icons/inhibit-active-symbolic.svg
+share/cinnamon/applets/inhibit%cinnamon.org@localhost/icons/inhibit-symbolic.svg
+share/cinnamon/applets/inhibit%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/keyboard%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/keyboard%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/menu%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/menu%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/menu%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/notifications%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/notifications%cinnamon.org@localhost/icons/alt-critical-notif-symbolic.svg
+share/cinnamon/applets/notifications%cinnamon.org@localhost/icons/critical-notif-symbolic.svg
+share/cinnamon/applets/notifications%cinnamon.org@localhost/icons/empty-notif-symbolic.svg
+share/cinnamon/applets/notifications%cinnamon.org@localhost/icons/low-notif-symbolic.svg
+share/cinnamon/applets/notifications%cinnamon.org@localhost/icons/normal-notif-symbolic.svg
+share/cinnamon/applets/notifications%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/notifications%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/on-screen-keyboard%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/on-screen-keyboard%cinnamon.org@localhost/icons/on-screen-keyboard-disabled-symbolic.svg
+share/cinnamon/applets/on-screen-keyboard%cinnamon.org@localhost/icons/on-screen-keyboard-symbolic.svg
+share/cinnamon/applets/on-screen-keyboard%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/panel-launchers%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/panel-launchers%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/panel-launchers%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/power%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/power%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/power%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/recent%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/recent%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/removable-drives%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/removable-drives%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/scale%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/scale%cinnamon.org@localhost/icons/cinnamon-scale-symbolic.svg
+share/cinnamon/applets/scale%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/scale%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/separator%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/separator%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/settings-example%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/settings-example%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/settings-example%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/settings%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/settings%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/show-desktop%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/show-desktop%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/show-desktop%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/slideshow%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/slideshow%cinnamon.org@localhost/icons/slideshow-disabled-symbolic.svg
+share/cinnamon/applets/slideshow%cinnamon.org@localhost/icons/slideshow-pause-symbolic.svg
+share/cinnamon/applets/slideshow%cinnamon.org@localhost/icons/slideshow-play-symbolic.svg
+share/cinnamon/applets/slideshow%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/sound%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/sound%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/sound%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/spacer%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/spacer%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/spacer%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/systray%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/systray%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/trash%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/trash%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/user%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/user%cinnamon.org@localhost/icons/logout-symbolic.svg
+share/cinnamon/applets/user%cinnamon.org@localhost/icons/switch-user-symbolic.svg
+share/cinnamon/applets/user%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/user%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/user%cinnamon.org@localhost/stylesheet.css
+share/cinnamon/applets/window-list%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/window-list%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/window-list%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/windows-quick-list%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/windows-quick-list%cinnamon.org@localhost/icons/windows-quick-list-symbolic.svg
+share/cinnamon/applets/windows-quick-list%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/workspace-switcher%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/workspace-switcher%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/workspace-switcher%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/applets/xrandr%cinnamon.org@localhost/applet.js
+share/cinnamon/applets/xrandr%cinnamon.org@localhost/metadata.json
+share/cinnamon/applets/xrandr%cinnamon.org@localhost/stylesheet.css
+share/cinnamon/bumpmaps/birdnfish.png
+share/cinnamon/bumpmaps/brick.png
+share/cinnamon/bumpmaps/fish.png
+share/cinnamon/bumpmaps/frost.png
+share/cinnamon/bumpmaps/hex.png
+share/cinnamon/bumpmaps/lizard.png
+share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+share/cinnamon/cinnamon-desktop-editor/directory-editor.ui
+share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
+share/cinnamon/cinnamon-looking-glass/cinnamon-looking-glass.py
+share/cinnamon/cinnamon-looking-glass/lookingglass_proxy.py
+share/cinnamon/cinnamon-looking-glass/page_extensions.py
+share/cinnamon/cinnamon-looking-glass/page_inspect.py
+share/cinnamon/cinnamon-looking-glass/page_log.py
+share/cinnamon/cinnamon-looking-glass/page_memory.py
+share/cinnamon/cinnamon-looking-glass/page_results.py
+share/cinnamon/cinnamon-looking-glass/page_windows.py
+share/cinnamon/cinnamon-looking-glass/pageutils.py
+share/cinnamon/cinnamon-menu-editor/cinnamon-menu-editor.ui
+share/cinnamon/cinnamon-menu-editor/cme/MainWindow.py
+share/cinnamon/cinnamon-menu-editor/cme/MenuEditor.py
+share/cinnamon/cinnamon-menu-editor/cme/__init__.py
+share/cinnamon/cinnamon-menu-editor/cme/config.py
+share/cinnamon/cinnamon-menu-editor/cme/util.py
+share/cinnamon/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+share/cinnamon/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
+share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.svg
+share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.ui
+share/cinnamon/cinnamon-settings/bin/ChooserButtonWidgets.py
+share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
+share/cinnamon/cinnamon-settings/bin/ExtensionCore.py
+share/cinnamon/cinnamon-settings/bin/GSettingsWidgets.py
+share/cinnamon/cinnamon-settings/bin/JsonSettingsWidgets.py
+share/cinnamon/cinnamon-settings/bin/KeybindingWidgets.py
+share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
+share/cinnamon/cinnamon-settings/bin/Spices.py
+share/cinnamon/cinnamon-settings/bin/TreeListWidgets.py
+share/cinnamon/cinnamon-settings/bin/__init__.py
+share/cinnamon/cinnamon-settings/bin/capi.py
+share/cinnamon/cinnamon-settings/bin/eyedropper.py
+share/cinnamon/cinnamon-settings/bin/imtools.py
+share/cinnamon/cinnamon-settings/bin/proxygsettings.py
+share/cinnamon/cinnamon-settings/bin/tweenEquations.py
+share/cinnamon/cinnamon-settings/cinnamon-online-accounts-info.ui
+share/cinnamon/cinnamon-settings/cinnamon-settings.py
+share/cinnamon/cinnamon-settings/cinnamon-settings.ui
+share/cinnamon/cinnamon-settings/config.py
+share/cinnamon/cinnamon-settings/modules/cs_accessibility.py
+share/cinnamon/cinnamon-settings/modules/cs_applets.py
+share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+share/cinnamon/cinnamon-settings/modules/cs_calendar.py
+share/cinnamon/cinnamon-settings/modules/cs_default.py
+share/cinnamon/cinnamon-settings/modules/cs_desklets.py
+share/cinnamon/cinnamon-settings/modules/cs_desktop.py
+share/cinnamon/cinnamon-settings/modules/cs_effects.py
+share/cinnamon/cinnamon-settings/modules/cs_extensions.py
+share/cinnamon/cinnamon-settings/modules/cs_fonts.py
+share/cinnamon/cinnamon-settings/modules/cs_general.py
+share/cinnamon/cinnamon-settings/modules/cs_hotcorner.py
+share/cinnamon/cinnamon-settings/modules/cs_info.py
+share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
+share/cinnamon/cinnamon-settings/modules/cs_mouse.py
+share/cinnamon/cinnamon-settings/modules/cs_notifications.py
+share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py
+share/cinnamon/cinnamon-settings/modules/cs_panel.py
+share/cinnamon/cinnamon-settings/modules/cs_power.py
+share/cinnamon/cinnamon-settings/modules/cs_privacy.py
+share/cinnamon/cinnamon-settings/modules/cs_screensaver.py
+share/cinnamon/cinnamon-settings/modules/cs_sound.py
+share/cinnamon/cinnamon-settings/modules/cs_startup.py
+share/cinnamon/cinnamon-settings/modules/cs_themes.py
+share/cinnamon/cinnamon-settings/modules/cs_tiling.py
+share/cinnamon/cinnamon-settings/modules/cs_user.py
+share/cinnamon/cinnamon-settings/modules/cs_windows.py
+share/cinnamon/cinnamon-settings/modules/cs_workspaces.py
+share/cinnamon/cinnamon-settings/xlet-settings.py
+share/cinnamon/cinnamon-slideshow/cinnamon-slideshow.py
+share/cinnamon/desklets/clock%cinnamon.org@localhost/desklet.js
+share/cinnamon/desklets/clock%cinnamon.org@localhost/metadata.json
+share/cinnamon/desklets/clock%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/desklets/launcher%cinnamon.org@localhost/desklet.js
+share/cinnamon/desklets/launcher%cinnamon.org@localhost/editorDialog.py
+share/cinnamon/desklets/launcher%cinnamon.org@localhost/editorDialog.ui
+share/cinnamon/desklets/launcher%cinnamon.org@localhost/metadata.json
+share/cinnamon/desklets/photoframe%cinnamon.org@localhost/desklet.js
+share/cinnamon/desklets/photoframe%cinnamon.org@localhost/icon.png
+share/cinnamon/desklets/photoframe%cinnamon.org@localhost/metadata.json
+share/cinnamon/desklets/photoframe%cinnamon.org@localhost/settings-schema.json
+share/cinnamon/desklets/photoframe%cinnamon.org@localhost/stylesheet.css
+share/cinnamon/faces/0_cars.jpg
+share/cinnamon/faces/0_chess.jpg
+share/cinnamon/faces/0_coffee.jpg
+share/cinnamon/faces/0_guitar.jpg
+share/cinnamon/faces/2_10.png
+share/cinnamon/faces/2_11.png
+share/cinnamon/faces/2_12.png
+share/cinnamon/faces/2_13.png
+share/cinnamon/faces/3_lightning.jpg
+share/cinnamon/faces/3_mountain.jpg
+share/cinnamon/faces/3_sky.jpg
+share/cinnamon/faces/3_sunset.jpg
+share/cinnamon/faces/4_cinnamon.jpg
+share/cinnamon/faces/4_flower.jpg
+share/cinnamon/faces/4_leaf.jpg
+share/cinnamon/faces/4_sunflower.jpg
+share/cinnamon/faces/5_fish.jpg
+share/cinnamon/faces/5_kitten.jpg
+share/cinnamon/faces/5_penguin.jpg
+share/cinnamon/faces/5_puppy.jpg
+share/cinnamon/faces/6_astronaut.jpg
+share/cinnamon/faces/6_butterfly.png
+share/cinnamon/faces/6_flake.jpg
+share/cinnamon/faces/6_grapes.jpg
+share/cinnamon/faces/7_bat.png
+share/cinnamon/faces/7_dog.png
+share/cinnamon/faces/7_elephant.png
+share/cinnamon/faces/7_fox.png
+share/cinnamon/faces/7_lion.png
+share/cinnamon/faces/7_panda.png
+share/cinnamon/faces/7_penguin.png
+share/cinnamon/faces/7_tucan.png
+share/cinnamon/faces/user-generic.png
+share/cinnamon/icons/move-symbolic.svg
+share/cinnamon/js/misc/config.js
+share/cinnamon/js/misc/docInfo.js
+share/cinnamon/js/misc/fileDialog.js
+share/cinnamon/js/misc/fileUtils.js
+share/cinnamon/js/misc/gnomeSession.js
+share/cinnamon/js/misc/gridNavigator.js
+share/cinnamon/js/misc/history.js
+share/cinnamon/js/misc/interfaces.js
+share/cinnamon/js/misc/modemManager.js
+share/cinnamon/js/misc/params.js
+share/cinnamon/js/misc/pointerTracker.js
+share/cinnamon/js/misc/screenSaver.js
+share/cinnamon/js/misc/signalManager.js
+share/cinnamon/js/misc/timers.js
+share/cinnamon/js/misc/util.js
+share/cinnamon/js/misc/windowUtils.js
+share/cinnamon/js/perf/core.js
+share/cinnamon/js/ui/accessibility.js
+share/cinnamon/js/ui/appFavorites.js
+share/cinnamon/js/ui/appSwitcher/appSwitcher.js
+share/cinnamon/js/ui/appSwitcher/appSwitcher3D.js
+share/cinnamon/js/ui/appSwitcher/classicSwitcher.js
+share/cinnamon/js/ui/appSwitcher/coverflowSwitcher.js
+share/cinnamon/js/ui/appSwitcher/timelineSwitcher.js
+share/cinnamon/js/ui/applet.js
+share/cinnamon/js/ui/appletManager.js
+share/cinnamon/js/ui/backgroundManager.js
+share/cinnamon/js/ui/boxpointer.js
+share/cinnamon/js/ui/checkBox.js
+share/cinnamon/js/ui/cinnamonDBus.js
+share/cinnamon/js/ui/cinnamonEntry.js
+share/cinnamon/js/ui/cinnamonMountOperation.js
+share/cinnamon/js/ui/dbusMenu.js
+share/cinnamon/js/ui/desklet.js
+share/cinnamon/js/ui/deskletManager.js
+share/cinnamon/js/ui/dnd.js
+share/cinnamon/js/ui/edgeFlip.js
+share/cinnamon/js/ui/environment.js
+share/cinnamon/js/ui/expo.js
+share/cinnamon/js/ui/expoThumbnail.js
+share/cinnamon/js/ui/extension.js
+share/cinnamon/js/ui/extensionSystem.js
+share/cinnamon/js/ui/flashspot.js
+share/cinnamon/js/ui/hotCorner.js
+share/cinnamon/js/ui/indicatorManager.js
+share/cinnamon/js/ui/keybindings.js
+share/cinnamon/js/ui/keyboard.js
+share/cinnamon/js/ui/layout.js
+share/cinnamon/js/ui/lightbox.js
+share/cinnamon/js/ui/lookingGlass.js
+share/cinnamon/js/ui/magnifier.js
+share/cinnamon/js/ui/magnifierDBus.js
+share/cinnamon/js/ui/main.js
+share/cinnamon/js/ui/messageTray.js
+share/cinnamon/js/ui/modalDialog.js
+share/cinnamon/js/ui/notificationDaemon.js
+share/cinnamon/js/ui/osdWindow.js
+share/cinnamon/js/ui/overrides.js
+share/cinnamon/js/ui/overview.js
+share/cinnamon/js/ui/panel.js
+share/cinnamon/js/ui/placesManager.js
+share/cinnamon/js/ui/popupMenu.js
+share/cinnamon/js/ui/radioButton.js
+share/cinnamon/js/ui/runDialog.js
+share/cinnamon/js/ui/scripting.js
+share/cinnamon/js/ui/search.js
+share/cinnamon/js/ui/searchProviderManager.js
+share/cinnamon/js/ui/separator.js
+share/cinnamon/js/ui/settings.js
+share/cinnamon/js/ui/slider.js
+share/cinnamon/js/ui/slideshowManager.js
+share/cinnamon/js/ui/soundManager.js
+share/cinnamon/js/ui/statusIconDispatcher.js
+share/cinnamon/js/ui/systray.js
+share/cinnamon/js/ui/themeManager.js
+share/cinnamon/js/ui/tooltips.js
+share/cinnamon/js/ui/tweener.js
+share/cinnamon/js/ui/windowAttentionHandler.js
+share/cinnamon/js/ui/windowEffects.js
+share/cinnamon/js/ui/windowManager.js
+share/cinnamon/js/ui/workspace.js
+share/cinnamon/js/ui/workspacesView.js
+share/cinnamon/js/ui/xdndHandler.js
+share/cinnamon/search_providers/google.xml
+share/cinnamon/search_providers/wikipedia.xml
+share/cinnamon/sounds/bell.ogg
+share/cinnamon/sounds/togglekeys-sound-off.ogg
+share/cinnamon/sounds/togglekeys-sound-on.ogg
+share/cinnamon/theme/add-workspace-hover.png
+share/cinnamon/theme/add-workspace.png
+share/cinnamon/theme/calendar-arrow-left.svg
+share/cinnamon/theme/calendar-arrow-right.svg
+share/cinnamon/theme/calendar-today.svg
+share/cinnamon/theme/checkbox-off.svg
+share/cinnamon/theme/checkbox.svg
+share/cinnamon/theme/cinnamon.css
+share/cinnamon/theme/close-window.svg
+share/cinnamon/theme/close.svg
+share/cinnamon/theme/corner-ripple.png
+share/cinnamon/theme/menu-symbolic.svg
+share/cinnamon/theme/overview-hover.png
+share/cinnamon/theme/overview.png
+share/cinnamon/theme/process-working.svg
+share/cinnamon/theme/radiobutton-off.svg
+share/cinnamon/theme/radiobutton.svg
+share/cinnamon/theme/scroll-hhandle.svg
+share/cinnamon/theme/scroll-vhandle.svg
+share/cinnamon/theme/thumbnail-generic.png
+share/cinnamon/theme/thumbnail.png
+share/cinnamon/theme/toggle-off-intl.svg
+share/cinnamon/theme/toggle-off-us.svg
+share/cinnamon/theme/toggle-on-intl.svg
+share/cinnamon/theme/toggle-on-us.svg
+share/cinnamon/theme/trash-icon.png
+share/cinnamon/thumbnails/cinnamon/unknown.png
+share/cinnamon/thumbnails/cursors/Adwaita.png
+share/cinnamon/thumbnails/cursors/DMZ-Black.png
+share/cinnamon/thumbnails/cursors/DMZ-White.png
+share/cinnamon/thumbnails/cursors/unknown.png
+share/cinnamon/thumbnails/gtk-3.0/Adwaita-dark.png
+share/cinnamon/thumbnails/gtk-3.0/Adwaita.png
+share/cinnamon/thumbnails/gtk-3.0/Box.png
+share/cinnamon/thumbnails/gtk-3.0/HighContrast.png
+share/cinnamon/thumbnails/gtk-3.0/README
+share/cinnamon/thumbnails/gtk-3.0/unknown.png
+share/cinnamon/thumbnails/metacity-1/Adwaita-dark.png
+share/cinnamon/thumbnails/metacity-1/Adwaita.png
+share/cinnamon/thumbnails/metacity-1/AgingGorilla.png
+share/cinnamon/thumbnails/metacity-1/Atlanta.png
+share/cinnamon/thumbnails/metacity-1/Box.png
+share/cinnamon/thumbnails/metacity-1/Bright.png
+share/cinnamon/thumbnails/metacity-1/Crux.png
+share/cinnamon/thumbnails/metacity-1/Esco.png
+share/cinnamon/thumbnails/metacity-1/HighContrast.png
+share/cinnamon/thumbnails/metacity-1/Metabox.png
+share/cinnamon/thumbnails/metacity-1/README
+share/cinnamon/thumbnails/metacity-1/Simple.png
+share/cinnamon/thumbnails/metacity-1/unknown.png
+share/cinnamon/thumbnails/wallclock.png
+share/dbus-1/services/org.Cinnamon.HotplugSniffer.service
+share/dbus-1/services/org.Cinnamon.Melange.service
+share/dbus-1/services/org.Cinnamon.Slideshow.service
+share/desktop-directories/cinnamon-audio-video.directory
+share/desktop-directories/cinnamon-c.directory
+share/desktop-directories/cinnamon-development.directory
+share/desktop-directories/cinnamon-education.directory
+share/desktop-directories/cinnamon-game.directory
+share/desktop-directories/cinnamon-graphics.directory
+share/desktop-directories/cinnamon-hardware.directory
+share/desktop-directories/cinnamon-internet-and-network.directory
+share/desktop-directories/cinnamon-look-and-feel.directory
+share/desktop-directories/cinnamon-menu-applications.directory
+share/desktop-directories/cinnamon-menu-system.directory
+share/desktop-directories/cinnamon-network.directory
+share/desktop-directories/cinnamon-office.directory
+share/desktop-directories/cinnamon-other.directory
+share/desktop-directories/cinnamon-personal.directory
+share/desktop-directories/cinnamon-settings-system.directory
+share/desktop-directories/cinnamon-settings.directory
+share/desktop-directories/cinnamon-system-tools.directory
+share/desktop-directories/cinnamon-system.directory
+share/desktop-directories/cinnamon-utility-accessibility.directory
+share/desktop-directories/cinnamon-utility.directory
+share/examples/menus/cinnamon-applications.menu
+share/glib-2.0/schemas/org.cinnamon.gschema.xml
+share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-SignalManager.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-Applet.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-AppletContextMenu.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-AppletPopupMenu.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-IconApplet.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-MenuItem.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextApplet.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextIconApplet.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-boxpointer-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-boxpointer.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-DBusClient.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-DbusMenuItem.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-PropertyStore.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-desklet-Desklet.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-desklet-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager-DeskletContainer.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dnd-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dnd.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-extension-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-extension.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-indicatorManager-AppIndicator.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-indicatorManager-IconCache.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-indicatorManager-IndicatorActor.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-indicatorManager-XmlLessDBusProxy.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-indicatorManager-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-layout-LayoutManager.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-layout-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-lightbox-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-lightbox.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-magnifierDBus-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-magnifierDBus.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-main-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-main.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-ConfirmDialog.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-InfoOSD.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-ModalDialog.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-NotifyDialog.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-SpicesAboutDialog.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-Panel.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-PanelDummy.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-PanelManager.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupIconMenuItem.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupIndicatorMenuItem.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenu.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuAbstractItem.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuBase.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuFactory.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuSection.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupSubMenu.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-runDialog-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-runDialog.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-scripting-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-scripting.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-search-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-search.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-AppletSettings.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-DeskletSettings.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-ExtensionSettings.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-XletSettingsBase.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-PanelItemTooltip.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-Tooltip.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-TooltipBase.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener-ClutterFrameTicker.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener-section.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener.html
+share/gtk-doc/html/cinnamon-js/cinnamon-js.devhelp2
+share/gtk-doc/html/cinnamon-js/home.png
+share/gtk-doc/html/cinnamon-js/index.html
+share/gtk-doc/html/cinnamon-js/left-insensitive.png
+share/gtk-doc/html/cinnamon-js/left.png
+share/gtk-doc/html/cinnamon-js/right-insensitive.png
+share/gtk-doc/html/cinnamon-js/right.png
+share/gtk-doc/html/cinnamon-js/style.css
+share/gtk-doc/html/cinnamon-js/up-insensitive.png
+share/gtk-doc/html/cinnamon-js/up.png
+share/gtk-doc/html/cinnamon-st/StBin.html
+share/gtk-doc/html/cinnamon-st/StBoxLayout.html
+share/gtk-doc/html/cinnamon-st/StButton.html
+share/gtk-doc/html/cinnamon-st/StDrawingArea.html
+share/gtk-doc/html/cinnamon-st/StEntry.html
+share/gtk-doc/html/cinnamon-st/StIcon.html
+share/gtk-doc/html/cinnamon-st/StLabel.html
+share/gtk-doc/html/cinnamon-st/StScrollView.html
+share/gtk-doc/html/cinnamon-st/StScrollable.html
+share/gtk-doc/html/cinnamon-st/StTable.html
+share/gtk-doc/html/cinnamon-st/StTextureCache.html
+share/gtk-doc/html/cinnamon-st/StThemeNodeTransition.html
+share/gtk-doc/html/cinnamon-st/StWidget.html
+share/gtk-doc/html/cinnamon-st/StWidgetAccessible.html
+share/gtk-doc/html/cinnamon-st/annotation-glossary.html
+share/gtk-doc/html/cinnamon-st/api-index-full.html
+share/gtk-doc/html/cinnamon-st/base.html
+share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme-context.html
+share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme-node.html
+share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme.html
+share/gtk-doc/html/cinnamon-st/cinnamon-st.devhelp2
+share/gtk-doc/html/cinnamon-st/containers.html
+share/gtk-doc/html/cinnamon-st/deprecated-api-index.html
+share/gtk-doc/html/cinnamon-st/home.png
+share/gtk-doc/html/cinnamon-st/index.html
+share/gtk-doc/html/cinnamon-st/left-insensitive.png
+share/gtk-doc/html/cinnamon-st/left.png
+share/gtk-doc/html/cinnamon-st/object-tree.html
+share/gtk-doc/html/cinnamon-st/pt01.html
+share/gtk-doc/html/cinnamon-st/right-insensitive.png
+share/gtk-doc/html/cinnamon-st/right.png
+share/gtk-doc/html/cinnamon-st/style.css
+share/gtk-doc/html/cinnamon-st/styling.html
+share/gtk-doc/html/cinnamon-st/up-insensitive.png
+share/gtk-doc/html/cinnamon-st/up.png
+share/gtk-doc/html/cinnamon-st/widgets.html
+share/gtk-doc/html/cinnamon-tutorials/building.html
+share/gtk-doc/html/cinnamon-tutorials/cinnamon-tutorials.devhelp2
+share/gtk-doc/html/cinnamon-tutorials/cjs.html
+share/gtk-doc/html/cinnamon-tutorials/documentation.html
+share/gtk-doc/html/cinnamon-tutorials/documenting-source.html
+share/gtk-doc/html/cinnamon-tutorials/documenting-tutorial.html
+share/gtk-doc/html/cinnamon-tutorials/extension-system.html
+share/gtk-doc/html/cinnamon-tutorials/home.png
+share/gtk-doc/html/cinnamon-tutorials/importer.html
+share/gtk-doc/html/cinnamon-tutorials/index.html
+share/gtk-doc/html/cinnamon-tutorials/left-insensitive.png
+share/gtk-doc/html/cinnamon-tutorials/left.png
+share/gtk-doc/html/cinnamon-tutorials/right-insensitive.png
+share/gtk-doc/html/cinnamon-tutorials/right.png
+share/gtk-doc/html/cinnamon-tutorials/settings.png
+share/gtk-doc/html/cinnamon-tutorials/style.css
+share/gtk-doc/html/cinnamon-tutorials/up-insensitive.png
+share/gtk-doc/html/cinnamon-tutorials/up.png
+share/gtk-doc/html/cinnamon-tutorials/using-documentation.html
+share/gtk-doc/html/cinnamon-tutorials/write-applet.html
+share/gtk-doc/html/cinnamon-tutorials/xlet-settings-ref.html
+share/gtk-doc/html/cinnamon-tutorials/xlet-settings.html
+share/gtk-doc/html/cinnamon-tutorials/xlet-translating.html
+share/gtk-doc/html/cinnamon-tutorials/xlet-versioning.html
+share/gtk-doc/html/cinnamon/CinnamonApp.html
+share/gtk-doc/html/cinnamon/CinnamonAppSystem.html
+share/gtk-doc/html/cinnamon/CinnamonEmbeddedWindow.html
+share/gtk-doc/html/cinnamon/CinnamonGenericContainer.html
+share/gtk-doc/html/cinnamon/CinnamonGlobal.html
+share/gtk-doc/html/cinnamon/CinnamonGtkEmbed.html
+share/gtk-doc/html/cinnamon/CinnamonMountOperation.html
+share/gtk-doc/html/cinnamon/CinnamonSlicer.html
+share/gtk-doc/html/cinnamon/CinnamonStack.html
+share/gtk-doc/html/cinnamon/CinnamonTrayIcon.html
+share/gtk-doc/html/cinnamon/CinnamonTrayManager.html
+share/gtk-doc/html/cinnamon/CinnamonWM.html
+share/gtk-doc/html/cinnamon/CinnamonWindowTracker.html
+share/gtk-doc/html/cinnamon/annotation-glossary.html
+share/gtk-doc/html/cinnamon/api-index-full.html
+share/gtk-doc/html/cinnamon/ch01.html
+share/gtk-doc/html/cinnamon/ch02.html
+share/gtk-doc/html/cinnamon/ch03.html
+share/gtk-doc/html/cinnamon/ch04.html
+share/gtk-doc/html/cinnamon/ch05.html
+share/gtk-doc/html/cinnamon/ch06.html
+share/gtk-doc/html/cinnamon/cinnamon-cinnamon-recorder.html
+share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html
+share/gtk-doc/html/cinnamon/cinnamon.devhelp2
+share/gtk-doc/html/cinnamon/deprecated-api-index.html
+share/gtk-doc/html/cinnamon/home.png
+share/gtk-doc/html/cinnamon/index.html
+share/gtk-doc/html/cinnamon/left-insensitive.png
+share/gtk-doc/html/cinnamon/left.png
+share/gtk-doc/html/cinnamon/object-tree.html
+share/gtk-doc/html/cinnamon/right-insensitive.png
+share/gtk-doc/html/cinnamon/right.png
+share/gtk-doc/html/cinnamon/style.css
+share/gtk-doc/html/cinnamon/up-insensitive.png
+share/gtk-doc/html/cinnamon/up.png
+share/icons/hicolor/16x16/categories/cs-backgrounds.svg
+share/icons/hicolor/16x16/categories/cs-desklets.svg
+share/icons/hicolor/scalable/actions/caps-lock-off-symbolic.svg
+share/icons/hicolor/scalable/actions/caps-lock-symbolic.svg
+share/icons/hicolor/scalable/actions/list-edit-symbolic.svg
+share/icons/hicolor/scalable/actions/num-lock-off-symbolic.svg
+share/icons/hicolor/scalable/actions/num-lock-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-down-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-end-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/pan-end-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-start-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/pan-start-symbolic.svg
+share/icons/hicolor/scalable/actions/pan-up-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon-panel-launcher.svg
+share/icons/hicolor/scalable/apps/removable-drives.svg
+share/icons/hicolor/scalable/categories/cs-applets.svg
+share/icons/hicolor/scalable/categories/cs-backgrounds-symbolic.svg
+share/icons/hicolor/scalable/categories/cs-backgrounds.svg
+share/icons/hicolor/scalable/categories/cs-bluetooth.svg
+share/icons/hicolor/scalable/categories/cs-cat-admin.svg
+share/icons/hicolor/scalable/categories/cs-cat-appearance.svg
+share/icons/hicolor/scalable/categories/cs-cat-hardware.svg
+share/icons/hicolor/scalable/categories/cs-cat-prefs.svg
+share/icons/hicolor/scalable/categories/cs-color.svg
+share/icons/hicolor/scalable/categories/cs-date-time.svg
+share/icons/hicolor/scalable/categories/cs-default-applications.svg
+share/icons/hicolor/scalable/categories/cs-desklets-symbolic.svg
+share/icons/hicolor/scalable/categories/cs-desklets.svg
+share/icons/hicolor/scalable/categories/cs-desktop-effects.svg
+share/icons/hicolor/scalable/categories/cs-desktop.svg
+share/icons/hicolor/scalable/categories/cs-details.svg
+share/icons/hicolor/scalable/categories/cs-display.svg
+share/icons/hicolor/scalable/categories/cs-drivers.svg
+share/icons/hicolor/scalable/categories/cs-extensions.svg
+share/icons/hicolor/scalable/categories/cs-firewall.svg
+share/icons/hicolor/scalable/categories/cs-fonts.svg
+share/icons/hicolor/scalable/categories/cs-general.svg
+share/icons/hicolor/scalable/categories/cs-input-method.svg
+share/icons/hicolor/scalable/categories/cs-keyboard.svg
+share/icons/hicolor/scalable/categories/cs-language.svg
+share/icons/hicolor/scalable/categories/cs-linuxmint.svg
+share/icons/hicolor/scalable/categories/cs-login.svg
+share/icons/hicolor/scalable/categories/cs-mouse.svg
+share/icons/hicolor/scalable/categories/cs-network.svg
+share/icons/hicolor/scalable/categories/cs-notifications.svg
+share/icons/hicolor/scalable/categories/cs-online-accounts.svg
+share/icons/hicolor/scalable/categories/cs-overview.svg
+share/icons/hicolor/scalable/categories/cs-panel.svg
+share/icons/hicolor/scalable/categories/cs-power.svg
+share/icons/hicolor/scalable/categories/cs-printer.svg
+share/icons/hicolor/scalable/categories/cs-privacy.svg
+share/icons/hicolor/scalable/categories/cs-region.svg
+share/icons/hicolor/scalable/categories/cs-retro.svg
+share/icons/hicolor/scalable/categories/cs-screen.svg
+share/icons/hicolor/scalable/categories/cs-screensaver.svg
+share/icons/hicolor/scalable/categories/cs-sound.svg
+share/icons/hicolor/scalable/categories/cs-sources.svg
+share/icons/hicolor/scalable/categories/cs-startup-programs.svg
+share/icons/hicolor/scalable/categories/cs-tablet.svg
+share/icons/hicolor/scalable/categories/cs-themes.svg
+share/icons/hicolor/scalable/categories/cs-tiling.svg
+share/icons/hicolor/scalable/categories/cs-universal-access.svg
+share/icons/hicolor/scalable/categories/cs-user-accounts.svg
+share/icons/hicolor/scalable/categories/cs-user.svg
+share/icons/hicolor/scalable/categories/cs-windows.svg
+share/icons/hicolor/scalable/categories/cs-workspaces.svg
+share/icons/hicolor/scalable/devices/audio-speaker-center-back.svg
+share/icons/hicolor/scalable/devices/audio-speaker-center.svg
+share/icons/hicolor/scalable/devices/audio-speaker-left-back.svg
+share/icons/hicolor/scalable/devices/audio-speaker-left-side.svg
+share/icons/hicolor/scalable/devices/audio-speaker-left.svg
+share/icons/hicolor/scalable/devices/audio-speaker-right-back.svg
+share/icons/hicolor/scalable/devices/audio-speaker-right-side.svg
+share/icons/hicolor/scalable/devices/audio-speaker-right.svg
+share/icons/hicolor/scalable/devices/audio-subwoofer.svg
+share/icons/hicolor/scalable/devices/bluetooth.svg
+share/icons/hicolor/scalable/devices/cpu-symbolic.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-danger.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-error.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
+share/polkit-1/actions/org.cinnamon.schema-install.policy
+share/polkit-1/actions/org.cinnamon.schema-remove.policy
+share/polkit-1/actions/org.cinnamon.settings-users.policy
+share/polkit-1/rules.d/desktop.rules
+share/xsessions/cinnamon.desktop
+share/xsessions/cinnamon2d.desktop
diff --git a/cinnamon/distinfo b/cinnamon/distinfo
new file mode 100644
index 0000000000..a2ac6fe0c4
--- /dev/null
+++ b/cinnamon/distinfo
@@ -0,0 +1,14 @@
+$NetBSD$
+
+SHA1 (cinnamon-3.8.2.tar.gz) = e121aea173cce905efd9e99708bd2b5a7c19df67
+RMD160 (cinnamon-3.8.2.tar.gz) = 516c9b874c9a7eea5f420c128fc2dedf54bc4ca6
+SHA512 (cinnamon-3.8.2.tar.gz) = beaa93a2881acfb5e9c738d49f150fd7ae7cba8827a607a394607fe2893f47a5e94cd6b2835d056f31986621f4d1fedc3d8d8f3ce75c8fd094782d6fb4a2a419
+Size (cinnamon-3.8.2.tar.gz) = 2238207 bytes
+SHA1 (patch-configure.ac) = e8b055699a6d98feaa19855cc306720cd444120a
+SHA1 (patch-data_org.cinnamon.gschema.xml.in) = 2b0e12c578cc007232d3ad11813774142244a562
+SHA1 (patch-files_Makefile.in) = 435a12f03baabd1e3ec482d9a5f4f28645a689a2
+SHA1 (patch-files_usr_share_cinnamon-session_sessions_cinnamon.session) = b8e63c49d1a53d49ddccb3bb156edda99886c414
+SHA1 (patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py) = 46953a3fd347bdd2023298e748ae04d09d8a728d
+SHA1 (patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__backgrounds.py) = ff773942a592ca48281876c8e02a35dd6eb452c2
+SHA1 (patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py) = 9f88ce95c464b5c673c0a9f0dbc7be15daff2f7d
+SHA1 (patch-src_Makefile.am) = a2445ebbbca1fa66e56307251e83ba80714da7ec
diff --git a/cinnamon/files/desktop.rules b/cinnamon/files/desktop.rules
new file mode 100644
index 0000000000..d8257d69c2
--- /dev/null
+++ b/cinnamon/files/desktop.rules
@@ -0,0 +1,95 @@
+// suspend, hibernate
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.freedesktop.upower.hibernate" ||
+ action.id == "org.freedesktop.upower.suspend" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
+
+// shutdown, restart
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.freedesktop.consolekit.system.stop" ||
+ action.id == "org.freedesktop.consolekit.system.restart" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
+
+// color management
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.freedesktop.color-manager.create-device" ||
+ action.id == "org.freedesktop.color-manager.create-profile" ||
+ action.id == "org.freedesktop.color-manager.delete-device" ||
+ action.id == "org.freedesktop.color-manager.delete-profile" ||
+ action.id == "org.freedesktop.color-manager.device-inhibit" ||
+ action.id == "org.freedesktop.color-manager.modify-device" ||
+ action.id == "org.freedesktop.color-manager.modify-profile" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
+
+// media
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.freedesktop.udisks2.eject-media" ||
+ action.id == "org.freedesktop.udisks2.filesystem-mount" ||
+ action.id == "org.freedesktop.udisks2.filesystem-mount-other-seat" ||
+ action.id == "org.freedesktop.udisks2.filesystem-mount-system" ||
+ action.id == "org.freedesktop.udisks2.filesystem-unmount-others" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
+
+// screen backlight
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.cinnamon.settings-daemon.plugins.power.backlight-helper" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
+
+// network manager
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.freedesktop.NetworkManager.enable-disable-network" ||
+ action.id == "org.freedesktop.NetworkManager.enable-disable-wifi" ||
+ action.id == "org.freedesktop.NetworkManager.enable-disable-wwan" ||
+ action.id == "org.freedesktop.NetworkManager.network-control" ||
+ action.id == "org.freedesktop.NetworkManager.settings.modify.hostname" ||
+ action.id == "org.freedesktop.NetworkManager.settings.modify.own" ||
+ action.id == "org.freedesktop.NetworkManager.settings.modify.system" ||
+ action.id == "org.freedesktop.NetworkManager.sleep-wake" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
+
+// others
+polkit.addRule (function(action, subject)
+{
+ if (action.id == "org.freedesktop.locale1.set-keyboard" ||
+ action.id == "org.freedesktop.locale1.set-locale" ||
+ action.id == "org.freedesktop.timedate1.set-local-rtc" ||
+ action.id == "org.freedesktop.timedate1.set-ntp" ||
+ action.id == "org.freedesktop.timedate1.set-time" ||
+ action.id == "org.freedesktop.timedate1.set-timezone" ||
+ action.id == "org.cinnamon.settings-users" ||
+ action.id == "org.nemo.root" &&
+ subject.isInGroup ("operator"))
+ {
+ return polkit.Result.YES;
+ }
+});
diff --git a/cinnamon/patches/patch-configure.ac b/cinnamon/patches/patch-configure.ac
new file mode 100644
index 0000000000..ad0c57c4ae
--- /dev/null
+++ b/cinnamon/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Disable check for linux only networkmanager.
+
+--- configure.ac.orig 2018-05-06 15:13:24.000000000 +0000
++++ configure.ac
+@@ -77,7 +77,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $
+ libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+ gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+- libnm-glib libnm-util atk-bridge-2.0)
++ atk-bridge-2.0)
+
+ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+
diff --git a/cinnamon/patches/patch-data_org.cinnamon.gschema.xml.in b/cinnamon/patches/patch-data_org.cinnamon.gschema.xml.in
new file mode 100644
index 0000000000..e1b636a159
--- /dev/null
+++ b/cinnamon/patches/patch-data_org.cinnamon.gschema.xml.in
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Use a default theme.
+
+--- data/org.cinnamon.gschema.xml.in.orig 2018-05-06 15:13:24.000000000 +0000
++++ data/org.cinnamon.gschema.xml.in
+@@ -412,7 +412,7 @@
+ </key>
+
+ <key name="favorite-apps" type="as">
+- <default>[ 'firefox.desktop', 'mintinstall.desktop', 'cinnamon-settings.desktop', 'hexchat.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop' ]</default>
++ <default>[ 'firefox.desktop', 'org.gnome.Software.desktop', 'cinnamon-settings.desktop', 'hexchat.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop' ]</default>
+ <_summary>List of desktop file IDs for favorite applications</_summary>
+ <_description>
+ The applications corresponding to these identifiers
+@@ -657,7 +657,7 @@
+ <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
+ gettext-domain="@GETTEXT_PACKAGE@">
+ <key name="name" type="s">
+- <default>""</default>
++ <default>"cinnamon"</default>
+ <_summary>Theme name</_summary>
+ <_description>
+ The name of the theme
diff --git a/cinnamon/patches/patch-files_Makefile.in b/cinnamon/patches/patch-files_Makefile.in
new file mode 100644
index 0000000000..cb0203fe8d
--- /dev/null
+++ b/cinnamon/patches/patch-files_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Copy files to destdir.
+
+--- files/Makefile.in.orig 2018-05-06 15:13:24.000000000 +0000
++++ files/Makefile.in
+@@ -7,7 +7,10 @@ distclean:
+ maintainer-clean:
+
+ install:
+- find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
++ find . -name "*.orig" -exec rm {} \;
++ cp -r usr/* $(DESTDIR)$(PREFIX);
++ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/menus;
++ cp etc/xdg/menus/cinnamon-applications.menu $(DESTDIR)$(PREFIX)/share/examples/menus/;
++
+
+ uninstall:
+- find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/cinnamon/patches/patch-files_usr_share_cinnamon-session_sessions_cinnamon.session b/cinnamon/patches/patch-files_usr_share_cinnamon-session_sessions_cinnamon.session
new file mode 100644
index 0000000000..7f2013f063
--- /dev/null
+++ b/cinnamon/patches/patch-files_usr_share_cinnamon-session_sessions_cinnamon.session
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add the MATE polkit authentication agent.
+
+--- files/usr/share/cinnamon-session/sessions/cinnamon.session.orig 2018-05-06 15:13:24.000000000 +0000
++++ files/usr/share/cinnamon-session/sessions/cinnamon.session
+@@ -1,6 +1,6 @@
+ [Cinnamon Session]
+ Name=Cinnamon
+-RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
++RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;polkit-mate-authentication-agent-1;
+ DesktopName=X-Cinnamon
+
+
diff --git a/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py b/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
new file mode 100644
index 0000000000..1ca533041a
--- /dev/null
+++ b/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
@@ -0,0 +1,125 @@
+$NetBSD$
+
+Add NetBSD backend and deal with group removal.
+
+--- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2018-05-26 23:40:41.000000000 +0000
++++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -573,6 +573,29 @@ class Module:
+ dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window)
+ response = dialog.run()
+
++ def _remove_from_group(self, username, group):
++ with open('/etc/group', 'r') as group_file:
++ groups = group_file.read()
++ grouplines = groups.splitlines()
++ for entry in grouplines:
++ fields = entry.split(':')
++ if group == fields[0]:
++ users = fields[3].split(',')
++ users[-1] = users[-1].rstrip()
++ if username in users:
++ newentry = entry
++ replace = [
++ (r'\b' + username + r'\b', ''),
++ (',,', ','),
++ (':,', ':'),
++ (r',$', '')
++ ]
++ for old, new in replace:
++ newentry = re.sub(old, new, newentry)
++ newgroups = groups.replace(entry, newentry)
++ with open("/etc/group", "w") as group_file:
++ group_file.write(newgroups)
++
+ def _on_groups_button_clicked(self, widget):
+ model, treeiter = self.users_treeview.get_selection().get_selected()
+ if treeiter != None:
+@@ -581,7 +604,15 @@ class Module:
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+ groups = dialog.get_selected_groups()
+- subprocess.call(["usermod", user.get_user_name(), "-G", ",".join(groups)])
++ # Add groups for user
++ subprocess.call(["usermod", "-G", ",".join(groups), user.get_user_name()])
++ # Remove deselected groups for user
++ old_groups = set(map(str.strip, self.groups_label.get_text().split(",")))
++ new_groups = set(map(str.strip, groups))
++ if new_groups < old_groups:
++ for del_group in old_groups - new_groups:
++ self._remove_from_group(user.get_user_name(), del_group)
++
+ groups.sort()
+ self.groups_label.set_text(", ".join(groups))
+ dialog.destroy()
+@@ -593,6 +624,8 @@ class Module:
+ if self.account_type_combo.get_active() == 1:
+ user.set_account_type(AccountsService.UserAccountType.ADMINISTRATOR)
+ else:
++ # Remove user from wheel
++ self._remove_from_group(user.get_user_name(), "wheel")
+ user.set_account_type(AccountsService.UserAccountType.STANDARD)
+
+ groups = []
+@@ -748,7 +781,16 @@ class Module:
+ else:
+ self.password_mask.set_text(_("Set at login"))
+
+- if user.get_account_type() == AccountsService.UserAccountType.ADMINISTRATOR:
++ groups = []
++ is_admin = False
++ for group in grp.getgrall():
++ if user.get_user_name() in group[3]:
++ groups.append(group[0])
++ if group[0] == "wheel":
++ is_admin = True
++ groups.sort()
++
++ if is_admin:
+ self.account_type_combo.set_active(1)
+ else:
+ self.account_type_combo.set_active(0)
+@@ -779,17 +821,12 @@ class Module:
+ print(message)
+ self.face_image.set_from_file("/usr/share/cinnamon/faces/user-generic.png")
+
+- groups = []
+- for group in grp.getgrall():
+- if user.get_user_name() in group[3]:
+- groups.append(group[0])
+- groups.sort()
+ self.groups_label.set_text(", ".join(groups))
+ self.builder.get_object("box_users").show()
+
+ # Count the number of connections for the currently logged-in user
+- connections = int(subprocess.check_output(["w", "-hs", user.get_user_name()]).decode("utf-8").count("\n"))
+- if connections > 0:
++ connections = int(subprocess.check_output(["w", "-h", user.get_user_name()]).decode("utf-8").count("\n"))
++ if connections > 1:
+ self.builder.get_object("button_delete_user").set_sensitive(False)
+ self.builder.get_object("button_delete_user").set_tooltip_text(_("This user is currently logged in"))
+ else:
+@@ -840,10 +877,11 @@ class Module:
+ description = "<b>%s</b>\n%s" % (fullname, username)
+ piter = self.users.append(None, [new_user, pixbuf, description])
+ # Add the user to his/her own group and sudo if Administrator was selected
+- if dialog.account_type_combo.get_active() == 1:
+- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
+- else:
+- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++ #if dialog.account_type_combo.get_active() == 1:
++ # print("trying to add to admins...")
++ # subprocess.call(["usermod", "-G", "%s,sudo,nopasswdlogin" % username, username])
++ #else:
++ # subprocess.call(["usermod", "-G", "%s,nopasswdlogin" % username, username])
+ self.load_groups()
+ dialog.destroy()
+
+@@ -907,7 +945,7 @@ class Module:
+ dialog = GroupDialog(_("Group Name"), group, self.window)
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+- subprocess.call(["groupmod", group, "-n", dialog.entry.get_text().lower()])
++ subprocess.call(["groupmod", "-n", dialog.entry.get_text().lower(), group])
+ self.load_groups()
+ dialog.destroy()
+
diff --git a/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__backgrounds.py b/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__backgrounds.py
new file mode 100644
index 0000000000..ac0c2d0c48
--- /dev/null
+++ b/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__backgrounds.py
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Point to gnome backgrounds.
+
+--- files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py.orig 2018-05-06 15:13:24.000000000 +0000
++++ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+@@ -268,7 +268,7 @@ class Module:
+ def get_system_backgrounds(self):
+ picture_list = []
+ folder_list = []
+- properties_dir = "/usr/share/cinnamon-background-properties"
++ properties_dir = "/usr/share/gnome-background-properties"
+ backgrounds = []
+ if os.path.exists(properties_dir):
+ for i in os.listdir(properties_dir):
diff --git a/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py b/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
new file mode 100644
index 0000000000..66280b242d
--- /dev/null
+++ b/cinnamon/patches/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
@@ -0,0 +1,53 @@
+$NetBSD$
+
+Adapt for NetBSD
+
+--- files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py.orig 2018-05-06 15:13:24.000000000 +0000
++++ files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+@@ -36,14 +36,16 @@ def getGraphicsInfos():
+ count = 0
+ envpath = os.environ["PATH"]
+ os.environ["PATH"] = envpath + ":/usr/local/sbin:/usr/sbin:/sbin"
+- for card in getProcessOut(("lspci")):
++ for card in getProcessOut(["pcictl", "/dev/pci0", "list"]):
+ if not "VGA" in card:
+ continue
+- cardId = card.split()[0]
++ cardN = card.split()[0]
++ cardId = cardN.split(":")[1]
++ cardFun = cardN.split(":")[2]
+ cardName = None
+- for line in getProcessOut(("lspci", "-v", "-s", cardId)):
+- if line.startswith(cardId):
+- cardName = (line.split(":")[2].split("(rev")[0].strip())
++ for line in getProcessOut(("pcictl", "/dev/pci0", "list", "-d", cardId, "-f", cardFun)):
++ if line.startswith(cardN):
++ cardName = (line.split(":")[3].split("(VGA")[0].strip())
+
+ if cardName:
+ cards[count] = (cardName)
+@@ -55,7 +57,7 @@ def getGraphicsInfos():
+ def getDiskSize():
+ disksize = 0
+ moreThanOnce = 0
+- for line in getProcessOut(("df", "-l")):
++ for line in getProcessOut(("df", "-k")):
+ if line.startswith("/dev/"):
+ moreThanOnce += 1
+ disksize += float(line.split()[1])
+@@ -104,13 +106,13 @@ def createSystemInfos():
+ title = ' '.join(contents[:2]) or "Manjaro Linux"
+ infos.append((_("Operating System"), title))
+ else:
+- s = '%s (%s)' % (' '.join(platform.linux_distribution()), arch)
++ s = '%s (%s)' % (platform.system(), arch)
+ # Normalize spacing in distribution name
+ s = re.sub('\s{2,}', ' ', s)
+ infos.append((_("Operating System"), s))
+ if 'CINNAMON_VERSION' in os.environ:
+ infos.append((_("Cinnamon Version"), os.environ['CINNAMON_VERSION']))
+- infos.append((_("Linux Kernel"), platform.release()))
++ infos.append((_(platform.system() + " Kernel"), platform.release()))
+ infos.append((_("Processor"), processorName))
+ if memunit == "kB":
+ infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024)), _("GiB"))))
diff --git a/cinnamon/patches/patch-src_Makefile.am b/cinnamon/patches/patch-src_Makefile.am
new file mode 100644
index 0000000000..e0e3adcf2e
--- /dev/null
+++ b/cinnamon/patches/patch-src_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Remove linux-only dependency.
+
+--- src/Makefile.am.orig 2018-05-06 15:13:24.000000000 +0000
++++ src/Makefile.am
+@@ -222,7 +222,7 @@ libcinnamon_la_LIBADD = \
+ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
+
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
diff --git a/cjs/Makefile b/cjs/Makefile
index 716d5038ef..d225de27d3 100644
--- a/cjs/Makefile
+++ b/cjs/Makefile
@@ -1,31 +1,32 @@
# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-DISTNAME= 3.0.1
-PKGNAME= cjs-${DISTNAME}
+DISTNAME= cjs-3.8.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=/linuxmint/cjs/archive/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= cjs
+GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= youri%NetBSD.org@localhost
HOMEPAGE= https://github.com/linuxmint/cjs
COMMENT= Javascript bindings based on gobject-introspection
LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
USE_TOOLS+= gmake bash pkg-config automake intltool
+CONFIG_SHELL= bash
USE_LANGUAGES= c c++
-PKGCONFIG_OVERRIDE+= libmenu/libcinnamon-menu-3.0.pc.in
+PKGCONFIG_OVERRIDE+= cjs-1.0.pc.in
-pre-configure:
- ${RUN} cd ${WRKSRC} && ./autogen.sh
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
+pre-configure:
+ ${RUN} cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
-.include "../../wip/spidermonkey24/buildlink3.mk"
+.include "../../lang/spidermonkey52/buildlink3.mk"
.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cjs/PLIST b/cjs/PLIST
index 12dba01d1a..fd527e6ad7 100644
--- a/cjs/PLIST
+++ b/cjs/PLIST
@@ -1,36 +1,11 @@
@comment $NetBSD$
bin/cjs
bin/cjs-console
-include/cjs-1.0/cjs/byteArray.h
-include/cjs-1.0/cjs/compat.h
include/cjs-1.0/cjs/context.h
include/cjs-1.0/cjs/coverage.h
-include/cjs-1.0/cjs/gjs-module.h
include/cjs-1.0/cjs/gjs.h
-include/cjs-1.0/cjs/importer.h
-include/cjs-1.0/cjs/jsapi-util.h
-include/cjs-1.0/cjs/mem.h
-include/cjs-1.0/cjs/native.h
-include/cjs-1.0/cjs/runtime.h
-include/cjs-1.0/cjs/type-module.h
-include/cjs-1.0/gi/arg.h
-include/cjs-1.0/gi/boxed.h
-include/cjs-1.0/gi/closure.h
-include/cjs-1.0/gi/enumeration.h
-include/cjs-1.0/gi/foreign.h
-include/cjs-1.0/gi/function.h
-include/cjs-1.0/gi/fundamental.h
-include/cjs-1.0/gi/gerror.h
-include/cjs-1.0/gi/gtype.h
-include/cjs-1.0/gi/interface.h
-include/cjs-1.0/gi/keep-alive.h
-include/cjs-1.0/gi/ns.h
-include/cjs-1.0/gi/object.h
-include/cjs-1.0/gi/param.h
-include/cjs-1.0/gi/repo.h
-include/cjs-1.0/gi/union.h
-include/cjs-1.0/gi/value.h
+include/cjs-1.0/cjs/macros.h
+include/cjs-1.0/util/error.h
lib/cjs/girepository-1.0/CjsPrivate-1.0.typelib
lib/libcjs.la
lib/pkgconfig/cjs-1.0.pc
-lib/pkgconfig/cjs-internals-1.0.pc
diff --git a/cjs/buildlink3.mk b/cjs/buildlink3.mk
index 25ff13b28f..d1b8274cf4 100644
--- a/cjs/buildlink3.mk
+++ b/cjs/buildlink3.mk
@@ -5,10 +5,13 @@ BUILDLINK_TREE+= cjs
.if !defined(CJS_BUILDLINK3_MK)
CJS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.cjs+= cjs>=3.0.1
+BUILDLINK_API_DEPENDS.cjs+= cjs>=3.8.0
BUILDLINK_PKGSRCDIR.cjs?= ../../wip/cjs
-.include "../../wip/spidermonkey24/buildlink3.mk"
+.include "../../lang/spidermonkey52/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
.endif # CJS_BUILDLINK3_MK
BUILDLINK_TREE+= -cjs
diff --git a/cjs/distinfo b/cjs/distinfo
index 21f078ead7..141c25588a 100644
--- a/cjs/distinfo
+++ b/cjs/distinfo
@@ -1,6 +1,6 @@
$NetBSD$
-SHA1 (3.0.1.tar.gz) = 3aa40f8bd0a03d8c5f9cd3fa10b41d258eae1f10
-RMD160 (3.0.1.tar.gz) = 1dfb937782858dd9d5276c2b621b65bc63ef767f
-SHA512 (3.0.1.tar.gz) = 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538
-Size (3.0.1.tar.gz) = 325349 bytes
+SHA1 (cjs-3.8.0.tar.gz) = 751d8d219559693d3abce587e1115f479fccee52
+RMD160 (cjs-3.8.0.tar.gz) = 711aea546cd11d4f10181b04d7d54650a9137e14
+SHA512 (cjs-3.8.0.tar.gz) = 7f776be2d4863ea7bb32e266efb0c5d5e0f86bab68bdabc1478e04809f8f887b4ff0853075baffa46055d347fc22c6252faefaceba750f61b0b21229f6130bd0
+Size (cjs-3.8.0.tar.gz) = 446667 bytes
diff --git a/muffin/DESCR b/muffin/DESCR
new file mode 100644
index 0000000000..b4a3a6a8f4
--- /dev/null
+++ b/muffin/DESCR
@@ -0,0 +1 @@
+Cinnamon window manager
diff --git a/muffin/Makefile b/muffin/Makefile
new file mode 100644
index 0000000000..699c310d71
--- /dev/null
+++ b/muffin/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.17 2013/06/17 12:45:12 thomasklausner Exp $
+
+DISTNAME= muffin-3.8.1
+CATEGORIES= wm
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= muffin
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmin/muffin
+COMMENT= Cinnamon window manager
+LICENSE= gnu-gpl-v2
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake intltool automake msgfmt pkg-config autoreconf
+
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+DEPENDS+= zenity-[0-9]*:../../x11/zenity
+
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../graphics/clutter/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
+
+.include "../../wip/cinnamon-desktop/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/muffin/PLIST b/muffin/PLIST
new file mode 100644
index 0000000000..d811250f98
--- /dev/null
+++ b/muffin/PLIST
@@ -0,0 +1,170 @@
+@comment $NetBSD$
+bin/muffin
+bin/muffin-message
+bin/muffin-theme-viewer
+bin/muffin-window-demo
+include/muffin/meta/atomnames.h
+include/muffin/meta/boxes.h
+include/muffin/meta/common.h
+include/muffin/meta/compositor-muffin.h
+include/muffin/meta/compositor.h
+include/muffin/meta/display.h
+include/muffin/meta/errors.h
+include/muffin/meta/gradient.h
+include/muffin/meta/group.h
+include/muffin/meta/keybindings.h
+include/muffin/meta/main.h
+include/muffin/meta/meta-background-actor.h
+include/muffin/meta/meta-plugin.h
+include/muffin/meta/meta-shadow-factory.h
+include/muffin/meta/meta-shaped-texture.h
+include/muffin/meta/meta-window-actor.h
+include/muffin/meta/prefs.h
+include/muffin/meta/preview-widget.h
+include/muffin/meta/screen.h
+include/muffin/meta/theme.h
+include/muffin/meta/types.h
+include/muffin/meta/util.h
+include/muffin/meta/window.h
+include/muffin/meta/workspace.h
+lib/libmuffin.la
+lib/muffin/Meta-Muffin.0.gir
+lib/muffin/Meta-Muffin.0.typelib
+lib/muffin/plugins/default.so
+lib/pkgconfig/libmuffin.pc
+lib/pkgconfig/muffin-plugins.pc
+man/man1/muffin-message.1
+man/man1/muffin-theme-viewer.1
+man/man1/muffin-window-demo.1
+man/man1/muffin.1
+share/applications/muffin.desktop
+share/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
+share/gtk-doc/html/muffin/MetaBackgroundActor.html
+share/gtk-doc/html/muffin/MetaDisplay.html
+share/gtk-doc/html/muffin/MetaPlugin.html
+share/gtk-doc/html/muffin/MetaRectangle.html
+share/gtk-doc/html/muffin/MetaScreen.html
+share/gtk-doc/html/muffin/MetaShadowFactory.html
+share/gtk-doc/html/muffin/MetaShapedTexture.html
+share/gtk-doc/html/muffin/MetaWindow.html
+share/gtk-doc/html/muffin/MetaWindowActor.html
+share/gtk-doc/html/muffin/MetaWorkspace.html
+share/gtk-doc/html/muffin/annotation-glossary.html
+share/gtk-doc/html/muffin/api-index-full.html
+share/gtk-doc/html/muffin/core-reference.html
+share/gtk-doc/html/muffin/deprecated-api-index.html
+share/gtk-doc/html/muffin/home.png
+share/gtk-doc/html/muffin/index.html
+share/gtk-doc/html/muffin/left-insensitive.png
+share/gtk-doc/html/muffin/left.png
+share/gtk-doc/html/muffin/muffin-Common.html
+share/gtk-doc/html/muffin/muffin-Errors.html
+share/gtk-doc/html/muffin/muffin-Main.html
+share/gtk-doc/html/muffin/muffin-MetaCompositor.html
+share/gtk-doc/html/muffin/muffin-MetaGroup.html
+share/gtk-doc/html/muffin/muffin-MetaKeybinding.html
+share/gtk-doc/html/muffin/muffin-Preferences.html
+share/gtk-doc/html/muffin/muffin-Utility-functions.html
+share/gtk-doc/html/muffin/muffin-overview.html
+share/gtk-doc/html/muffin/muffin.devhelp2
+share/gtk-doc/html/muffin/object-tree.html
+share/gtk-doc/html/muffin/right-insensitive.png
+share/gtk-doc/html/muffin/right.png
+share/gtk-doc/html/muffin/running-muffin.html
+share/gtk-doc/html/muffin/style.css
+share/gtk-doc/html/muffin/up-insensitive.png
+share/gtk-doc/html/muffin/up.png
+share/locale/am/LC_MESSAGES/muffin.mo
+share/locale/ar/LC_MESSAGES/muffin.mo
+share/locale/as/LC_MESSAGES/muffin.mo
+share/locale/ast/LC_MESSAGES/muffin.mo
+share/locale/az/LC_MESSAGES/muffin.mo
+share/locale/be/LC_MESSAGES/muffin.mo
+share/locale/be@latin/LC_MESSAGES/muffin.mo
+share/locale/bg/LC_MESSAGES/muffin.mo
+share/locale/bn/LC_MESSAGES/muffin.mo
+share/locale/bn_IN/LC_MESSAGES/muffin.mo
+share/locale/br/LC_MESSAGES/muffin.mo
+share/locale/bs/LC_MESSAGES/muffin.mo
+share/locale/ca/LC_MESSAGES/muffin.mo
+share/locale/ca@valencia/LC_MESSAGES/muffin.mo
+share/locale/cs/LC_MESSAGES/muffin.mo
+share/locale/cy/LC_MESSAGES/muffin.mo
+share/locale/da/LC_MESSAGES/muffin.mo
+share/locale/de/LC_MESSAGES/muffin.mo
+share/locale/dz/LC_MESSAGES/muffin.mo
+share/locale/el/LC_MESSAGES/muffin.mo
+share/locale/en_CA/LC_MESSAGES/muffin.mo
+share/locale/en_GB/LC_MESSAGES/muffin.mo
+share/locale/eo/LC_MESSAGES/muffin.mo
+share/locale/es/LC_MESSAGES/muffin.mo
+share/locale/et/LC_MESSAGES/muffin.mo
+share/locale/eu/LC_MESSAGES/muffin.mo
+share/locale/fa/LC_MESSAGES/muffin.mo
+share/locale/fi/LC_MESSAGES/muffin.mo
+share/locale/fr/LC_MESSAGES/muffin.mo
+share/locale/ga/LC_MESSAGES/muffin.mo
+share/locale/gl/LC_MESSAGES/muffin.mo
+share/locale/gu/LC_MESSAGES/muffin.mo
+share/locale/ha/LC_MESSAGES/muffin.mo
+share/locale/he/LC_MESSAGES/muffin.mo
+share/locale/hi/LC_MESSAGES/muffin.mo
+share/locale/hr/LC_MESSAGES/muffin.mo
+share/locale/hu/LC_MESSAGES/muffin.mo
+share/locale/hy/LC_MESSAGES/muffin.mo
+share/locale/id/LC_MESSAGES/muffin.mo
+share/locale/ig/LC_MESSAGES/muffin.mo
+share/locale/is/LC_MESSAGES/muffin.mo
+share/locale/it/LC_MESSAGES/muffin.mo
+share/locale/ja/LC_MESSAGES/muffin.mo
+share/locale/ka/LC_MESSAGES/muffin.mo
+share/locale/kn/LC_MESSAGES/muffin.mo
+share/locale/ko/LC_MESSAGES/muffin.mo
+share/locale/ku/LC_MESSAGES/muffin.mo
+share/locale/la/LC_MESSAGES/muffin.mo
+share/locale/lt/LC_MESSAGES/muffin.mo
+share/locale/lv/LC_MESSAGES/muffin.mo
+share/locale/mai/LC_MESSAGES/muffin.mo
+share/locale/mg/LC_MESSAGES/muffin.mo
+share/locale/mk/LC_MESSAGES/muffin.mo
+share/locale/ml/LC_MESSAGES/muffin.mo
+share/locale/mn/LC_MESSAGES/muffin.mo
+share/locale/mr/LC_MESSAGES/muffin.mo
+share/locale/ms/LC_MESSAGES/muffin.mo
+share/locale/nb/LC_MESSAGES/muffin.mo
+share/locale/nds/LC_MESSAGES/muffin.mo
+share/locale/ne/LC_MESSAGES/muffin.mo
+share/locale/nl/LC_MESSAGES/muffin.mo
+share/locale/nn/LC_MESSAGES/muffin.mo
+share/locale/oc/LC_MESSAGES/muffin.mo
+share/locale/or/LC_MESSAGES/muffin.mo
+share/locale/pa/LC_MESSAGES/muffin.mo
+share/locale/pl/LC_MESSAGES/muffin.mo
+share/locale/pt/LC_MESSAGES/muffin.mo
+share/locale/pt_BR/LC_MESSAGES/muffin.mo
+share/locale/ro/LC_MESSAGES/muffin.mo
+share/locale/ru/LC_MESSAGES/muffin.mo
+share/locale/rw/LC_MESSAGES/muffin.mo
+share/locale/si/LC_MESSAGES/muffin.mo
+share/locale/sk/LC_MESSAGES/muffin.mo
+share/locale/sl/LC_MESSAGES/muffin.mo
+share/locale/sq/LC_MESSAGES/muffin.mo
+share/locale/sr/LC_MESSAGES/muffin.mo
+share/locale/sr@latin/LC_MESSAGES/muffin.mo
+share/locale/sv/LC_MESSAGES/muffin.mo
+share/locale/ta/LC_MESSAGES/muffin.mo
+share/locale/te/LC_MESSAGES/muffin.mo
+share/locale/th/LC_MESSAGES/muffin.mo
+share/locale/tk/LC_MESSAGES/muffin.mo
+share/locale/tr/LC_MESSAGES/muffin.mo
+share/locale/ug/LC_MESSAGES/muffin.mo
+share/locale/uk/LC_MESSAGES/muffin.mo
+share/locale/vi/LC_MESSAGES/muffin.mo
+share/locale/wa/LC_MESSAGES/muffin.mo
+share/locale/xh/LC_MESSAGES/muffin.mo
+share/locale/yo/LC_MESSAGES/muffin.mo
+share/locale/zh_CN/LC_MESSAGES/muffin.mo
+share/locale/zh_HK/LC_MESSAGES/muffin.mo
+share/locale/zh_TW/LC_MESSAGES/muffin.mo
+share/muffin/icons/muffin-window-demo.png
+share/muffin/theme/metacity-theme-3.xml
diff --git a/muffin/buildlink3.mk b/muffin/buildlink3.mk
new file mode 100644
index 0000000000..271ccb1a59
--- /dev/null
+++ b/muffin/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= muffin
+
+.if !defined(MUFFIN_BUILDLINK3_MK)
+MUFFIN_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.muffin+= muffin>=3.8.1
+BUILDLINK_PKGSRCDIR.muffin?= ../../wip/muffin
+
+.endif # MUFFIN_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -muffin
diff --git a/muffin/distinfo b/muffin/distinfo
new file mode 100644
index 0000000000..2968b90f09
--- /dev/null
+++ b/muffin/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.7 2009/06/22 14:47:06 jihbed Exp $
+
+SHA1 (muffin-3.8.1.tar.gz) = 1b5b58df41b9f9519f73fd6460dd1eea1c6a4e48
+RMD160 (muffin-3.8.1.tar.gz) = 9c9ec3645a799db9b61e0fa402a78c62667e6252
+SHA512 (muffin-3.8.1.tar.gz) = a8cd492d08ea8b60924eb801750ea29126d5c4a8166d26be1132645a0e345f9b69a9c6a1d28e66c97018d672e7b168d8dd0ff84735a37b5a8cb878851f95aee3
+Size (muffin-3.8.1.tar.gz) = 2721853 bytes
diff --git a/nemo/DESCR b/nemo/DESCR
index 1f6333e182..b8462a1d25 100644
--- a/nemo/DESCR
+++ b/nemo/DESCR
@@ -1,8 +1 @@
-Nemo is a new way of managing files, or rather not manage files.
-Currently it's a cross between a calendar and a file browser with
-labels.
-
-In the default view, files are displayed by date of last change
-instead of the typical hierarchical view.
-
-Nemo is a free/open source GTK application written in C#.
+Nemo is the file manager for the Cinnamon desktop environment.
diff --git a/nemo/Makefile b/nemo/Makefile
index 2f98e1cfda..dcd297708e 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -1,31 +1,60 @@
-# $NetBSD: Makefile,v 1.17 2013/06/17 12:45:12 thomasklausner Exp $
-#
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-DISTNAME= nemo-0.2.4
+DISTNAME= nemo-3.6.5
CATEGORIES= sysutils
-MASTER_SITES= http://www.nemo-docs.com/media/static/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= nemo
+GITHUB_TAG= ${PKGVERSION_NOREV}
-# http://www.nemo-docs.com/media/static/nemo-documents-setup.exe?_=1t5ATJ
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/nemo
+COMMENT= File Manager for Cinnamon
+LICENSE= gnu-gpl-v2
-BROKEN_REASON= Unversioned sources
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake bash pkg-config intltool autoconf automake autoreconf
+CONFIGURE_ARGS+= --disable-selinux
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.nemo-docs.com/
-COMMENT= File manager based on labels and timestamps
-#LICENSE= LICENSE
+SUBST_CLASSES= prefix
+SUBST_MESSAGE.prefix= Fix prefix references
+SUBST_FILES.prefix= src/nemo-interesting-folder-bar.c
+SUBST_FILES.prefix+= src/nemo-properties-window.c
+SUBST_STAGE.prefix= pre-configure
+SUBST_SED.prefix= -e 's,/usr/share,${PREFIX}/share,g'
-# for stetic
-DEPENDS+= monodevelop-[0-9]*:../../devel/monodevelop
+DEPENDS+= ${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
+DEPENDS+= gvfs-[0-9]*:../../sysutils/gvfs
+BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= # C#
-USE_TOOLS+= gmake msgfmt pkg-config
+REPLACE_PYTHON= data/merge_action_strings \
+ files/usr/share/nemo/actions/myaction.py \
+ files/usr/share/nemo/actions/send-by-mail.py
-.include "../../lang/mono2/buildlink3.mk"
-.include "../../x11/gnome-sharp/buildlink3.mk"
-.include "../../x11/gtk-sharp/buildlink3.mk"
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+
+pre-install:
+ cd ${WRKSRC}/files && mv usr/share . && rmdir usr
+
+#.include "../../devel/py-meson/build.mk"
+.include "../../lang/python/application.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/exempi/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../devel/dconf/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/ndesk-dbus/buildlink3.mk"
-.include "../../sysutils/ndesk-dbus-glib/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../multimedia/ffmpegthumbnailer/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+
+.include "../../wip/cinnamon-desktop/buildlink3.mk"
+.include "../../wip/xapps/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/nemo/PLIST b/nemo/PLIST
index cb554ccf12..9dd14ee3a2 100644
--- a/nemo/PLIST
+++ b/nemo/PLIST
@@ -1,19 +1,108 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/22 14:47:06 jihbed Exp $
+@comment $NetBSD$
bin/nemo
-bin/nemo.exe
+bin/nemo-autorun-software
+bin/nemo-connect-server
+bin/nemo-desktop
+bin/nemo-open-with
+include/nemo/libnemo-extension/nemo-column-provider.h
+include/nemo/libnemo-extension/nemo-column.h
+include/nemo/libnemo-extension/nemo-extension-types.h
+include/nemo/libnemo-extension/nemo-file-info.h
+include/nemo/libnemo-extension/nemo-info-provider.h
+include/nemo/libnemo-extension/nemo-location-widget-provider.h
+include/nemo/libnemo-extension/nemo-menu-item.h
+include/nemo/libnemo-extension/nemo-menu-provider.h
+include/nemo/libnemo-extension/nemo-menu.h
+include/nemo/libnemo-extension/nemo-name-and-desc-provider.h
+include/nemo/libnemo-extension/nemo-property-page-provider.h
+include/nemo/libnemo-extension/nemo-property-page.h
+include/nemo/libnemo-extension/nemo-simple-button.h
+lib/girepository-1.0/Nemo-3.0.typelib
+lib/libnemo-extension.la
+lib/pkgconfig/libnemo-extension.pc
+libexec/nemo-convert-metadata
+libexec/nemo-extensions-list
+man/man1/nemo-connect-server.1
+man/man1/nemo.1
+share/applications/nemo-autorun-software.desktop
+share/applications/nemo-autostart.desktop
share/applications/nemo.desktop
-share/locale/ar/LC_MESSAGES/nemo.mo
-share/locale/ca/LC_MESSAGES/nemo.mo
-share/locale/cs/LC_MESSAGES/nemo.mo
-share/locale/da/LC_MESSAGES/nemo.mo
-share/locale/de/LC_MESSAGES/nemo.mo
-share/locale/el/LC_MESSAGES/nemo.mo
-share/locale/es/LC_MESSAGES/nemo.mo
-share/locale/fi/LC_MESSAGES/nemo.mo
-share/locale/fr/LC_MESSAGES/nemo.mo
-share/locale/nb/LC_MESSAGES/nemo.mo
-share/locale/pt/LC_MESSAGES/nemo.mo
-share/locale/pt_BR/LC_MESSAGES/nemo.mo
-share/locale/sv/LC_MESSAGES/nemo.mo
-share/nemo/nemo.png
-share/nemo/no-preview.png
+share/dbus-1/services/nemo.FileManager1.service
+share/dbus-1/services/nemo.service
+share/gir-1.0/Nemo-3.0.gir
+share/glib-2.0/schemas/org.nemo.gschema.xml
+share/gtksourceview-2.0/language-specs/nemo_action.lang
+share/gtksourceview-3.0/language-specs/nemo_action.lang
+share/icons/hicolor/16x16/actions/menu-bullet.png
+share/icons/hicolor/16x16/actions/menu-none.png
+share/icons/hicolor/16x16/actions/menu-sort-down-free.png
+share/icons/hicolor/16x16/actions/menu-sort-down.png
+share/icons/hicolor/16x16/actions/menu-sort-left-free.png
+share/icons/hicolor/16x16/actions/menu-sort-left.png
+share/icons/hicolor/16x16/actions/menu-sort-right-free.png
+share/icons/hicolor/16x16/actions/menu-sort-right.png
+share/icons/hicolor/16x16/actions/menu-sort-up-free.png
+share/icons/hicolor/16x16/actions/menu-sort-up.png
+share/icons/hicolor/16x16/actions/nemo-eject.png
+share/icons/hicolor/16x16/apps/nemo.png
+share/icons/hicolor/22x22/apps/nemo.png
+share/icons/hicolor/24x24/apps/nemo.png
+share/icons/hicolor/32x32/actions/nemo-eject.png
+share/icons/hicolor/32x32/apps/nemo.png
+share/icons/hicolor/48x48/status/progress-0.png
+share/icons/hicolor/48x48/status/progress-10.png
+share/icons/hicolor/48x48/status/progress-100.png
+share/icons/hicolor/48x48/status/progress-20.png
+share/icons/hicolor/48x48/status/progress-30.png
+share/icons/hicolor/48x48/status/progress-40.png
+share/icons/hicolor/48x48/status/progress-50.png
+share/icons/hicolor/48x48/status/progress-60.png
+share/icons/hicolor/48x48/status/progress-70.png
+share/icons/hicolor/48x48/status/progress-80.png
+share/icons/hicolor/48x48/status/progress-90.png
+share/icons/hicolor/scalable/actions/collapse-menu-hover-symbolic.svg
+share/icons/hicolor/scalable/actions/collapse-menu-symbolic.svg
+share/icons/hicolor/scalable/actions/expand-menu-hover-symbolic.svg
+share/icons/hicolor/scalable/actions/expand-menu-symbolic.svg
+share/icons/hicolor/scalable/actions/location-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
+share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
+share/icons/hicolor/scalable/apps/nemo.svg
+share/mime/XMLnamespaces
+share/mime/aliases
+share/mime/application/nemo-action.xml
+share/mime/application/x-gnome-saved-search.xml
+share/mime/generic-icons
+share/mime/globs
+share/mime/globs2
+share/mime/icons
+share/mime/magic
+share/mime/mime.cache
+share/mime/packages/nemo.xml
+share/mime/subclasses
+share/mime/treemagic
+share/mime/types
+share/mime/version
+share/nemo/actions/90_new-workspace.nemo_action
+share/nemo/actions/91_delete-workspace.nemo_action
+share/nemo/actions/92_show-expo.nemo_action
+share/nemo/actions/add-desklets.nemo_action
+share/nemo/actions/change-background.nemo_action
+share/nemo/actions/desktop-settings.nemo_action
+share/nemo/actions/mount-archive.nemo_action
+share/nemo/actions/myaction.py
+share/nemo/actions/new-launcher.nemo_action
+share/nemo/actions/sample.nemo_action
+share/nemo/actions/send-by-mail.nemo_action
+share/nemo/actions/send-by-mail.py
+share/nemo/actions/set-as-background.nemo_action
+share/nemo/icons/hicolor/16x16/emblems/emblem-note.png
+share/nemo/icons/hicolor/24x24/emblems/emblem-note.png
+share/nemo/icons/hicolor/48x48/emblems/emblem-note.png
+share/nemo/nemo-extras.placeholder
+share/nemo/nemo-suggested.placeholder
+share/nemo/script-info.md
+share/polkit-1/actions/org.nemo.root.policy
diff --git a/nemo/buildlink3.mk b/nemo/buildlink3.mk
new file mode 100644
index 0000000000..e0f72e6d5c
--- /dev/null
+++ b/nemo/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= nemo
+
+.if !defined(NEMO_BUILDLINK3_MK)
+NEMO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nemo+= nemo>=3.6.5
+BUILDLINK_PKGSRCDIR.nemo?= ../../wip/nemo
+
+.endif # NEMO_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -nemo
diff --git a/nemo/distinfo b/nemo/distinfo
index 896b28d0c1..0284ed76b6 100644
--- a/nemo/distinfo
+++ b/nemo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2009/06/22 14:47:06 jihbed Exp $
+$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-SHA1 (nemo-0.2.4.tar.bz2) = 8871104b41973132ebbc61f9366fd0d8eb39f80b
-RMD160 (nemo-0.2.4.tar.bz2) = 13c1805f20c494902c307c7c7d715df7c7142cb4
-Size (nemo-0.2.4.tar.bz2) = 153134 bytes
-SHA1 (patch-aa) = 320ffca1300d0ea26ebc891a6cd7d4100417a4f1
-SHA1 (patch-ab) = ab1a2d9bd0605d93dfe0495493ba2f8e1d757070
+SHA1 (nemo-3.6.5.tar.gz) = 7e31c77ce7a019ac77ca13611c72ba5b86e9e132
+RMD160 (nemo-3.6.5.tar.gz) = 6f9fc76900eb78493914c4eef3778354881af9f2
+SHA512 (nemo-3.6.5.tar.gz) = 6a8652633c0d71e910aad1447cae1cc09de67e6325ff4c7b1515e653e354be80ec2b9889f92bbe3fa011132152729e8aacf95698c079ff00d6b8e737a9cd25f1
+Size (nemo-3.6.5.tar.gz) = 1433746 bytes
+SHA1 (patch-files_Makefile.in) = 215130f3097729c5022a8a9a4ddc1c1f6a70410f
diff --git a/nemo/patches/patch-aa b/nemo/patches/patch-aa
deleted file mode 100644
index 5e5218b81d..0000000000
--- a/nemo/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/06/22 14:47:06 jihbed Exp $
-
---- Makefile.orig 2009-06-22 11:20:10.000000000 +0000
-+++ Makefile 2009-06-22 11:21:53.000000000 +0000
-@@ -4,7 +4,7 @@
-
- all:
- make -C po/
-- gmcs -debug -unsafe broker/*.cs metadata/MetadataStore.cs common/*.cs gtk/*.cs uicommon/*.cs gtk-gui/*.cs -resource:images/no-preview.png,no-preview.png -resource:images/close.png,close.png -resource:images/zip.png,zip.png -resource:images/stock_about.png,stock_about.png -resource:images/image-x-generic.png,image-x-generic.png -resource:images/pdf.png,pdf.png -resource:images/text-html.png,text-html.png -resource:images/text-x-generic.png,text-x-generic.png -resource:images/dot.png,dot.png -resource:images/video-x-generic.png,video-x-generic.png -resource:images/x-office-document.png,x-office-document.png -resource:images/x-office-presentation.png,x-office-presentation.png -resource:images/x-office-spreadsheet.png,x-office-spreadsheet.png -resource:images/starred_right.png,starred_right.png -resource:images/big_star.png,big_star.png -resource:images/blue_guy.png,blue_guy.png -resource:images/blue_guy_med.png,blue_guy_med.png -resource:images/small_blue_guy.png,small_blue_g
uy.png -r:System.Data -r:Mono.Data.Sqlite -r:Mono.Posix -r:Mono.Cairo -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 -r:/usr/lib/cli/ndesk-dbus-1.0/NDesk.DBus.dll -r:/usr/lib/cli/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll -out:$(PRG)
-+ gmcs -debug -unsafe broker/*.cs metadata/MetadataStore.cs common/*.cs gtk/*.cs uicommon/*.cs gtk-gui/*.cs -resource:images/no-preview.png,no-preview.png -resource:images/close.png,close.png -resource:images/zip.png,zip.png -resource:images/stock_about.png,stock_about.png -resource:images/image-x-generic.png,image-x-generic.png -resource:images/pdf.png,pdf.png -resource:images/text-html.png,text-html.png -resource:images/text-x-generic.png,text-x-generic.png -resource:images/dot.png,dot.png -resource:images/video-x-generic.png,video-x-generic.png -resource:images/x-office-document.png,x-office-document.png -resource:images/x-office-presentation.png,x-office-presentation.png -resource:images/x-office-spreadsheet.png,x-office-spreadsheet.png -resource:images/starred_right.png,starred_right.png -resource:images/big_star.png,big_star.png -resource:images/blue_guy.png,blue_guy.png -resource:images/blue_guy_med.png,blue_guy_med.png -resource:images/small_blue_guy.png,small_blue_g
uy.png -r:System.Data -r:Mono.Data.Sqlite -r:Mono.Posix -r:Mono.Cairo -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 -r:/usr/pkg/lib/mono/ndesk-dbus-1.0/NDesk.DBus.dll -r:/usr/pkg/lib/mono/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll -out:$(PRG)
-
- clean:
- @if test -f $(PRG); then rm $(PRG); fi
diff --git a/nemo/patches/patch-ab b/nemo/patches/patch-ab
deleted file mode 100644
index 3a107a022d..0000000000
--- a/nemo/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/06/22 14:47:06 jihbed Exp $
-
---- nemo.in.orig 2009-06-22 14:17:26.000000000 +0000
-+++ nemo.in 2009-06-22 14:18:26.000000000 +0000
-@@ -1,3 +1,3 @@
--#!/bin/bash
-+#!/bin/sh
-
--exec -a nemo mono @PREFIX@/bin/nemo.exe $@
-+exec dbus-launch mono @PREFIX@/bin/nemo.exe $@
diff --git a/nemo/patches/patch-ac b/nemo/patches/patch-ac
deleted file mode 100644
index cb60cab8b2..0000000000
--- a/nemo/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2009/03/25 22:56:34 jihbed Exp $
---- nemo.in.orig 2008-03-24 19:15:26.000000000 +0200
-+++ nemo.in 2008-04-25 19:39:06.000000000 +0300
-@@ -1,3 +1,3 @@
--#!/bin/bash
-+#!/bin/sh
-
--exec -a nemo mono @PREFIX@/bin/nemo.exe
-+exec dbus-launch mono @PREFIX@/bin/nemo.exe
diff --git a/nemo/patches/patch-files_Makefile.in b/nemo/patches/patch-files_Makefile.in
new file mode 100644
index 0000000000..f9d13638aa
--- /dev/null
+++ b/nemo/patches/patch-files_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix installation to destdir.
+
+--- files/Makefile.in.orig 2017-12-18 12:38:36.000000000 +0000
++++ files/Makefile.in
+@@ -7,7 +7,7 @@ distclean:
+ check:
+
+ install:
+- find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/ \;
++ find . -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)/$(PREFIX) \;
+
+ uninstall:
+ find -mindepth 1 -type f -exec rm $(DESTDIR)/{} \;
diff --git a/py-pam/DESCR b/py-pam/DESCR
new file mode 100644
index 0000000000..aee96f24e9
--- /dev/null
+++ b/py-pam/DESCR
@@ -0,0 +1 @@
+Pure Python interface to the Pluggable Authentication Modules system on Linux.
diff --git a/py-pam/Makefile b/py-pam/Makefile
new file mode 100644
index 0000000000..ad04d08879
--- /dev/null
+++ b/py-pam/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= python-pam-1.8.3
+PKGNAME= ${PYPKGPREFIX}-pam-1.8.3
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_GITHUB:=FireFighterBlu3/}
+GITHUB_PROJECT= python-pam
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/FireFighterBlu3/python-pam
+COMMENT= Python PAM library
+LICENSE= mit
+
+PY_PATCHPLIST= yes
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/py-pam/PLIST b/py-pam/PLIST
new file mode 100644
index 0000000000..5a5196e04d
--- /dev/null
+++ b/py-pam/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD$
+${PYSITELIB}/pam.pyo
+${PYSITELIB}/pam.pyc
+${PYSITELIB}/pam.py
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
diff --git a/py-pam/distinfo b/py-pam/distinfo
new file mode 100644
index 0000000000..26f1aee5db
--- /dev/null
+++ b/py-pam/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (python-pam-1.8.3.tar.gz) = 8b82d5bb75c189e83cf034c97d0a423cec0ddac0
+RMD160 (python-pam-1.8.3.tar.gz) = f13666362f5994aa3d9812ff8bbedda1bd2de381
+SHA512 (python-pam-1.8.3.tar.gz) = 30546571f0f78ddd8c0abf0b40c67dc39467650d9d0c47355f4ecaac1209e7decd6f4baa3a801da32cbe4229e6395d27ad9d3a38fa777abadda9f0e238a5f83f
+Size (python-pam-1.8.3.tar.gz) = 5563 bytes
diff --git a/py-xapp/DESCR b/py-xapp/DESCR
new file mode 100644
index 0000000000..c697a5ef5b
--- /dev/null
+++ b/py-xapp/DESCR
@@ -0,0 +1 @@
+Python Xapp Library.
diff --git a/py-xapp/Makefile b/py-xapp/Makefile
new file mode 100644
index 0000000000..8e255ead24
--- /dev/null
+++ b/py-xapp/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= python-xapp-1.2.0
+PKGNAME= ${PYPKGPREFIX}-xapp-1.2.0
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= python-xapp
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/python-xapp
+COMMENT= Python Xapp library
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
+
+PY_PATCHPLIST= yes
+
+.include "../../lang/python/pyversion.mk"
+
+USE_TOOLS+= gmake pkg-config intltool msgfmt
+
+DEPENDS+= ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/py-xapp/PLIST b/py-xapp/PLIST
new file mode 100644
index 0000000000..742705aeb8
--- /dev/null
+++ b/py-xapp/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD$
+${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/xapp/__init__.py
+${PYSITELIB}/xapp/__init__.pyo
+${PYSITELIB}/xapp/__init__.pyc
+${PYSITELIB}/xapp/os.pyo
+${PYSITELIB}/xapp/os.pyc
+${PYSITELIB}/xapp/os.py
diff --git a/py-xapp/distinfo b/py-xapp/distinfo
new file mode 100644
index 0000000000..549f13fe7c
--- /dev/null
+++ b/py-xapp/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (python-xapp-1.2.0.tar.gz) = d73216916b7ed2215bd848beaca7e31f91cd1425
+RMD160 (python-xapp-1.2.0.tar.gz) = 0cfa81ff60ded80d365932a1e2452c5efe0cac49
+SHA512 (python-xapp-1.2.0.tar.gz) = de3cfab90fd53bcd5ffd201858247d733589867eada2e53f59051ac428b95a6deaa605e3eb48422657aa543b0239c8ce771703cad8cbaeb2ca10360281169999
+Size (python-xapp-1.2.0.tar.gz) = 12412 bytes
diff --git a/system-config-printer/DESCR b/system-config-printer/DESCR
new file mode 100644
index 0000000000..cc17ffcac2
--- /dev/null
+++ b/system-config-printer/DESCR
@@ -0,0 +1 @@
+CUPS Print configuration utility.
diff --git a/system-config-printer/Makefile b/system-config-printer/Makefile
new file mode 100644
index 0000000000..6eda735f95
--- /dev/null
+++ b/system-config-printer/Makefile
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= system-config-printer-1.5.11
+CATEGORIES= print
+MASTER_SITES= ${MASTER_SITE_GITHUB:=zdohnal/}
+GITHUB_PROJECT= system-config-printer
+#GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/zdohnal/system-config-printer
+COMMENT= CUPS printer configuration tool and status applet
+LICENSE= gnu-gpl-v2
+
+PY_PATCHPLIST= yes
+
+.include "../../lang/python/pyversion.mk"
+
+USE_TOOLS+= gmake pkg-config intltool msgfmt autoconf automake aclocal
+GNU_CONFIGURE= yes
+
+pre-configure:
+ cd ${WRKSRC} && \
+ touch README ChangeLog && \
+ autoreconf -fvi
+
+DEPENDS+= ${PYPKGPREFIX}-cups-[0-9]*:../../print/py-cups
+DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject
+DEPENDS+= ${PYPKGPREFIX}-curl-[0-9]*:../../www/py-curl
+
+PY_PATCHPLIST= yes
+
+REPLACE_PYTHON= *.py troubleshoot/__init__.py
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../security/libsecret/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/system-config-printer/PLIST b/system-config-printer/PLIST
new file mode 100644
index 0000000000..325577b34d
--- /dev/null
+++ b/system-config-printer/PLIST
@@ -0,0 +1,173 @@
+@comment $NetBSD$
+bin/install-printerdriver
+bin/scp-dbus-service
+bin/system-config-printer
+bin/system-config-printer-applet
+etc/cupshelpers/preferreddrivers.xml
+etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
+etc/xdg/autostart/print-applet.desktop
+${PYSITELIB}/cupshelpers/__init__.py
+${PYSITELIB}/cupshelpers/__init__.pyc
+${PYSITELIB}/cupshelpers/config.pyc
+${PYSITELIB}/cupshelpers/cupshelpers.pyc
+${PYSITELIB}/cupshelpers/installdriver.pyc
+${PYSITELIB}/cupshelpers/openprinting.pyc
+${PYSITELIB}/cupshelpers/ppds.pyc
+${PYSITELIB}/cupshelpers/xmldriverprefs.pyc
+${PYSITELIB}/cupshelpers/config.py
+${PYSITELIB}/cupshelpers/cupshelpers.py
+${PYSITELIB}/cupshelpers/installdriver.py
+${PYSITELIB}/cupshelpers/openprinting.py
+${PYSITELIB}/cupshelpers/ppds.py
+${PYSITELIB}/cupshelpers/xmldriverprefs.py
+man/man1/system-config-printer-applet.1
+man/man1/system-config-printer.1
+share/applications/system-config-printer.desktop
+share/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml
+share/dbus-1/services/org.fedoraproject.Config.Printing.service
+share/locale/ar/LC_MESSAGES/system-config-printer.mo
+share/locale/as/LC_MESSAGES/system-config-printer.mo
+share/locale/bg/LC_MESSAGES/system-config-printer.mo
+share/locale/bn/LC_MESSAGES/system-config-printer.mo
+share/locale/bn_IN/LC_MESSAGES/system-config-printer.mo
+share/locale/br/LC_MESSAGES/system-config-printer.mo
+share/locale/bs/LC_MESSAGES/system-config-printer.mo
+share/locale/ca/LC_MESSAGES/system-config-printer.mo
+share/locale/cs/LC_MESSAGES/system-config-printer.mo
+share/locale/cy/LC_MESSAGES/system-config-printer.mo
+share/locale/da/LC_MESSAGES/system-config-printer.mo
+share/locale/de/LC_MESSAGES/system-config-printer.mo
+share/locale/el/LC_MESSAGES/system-config-printer.mo
+share/locale/en_GB/LC_MESSAGES/system-config-printer.mo
+share/locale/es/LC_MESSAGES/system-config-printer.mo
+share/locale/et/LC_MESSAGES/system-config-printer.mo
+share/locale/fa/LC_MESSAGES/system-config-printer.mo
+share/locale/fi/LC_MESSAGES/system-config-printer.mo
+share/locale/fr/LC_MESSAGES/system-config-printer.mo
+share/locale/gu/LC_MESSAGES/system-config-printer.mo
+share/locale/he/LC_MESSAGES/system-config-printer.mo
+share/locale/hi/LC_MESSAGES/system-config-printer.mo
+share/locale/hr/LC_MESSAGES/system-config-printer.mo
+share/locale/hu/LC_MESSAGES/system-config-printer.mo
+share/locale/id/LC_MESSAGES/system-config-printer.mo
+share/locale/is/LC_MESSAGES/system-config-printer.mo
+share/locale/it/LC_MESSAGES/system-config-printer.mo
+share/locale/ja/LC_MESSAGES/system-config-printer.mo
+share/locale/kn/LC_MESSAGES/system-config-printer.mo
+share/locale/ko/LC_MESSAGES/system-config-printer.mo
+share/locale/lt/LC_MESSAGES/system-config-printer.mo
+share/locale/lv/LC_MESSAGES/system-config-printer.mo
+share/locale/mai/LC_MESSAGES/system-config-printer.mo
+share/locale/ml/LC_MESSAGES/system-config-printer.mo
+share/locale/mr/LC_MESSAGES/system-config-printer.mo
+share/locale/ms/LC_MESSAGES/system-config-printer.mo
+share/locale/nb/LC_MESSAGES/system-config-printer.mo
+share/locale/nds/LC_MESSAGES/system-config-printer.mo
+share/locale/nl/LC_MESSAGES/system-config-printer.mo
+share/locale/nn/LC_MESSAGES/system-config-printer.mo
+share/locale/or/LC_MESSAGES/system-config-printer.mo
+share/locale/pa/LC_MESSAGES/system-config-printer.mo
+share/locale/pl/LC_MESSAGES/system-config-printer.mo
+share/locale/pt/LC_MESSAGES/system-config-printer.mo
+share/locale/pt_BR/LC_MESSAGES/system-config-printer.mo
+share/locale/ro/LC_MESSAGES/system-config-printer.mo
+share/locale/ru/LC_MESSAGES/system-config-printer.mo
+share/locale/si/LC_MESSAGES/system-config-printer.mo
+share/locale/sk/LC_MESSAGES/system-config-printer.mo
+share/locale/sl/LC_MESSAGES/system-config-printer.mo
+share/locale/sr/LC_MESSAGES/system-config-printer.mo
+share/locale/sr@latin/LC_MESSAGES/system-config-printer.mo
+share/locale/sv/LC_MESSAGES/system-config-printer.mo
+share/locale/ta/LC_MESSAGES/system-config-printer.mo
+share/locale/te/LC_MESSAGES/system-config-printer.mo
+share/locale/th/LC_MESSAGES/system-config-printer.mo
+share/locale/tr/LC_MESSAGES/system-config-printer.mo
+share/locale/uk/LC_MESSAGES/system-config-printer.mo
+share/locale/vi/LC_MESSAGES/system-config-printer.mo
+share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo
+share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo
+share/metainfo/system-config-printer.appdata.xml
+share/system-config-printer/HIG.py
+share/system-config-printer/OpenPrintingRequest.py
+share/system-config-printer/PhysicalDevice.py
+share/system-config-printer/SearchCriterion.py
+share/system-config-printer/ToolbarSearchEntry.py
+share/system-config-printer/applet.py
+share/system-config-printer/asyncconn.py
+share/system-config-printer/asyncipp.py
+share/system-config-printer/asyncpk1.py
+share/system-config-printer/authconn.py
+share/system-config-printer/check-device-ids.py
+share/system-config-printer/config.py
+share/system-config-printer/cupspk.py
+share/system-config-printer/debug.py
+share/system-config-printer/dnssdresolve.py
+share/system-config-printer/errordialogs.py
+share/system-config-printer/firewallsettings.py
+share/system-config-printer/gtkinklevel.py
+share/system-config-printer/gui.py
+share/system-config-printer/icons/i-network-printer.png
+share/system-config-printer/install-printerdriver.py
+share/system-config-printer/installpackage.py
+share/system-config-printer/jobviewer.py
+share/system-config-printer/killtimer.py
+share/system-config-printer/monitor.py
+share/system-config-printer/newprinter.py
+share/system-config-printer/options.py
+share/system-config-printer/optionwidgets.py
+share/system-config-printer/ppdcache.py
+share/system-config-printer/ppdippstr.py
+share/system-config-printer/ppdsloader.py
+share/system-config-printer/printerproperties.py
+share/system-config-printer/probe_printer.py
+share/system-config-printer/pysmb.py
+share/system-config-printer/scp-dbus-service.py
+share/system-config-printer/serversettings.py
+share/system-config-printer/smburi.py
+share/system-config-printer/statereason.py
+share/system-config-printer/system-config-printer.py
+share/system-config-printer/timedops.py
+share/system-config-printer/troubleshoot/CheckLocalServerPublishing.py
+share/system-config-printer/troubleshoot/CheckNetworkServerSanity.py
+share/system-config-printer/troubleshoot/CheckPPDSanity.py
+share/system-config-printer/troubleshoot/CheckPrinterSanity.py
+share/system-config-printer/troubleshoot/CheckSELinux.py
+share/system-config-printer/troubleshoot/CheckUSBPermissions.py
+share/system-config-printer/troubleshoot/ChooseNetworkPrinter.py
+share/system-config-printer/troubleshoot/ChoosePrinter.py
+share/system-config-printer/troubleshoot/DeviceListed.py
+share/system-config-printer/troubleshoot/ErrorLogCheckpoint.py
+share/system-config-printer/troubleshoot/ErrorLogFetch.py
+share/system-config-printer/troubleshoot/ErrorLogParse.py
+share/system-config-printer/troubleshoot/LocalOrRemote.py
+share/system-config-printer/troubleshoot/Locale.py
+share/system-config-printer/troubleshoot/NetworkCUPSPrinterShared.py
+share/system-config-printer/troubleshoot/PrintTestPage.py
+share/system-config-printer/troubleshoot/PrinterStateReasons.py
+share/system-config-printer/troubleshoot/QueueNotEnabled.py
+share/system-config-printer/troubleshoot/QueueRejectingJobs.py
+share/system-config-printer/troubleshoot/RemoteAddress.py
+share/system-config-printer/troubleshoot/SchedulerNotRunning.py
+share/system-config-printer/troubleshoot/ServerFirewalled.py
+share/system-config-printer/troubleshoot/Shrug.py
+share/system-config-printer/troubleshoot/VerifyPackages.py
+share/system-config-printer/troubleshoot/Welcome.py
+share/system-config-printer/troubleshoot/__init__.py
+share/system-config-printer/troubleshoot/base.py
+share/system-config-printer/ui/AboutDialog.ui
+share/system-config-printer/ui/ConnectDialog.ui
+share/system-config-printer/ui/ConnectingDialog.ui
+share/system-config-printer/ui/InstallDialog.ui
+share/system-config-printer/ui/JobsWindow.ui
+share/system-config-printer/ui/NewPrinterName.ui
+share/system-config-printer/ui/NewPrinterWindow.ui
+share/system-config-printer/ui/PrinterPropertiesDialog.ui
+share/system-config-printer/ui/PrintersWindow.ui
+share/system-config-printer/ui/SMBBrowseDialog.ui
+share/system-config-printer/ui/ServerSettingsDialog.ui
+share/system-config-printer/ui/WaitWindow.ui
+share/system-config-printer/ui/statusicon_popupmenu.ui
+share/system-config-printer/userdefault.py
+share/system-config-printer/xml/preferreddrivers.rng
+share/system-config-printer/xml/validate.py
diff --git a/system-config-printer/distinfo b/system-config-printer/distinfo
new file mode 100644
index 0000000000..fb01784d16
--- /dev/null
+++ b/system-config-printer/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (system-config-printer-1.5.11.tar.gz) = 2375c76f695165b7b976390abd55aaf721285df8
+RMD160 (system-config-printer-1.5.11.tar.gz) = 9232f16d486797b93a62f7df628ba3c538e6935f
+SHA512 (system-config-printer-1.5.11.tar.gz) = ea4b62a6f53971f24966cd332fad24797645027b69b3cdee556a32bdb43d743687be8dbed04c7f669e27e548a18783d2f6e7bcf1c6a50de05c26a71181acd464
+Size (system-config-printer-1.5.11.tar.gz) = 1984545 bytes
+SHA1 (patch-configure.ac) = 300cb734708b1e0000842930d834554a9f985ed3
diff --git a/system-config-printer/patches/patch-configure.ac b/system-config-printer/patches/patch-configure.ac
new file mode 100644
index 0000000000..d470f4c909
--- /dev/null
+++ b/system-config-printer/patches/patch-configure.ac
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Portability fix.
+
+--- configure.ac.orig 2018-01-24 13:38:55.000000000 +0000
++++ configure.ac
+@@ -55,10 +55,10 @@ fi
+ if test "x$with_udev_rules" != xno -a "x$with_udevdir" != xno; then
+ PKG_CHECK_MODULES(libudev, [libudev >= 172], has_libudev=yes, has_libudev=no)
+ PKG_CHECK_MODULES(libusb, libusb-1.0, has_libusb=yes, has_libusb=no)
+- if test x$has_glib == xno -o \
+- x$has_udev == xno -o \
+- x$has_libudev == xno -o \
+- x$has_libusb == xno ; then
++ if test x$has_glib = xno -o \
++ x$has_udev = xno -o \
++ x$has_libudev = xno -o \
++ x$has_libusb = xno ; then
+ AC_MSG_ERROR([Missing packages])
+ fi
+
diff --git a/xapps/DESCR b/xapps/DESCR
new file mode 100644
index 0000000000..3e79501ac6
--- /dev/null
+++ b/xapps/DESCR
@@ -0,0 +1 @@
+Common library for X-Apps project.
diff --git a/xapps/Makefile b/xapps/Makefile
new file mode 100644
index 0000000000..302d9cf0f0
--- /dev/null
+++ b/xapps/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= xapps-1.2.1
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= xapps
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/xapps
+COMMENT= Components which are common to multiple desktop environments
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
+
+SUBST_CLASSES= pypath
+SUBST_STAGE.pypath= post-patch
+SUBST_FILES.pypath= pygobject/meson.build files/meson.build
+SUBST_VARS.pypath= PREFIX PYTHONBIN
+
+
+PY_PATCHPLIST= yes
+
+USE_TOOLS+= gmake bash pkg-config intltool msgfmt
+
+REPLACE_PYTHON= schemas/meson_install_schemas.py \
+ files/usr/bin/pastebin \
+ files/usr/bin/upload-system-info
+
+REPLACE_BASH= files/usr/bin/xfce4-set-wallpaper
+
+.include "../../devel/py-meson/build.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
+
+.include "../../lang/python/extension.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xapps/PLIST b/xapps/PLIST
new file mode 100644
index 0000000000..7ad5a3a2e0
--- /dev/null
+++ b/xapps/PLIST
@@ -0,0 +1,37 @@
+@comment $NetBSD$
+bin/pastebin
+bin/upload-system-info
+bin/xfce4-set-wallpaper
+include/xapp/libxapp/xapp-gtk-window.h
+include/xapp/libxapp/xapp-kbd-layout-controller.h
+include/xapp/libxapp/xapp-monitor-blanker.h
+include/xapp/libxapp/xapp-preferences-window.h
+lib/girepository-1.0/XApp-1.0.typelib
+lib/libxapp.so
+lib/libxapp.so.1
+lib/libxapp.so.${PKGVERSION}
+lib/pkgconfig/xapp.pc
+${PYSITELIB}/gi/overrides/XApp.py
+share/gir-1.0/XApp-1.0.gir
+share/glade/catalogs/xapp-glade-catalog.xml
+share/glib-2.0/schemas/org.x.apps.gschema.xml
+share/icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg
+share/icons/hicolor/scalable/actions/category-search-symbolic.svg
+share/icons/hicolor/scalable/actions/extract-archive-symbolic.svg
+share/icons/hicolor/scalable/actions/media-mount-symbolic.svg
+share/icons/hicolor/scalable/actions/view-bottom-pane-symbolic.svg
+share/icons/hicolor/scalable/actions/view-left-pane-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/view-left-pane-symbolic.svg
+share/icons/hicolor/scalable/actions/view-right-pane-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/view-right-pane-symbolic.svg
+share/icons/hicolor/scalable/actions/view-top-pane-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic-rtl.svg
+share/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-search-entire-word-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-search-wrap-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-text-case-symbolic.svg
+share/icons/hicolor/scalable/actions/xapp-use-regex-symbolic.svg
+share/vala/vapi/xapp.deps
+share/vala/vapi/xapp.vapi
diff --git a/xapps/buildlink3.mk b/xapps/buildlink3.mk
new file mode 100644
index 0000000000..9a39115d75
--- /dev/null
+++ b/xapps/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= xapps
+
+.if !defined(XAPPS_BUILDLINK3_MK)
+XAPPS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.xapps+= xapps>=1.2.1
+BUILDLINK_PKGSRCDIR.xapps?= ../../wip/xapps
+
+.endif # XAPPS_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -xapps
diff --git a/xapps/distinfo b/xapps/distinfo
new file mode 100644
index 0000000000..c583388df2
--- /dev/null
+++ b/xapps/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+SHA1 (xapps-1.2.1.tar.gz) = 72d3a4a3c26c24d556449360ba6ff5f232159bdb
+RMD160 (xapps-1.2.1.tar.gz) = 45b191cc16684f03ad0b0f3422a8349eb4c191f5
+SHA512 (xapps-1.2.1.tar.gz) = 9348771dff831b879c2ef5f24ebba7c43c5dc4a8e0b417082e79221bd6de419fdf2cd3d8e4f72f1542b936deb12398065bbd63bcf596eb20ad13ad7e5b0fc45f
+Size (xapps-1.2.1.tar.gz) = 48003 bytes
+SHA1 (patch-files_meson.build) = bbe8ea87eaf7ab7e60060ee3baac49f9f55f1c51
+SHA1 (patch-pygobject_meson.build) = 2585e921bfef7a6814da46d62e8d36a133b20a9d
diff --git a/xapps/patches/patch-files_meson.build b/xapps/patches/patch-files_meson.build
new file mode 100644
index 0000000000..7444e9cbf5
--- /dev/null
+++ b/xapps/patches/patch-files_meson.build
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Destdir support.
+
+--- files/meson.build.orig 2018-05-06 13:34:47.000000000 +0000
++++ files/meson.build
+@@ -1,7 +1,10 @@
+ message('Copying ./files structure')
+
+-install_subdir('usr',
+- install_dir: '/',
++install_subdir('usr/bin',
++ install_dir: '@PREFIX@',
++)
++install_subdir('usr/share',
++ install_dir: '@PREFIX@',
+ )
+
+
diff --git a/xapps/patches/patch-pygobject_meson.build b/xapps/patches/patch-pygobject_meson.build
new file mode 100644
index 0000000000..fa75b3b108
--- /dev/null
+++ b/xapps/patches/patch-pygobject_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust python path.
+
+--- pygobject/meson.build.orig 2018-05-06 13:34:47.000000000 +0000
++++ pygobject/meson.build
+@@ -3,7 +3,7 @@ pygobject = dependency('pygobject-3.0',
+ required: true,
+ )
+
+-foreach exec : ['python2', 'python3']
++foreach exec : ['@PYTHONBIN@']
+ r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)')
+
+ if r.returncode() == 0
Home |
Main Index |
Thread Index |
Old Index