diff options
| -rw-r--r-- | x11/lxsession/Makefile | 26 | ||||
| -rw-r--r-- | x11/lxsession/PLIST | 23 | ||||
| -rw-r--r-- | x11/lxsession/distinfo | 11 | ||||
| -rw-r--r-- | x11/lxsession/patches/patch-data_Makefile.in | 38 |
4 files changed, 84 insertions, 14 deletions
diff --git a/x11/lxsession/Makefile b/x11/lxsession/Makefile index 5cb4640447d..432197d5a52 100644 --- a/x11/lxsession/Makefile +++ b/x11/lxsession/Makefile @@ -1,24 +1,34 @@ -# $NetBSD: Makefile,v 1.10 2015/04/25 14:25:13 tnn Exp $ +# $NetBSD: Makefile,v 1.11 2016/05/23 08:56:21 youri Exp $ -DISTNAME= lxsession-0.4.6.1 -PKGREVISION= 9 +DISTNAME= lxsession-0.5.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lxde/} +EXTRACT_SUFX= .tar.xz -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://lxde.sourceforge.net/ +MAINTAINER= youri@NetBSD.org +HOMEPAGE= http://lxde.org/ COMMENT= Session manager for LXDE - LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes +LXDE_CONF= share/examples/lxsession +GNU_CONFIGURE= yes INSTALLATION_DIRS= share/doc/lxsession -USE_TOOLS+= intltool msgfmt pkg-config +USE_TOOLS+= intltool msgfmt pkg-config + +PKG_SYSCONFSUBDIR= xdg +MAKE_DIRS+= ${PKG_SYSCONFDIR}/autostart + +CONF_FILES+= ${LXDE_CONF}/lxpolkit.desktop \ + ${PKG_SYSCONFDIR}/autostart/lxpolkit.desktop post-install: ${INSTALL_DATA} ${WRKSRC}/README \ ${DESTDIR}${PREFIX}/share/doc/lxsession/ +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../security/polkit/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libunique/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lxsession/PLIST b/x11/lxsession/PLIST index 1887286e2e7..b3c53c3f6c9 100644 --- a/x11/lxsession/PLIST +++ b/x11/lxsession/PLIST @@ -1,13 +1,34 @@ -@comment $NetBSD: PLIST,v 1.1 2013/02/01 01:31:37 reed Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/05/23 08:56:21 youri Exp $ +bin/lxclipboard bin/lxlock +bin/lxpolkit bin/lxsession +bin/lxsession-db +bin/lxsession-default +bin/lxsession-default-apps +bin/lxsession-default-terminal +bin/lxsession-edit bin/lxsession-logout +bin/lxsession-xdg-autostart +bin/lxsession-xsettings +bin/lxsettings-daemon +man/man1/lxclipboard.1 +man/man1/lxlock.1 +man/man1/lxsession-default-apps.1 +man/man1/lxsession-default-terminal.1 +man/man1/lxsession-default.1 man/man1/lxsession-logout.1 man/man1/lxsession.1 +share/applications/lxsession-default-apps.desktop +share/applications/lxsession-edit.desktop share/doc/lxsession/README +share/examples/lxsession/lxpolkit.desktop share/lxsession/images/gnome-session-hibernate.png share/lxsession/images/gnome-session-reboot.png share/lxsession/images/gnome-session-suspend.png share/lxsession/images/gnome-session-switch.png share/lxsession/images/system-log-out.png share/lxsession/images/system-shutdown.png +share/lxsession/ui/lxpolkit.ui +share/lxsession/ui/lxsession-default-apps.ui +share/lxsession/ui/lxsession-edit.ui diff --git a/x11/lxsession/distinfo b/x11/lxsession/distinfo index d215f9d7c0f..fe7285bfb9c 100644 --- a/x11/lxsession/distinfo +++ b/x11/lxsession/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 03:28:48 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/05/23 08:56:21 youri Exp $ -SHA1 (lxsession-0.4.6.1.tar.gz) = ef7f74617f7555f3e292b670099ef44389a9a849 -RMD160 (lxsession-0.4.6.1.tar.gz) = 97c0c88abdb81c22ec356371c4b7572cd715608f -SHA512 (lxsession-0.4.6.1.tar.gz) = eea554ba70b3fd278b7ce0bb2d278241dff26eaccf74f2a4a0a9846515688fd5dd846c97f29c71139a0c3b95bc5e906efc4673f0cd79d8db427894dff5524f16 -Size (lxsession-0.4.6.1.tar.gz) = 407100 bytes +SHA1 (lxsession-0.5.2.tar.xz) = 00d45cccbdd6fb05c46998671a7c12123a0a2179 +RMD160 (lxsession-0.5.2.tar.xz) = 81a379a4c32085447034e965e19c840eb82588dc +SHA512 (lxsession-0.5.2.tar.xz) = 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1 +Size (lxsession-0.5.2.tar.xz) = 354092 bytes +SHA1 (patch-data_Makefile.in) = ec76ab351a3417b71e80f8201808174e63c8f2da diff --git a/x11/lxsession/patches/patch-data_Makefile.in b/x11/lxsession/patches/patch-data_Makefile.in new file mode 100644 index 00000000000..059a1556da0 --- /dev/null +++ b/x11/lxsession/patches/patch-data_Makefile.in @@ -0,0 +1,38 @@ +$NetBSD: patch-data_Makefile.in,v 1.1 2016/05/23 08:56:21 youri Exp $ + +Fix config file installation. + +--- data/Makefile.in.orig 2014-11-29 14:53:23.000000000 +0000 ++++ data/Makefile.in +@@ -337,6 +337,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ ++sysconfexampledir = ${datadir}/examples + target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ +@@ -418,18 +419,18 @@ lxpolkit.desktop.in: $(top_builddir)/con + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-autostartDATA: $(autostart_DATA) + @$(NORMAL_INSTALL) +- @list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \ ++ @list='$(autostart_DATA)'; test -n "$(sysconfexampledir)/lxsession" || list=; \ + if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(autostartdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(autostartdir)" || exit 1; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)/lxsession'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(sysconfexampledir)/lxsession" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(autostartdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(autostartdir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfexampledir)/lxsession'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfexampledir)/lxsession" || exit $$?; \ + done + + uninstall-autostartDATA: |