Fri Dec 19 23:58:18 2008 UTC ()
Fix PR pkg/36260.  Remove system config directory from PLIST.


(hira)
diff -r1.22 -r1.23 pkgsrc/x11/xfce4-session/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/xfce4-session/PLIST
diff -r1.17 -r1.18 pkgsrc/x11/xfce4-session/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/x11/xfce4-session/distinfo
diff -r0 -r1.1 pkgsrc/x11/xfce4-session/patches/patch-ab
cvs diff -r1.22 -r1.23 pkgsrc/x11/xfce4-session/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-session/Makefile 2008/12/18 14:52:09 1.22
+++ pkgsrc/x11/xfce4-session/Makefile 2008/12/19 23:58:18 1.23
@@ -1,28 +1,33 @@ @@ -1,28 +1,33 @@
1# $NetBSD: Makefile,v 1.22 2008/12/18 14:52:09 hira Exp $ 1# $NetBSD: Makefile,v 1.23 2008/12/19 23:58:18 hira Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../meta-pkgs/xfce4/Makefile.common" 5.include "../../meta-pkgs/xfce4/Makefile.common"
6 6
7DISTNAME= xfce4-session-${XFCE4_VERSION} 7DISTNAME= xfce4-session-${XFCE4_VERSION}
8PKGREVISION= 1 8PKGREVISION= 2
9CATEGORIES= x11 9CATEGORIES= x11
10COMMENT= Xfce session manager 10COMMENT= Xfce session manager
11 11
12PKG_SYSCONFSUBDIR= xdg/xfce4-session 
13EGDIR= ${XFCE4_EGBASE}/session 12EGDIR= ${XFCE4_EGBASE}/session
14CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \ 13CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \
15 ${PKG_SYSCONFDIR:Q}/xfce4-session.rc 14 ${PKG_SYSCONFDIR:Q}/xdg/xfce4-session/xfce4-session.rc
 15CONF_FILES+= ${PREFIX}/share/xdg/autostart/xfce4-tips-autostart.desktop \
 16 ${PKG_SYSCONFDIR:Q}/xdg/autostart/xfce4-tips-autostart.desktop
16 17
17CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
18CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q} 19CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q}
19 20
20REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} 21REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} ${PREFIX}/share/xdg/autostart
21BUILD_DEFS+= PKG_SYSCONFBASE 22BUILD_DEFS+= PKG_SYSCONFBASE
22 23
 24OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg
 25OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/xfce4-session
 26OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
 27
23USE_TOOLS+= iceauth:run 28USE_TOOLS+= iceauth:run
24USE_DIRS+= xdg-1.4 29USE_DIRS+= xdg-1.4
25 30
26.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 31.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
27.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" 32.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/x11/xfce4-session/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-session/PLIST 2008/12/18 14:52:09 1.11
+++ pkgsrc/x11/xfce4-session/PLIST 2008/12/19 23:58:18 1.12
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1@comment $NetBSD: PLIST,v 1.11 2008/12/18 14:52:09 hira Exp $ 1@comment $NetBSD: PLIST,v 1.12 2008/12/19 23:58:18 hira Exp $
2bin/xfce4-autostart-editor 2bin/xfce4-autostart-editor
3bin/xfce4-session 3bin/xfce4-session
4bin/xfce4-session-logout 4bin/xfce4-session-logout
5bin/xfce4-tips 5bin/xfce4-tips
6etc/xdg/autostart/xfce4-tips-autostart.desktop 
7include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h 6include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
8include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h 7include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
9lib/libxfsm-4.2.la 8lib/libxfsm-4.2.la
10lib/pkgconfig/xfce4-session-1.0.pc 9lib/pkgconfig/xfce4-session-1.0.pc
11lib/xfce4/mcs-plugins/session_settings.la 10lib/xfce4/mcs-plugins/session_settings.la
12lib/xfce4/mcs-plugins/splash_settings.la 11lib/xfce4/mcs-plugins/splash_settings.la
13lib/xfce4/splash/engines/libbalou.la 12lib/xfce4/splash/engines/libbalou.la
14lib/xfce4/splash/engines/libmice.la 13lib/xfce4/splash/engines/libmice.la
15lib/xfce4/splash/engines/libsimple.la 14lib/xfce4/splash/engines/libsimple.la
16libexec/balou-export-theme 15libexec/balou-export-theme
17libexec/balou-install-theme 16libexec/balou-install-theme
18libexec/xfsm-shutdown-helper 17libexec/xfsm-shutdown-helper
19man/man1/xfce4-session-logout.1 18man/man1/xfce4-session-logout.1
@@ -80,33 +79,33 @@ share/locale/ro/LC_MESSAGES/xfce4-sessio @@ -80,33 +79,33 @@ share/locale/ro/LC_MESSAGES/xfce4-sessio
80share/locale/ru/LC_MESSAGES/xfce4-session.mo 79share/locale/ru/LC_MESSAGES/xfce4-session.mo
81share/locale/si/LC_MESSAGES/xfce4-session.mo 80share/locale/si/LC_MESSAGES/xfce4-session.mo
82share/locale/sk/LC_MESSAGES/xfce4-session.mo 81share/locale/sk/LC_MESSAGES/xfce4-session.mo
83share/locale/sv/LC_MESSAGES/xfce4-session.mo 82share/locale/sv/LC_MESSAGES/xfce4-session.mo
84share/locale/ta/LC_MESSAGES/xfce4-session.mo 83share/locale/ta/LC_MESSAGES/xfce4-session.mo
85share/locale/tr/LC_MESSAGES/xfce4-session.mo 84share/locale/tr/LC_MESSAGES/xfce4-session.mo
86share/locale/uk/LC_MESSAGES/xfce4-session.mo 85share/locale/uk/LC_MESSAGES/xfce4-session.mo
87share/locale/ur/LC_MESSAGES/xfce4-session.mo 86share/locale/ur/LC_MESSAGES/xfce4-session.mo
88share/locale/vi/LC_MESSAGES/xfce4-session.mo 87share/locale/vi/LC_MESSAGES/xfce4-session.mo
89share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo 88share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
90share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo 89share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
91share/themes/Default/balou/logo.png 90share/themes/Default/balou/logo.png
92share/themes/Default/balou/themerc 91share/themes/Default/balou/themerc
 92share/xdg/autostart/xfce4-tips-autostart.desktop
93share/xfce4/doc/C/images/xfsm-advanced.png 93share/xfce4/doc/C/images/xfsm-advanced.png
94share/xfce4/doc/C/images/xfsm-general.png 94share/xfce4/doc/C/images/xfsm-general.png
95share/xfce4/doc/C/images/xfsm-splash.png 95share/xfce4/doc/C/images/xfsm-splash.png
96share/xfce4/doc/C/xfce4-session.html 96share/xfce4/doc/C/xfce4-session.html
97share/xfce4/doc/fr/images/xfsm-advanced.png 97share/xfce4/doc/fr/images/xfsm-advanced.png
98share/xfce4/doc/fr/images/xfsm-general.png 98share/xfce4/doc/fr/images/xfsm-general.png
99share/xfce4/doc/fr/images/xfsm-splash.png 99share/xfce4/doc/fr/images/xfsm-splash.png
100share/xfce4/doc/fr/xfce4-session.html 100share/xfce4/doc/fr/xfce4-session.html
101share/xfce4/tips/tips 101share/xfce4/tips/tips
102share/xfce4/tips/tips.dat 102share/xfce4/tips/tips.dat
103@dirrm share/xfce4/tips 103@dirrm share/xfce4/tips
 104@dirrm share/xdg/autostart
104@dirrm share/themes/Default/balou 105@dirrm share/themes/Default/balou
105@dirrm share/examples/xfce4/session 106@dirrm share/examples/xfce4/session
106@dirrm lib/xfce4/splash/engines 107@dirrm lib/xfce4/splash/engines
107@dirrm lib/xfce4/splash 108@dirrm lib/xfce4/splash
108@dirrm include/xfce4/xfce4-session-4.2/libxfsm 109@dirrm include/xfce4/xfce4-session-4.2/libxfsm
109@dirrm include/xfce4/xfce4-session-4.2 110@dirrm include/xfce4/xfce4-session-4.2
110@dirrm etc/xdg/xfce4-session 
111@dirrm etc/xdg/autostart 
112@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE} 111@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE}
cvs diff -r1.17 -r1.18 pkgsrc/x11/xfce4-session/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-session/Attic/buildlink3.mk 2008/12/18 16:46:29 1.17
+++ pkgsrc/x11/xfce4-session/Attic/buildlink3.mk 2008/12/19 23:58:18 1.18
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.17 2008/12/18 16:46:29 hira Exp $ 1# $NetBSD: buildlink3.mk,v 1.18 2008/12/19 23:58:18 hira Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+ 4XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= xfce4-session 7BUILDLINK_DEPENDS+= xfce4-session
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-session} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-session}
11BUILDLINK_PACKAGES+= xfce4-session 11BUILDLINK_PACKAGES+= xfce4-session
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session
13 13
14.if ${XFCE4_SESSION_BUILDLINK3_MK} == "+" 14.if ${XFCE4_SESSION_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb1 15BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb2
16BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session 16BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session
17.endif # XFCE4_SESSION_BUILDLINK3_MK 17.endif # XFCE4_SESSION_BUILDLINK3_MK
18 18
19.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 19.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
20.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" 20.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
21.include "../../devel/xfce4-dev-tools/buildlink3.mk" 21.include "../../devel/xfce4-dev-tools/buildlink3.mk"
22.include "../../devel/glib2/buildlink3.mk" 22.include "../../devel/glib2/buildlink3.mk"
23 23
24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.10 -r1.11 pkgsrc/x11/xfce4-session/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-session/distinfo 2008/12/17 12:50:04 1.10
+++ pkgsrc/x11/xfce4-session/distinfo 2008/12/19 23:58:18 1.11
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.10 2008/12/17 12:50:04 hira Exp $ 1$NetBSD: distinfo,v 1.11 2008/12/19 23:58:18 hira Exp $
2 2
3SHA1 (xfce4-session-4.4.3.tar.bz2) = 609cf888548e1dc7f2b2318698ab86ac73fb0f4d 3SHA1 (xfce4-session-4.4.3.tar.bz2) = 609cf888548e1dc7f2b2318698ab86ac73fb0f4d
4RMD160 (xfce4-session-4.4.3.tar.bz2) = e0aa16b9089ae00a34f5e1df5b1b9af7a104f922 4RMD160 (xfce4-session-4.4.3.tar.bz2) = e0aa16b9089ae00a34f5e1df5b1b9af7a104f922
5Size (xfce4-session-4.4.3.tar.bz2) = 1276089 bytes 5Size (xfce4-session-4.4.3.tar.bz2) = 1276089 bytes
6SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195 6SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195
 7SHA1 (patch-ab) = d87076b003dd7e7ee74251199d4a1af0a5c5a355
File Added: pkgsrc/x11/xfce4-session/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2008/12/19 23:58:18 hira Exp $

--- xfce4-tips/Makefile.in.orig	2008-12-20 08:38:59.000000000 +0900
+++ xfce4-tips/Makefile.in	2008-12-20 08:39:31.000000000 +0900
@@ -299,7 +299,7 @@
 xfce4_tips_LDADD = \
 	@LIBXFCEGUI4_LIBS@
 
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(datadir)/xdg/autostart
 desktop_in_files = xfce4-tips-autostart.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 EXTRA_DIST = \