CVS commit: pkgsrc/x11/lxde-common

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Sun May 27 14:24:45 UTC 2018

Modified Files:
        pkgsrc/x11/lxde-common: Makefile distinfo
        pkgsrc/x11/lxde-common/patches: patch-startlxde.in

Log Message:
Handle sysconfdir properly.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/lxde-common/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/lxde-common/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/lxde-common/patches/patch-startlxde.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/lxde-common/Makefile
diff -u pkgsrc/x11/lxde-common/Makefile:1.5 pkgsrc/x11/lxde-common/Makefile:1.6
--- pkgsrc/x11/lxde-common/Makefile:1.5 Tue May 22 16:01:51 2018
+++ pkgsrc/x11/lxde-common/Makefile     Sun May 27 14:24:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/05/22 16:01:51 youri Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/27 14:24:45 youri Exp $
 
 DISTNAME=      lxde-common-0.99.2
 CATEGORIES=    x11
@@ -20,6 +20,7 @@ DEPENDS+=     openbox>=0:../../wm/openbox
 DEPENDS+=      xprop>=0:../../x11/xprop
 
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 LXDE_CONF=             share/examples/lxde
 PKG_SYSCONFSUBDIR=     xdg
 

Index: pkgsrc/x11/lxde-common/distinfo
diff -u pkgsrc/x11/lxde-common/distinfo:1.3 pkgsrc/x11/lxde-common/distinfo:1.4
--- pkgsrc/x11/lxde-common/distinfo:1.3 Fri May 25 14:26:00 2018
+++ pkgsrc/x11/lxde-common/distinfo     Sun May 27 14:24:45 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/05/25 14:26:00 youri Exp $
+$NetBSD: distinfo,v 1.4 2018/05/27 14:24:45 youri Exp $
 
 SHA1 (lxde-common-0.99.2.tar.xz) = e54d80b64e6a89ff1f89ced7a826fa4e8bf453ec
 RMD160 (lxde-common-0.99.2.tar.xz) = e8e7b5438e6296be63e278878902260b5e0ce598
@@ -6,4 +6,4 @@ SHA512 (lxde-common-0.99.2.tar.xz) = 9eb
 Size (lxde-common-0.99.2.tar.xz) = 889948 bytes
 SHA1 (patch-Makefile.in) = 01b1d4196ce3b16a06a36c71c49516814e5823dc
 SHA1 (patch-configure) = 52f637fa4c481defcb96fbcabfbf665593a38e97
-SHA1 (patch-startlxde.in) = 138ae9e98d6ee9dd0295619bfdce1e773e89875a
+SHA1 (patch-startlxde.in) = 8d7ede20396fbad81d6489cd1fcc97d354717a51

Index: pkgsrc/x11/lxde-common/patches/patch-startlxde.in
diff -u pkgsrc/x11/lxde-common/patches/patch-startlxde.in:1.1 pkgsrc/x11/lxde-common/patches/patch-startlxde.in:1.2
--- pkgsrc/x11/lxde-common/patches/patch-startlxde.in:1.1       Fri May 25 14:26:00 2018
+++ pkgsrc/x11/lxde-common/patches/patch-startlxde.in   Sun May 27 14:24:45 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-startlxde.in,v 1.1 2018/05/25 14:26:00 youri Exp $
+$NetBSD: patch-startlxde.in,v 1.2 2018/05/27 14:24:45 youri Exp $
 
-Fix config file location.
+let pkgsrc handle sysconfdir.
 
 --- startlxde.in.orig  2016-11-21 22:59:09.000000000 +0000
 +++ startlxde.in
@@ -9,7 +9,7 @@ Fix config file location.
  if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then
        mkdir -p "$OPENBOX_CONF_DIR"
 -      cp @sysconfdir@/xdg/openbox/LXDE/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
-+      cp @prefix@/etc/xdg/openbox/LXDE/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
++      cp @sysconfdir@/openbox/LXDE/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
  fi
  
  # Ensure the existance of the 'Desktop' folder