From df05624c41cab4bc41700431febe1f63fa2d787d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 7 May 2013 11:41:50 +0200 Subject: [PATCH] xfconf: remove xfconf-perl pkg and replace it with 'perl' pkg option (off). --- srcpkgs/xfconf-perl | 1 - srcpkgs/xfconf/template | 38 +++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 18 deletions(-) delete mode 120000 srcpkgs/xfconf-perl diff --git a/srcpkgs/xfconf-perl b/srcpkgs/xfconf-perl deleted file mode 120000 index ead062cb62f..00000000000 --- a/srcpkgs/xfconf-perl +++ /dev/null @@ -1 +0,0 @@ -xfconf \ No newline at end of file diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template index 075ba29078d..be0a44e997f 100644 --- a/srcpkgs/xfconf/template +++ b/srcpkgs/xfconf/template @@ -1,11 +1,10 @@ # Template file for 'xfconf' pkgname=xfconf version=4.10.0 -revision=2 +revision=3 build_style=gnu-configure -hostmakedepends="pkg-config intltool>=0.50.2_1 perl>=5.16" -makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig - perl-Glib>=1.242_1 dbus-glib-devel libxfce4util-devel" +hostmakedepends="pkg-config intltool>=0.50.2_1" +makedepends="dbus-glib-devel libxfce4util-devel" short_desc="Xfce hierarchical (tree-like) configuration system" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -17,9 +16,20 @@ long_desc=" immediate child nodes of the root are called channels. All settings beneath the channel nodes are called properties." +# Package build options +build_options="perl" +desc_option_perl="Enable support for perl bindings" + +if [ "$build_option_perl" ]; then + configure_args+=" --enable-perl-bindings" + makedepends+=" perl>=5.16 perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib>=1.242_1" +else + configure_args+=" --disable-perl-bindings" +fi + xfconf-devel_package() { depends="dbus-glib-devel xfconf>=$version" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -27,19 +37,13 @@ xfconf-devel_package() { } } -xfconf-perl_package() { - depends="perl-Glib>=1.242_1" - short_desc="${short_desc} - perl bindings" - pkg_install() { - vmove usr/lib/perl5 - vmove usr/share/man - find ${PKGDESTDIR}/usr/lib/perl5 -type f \ - -name perllocal.pod -o -name .packlist|xargs rm -f - } -} - xfconf_package() { + if [ "$build_option_perl" ]; then + replaces="xfconf-perl>=0" + provides="xfconf-perl-${version}" + depends="perl-Glib>=1.242_1" + fi pkg_install() { - vmove usr + vmove all } }