diff options
author | hira <hira> | 2008-12-19 23:58:18 +0000 |
---|---|---|
committer | hira <hira> | 2008-12-19 23:58:18 +0000 |
commit | 129741eb9a1700c842285ae3815b1bfb32628520 (patch) | |
tree | c1d525ee2edd646dd9ea8a3ce9bf8a3951395cb8 | |
parent | 67ab83172bde1ca657ab81f629d7794895f69cca (diff) | |
download | pkgsrc-129741eb9a1700c842285ae3815b1bfb32628520.tar.gz |
Fix PR pkg/36260. Remove system config directory from PLIST.
-rw-r--r-- | x11/xfce4-session/Makefile | 17 | ||||
-rw-r--r-- | x11/xfce4-session/PLIST | 7 | ||||
-rw-r--r-- | x11/xfce4-session/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/xfce4-session/distinfo | 3 | ||||
-rw-r--r-- | x11/xfce4-session/patches/patch-ab | 13 |
5 files changed, 31 insertions, 13 deletions
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index e95e06073a3..0952167cac7 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,25 +1,30 @@ -# $NetBSD: Makefile,v 1.22 2008/12/18 14:52:09 hira Exp $ +# $NetBSD: Makefile,v 1.23 2008/12/19 23:58:18 hira Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-session-${XFCE4_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce session manager -PKG_SYSCONFSUBDIR= xdg/xfce4-session EGDIR= ${XFCE4_EGBASE}/session CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \ - ${PKG_SYSCONFDIR:Q}/xfce4-session.rc + ${PKG_SYSCONFDIR:Q}/xdg/xfce4-session/xfce4-session.rc +CONF_FILES+= ${PREFIX}/share/xdg/autostart/xfce4-tips-autostart.desktop \ + ${PKG_SYSCONFDIR:Q}/xdg/autostart/xfce4-tips-autostart.desktop -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q} -REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} +REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} ${PREFIX}/share/xdg/autostart BUILD_DEFS+= PKG_SYSCONFBASE +OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg +OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/xfce4-session +OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart + USE_TOOLS+= iceauth:run USE_DIRS+= xdg-1.4 diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index b20e6508649..c8e2f8b1f8c 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.11 2008/12/18 14:52:09 hira Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/12/19 23:58:18 hira Exp $ bin/xfce4-autostart-editor bin/xfce4-session bin/xfce4-session-logout bin/xfce4-tips -etc/xdg/autostart/xfce4-tips-autostart.desktop include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h lib/libxfsm-4.2.la @@ -90,6 +89,7 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo share/themes/Default/balou/logo.png share/themes/Default/balou/themerc +share/xdg/autostart/xfce4-tips-autostart.desktop share/xfce4/doc/C/images/xfsm-advanced.png share/xfce4/doc/C/images/xfsm-general.png share/xfce4/doc/C/images/xfsm-splash.png @@ -101,12 +101,11 @@ share/xfce4/doc/fr/xfce4-session.html share/xfce4/tips/tips share/xfce4/tips/tips.dat @dirrm share/xfce4/tips +@dirrm share/xdg/autostart @dirrm share/themes/Default/balou @dirrm share/examples/xfce4/session @dirrm lib/xfce4/splash/engines @dirrm lib/xfce4/splash @dirrm include/xfce4/xfce4-session-4.2/libxfsm @dirrm include/xfce4/xfce4-session-4.2 -@dirrm etc/xdg/xfce4-session -@dirrm etc/xdg/autostart @unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index 1bea4dcb230..3e25914a363 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/12/18 16:46:29 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2008/12/19 23:58:18 hira Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-session BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session .if ${XFCE4_SESSION_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb1 +BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.3nb2 BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session .endif # XFCE4_SESSION_BUILDLINK3_MK diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 9ea4c204398..2b50170454f 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.10 2008/12/17 12:50:04 hira Exp $ +$NetBSD: distinfo,v 1.11 2008/12/19 23:58:18 hira Exp $ SHA1 (xfce4-session-4.4.3.tar.bz2) = 609cf888548e1dc7f2b2318698ab86ac73fb0f4d RMD160 (xfce4-session-4.4.3.tar.bz2) = e0aa16b9089ae00a34f5e1df5b1b9af7a104f922 Size (xfce4-session-4.4.3.tar.bz2) = 1276089 bytes SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195 +SHA1 (patch-ab) = d87076b003dd7e7ee74251199d4a1af0a5c5a355 diff --git a/x11/xfce4-session/patches/patch-ab b/x11/xfce4-session/patches/patch-ab new file mode 100644 index 00000000000..0b11449f41d --- /dev/null +++ b/x11/xfce4-session/patches/patch-ab @@ -0,0 +1,13 @@ +$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 = \ |