pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Use PKG_SYSCONFDIR framework. Bump PKGREVISION.
details: https://anonhg.NetBSD.org/pkgsrc/rev/4e930131778f
branches: trunk
changeset: 495618:4e930131778f
user: hira <hira%pkgsrc.org@localhost>
date: Wed Jun 15 09:00:15 2005 +0000
description:
Use PKG_SYSCONFDIR framework. Bump PKGREVISION.
diffstat:
x11/xfce4-desktop/Makefile | 22 +++++++++++-
x11/xfce4-desktop/PLIST | 68 ++++++++++++++++++-------------------
x11/xfce4-desktop/distinfo | 4 +-
x11/xfce4-desktop/patches/patch-aa | 13 +++++++
x11/xfce4-desktop/patches/patch-ab | 13 +++++++
x11/xfce4-panel/Makefile | 18 +++++++++-
x11/xfce4-panel/PLIST | 50 +++++++++++++--------------
x11/xfce4-panel/distinfo | 3 +-
x11/xfce4-panel/patches/patch-aa | 13 +++++++
x11/xfce4-session/Makefile | 14 +++++++-
x11/xfce4-session/PLIST | 5 +-
x11/xfce4-session/distinfo | 3 +-
x11/xfce4-session/patches/patch-aa | 13 +++++++
x11/xfce4-utils/Makefile | 13 ++++++-
x11/xfce4-utils/PLIST | 4 +-
x11/xfce4-utils/distinfo | 3 +-
x11/xfce4-utils/patches/patch-aa | 13 +++++++
17 files changed, 198 insertions(+), 74 deletions(-)
diffs (truncated from 475 to 300 lines):
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-desktop/Makefile
--- a/x11/xfce4-desktop/Makefile Wed Jun 15 08:57:03 2005 +0000
+++ b/x11/xfce4-desktop/Makefile Wed Jun 15 09:00:15 2005 +0000
@@ -1,12 +1,32 @@
-# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/15 09:00:15 hira Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfdesktop-${XFCE4_VERSION}
PKGNAME= xfce4-desktop-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 desktop background manager
+USE_PKGINSTALL= yes
+
+PKG_SYSCONFSUBDIR= xdg/xfce4/desktop
+EGDIR= ${XFCE4_EGBASE}/desktop
+CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/menu.xml
+.for _l in cs da de es et fi fr he ja ko nl pt_BR ro ru sk uk vi zh_TW
+CONF_FILES+= ${EGDIR}/menu.xml.${_l} ${PKG_SYSCONFDIR}/menu.xml.${_l}
+.endfor
+CONF_FILES+= ${EGDIR}/xfce-registered-categories.xml \
+ ${PKG_SYSCONFDIR}/xfce-registered-categories.xml
+.for _l in cs eu fi hu ja nl pt_BR ro ru sk zh_CN zh_TW
+CONF_FILES+= ${EGDIR}/xfce-registered-categories.xml.${_l} \
+ ${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l}
+.endfor
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+
+MAKE_DIRS+= ${XFCE4_EGBASE} ${EGDIR}
+
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-desktop/PLIST
--- a/x11/xfce4-desktop/PLIST Wed Jun 15 08:57:03 2005 +0000
+++ b/x11/xfce4-desktop/PLIST Wed Jun 15 09:00:15 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/18 06:10:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/06/15 09:00:15 hira Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfdesktop.mo
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfdesktop.mo
@@ -45,44 +45,44 @@
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
bin/xfce4-menueditor
bin/xfdesktop
-etc/xdg/xfce4/desktop/menu.xml
-etc/xdg/xfce4/desktop/menu.xml.cs
-etc/xdg/xfce4/desktop/menu.xml.da
-etc/xdg/xfce4/desktop/menu.xml.de
-etc/xdg/xfce4/desktop/menu.xml.es
-etc/xdg/xfce4/desktop/menu.xml.et
-etc/xdg/xfce4/desktop/menu.xml.fi
-etc/xdg/xfce4/desktop/menu.xml.fr
-etc/xdg/xfce4/desktop/menu.xml.he
-etc/xdg/xfce4/desktop/menu.xml.ja
-etc/xdg/xfce4/desktop/menu.xml.ko
-etc/xdg/xfce4/desktop/menu.xml.nl
-etc/xdg/xfce4/desktop/menu.xml.pt_BR
-etc/xdg/xfce4/desktop/menu.xml.ro
-etc/xdg/xfce4/desktop/menu.xml.ru
-etc/xdg/xfce4/desktop/menu.xml.sk
-etc/xdg/xfce4/desktop/menu.xml.uk
-etc/xdg/xfce4/desktop/menu.xml.vi
-etc/xdg/xfce4/desktop/menu.xml.zh_TW
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sk
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
lib/xfce4/mcs-plugins/backdrop_settings.la
lib/xfce4/modules/xfce4_desktop_menu.la
lib/xfce4/panel-plugins/libdesktopmenu.la
man/man1/xfdesktop.1
share/applications/xfce-backdrop-settings.desktop
share/applications/xfce-menueditor.desktop
+share/examples/xfce4/desktop/menu.xml
+share/examples/xfce4/desktop/menu.xml.cs
+share/examples/xfce4/desktop/menu.xml.da
+share/examples/xfce4/desktop/menu.xml.de
+share/examples/xfce4/desktop/menu.xml.es
+share/examples/xfce4/desktop/menu.xml.et
+share/examples/xfce4/desktop/menu.xml.fi
+share/examples/xfce4/desktop/menu.xml.fr
+share/examples/xfce4/desktop/menu.xml.he
+share/examples/xfce4/desktop/menu.xml.ja
+share/examples/xfce4/desktop/menu.xml.ko
+share/examples/xfce4/desktop/menu.xml.nl
+share/examples/xfce4/desktop/menu.xml.pt_BR
+share/examples/xfce4/desktop/menu.xml.ro
+share/examples/xfce4/desktop/menu.xml.ru
+share/examples/xfce4/desktop/menu.xml.sk
+share/examples/xfce4/desktop/menu.xml.uk
+share/examples/xfce4/desktop/menu.xml.vi
+share/examples/xfce4/desktop/menu.xml.zh_TW
+share/examples/xfce4/desktop/xfce-registered-categories.xml
+share/examples/xfce4/desktop/xfce-registered-categories.xml.cs
+share/examples/xfce4/desktop/xfce-registered-categories.xml.eu
+share/examples/xfce4/desktop/xfce-registered-categories.xml.fi
+share/examples/xfce4/desktop/xfce-registered-categories.xml.hu
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ja
+share/examples/xfce4/desktop/xfce-registered-categories.xml.nl
+share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ro
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ru
+share/examples/xfce4/desktop/xfce-registered-categories.xml.sk
+share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN
+share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW
share/icons/hicolor/32x32/apps/xfce4-backdrop.png
share/icons/hicolor/32x32/apps/xfce4-menueditor.png
share/icons/hicolor/48x48/apps/xfce4-backdrop.png
@@ -119,6 +119,4 @@
share/xfce4/doc/fr/images/xfdesktop-list.png
share/xfce4/doc/fr/images/xfdesktop-menu-tab.png
share/xfce4/doc/fr/xfdesktop.html
-@dirrm etc/xdg/xfce4/desktop
-@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE}
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-desktop/distinfo
--- a/x11/xfce4-desktop/distinfo Wed Jun 15 08:57:03 2005 +0000
+++ b/x11/xfce4-desktop/distinfo Wed Jun 15 09:00:15 2005 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.11 2005/05/18 06:10:31 martti Exp $
+$NetBSD: distinfo,v 1.12 2005/06/15 09:00:15 hira Exp $
SHA1 (xfdesktop-4.2.2.tar.gz) = 5a8bd1fe4541e96f781535ea2a3b8266c3249feb
RMD160 (xfdesktop-4.2.2.tar.gz) = f4eed52553607b3db14130e529bbe68cb0a5adf2
Size (xfdesktop-4.2.2.tar.gz) = 2945698 bytes
+SHA1 (patch-aa) = 688161e8361ca83bc30ea71b0f15f044bdcdd045
+SHA1 (patch-ab) = 6a7d204cdafdc9535b6732ed7e6d717ba712eaab
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-desktop/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-desktop/patches/patch-aa Wed Jun 15 09:00:15 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/15 09:00:15 hira Exp $
+
+--- Makefile.in.orig 2005-06-13 18:40:55.000000000 +0900
++++ Makefile.in 2005-06-13 18:41:43.000000000 +0900
+@@ -275,7 +275,7 @@
+
+ SUBDIRS = backdrops common doc po settings src modules pixmaps \
+ $(am__append_1) $(am__append_2)
+-confdir = $(sysconfdir)/xdg/xfce4/desktop
++confdir = $(datadir)/examples/xfce4/desktop
+ conf_DATA = \
+ menu.xml \
+ menu.xml.cs \
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-desktop/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-desktop/patches/patch-ab Wed Jun 15 09:00:15 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/06/15 09:00:15 hira Exp $
+
+--- modules/menu/Makefile.in.orig 2005-06-13 18:42:49.000000000 +0900
++++ modules/menu/Makefile.in 2005-06-13 18:43:10.000000000 +0900
+@@ -292,7 +292,7 @@
+ @GMODULE_LIBS@ \
+ @LIBXFCEGUI4_LIBS@
+
+-xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop
++xfceconfdir = $(datadir)/examples/xfce4/desktop
+ xfceconf_DATA = \
+ xfce-registered-categories.xml \
+ xfce-registered-categories.xml.cs \
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-panel/Makefile
--- a/x11/xfce4-panel/Makefile Wed Jun 15 08:57:03 2005 +0000
+++ b/x11/xfce4-panel/Makefile Wed Jun 15 09:00:15 2005 +0000
@@ -1,14 +1,30 @@
-# $NetBSD: Makefile,v 1.16 2005/05/18 06:10:31 martti Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/15 09:01:59 hira Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-panel-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= XFce4 panel
PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in
PTHREAD_AUTO_VARS= yes
+USE_PKGINSTALL= yes
+
+PKG_SYSCONFSUBDIR= xdg/xfce4/panel
+EGDIR= ${XFCE4_EGBASE}/panel
+CONF_FILES= ${EGDIR}/contents.xml ${PKG_SYSCONFDIR}/contents.xml
+.for _l in ar az ca da eu fi fr he hu it ja ko lt ms nl ro ru sk tr vi zh_CN \
+ zh_TW
+CONF_FILES+= ${EGDIR}/contents.xml.${_l} \
+ ${PKG_SYSCONFDIR}/contents.xml.${_l}
+.endfor
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+
+MAKE_DIRS+= ${XFCE4_EGBASE} ${EGDIR}
+
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-panel/PLIST
--- a/x11/xfce4-panel/PLIST Wed Jun 15 08:57:03 2005 +0000
+++ b/x11/xfce4-panel/PLIST Wed Jun 15 09:00:15 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/18 06:10:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/06/15 09:01:59 hira Exp $
${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -43,29 +43,6 @@
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
bin/xfce4-panel
-etc/xdg/xfce4/panel/contents.xml
-etc/xdg/xfce4/panel/contents.xml.ar
-etc/xdg/xfce4/panel/contents.xml.az
-etc/xdg/xfce4/panel/contents.xml.ca
-etc/xdg/xfce4/panel/contents.xml.da
-etc/xdg/xfce4/panel/contents.xml.eu
-etc/xdg/xfce4/panel/contents.xml.fi
-etc/xdg/xfce4/panel/contents.xml.fr
-etc/xdg/xfce4/panel/contents.xml.he
-etc/xdg/xfce4/panel/contents.xml.hu
-etc/xdg/xfce4/panel/contents.xml.it
-etc/xdg/xfce4/panel/contents.xml.ja
-etc/xdg/xfce4/panel/contents.xml.ko
-etc/xdg/xfce4/panel/contents.xml.lt
-etc/xdg/xfce4/panel/contents.xml.ms
-etc/xdg/xfce4/panel/contents.xml.nl
-etc/xdg/xfce4/panel/contents.xml.ro
-etc/xdg/xfce4/panel/contents.xml.ru
-etc/xdg/xfce4/panel/contents.xml.sk
-etc/xdg/xfce4/panel/contents.xml.tr
-etc/xdg/xfce4/panel/contents.xml.vi
-etc/xdg/xfce4/panel/contents.xml.zh_CN
-etc/xdg/xfce4/panel/contents.xml.zh_TW
include/xfce4/panel/add-control-dialog.h
include/xfce4/panel/controls.h
include/xfce4/panel/global.h
@@ -86,6 +63,29 @@
lib/xfce4/panel-plugins/libswitcher.la
lib/xfce4/panel-plugins/libsystembuttons.la
share/applications/xfce-panel-settings.desktop
+share/examples/xfce4/panel/contents.xml
+share/examples/xfce4/panel/contents.xml.ar
+share/examples/xfce4/panel/contents.xml.az
+share/examples/xfce4/panel/contents.xml.ca
+share/examples/xfce4/panel/contents.xml.da
+share/examples/xfce4/panel/contents.xml.eu
+share/examples/xfce4/panel/contents.xml.fi
+share/examples/xfce4/panel/contents.xml.fr
+share/examples/xfce4/panel/contents.xml.he
+share/examples/xfce4/panel/contents.xml.hu
+share/examples/xfce4/panel/contents.xml.it
+share/examples/xfce4/panel/contents.xml.ja
+share/examples/xfce4/panel/contents.xml.ko
+share/examples/xfce4/panel/contents.xml.lt
+share/examples/xfce4/panel/contents.xml.ms
+share/examples/xfce4/panel/contents.xml.nl
+share/examples/xfce4/panel/contents.xml.ro
+share/examples/xfce4/panel/contents.xml.ru
+share/examples/xfce4/panel/contents.xml.sk
+share/examples/xfce4/panel/contents.xml.tr
+share/examples/xfce4/panel/contents.xml.vi
+share/examples/xfce4/panel/contents.xml.zh_CN
+share/examples/xfce4/panel/contents.xml.zh_TW
share/icons/hicolor/16x16/apps/xfce-system-exit.png
share/icons/hicolor/16x16/apps/xfce-system-info.png
share/icons/hicolor/16x16/apps/xfce-system-lock.png
@@ -133,5 +133,3 @@
share/xfce4/doc/fr/xfce4-panel.html
@dirrm lib/xfce4/panel-plugins
@dirrm include/xfce4/panel
-@dirrm etc/xdg/xfce4/panel
-@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-panel/distinfo
--- a/x11/xfce4-panel/distinfo Wed Jun 15 08:57:03 2005 +0000
+++ b/x11/xfce4-panel/distinfo Wed Jun 15 09:00:15 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/05/18 06:10:31 martti Exp $
+$NetBSD: distinfo,v 1.12 2005/06/15 09:01:59 hira Exp $
SHA1 (xfce4-panel-4.2.2.tar.gz) = b69c771437c4a133d3814dfef52a5d2089d278bb
RMD160 (xfce4-panel-4.2.2.tar.gz) = 262aaa0acf58af515c9f5bc1bb0db1621088e593
Size (xfce4-panel-4.2.2.tar.gz) = 1184587 bytes
+SHA1 (patch-aa) = 80188922f6282ffa109c639727ed86678221e36b
diff -r 27a9543b303b -r 4e930131778f x11/xfce4-panel/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce4-panel/patches/patch-aa Wed Jun 15 09:00:15 2005 +0000
Home |
Main Index |
Thread Index |
Old Index