[pkgsrc/trunk]: pkgsrc/wm/openbox Give autostart.sh the full CONF_FILES treat...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/622f72f9186c
branches:  trunk
changeset: 568897:622f72f9186c
user:      snj <snj%pkgsrc.org@localhost>
date:      Thu Dec 24 03:13:07 2009 +0000

description:
Give autostart.sh the full CONF_FILES treatment.  Fixes PR pkg/42502.

diffstat:

 wm/openbox/Makefile         |   5 ++++-
 wm/openbox/PLIST            |   4 ++--
 wm/openbox/distinfo         |   4 ++--
 wm/openbox/patches/patch-aa |  22 +++++++++++++++++++---
 4 files changed, 27 insertions(+), 8 deletions(-)

diffs (92 lines):

diff -r c140eaddde89 -r 622f72f9186c wm/openbox/Makefile
--- a/wm/openbox/Makefile       Wed Dec 23 23:38:46 2009 +0000
+++ b/wm/openbox/Makefile       Thu Dec 24 03:13:07 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2009/12/15 12:42:04 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2009/12/24 03:13:07 snj Exp $
 
 DISTNAME=      openbox-3.4.8
+PKGREVISION=   1
 CATEGORIES=    wm x11
 MASTER_SITES=  http://icculus.org/openbox/releases/
 # PR pkg/36489
@@ -32,6 +33,8 @@
 EGDIR=                 ${PREFIX}/share/examples/openbox
 CONF_FILES=            ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml
 CONF_FILES+=           ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
+CONF_FILES+=           ${EGDIR}/autostart.sh \
+                           ${PKG_SYSCONFDIR}/openbox/autostart.sh
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r c140eaddde89 -r 622f72f9186c wm/openbox/PLIST
--- a/wm/openbox/PLIST  Wed Dec 23 23:38:46 2009 +0000
+++ b/wm/openbox/PLIST  Thu Dec 24 03:13:07 2009 +0000
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.20 2009/12/15 12:42:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/12/24 03:13:07 snj Exp $
 bin/gdm-control
 bin/gnome-panel-control
 bin/openbox
 bin/openbox-gnome-session
 bin/openbox-kde-session
 bin/openbox-session
-etc/xdg/openbox/autostart.sh
 include/openbox/3.4/openbox/color.h
 include/openbox/3.4/openbox/font.h
 include/openbox/3.4/openbox/geom.h
@@ -45,6 +44,7 @@
 share/doc/openbox/xbm/shade_toggled.xbm
 share/examples/openbox/menu.xml
 share/examples/openbox/rc.xml
+share/examples/openbox/autostart.sh
 share/gnome/wm-properties/openbox.desktop
 share/locale/ar/LC_MESSAGES/openbox.mo
 share/locale/bn_IN/LC_MESSAGES/openbox.mo
diff -r c140eaddde89 -r 622f72f9186c wm/openbox/distinfo
--- a/wm/openbox/distinfo       Wed Dec 23 23:38:46 2009 +0000
+++ b/wm/openbox/distinfo       Thu Dec 24 03:13:07 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2009/12/15 12:42:04 wiz Exp $
+$NetBSD: distinfo,v 1.23 2009/12/24 03:13:07 snj Exp $
 
 SHA1 (openbox-3.4.8.tar.gz) = dae3c3d84ce896e93a52bca0d098fe37c4df4424
 RMD160 (openbox-3.4.8.tar.gz) = 93b8a28275261563b988ca893a3577a2297c60a9
 Size (openbox-3.4.8.tar.gz) = 906181 bytes
-SHA1 (patch-aa) = ab103dd0ac0c711f5f4670e30596646b86fcd158
+SHA1 (patch-aa) = 7a6b00fce344776bc518bc9a0161213e4c47355e
 SHA1 (patch-ab) = bb13ec5801c2e271f1e6b2dc4d0aa149c9e2dff1
diff -r c140eaddde89 -r 622f72f9186c wm/openbox/patches/patch-aa
--- a/wm/openbox/patches/patch-aa       Wed Dec 23 23:38:46 2009 +0000
+++ b/wm/openbox/patches/patch-aa       Thu Dec 24 03:13:07 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2009/12/15 12:42:04 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2009/12/24 03:13:07 snj Exp $
 
---- Makefile.in.orig   2009-12-08 20:57:45.000000000 +0000
-+++ Makefile.in
+--- Makefile.in.orig   2009-12-08 12:57:45.000000000 -0800
++++ Makefile.in        2009-12-23 19:06:19.000000000 -0800
 @@ -483,7 +483,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = m4 po
  docxbmdir = $(docdir)/xbm
@@ -27,3 +27,19 @@
        done
  
  uninstall-dist_rcDATA:
+@@ -3146,12 +3146,12 @@ uninstall-nodist_pkgconfigDATA:
+       done
+ install-nodist_rcDATA: $(nodist_rc_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
++      test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples/openbox"
+       @list='$(nodist_rc_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+-        echo " $(nodist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
+-        $(nodist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
++        echo " $(nodist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/openbox/$$f'"; \
++        $(nodist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/openbox/$$f"; \
+       done
+ 
+ uninstall-nodist_rcDATA: