diff options
51 files changed, 116 insertions, 114 deletions
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk index f19b81b517e..cff0f0adb54 100644 --- a/audio/xfce4-mixer/buildlink3.mk +++ b/audio/xfce4-mixer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:08:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:23 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk index 957928e0eab..f200ca98077 100644 --- a/audio/xfce4-xmms-plugin/buildlink3.mk +++ b/audio/xfce4-xmms-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk index d8ab928e607..7bdcf595930 100644 --- a/graphics/xfce4-artwork/buildlink3.mk +++ b/graphics/xfce4-artwork/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:40 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_ARTWORK_BUILDLINK3_MK:= ${XFCE4_ARTWORK_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-artwork?= ../../graphics/xfce4-artwork .include "../../x11/xfce4-desktop/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk index 946c79deb58..91fdd2d6fea 100644 --- a/graphics/xfce4-icon-theme/buildlink3.mk +++ b/graphics/xfce4-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:40 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_ICON_THEME_BUILDLINK3_MK:= ${XFCE4_ICON_THEME_BUILDLINK3_MK}+ @@ -18,4 +18,4 @@ BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk index 2ba0338a529..a951c5de024 100644 --- a/graphics/xfce4-iconbox/buildlink3.mk +++ b/graphics/xfce4-iconbox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:41 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_ICONBOX_BUILDLINK3_MK:= ${XFCE4_ICONBOX_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common index 46d70c70785..b025591efe2 100644 --- a/meta-pkgs/xfce4/Makefile.common +++ b/meta-pkgs/xfce4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2005/11/17 08:16:19 martti Exp $ +# $NetBSD: Makefile.common,v 1.29 2006/02/17 06:49:24 martti Exp $ MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.3.2/src/ \ http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.3.2/src/ @@ -19,7 +19,7 @@ USE_TOOLS+= gmake pkg-config GCC_REQD+= 3.0 .endif -XFCE4_EGBASE= ${PREFIX}/share/examples/xfce4 +XFCE4_EGBASE= ${PREFIX:Q}/share/examples/xfce4 .include "../../devel/glib2/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk index d357e52871b..04466701771 100644 --- a/meta-pkgs/xfce4/buildlink3.mk +++ b/meta-pkgs/xfce4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:06 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+ @@ -35,4 +35,4 @@ BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4 .include "../../x11/xfce4-utils/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk index a620d283554..b6b529c7934 100644 --- a/misc/xfce4-weather-plugin/buildlink3.mk +++ b/misc/xfce4-weather-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:14 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?= ../../misc/xfce4-weather-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk index 6f864aca13c..2af9a96a09c 100644 --- a/net/xfce4-wavelan-plugin/buildlink3.mk +++ b/net/xfce4-wavelan-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?= ../../net/xfce4-wavelan-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk index bd07cdeef86..8bf249022ae 100644 --- a/print/xfce4-print/buildlink3.mk +++ b/print/xfce4-print/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:10:41 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+ @@ -32,4 +32,4 @@ MAKEVARS+= PKG_BUILD_OPTIONS.xfce4-print . include "../../print/cups/buildlink3.mk" .endif -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk index ebb321a4d4c..fd9cbf0637d 100644 --- a/print/xfce4-print/options.mk +++ b/print/xfce4-print/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/12/01 18:21:52 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2006/02/17 06:49:24 martti Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-print PKG_SUPPORTED_OPTIONS= cups @@ -8,5 +8,5 @@ PKG_SUPPORTED_OPTIONS= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-cups +CONFIGURE_ARGS+= --disable-cups .endif diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk index f4137d9ef20..4e6a56df34e 100644 --- a/sysutils/xfce4-appfinder/buildlink3.mk +++ b/sysutils/xfce4-appfinder/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_APPFINDER_BUILDLINK3_MK:= ${XFCE4_APPFINDER_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-appfinder?= ../../sysutils/xfce4-appfinder .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk index 86283c7bedb..f7e90696459 100644 --- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk +++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk index ed528bb0de5..832083938f2 100644 --- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk +++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile index 6735abc3ddd..4229081c611 100644 --- a/sysutils/xfce4-fm/Makefile +++ b/sysutils/xfce4-fm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/02/17 06:49:24 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -15,7 +15,7 @@ PKGCONFIG_OVERRIDE= src/xffm-1.0.pc.in CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LDFLAGS} -UNLIMIT_RESOURCES+= datasize +UNLIMIT_RESOURCES+= datasize .include "../../databases/dbh/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk index b75f5db2026..b6d08b5cc97 100644 --- a/sysutils/xfce4-fm/buildlink3.mk +++ b/sysutils/xfce4-fm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_FM_BUILDLINK3_MK:= ${XFCE4_FM_BUILDLINK3_MK}+ @@ -21,4 +21,4 @@ BUILDLINK_PKGSRCDIR.xfce4-fm?= ../../sysutils/xfce4-fm .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk index 650098532b5..5438fa8436a 100644 --- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk +++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?= ../../sysutils/xfce4-fsguard-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-minicmd-plugin/buildlink3.mk b/sysutils/xfce4-minicmd-plugin/buildlink3.mk index b3321f69b97..fb70a973dd4 100644 --- a/sysutils/xfce4-minicmd-plugin/buildlink3.mk +++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?= ../../sysutils/xfce4-minicmd-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk index 95083c072ba..d6716390259 100644 --- a/sysutils/xfce4-netload-plugin/buildlink3.mk +++ b/sysutils/xfce4-netload-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk index 605e62f8d3e..df7ace8874b 100644 --- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk +++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?= ../../sysutils/xfce4-quicklaunc .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk index e3773625c94..6250cc586f9 100644 --- a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk +++ b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?= ../../sysutils/xfce4-showdesktop- .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk index 11fdcc3e5fc..f47e85690bc 100644 --- a/sysutils/xfce4-systemload-plugin/buildlink3.mk +++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:= ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-pl .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk index 5292c491570..ca7bf17a590 100644 --- a/sysutils/xfce4-systray/buildlink3.mk +++ b/sysutils/xfce4-systray/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SYSTRAY_BUILDLINK3_MK:= ${XFCE4_SYSTRAY_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-systray?= ../../sysutils/xfce4-systray .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk index ff3bbb92eaf..bc0d102a520 100644 --- a/sysutils/xfce4-xkb-plugin/buildlink3.mk +++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_XKB_PLUGIN_BUILDLINK3_MK:= ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?= ../../sysutils/xfce4-xkb-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/time/xfce4-calendar/buildlink3.mk b/time/xfce4-calendar/buildlink3.mk index 18941c23a86..69513899b09 100644 --- a/time/xfce4-calendar/buildlink3.mk +++ b/time/xfce4-calendar/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_CALENDAR_BUILDLINK3_MK:= ${XFCE4_CALENDAR_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-calendar?= ../../time/xfce4-calendar .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk index e4d828e9245..e4f63ee1a77 100644 --- a/time/xfce4-datetime-plugin/buildlink3.mk +++ b/time/xfce4-datetime-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?= ../../time/xfce4-datetime-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk index 60cc62e435d..0643afb0abe 100644 --- a/wm/xfce4-wm-themes/buildlink3.mk +++ b/wm/xfce4-wm-themes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes .include "../../wm/xfce4-wm/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk index 21e4f81a72d..da0445e71d8 100644 --- a/wm/xfce4-wm/buildlink3.mk +++ b/wm/xfce4-wm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+ @@ -21,4 +21,4 @@ BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index 2b7ecb6eacb..38e3b1d9a11 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:39 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/02/17 06:49:25 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= Xfce widget library #PKGREVISION= 1 -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 4643111c3c4..60f8c75330f 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:39 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+ @@ -23,4 +23,4 @@ BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile index 61168b74e00..23669d36939 100644 --- a/x11/libxfce4mcs/Makefile +++ b/x11/libxfce4mcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:39 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/02/17 06:49:25 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -9,7 +9,7 @@ COMMENT= Xfce settings management library #PKGREVISION= 1 -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html PKGCONFIG_OVERRIDE= libxfce4mcs/libxfce4mcs-client-1.0.pc.in PKGCONFIG_OVERRIDE+= libxfce4mcs/libxfce4mcs-manager-1.0.pc.in diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk index 5246884a300..4021fe57427 100644 --- a/x11/libxfce4mcs/buildlink3.mk +++ b/x11/libxfce4mcs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:39 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs .include "../../x11/libxfce4util/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 932d2e02cbc..7c49be91003 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:39 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/02/17 06:49:25 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -10,7 +10,7 @@ PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce basic library -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index 0dac0ae802b..f656d883a61 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:39 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+ @@ -18,4 +18,4 @@ BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk index 72a167aaa40..d521d1f5350 100644 --- a/x11/xfce4-clipman-plugin/buildlink3.mk +++ b/x11/xfce4-clipman-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index 86dafb4a819..2e073767896 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/02/17 06:49:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -12,16 +12,17 @@ COMMENT= Xfce desktop background manager PKG_SYSCONFSUBDIR= xdg/xfce4/desktop EGDIR= ${XFCE4_EGBASE}/desktop -CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/menu.xml -.for _l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \ +CONF_FILES= ${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml +.for l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \ uk vi zh_TW -CONF_FILES+= ${EGDIR}/menu.xml.${_l} ${PKG_SYSCONFDIR}/menu.xml.${_l} +CONF_FILES+= ${EGDIR:Q}/menu.xml.${l} \ + ${PKG_SYSCONFDIR:Q}/menu.xml.${l} .endfor -CONF_FILES+= ${EGDIR}/xfce-registered-categories.xml \ - ${PKG_SYSCONFDIR}/xfce-registered-categories.xml -.for _l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW -CONF_FILES+= ${EGDIR}/xfce-registered-categories.xml.${_l} \ - ${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l} +CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml \ + ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml +.for l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW +CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l} \ + ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l} .endfor CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 59cf098284a..e566192f9e6 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk index 351d5ceb87e..c2cd49e591f 100644 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ b/x11/xfce4-gtk2-engine/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk index 178c8f3aa02..edd7dadb505 100644 --- a/x11/xfce4-mcs-manager/buildlink3.mk +++ b/x11/xfce4-mcs-manager/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager .include "../../x11/libxfce4mcs/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk index 2fa5bc6501f..ee56d319c5a 100644 --- a/x11/xfce4-mcs-plugins/buildlink3.mk +++ b/x11/xfce4-mcs-plugins/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins .include "../../x11/xfce4-mcs-manager/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk index b0efa124b0a..100f40172ba 100644 --- a/x11/xfce4-notes-plugin/buildlink3.mk +++ b/x11/xfce4-notes-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index fa59459b213..2eeb0fa128b 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/02/17 06:49:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -14,11 +14,11 @@ PTHREAD_AUTO_VARS= 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 el eu fi fr he hu it ja ko lt ms nl pl ro ru sk sv \ +CONF_FILES= ${EGDIR:Q}/contents.xml ${PKG_SYSCONFDIR:Q}/contents.xml +.for l in ar az ca da el eu fi fr he hu it ja ko lt ms nl pl ro ru sk sv \ tr vi zh_CN zh_TW -CONF_FILES+= ${EGDIR}/contents.xml.${_l} \ - ${PKG_SYSCONFDIR}/contents.xml.${_l} +CONF_FILES+= ${EGDIR:Q}/contents.xml.${l} \ + ${PKG_SYSCONFDIR:Q}/contents.xml.${l} .endfor CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index be49e8d5a19..aebcc4d2284 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+ @@ -21,4 +21,4 @@ BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel .include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index 823b6b934f3..1b3cbf88427 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/02/17 06:49:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -11,10 +11,11 @@ COMMENT= Xfce session manager PKG_SYSCONFSUBDIR= xdg/xfce4-session EGDIR= ${XFCE4_EGBASE}/session -CONF_FILES= ${EGDIR}/xfce4-session.rc \ - ${PKG_SYSCONFDIR}/xfce4-session.rc +CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \ + ${PKG_SYSCONFDIR:Q}/xfce4-session.rc -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} ICEAUTH=${TOOLS_PATH.iceauth} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} \ + ICEAUTH=${TOOLS_PATH.iceauth:Q} REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index f85907d0080..e92f4252063 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk index b93016d4d57..3424d462123 100644 --- a/x11/xfce4-taskbar-plugin/buildlink3.mk +++ b/x11/xfce4-taskbar-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:= ${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?= ../../x11/xfce4-taskbar-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk index 8876bb82e67..47415f60176 100644 --- a/x11/xfce4-toys/buildlink3.mk +++ b/x11/xfce4-toys/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_TOYS_BUILDLINK3_MK:= ${XFCE4_TOYS_BUILDLINK3_MK}+ @@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk index 73a5135db47..ac6aa1318ea 100644 --- a/x11/xfce4-trigger-launcher/buildlink3.mk +++ b/x11/xfce4-trigger-launcher/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:= ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?= ../../x11/xfce4-trigger-launcher .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 5144579ee40..704b49a1a26 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:11:47 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/02/17 06:49:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -12,7 +12,7 @@ COMMENT= Xfce utilities PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} -CONF_FILES= ${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc +CONF_FILES= ${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc REQD_DIRS+= ${EGDIR} diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index f79085d7c14..3de020aa9bc 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk index 4d80c2c30dc..e197659ffe2 100644 --- a/x11/xfce4-windowlist-plugin/buildlink3.mk +++ b/x11/xfce4-windowlist-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+ @@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?= ../../x11/xfce4-windowlist-plugin .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |