From fe7a5e4d8acb8a5c307e5d36e2602b4bf48fde4e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 12 Apr 2013 13:13:49 +0200 Subject: [PATCH] Convert some packages to the new template format (half from g and glib deps). --- srcpkgs/elfutils/template | 3 +- srcpkgs/garcon/garcon-devel.template | 14 ----- srcpkgs/garcon/template | 21 ++++++- srcpkgs/gawk/template | 8 ++- srcpkgs/gc/gc-devel.template | 13 ---- srcpkgs/gc/template | 17 +++++- srcpkgs/gcr/gcr-devel.template | 12 ---- srcpkgs/gcr/template | 31 +++++++--- srcpkgs/gd/gd-devel.template | 11 ---- srcpkgs/gd/gd-progs.template | 8 --- srcpkgs/gd/template | 26 +++++++- srcpkgs/gdb/template | 11 +++- srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template | 14 ----- srcpkgs/gdk-pixbuf/template | 23 ++++++- srcpkgs/gdm/gdm-devel.template | 10 ---- srcpkgs/gdm/libgdm.template | 7 --- srcpkgs/gdm/template | 60 ++++++++++++------- srcpkgs/geany/geany-devel.template | 13 ---- srcpkgs/geany/geany-plugins.template | 11 ---- srcpkgs/geany/template | 29 +++++++-- srcpkgs/geary/template | 7 ++- srcpkgs/gedit/gedit-devel.template | 11 ---- srcpkgs/gedit/template | 23 +++++-- srcpkgs/geeqie/template | 8 ++- srcpkgs/gegl/gegl-devel.template | 10 ---- srcpkgs/gegl/template | 18 +++++- srcpkgs/gendesk/template | 10 +++- srcpkgs/gengetopt/template | 8 ++- srcpkgs/geoclue/geoclue-devel.template | 10 ---- srcpkgs/geoclue/template | 17 +++++- srcpkgs/geoip/geoip-devel.template | 14 ----- srcpkgs/geoip/libgeoip.template | 14 ----- srcpkgs/geoip/template | 31 ++++++++-- srcpkgs/gettext/gettext-devel.template | 12 ---- srcpkgs/gettext/gettext-libs.template | 7 --- srcpkgs/gettext/template | 28 ++++++++- .../ghostscript/ghostscript-devel.template | 12 ---- srcpkgs/ghostscript/libgs.template | 7 --- srcpkgs/ghostscript/libijs.template | 7 --- srcpkgs/ghostscript/template | 44 +++++++++++++- srcpkgs/giblib/giblib-devel.template | 15 ----- srcpkgs/giblib/template | 20 ++++++- srcpkgs/giflib/giflib-devel.template | 9 --- srcpkgs/giflib/giflib-tools.template | 8 --- srcpkgs/giflib/template | 27 ++++++++- srcpkgs/giggle/giggle-devel.template | 12 ---- srcpkgs/giggle/libgiggle.template | 10 ---- srcpkgs/giggle/template | 43 +++++++++---- srcpkgs/gimp/gimp-devel.template | 14 ----- srcpkgs/gimp/gimp-python.template | 14 ----- srcpkgs/gimp/template | 50 ++++++++++++---- srcpkgs/git/git-docs.template | 13 ---- srcpkgs/git/git-perl.template | 13 ---- srcpkgs/git/git-python.template | 13 ---- srcpkgs/git/template | 47 +++++++++++++-- srcpkgs/gitflow/template | 10 +++- srcpkgs/gjs/gjs-devel.template | 10 ---- srcpkgs/gjs/template | 17 +++++- srcpkgs/glade3/glade3-devel.template | 16 ----- srcpkgs/glade3/libgladeui3.template | 15 ----- srcpkgs/glade3/template | 37 +++++++++++- srcpkgs/glew/glew-devel.template | 14 ----- srcpkgs/glew/template | 22 +++++-- srcpkgs/glib-networking/template | 11 +++- srcpkgs/glib/glib-devel.template | 32 ---------- srcpkgs/glib/libglib-devel.template | 12 ---- srcpkgs/glib/template | 50 +++++++++++++++- srcpkgs/intltool/template | 11 +++- srcpkgs/libX11/libX11-devel.template | 10 ---- srcpkgs/libX11/template | 17 +++++- srcpkgs/libXau/libXau-devel.template | 11 ---- srcpkgs/libXau/template | 17 +++++- srcpkgs/libXdmcp/libXdmcp-devel.template | 9 --- srcpkgs/libXdmcp/template | 16 ++++- srcpkgs/libarchive/bsdcpio.template | 9 --- srcpkgs/libarchive/bsdtar.template | 9 --- srcpkgs/libarchive/libarchive-devel.template | 12 ---- srcpkgs/libarchive/template | 37 +++++++++++- srcpkgs/libgcrypt/libgcrypt-devel.template | 11 ---- srcpkgs/libgcrypt/template | 19 +++++- .../libgpg-error/libgpg-error-devel.template | 11 ---- srcpkgs/libgpg-error/template | 19 +++++- srcpkgs/libxcb/libxcb-devel.template | 10 ---- srcpkgs/libxcb/template | 17 +++++- srcpkgs/libxml2/libxml2-devel.template | 16 ----- srcpkgs/libxml2/libxml2-python.template | 8 --- srcpkgs/libxml2/template | 31 +++++++++- srcpkgs/libxslt/libxslt-devel.template | 19 ------ srcpkgs/libxslt/libxslt-python.template | 13 ---- srcpkgs/libxslt/template | 32 +++++++++- srcpkgs/perl-XML-Parser/template | 10 +++- srcpkgs/xcb-proto/template | 13 ++-- srcpkgs/xextproto/template | 8 ++- srcpkgs/xmlcatmgr/template | 18 ++++-- srcpkgs/xmlto/template | 9 ++- srcpkgs/xz/liblzma-devel.template | 11 ---- srcpkgs/xz/liblzma.template | 8 --- srcpkgs/xz/template | 30 +++++++++- 98 files changed, 912 insertions(+), 753 deletions(-) delete mode 100644 srcpkgs/garcon/garcon-devel.template delete mode 100644 srcpkgs/gc/gc-devel.template delete mode 100644 srcpkgs/gcr/gcr-devel.template delete mode 100644 srcpkgs/gd/gd-devel.template delete mode 100644 srcpkgs/gd/gd-progs.template delete mode 100644 srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template delete mode 100644 srcpkgs/gdm/gdm-devel.template delete mode 100644 srcpkgs/gdm/libgdm.template delete mode 100644 srcpkgs/geany/geany-devel.template delete mode 100644 srcpkgs/geany/geany-plugins.template delete mode 100644 srcpkgs/gedit/gedit-devel.template delete mode 100644 srcpkgs/gegl/gegl-devel.template delete mode 100644 srcpkgs/geoclue/geoclue-devel.template delete mode 100644 srcpkgs/geoip/geoip-devel.template delete mode 100644 srcpkgs/geoip/libgeoip.template delete mode 100644 srcpkgs/gettext/gettext-devel.template delete mode 100644 srcpkgs/gettext/gettext-libs.template delete mode 100644 srcpkgs/ghostscript/ghostscript-devel.template delete mode 100644 srcpkgs/ghostscript/libgs.template delete mode 100644 srcpkgs/ghostscript/libijs.template delete mode 100644 srcpkgs/giblib/giblib-devel.template delete mode 100644 srcpkgs/giflib/giflib-devel.template delete mode 100644 srcpkgs/giflib/giflib-tools.template delete mode 100644 srcpkgs/giggle/giggle-devel.template delete mode 100644 srcpkgs/giggle/libgiggle.template delete mode 100644 srcpkgs/gimp/gimp-devel.template delete mode 100644 srcpkgs/gimp/gimp-python.template delete mode 100644 srcpkgs/git/git-docs.template delete mode 100644 srcpkgs/git/git-perl.template delete mode 100644 srcpkgs/git/git-python.template delete mode 100644 srcpkgs/gjs/gjs-devel.template delete mode 100644 srcpkgs/glade3/glade3-devel.template delete mode 100644 srcpkgs/glade3/libgladeui3.template delete mode 100644 srcpkgs/glew/glew-devel.template delete mode 100644 srcpkgs/glib/glib-devel.template delete mode 100644 srcpkgs/glib/libglib-devel.template delete mode 100644 srcpkgs/libX11/libX11-devel.template delete mode 100644 srcpkgs/libXau/libXau-devel.template delete mode 100644 srcpkgs/libXdmcp/libXdmcp-devel.template delete mode 100644 srcpkgs/libarchive/bsdcpio.template delete mode 100644 srcpkgs/libarchive/bsdtar.template delete mode 100644 srcpkgs/libarchive/libarchive-devel.template delete mode 100644 srcpkgs/libgcrypt/libgcrypt-devel.template delete mode 100644 srcpkgs/libgpg-error/libgpg-error-devel.template delete mode 100644 srcpkgs/libxcb/libxcb-devel.template delete mode 100644 srcpkgs/libxml2/libxml2-devel.template delete mode 100644 srcpkgs/libxml2/libxml2-python.template delete mode 100644 srcpkgs/libxslt/libxslt-devel.template delete mode 100644 srcpkgs/libxslt/libxslt-python.template delete mode 100644 srcpkgs/xz/liblzma-devel.template delete mode 100644 srcpkgs/xz/liblzma.template diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index b4fe3999011..ef1fb9a1c67 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -32,6 +32,7 @@ elfutils-devel_package() { elfutils_package() { pkg_install() { - vmove usr + vmove usr/bin + vmove usr/share } } diff --git a/srcpkgs/garcon/garcon-devel.template b/srcpkgs/garcon/garcon-devel.template deleted file mode 100644 index 1e32a6bb693..00000000000 --- a/srcpkgs/garcon/garcon-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'garcon-devel'. -# -noarch=yes -depends="glib-devel ${sourcepkg}-${version}_${revision}" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template index 7a8913027f9..f5e485199b1 100644 --- a/srcpkgs/garcon/template +++ b/srcpkgs/garcon/template @@ -1,7 +1,7 @@ # Template file for 'garcon' pkgname=garcon version=0.2.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config intltool glib-devel libxfce4util-devel" @@ -18,5 +18,20 @@ long_desc=" was lacking menu merging features essential for loading menus modified with menu editors." -conf_files="/etc/xdg/menus/xfce-applications.menu" -subpackages="$pkgname-devel" +garcon-devel_package() { + depends="glib-devel ${sourcepkg}-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + } +} + +garcon_package() { + conf_files="/etc/xdg/menus/xfce-applications.menu" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template index eab61954115..dadc982c0ca 100644 --- a/srcpkgs/gawk/template +++ b/srcpkgs/gawk/template @@ -2,7 +2,6 @@ pkgname=gawk version=4.0.2 revision=2 -conflicts="chroot-gawk>=0" build_style=gnu-configure configure_args="--with-readline" makedepends="readline-devel" @@ -17,3 +16,10 @@ pre_configure() { # Create symlinks for bins and manpages. sed -i -e "s|\$(LN)|\$(LN_S)|g" Makefile.in doc/Makefile.in } + +gawk_package() { + conflicts="chroot-gawk>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gc/gc-devel.template b/srcpkgs/gc/gc-devel.template deleted file mode 100644 index f7436320ad8..00000000000 --- a/srcpkgs/gc/gc-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'gc-devel'. -# -depends="gc>=$version" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/share usr - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template index 76787ce0113..3fe3115bf3f 100644 --- a/srcpkgs/gc/template +++ b/srcpkgs/gc/template @@ -4,7 +4,6 @@ version=7.2d revision=1 wrksrc=gc-7.2 build_style=gnu-configure -subpackages="gc-devel" short_desc="A garbage collector for C and C++" maintainer="Juan RP " homepage="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" @@ -18,3 +17,19 @@ long_desc=" deallocating memory that is no longer useful. The collector automatically recycles memory when it determines that it can no longer be otherwise accessed." + +gc-devel_package() { + depends="gc>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/share + vmove "usr/lib/*.a" + } +} + +gc_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gcr/gcr-devel.template b/srcpkgs/gcr/gcr-devel.template deleted file mode 100644 index 9c81e1daced..00000000000 --- a/srcpkgs/gcr/gcr-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'gcr-devel'. -# -depends="glib-devel p11-kit-devel gtk+3-devel gcr-${version}_${revision}" -short_desc="${sourcepkg} -- development files" -replaces="gnome-keyring-devel<3.3.92" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share - vmove usr/share/gir-1.0 usr/share -} diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index 9474850c62e..9afa4a4b995 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -20,17 +20,30 @@ long_desc=" GCK is a library for accessing PKCS#11 modules like smart cards, in a (G)object oriented way." -depends="hicolor-icon-theme desktop-file-utils" -fulldepends="gnupg" - hostmakedepends="which pkg-config intltool gnome-doc-utils - gobject-introspection libtasn1-tools" - -makedepends="gtk+3-devel>=3.8.0 p11-kit-devel libgcrypt-devel perl-XML-Parser gobject-introspection" - -replaces="gnome-keyring<3.3.92" -subpackages="gcr-devel" + gobject-introspection libtasn1-tools gobject-introspection gnupg" +makedepends="gtk+3-devel>=3.8.0 p11-kit-devel libgcrypt-devel perl-XML-Parser" post_install() { vinstall ${FILESDIR}/10-gcr-memlock.conf 644 etc/security/limits.d } + +gcr-devel_package() { + depends="glib-devel p11-kit-devel gtk+3-devel gcr-${version}_${revision}" + short_desc="${sourcepkg} -- development files" + replaces="gnome-keyring-devel<3.3.92" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + vmove usr/share/gir-1.0 + } +} + +gcr_package() { + replaces="gnome-keyring<3.3.92" + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gd/gd-devel.template b/srcpkgs/gd/gd-devel.template deleted file mode 100644 index e0c7d8d49e4..00000000000 --- a/srcpkgs/gd/gd-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'gd-devel'. -# -depends="libXpm-devel libjpeg-turbo-devel fontconfig-devel zlib-devel - libpng-devel gd>=${version}" -short_desc="${sourcepkg} development files" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/bin/gdlib-config usr/bin -} diff --git a/srcpkgs/gd/gd-progs.template b/srcpkgs/gd/gd-progs.template deleted file mode 100644 index c7b6a275e84..00000000000 --- a/srcpkgs/gd/gd-progs.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'gd-progs'. -# -depends="perl" -short_desc="Utility programs that use libgd" - -do_install() { - vmove usr/bin usr -} diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template index d14a7e3e59e..e16d227d61c 100644 --- a/srcpkgs/gd/template +++ b/srcpkgs/gd/template @@ -5,10 +5,34 @@ revision=9 build_style=gnu-configure makedepends="pkg-config libXpm-devel libjpeg-turbo-devel fontconfig-devel libpng-devel>=1.5.10" -subpackages="gd-devel gd-progs" short_desc="Graphics library for the dynamic creation of images" maintainer="Juan RP " homepage="http://www.libgd.org/" license="BSD" distfiles="http://jaist.dl.sourceforge.net/project/buluoos/0.1/src/gd-$version.tar.bz2" checksum=bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 + +gd-devel_package() { + depends="libXpm-devel libjpeg-turbo-devel fontconfig-devel zlib-devel + libpng-devel gd>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/bin/gdlib-config + } +} + +gd-progs_package() { + depends="perl" + short_desc="Utility programs that use libgd" + pkg_install() { + vmove usr/bin + } +} + +gd_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index d20ca844946..c04b47bf6a0 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -26,9 +26,6 @@ long_desc=" * Change things in your program, so you can experiment with correcting the effects of one bug and go on to learn about another." -pycompile_dirs="usr/share/gdb/python/gdb" -conf_files="/etc/gdb/gdbinit" - post_install() { # resolve conflicts with binutils rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib @@ -37,3 +34,11 @@ post_install() { rm -f ${DESTDIR}/usr/share/info/${f}.info* done } + +gdb_package() { + conf_files="/etc/gdb/gdbinit" + pycompile_dirs="usr/share/gdb/python/gdb" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template deleted file mode 100644 index c1d95afdc19..00000000000 --- a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'gdk-pixbuf-devel'. -# -depends="perl libpng-devel>=1.5.10 shared-mime-info - ${sourcepkg}>=${version}_${revision}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/lib/pkgconfig usr/lib - vmove usr/include usr - vmove "usr/bin/*csource*" usr/bin - vmove "usr/share/man/man1/*csource*" usr/share/man/man1 - vmove usr/share/gir-1.0 usr/share - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index 247257f9fa8..0b494d21e24 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -3,15 +3,34 @@ pkgname=gdk-pixbuf version=2.28.0 revision=1 build_style=gnu-configure -subpackages="$pkgname-devel" configure_args="--without-libjasper --with-included-loaders=png --with-x11" hostmakedepends="perl pkg-config" makedepends="libglib-devel libpng-devel>=1.5.10 libjpeg-turbo-devel tiff-devel libX11-devel gobject-introspection" -triggers="gtk-pixbuf-loaders" short_desc="An Image loading library for The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=561e37695bfb1b07549588b3fca2e6f05b2320eee75b13748bb7dc5e1257d347 + +gdk-pixbuf-devel_package() { + depends="perl libpng-devel>=1.5.10 shared-mime-info + ${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/lib/pkgconfig + vmove usr/include + vmove "usr/bin/*csource*" + vmove "usr/share/man/man1/*csource*" + vmove usr/share/gir-1.0 + vmove usr/share/gtk-doc + } +} + +gdk-pixbuf_package() { + triggers="gtk-pixbuf-loaders" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gdm/gdm-devel.template b/srcpkgs/gdm/gdm-devel.template deleted file mode 100644 index 6ad7ee1ef69..00000000000 --- a/srcpkgs/gdm/gdm-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'gdm-devel'. -# -depends="libgdm-${version}_${revision}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gir-1.0 usr/share -} diff --git a/srcpkgs/gdm/libgdm.template b/srcpkgs/gdm/libgdm.template deleted file mode 100644 index dbdb154ae6d..00000000000 --- a/srcpkgs/gdm/libgdm.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libgdm'. -# -short_desc="${short_desc} - runtime libraries" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 4c06620a23c..43b4e60f388 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.8.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers @@ -10,9 +10,8 @@ configure_args="--disable-schemas-compile --disable-static --with-systemdsystemunitdir=/usr/lib/systemd/system --without-console-kit" hostmakedepends="pkg-config itstool intltool which gnome-doc-utils gobject-introspection" makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.8 upower-devel - libcanberra-devel systemd-devel" -fulldepends="xrdb dconf>=0.16 hicolor-icon-theme polkit-gnome xorg-server - gnome-session>=3.8.0 gnome-settings-daemon>=3.8" + libcanberra-devel systemd-devel xrdb dconf>=0.16 hicolor-icon-theme + xorg-server gnome-session>=3.8.0 gnome-settings-daemon>=3.8" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -33,22 +32,6 @@ long_desc=" xdmcp a little bit in places where I thought xdm was lacking (but is still compatible with xdm's xdmcp)." -subpackages="libgdm gdm-devel" - -conf_files=" - /etc/gdm/custom.conf - /etc/pam.d/gdm - /etc/pam.d/gdm-autologin - /etc/pam.d/gdm-fingerprint - /etc/pam.d/gdm-password - /etc/pam.d/gdm-smartcard - /etc/pam.d/gdm-welcome" - -# Create the 'gdm' system user/group. -system_accounts="gdm" -gdm_homedir="/var/lib/gdm" -systemd_services="gdm.service off" - post_install() { # Use our own pam files. rm -f ${DESTDIR}/etc/pam.d/* @@ -60,3 +43,40 @@ post_install() { chmod 1770 ${DESTDIR}/var/log/gdm chmod 700 ${DESTDIR}/var/lib/gdm/.config/dconf } + +libgdm_package() { + short_desc="${short_desc} - runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +gdm-devel_package() { + depends="libgdm-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + } +} + +gdm_package() { + conf_files=" + /etc/gdm/custom.conf + /etc/pam.d/gdm + /etc/pam.d/gdm-autologin + /etc/pam.d/gdm-fingerprint + /etc/pam.d/gdm-password + /etc/pam.d/gdm-smartcard + /etc/pam.d/gdm-welcome" + # Create the 'gdm' system user/group. + system_accounts="gdm" + gdm_homedir="/var/lib/gdm" + systemd_services="gdm.service off" + depends="xrdb dconf>=0.16 hicolor-icon-theme + xorg-server gnome-session>=3.8.0 gnome-settings-daemon>=3.8 + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/geany/geany-devel.template b/srcpkgs/geany/geany-devel.template deleted file mode 100644 index e39fa21bc0f..00000000000 --- a/srcpkgs/geany/geany-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'geany-devel'. -# -noarch=yes -depends="gtk+-devel" -short_desc="${short_desc} - Development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/geany/geany-plugins.template b/srcpkgs/geany/geany-plugins.template deleted file mode 100644 index 66c0615b9dc..00000000000 --- a/srcpkgs/geany/geany-plugins.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'geany-plugins'. -# -depends="geany>=$version" -short_desc="${short_desc} - builtin plugins" -long_desc="${long_desc} - - This package contains the plugins for geany." - -do_install() { - vmove usr/lib/geany usr/lib -} diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template index 97c06c77837..b8bb005deb3 100644 --- a/srcpkgs/geany/template +++ b/srcpkgs/geany/template @@ -1,12 +1,9 @@ # Template file for 'geany' pkgname=geany version=1.22 -revision=2 +revision=3 build_style=waf -depends="hicolor-icon-theme desktop-file-utils" makedepends="pkg-config intltool python gtk+-devel vte-devel" -subpackages="${pkgname}-plugins ${pkgname}-devel" - short_desc="Fast and lightweight IDE" maintainer="davehome " license="GPL-2" @@ -18,3 +15,27 @@ long_desc=" integrated development environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. It supports many filetypes and has some nice features." + +geany-plugins_package() { + depends="geany>=$version" + short_desc="${short_desc} - builtin plugins" + pkg_install() { + vmove usr/lib/geany + } +} + +geany-devel_package() { + depends="gtk+-devel" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +geany_package() { + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index c6815787372..8e2f57c2695 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -12,8 +12,13 @@ homepage="http://yorba.org/geary/" distfiles="http://yorba.org/download/geary/0.2/geary-${version}.tar.xz" checksum=be692581d80b85dd604d63283d181310bbaba8226ce90a9f1da5d94a37ff000d -depends="hicolor-icon-theme desktop-file-utils" makedepends="pkg-config intltool cmake vala-devel webkit-gtk3-devel libgee-devel libgnome-keyring-devel gmime-devel libunique-devel sqlite-devel libnotify-devel libcanberra-devel" +geary_package() { + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gedit/gedit-devel.template b/srcpkgs/gedit/gedit-devel.template deleted file mode 100644 index 707d6a9e668..00000000000 --- a/srcpkgs/gedit/gedit-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'gedit-devel'. -# -depends="gtksourceview-devel>=3.8 libpeas-devel>=1.8" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share - vmove usr/share/gedit/gir-1.0 usr/share/gedit -} diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index eb4810b8c95..f7e247b8aa3 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -5,16 +5,31 @@ revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-updater --enable-python=no --enable-gvfs-metadata" -depends="pygobject hicolor-icon-theme desktop-file-utils" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection python3" makedepends="gtksourceview-devel>=3.8 libpeas-devel>=1.8 enchant-devel - gsettings-desktop-schemas-devel>=3.8 libzeitgeist-devel" -fulldepends="iso-codes" -subpackages="gedit-devel" + gsettings-desktop-schemas-devel>=3.8 libzeitgeist-devel iso-codes" short_desc="A text editor for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/gedit/3.8/gedit-$version.tar.xz" checksum=1438146371cce64da932bb7121d6d0238684632c5bf53f9508d31552931ad1a1 + +gedit-devel_package() { + depends="gtksourceview-devel>=3.8 libpeas-devel>=1.8" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + vmove usr/share/gedit/gir-1.0 + } +} + +gedit_package() { + depends="pygobject hicolor-icon-theme desktop-file-utils iso-codes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index ba7f8381080..f1d836ac492 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -4,7 +4,6 @@ version=1.1 revision=2 build_style=gnu-configure configure_args="--disable-gps" -depends="desktop-file-utils" makedepends="pkg-config intltool gtk+-devel exiv2-devel lcms-devel" short_desc="Lightweight Gtk+ based image viewer" maintainer="Juan RP " @@ -20,3 +19,10 @@ long_desc=" geeqie works on files and directories, there is no need to import images fast preview for many raw image formats tools for image comparison, sorting and managing photo collection" + +geeqie_package() { + depends="desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gegl/gegl-devel.template b/srcpkgs/gegl/gegl-devel.template deleted file mode 100644 index 235740e9451..00000000000 --- a/srcpkgs/gegl/gegl-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'gegl-devel'. -# -noarch=yes -depends="glib-devel gegl>=$version" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index 6228740eb49..e276daf6e29 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,17 +1,31 @@ # Template build file for 'gegl'. pkgname=gegl version=0.2.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-docs --without-sdl --without-libopenraw --without-libavformat --without-graphviz --without-lua --without-libspiro --without-umfpack --with-exiv2 --without-libv4l --disable-introspection" makedepends="pkg-config intltool glib-devel libpng-devel>=1.5.10 libjpeg-turbo-devel librsvg-devel gtk+-devel babl-devel jasper-devel exiv2-devel" -subpackages="gegl-devel" short_desc="Graph based image processing framework" maintainer="Juan RP " license="GPL-3, LGPL-3" homepage="http://www.gimp.org" distfiles="ftp://ftp.gimp.org/pub/gegl/0.2/gegl-$version.tar.bz2" checksum=df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 + +gegl-devel_package() { + depends="glib-devel gegl>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +gegl_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index a0459997fbd..bad43c89cd3 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -1,7 +1,7 @@ # Template file for 'gendesk' pkgname=gendesk version=0.4.2 -revision=1 +revision=2 makedepends="go>=1.0.2" short_desc="Utility to generate .desktop files and download icons" maintainer="Juan RP " @@ -9,8 +9,6 @@ license="MIT" homepage="http://roboticoverlords.org/gendesk/" distfiles="http://roboticoverlords.org/${pkgname}/${pkgname}-${version}.tar.gz" checksum=10b2a294f5d57fcc2fd8612ca9cba7f0f82af03b1bd38d93a3ef757689d20a8a -long_desc=" - ${pkgname} is an ${short_desc}." do_build() { ${XBPS_FETCH_CMD} http://roboticoverlords.org/images/default.png @@ -22,3 +20,9 @@ post_install() { vinstall default.png 644 usr/share/pixmaps vinstall LICENSE 644 usr/share/licenses/${pkgname} } + +gendesk_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gengetopt/template b/srcpkgs/gengetopt/template index 249209ac3fc..beaeac53127 100644 --- a/srcpkgs/gengetopt/template +++ b/srcpkgs/gengetopt/template @@ -3,7 +3,7 @@ pkgname=gengetopt version=2.22.5 revision=1 build_style=gnu-configure -makedepends="flex" +hostmakedepends="flex" short_desc="A tool to write cli option parsing code for C programs" maintainer="Juan RP " license="GPL-2" @@ -15,3 +15,9 @@ long_desc=" the command line options, to validate them and fills a struct." disable_parallel_build=yes + +gengetopt_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/geoclue/geoclue-devel.template b/srcpkgs/geoclue/geoclue-devel.template deleted file mode 100644 index 275888445a5..00000000000 --- a/srcpkgs/geoclue/geoclue-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'geoclue-devel'. -# -depends="${sourcepkg}>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template index 98d4fcbdcea..58c7a7065fd 100644 --- a/srcpkgs/geoclue/template +++ b/srcpkgs/geoclue/template @@ -2,7 +2,6 @@ pkgname=geoclue version=0.12.0 revision=6 -subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-static --enable-networkmanager=no --enable-conic=no" hostmakedepends="automake gtk-doc pkg-config intltool gobject-introspection" @@ -25,3 +24,19 @@ pre_configure() { sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac autoreconf -fi } + +geoclue-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + } +} + +geoclue_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/geoip/geoip-devel.template b/srcpkgs/geoip/geoip-devel.template deleted file mode 100644 index 913f1640d6a..00000000000 --- a/srcpkgs/geoip/geoip-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'geoip-devel'. -# -depends="zlib-devel libgeoip" -short_desc="${short_desc} (Development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/geoip/libgeoip.template b/srcpkgs/geoip/libgeoip.template deleted file mode 100644 index b81dfa005d8..00000000000 --- a/srcpkgs/geoip/libgeoip.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'libgeoip'. -# -short_desc="${short_desc} (Runtime library)" -long_desc="${long_desc} - - This package contains the JACK runtime lib(s)." - -do_install() -{ - vmove "usr/lib/*.so*" usr/lib - vmove usr/share/GeoIP usr/share -} - - diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template index 8b547706aaa..2f0781fdaf2 100644 --- a/srcpkgs/geoip/template +++ b/srcpkgs/geoip/template @@ -1,15 +1,16 @@ # Template file for 'geoip' pkgname=geoip version=1.4.8 -distfiles="http://geolite.maxmind.com/download/${pkgname}/api/c/GeoIP-${version}.tar.gz" +revision=1 +wrksrc="GeoIP-${version}" build_style=gnu-configure configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip" makedepends="zlib-devel" -revision=1 short_desc="Non-DNS IP-to-country resolver C library and utilities" maintainer="davehome " homepage="http://www.maxmind.com/app/c" license="GPL-2" +distfiles="http://geolite.maxmind.com/download/${pkgname}/api/c/GeoIP-${version}.tar.gz" checksum=cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4 long_desc=" GeoIP is the proprietary technology that drives MaxMind's IP geolocation data @@ -17,9 +18,27 @@ long_desc=" geographical and other information about their Internet visitors in real-time." -subpackages="lib${pkgname} ${pkgname}-devel" +libgeoip_package() { + short_desc="${short_desc} (Runtime library)" + pkg_install() { + vmove "usr/lib/*.so*" + vmove usr/share/GeoIP + } +} -conf_files="/etc/geoip/GeoIP.conf" - -wrksrc="GeoIP-${version}" +geoip-devel_package() { + depends="zlib-devel libgeoip>=${version}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} +geoip_package() { + conf_files="/etc/geoip/GeoIP.conf" + pkg_install() { + vmove etc + vmove usr/bin + vmove usr/share + } +} diff --git a/srcpkgs/gettext/gettext-devel.template b/srcpkgs/gettext/gettext-devel.template deleted file mode 100644 index 02ea2f06984..00000000000 --- a/srcpkgs/gettext/gettext-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'gettext-devel'. -# -depends="gettext-libs>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/share/doc/gettext usr/share/doc - vmove usr/share/aclocal usr/share - vmove usr/share/gettext usr/share -} diff --git a/srcpkgs/gettext/gettext-libs.template b/srcpkgs/gettext/gettext-libs.template deleted file mode 100644 index c951930c728..00000000000 --- a/srcpkgs/gettext/gettext-libs.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'gettext-libs'. -# -short_desc="${short_desc} - shared libraries" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index 04922bffeba..c6a9c69c272 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -2,8 +2,6 @@ pkgname=gettext version=0.18.2.1 revision=1 -conflicts="chroot-gettext>=0" -subpackages="${pkgname}-devel ${pkgname}-libs" build_style=gnu-configure configure_args="--disable-java --disable-native-java --disable-csharp --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs @@ -15,3 +13,29 @@ homepage="http://www.gnu.org/software/gettext/" license="GPL-3" distfiles="http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${version}.tar.gz" checksum=32fc1b85fc249ab81bfc37b942a992c7a34f2e1101357ce0d4591341b9164a0a + +gettext-devel_package() { + depends="gettext-libs>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/share/doc/gettext + vmove usr/share/aclocal + vmove usr/share/gettext + } +} + +gettext-libs_package() { + short_desc="${short_desc} - shared libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +gettext_package() { + conflicts="chroot-gettext>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ghostscript/ghostscript-devel.template b/srcpkgs/ghostscript/ghostscript-devel.template deleted file mode 100644 index 115269f6a75..00000000000 --- a/srcpkgs/ghostscript/ghostscript-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'ghostscript-devel'. -# -noarch=yes -depends="libijs>=${version} libgs>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/bin/ijs-config usr/bin - vmove usr/share/man/man1/ijs-config.1 usr/share/man/man1 -} diff --git a/srcpkgs/ghostscript/libgs.template b/srcpkgs/ghostscript/libgs.template deleted file mode 100644 index aaf3742203f..00000000000 --- a/srcpkgs/ghostscript/libgs.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libgs'. -# -short_desc="${short_desc} -- runtime shared library" - -do_install() { - vmove "usr/lib/libgs.so*" usr/lib -} diff --git a/srcpkgs/ghostscript/libijs.template b/srcpkgs/ghostscript/libijs.template deleted file mode 100644 index 6fc8c766dd6..00000000000 --- a/srcpkgs/ghostscript/libijs.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libijs'. -# -short_desc="${short_desc} -- IJS runtime shared library" - -do_install() { - vmove "usr/lib/libijs*" usr/lib -} diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template index 2de1db8fa01..9fd70fa8aee 100644 --- a/srcpkgs/ghostscript/template +++ b/srcpkgs/ghostscript/template @@ -1,7 +1,7 @@ # Template file for 'ghostscript' pkgname=ghostscript version=9.06 -revision=3 +revision=4 short_desc="An interpreter for the PostScript language" maintainer="Juan RP " homepage="http://www.ghostscript.com/" @@ -10,8 +10,6 @@ distfiles="http://downloads.ghostscript.com/public/$pkgname-$version.tar.bz2" checksum=05acd1b576899572ef8ecbc25637cf73cbd0be267e651732db3012db33088e04 disable_parallel_build=yes -subpackages="libgs libijs $pkgname-devel" -depends="gsfonts" hostmakedepends="automake libtool pkg-config" makedepends="dbus-devel libXext-devel libXt-devel libpng-devel>=1.5.10 fontconfig-devel jasper-devel tiff-devel lcms2-devel cups-devel" @@ -58,3 +56,43 @@ do_install() { cd ijs && make DESTDIR=${DESTDIR} install } + +libgs_package() { + short_desc="${short_desc} -- runtime shared library" + pkg_install() { + vmove "usr/lib/libgs.so*" + } +} + +libijs_package() { + short_desc="${short_desc} -- IJS runtime shared library" + pkg_install() { + vmove "usr/lib/libijs*" + } +} + +ghostscript-devel_package() { + depends="libijs>=${version} libgs>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/bin/ijs-config + vmove usr/share/man/man1/ijs-config.1 + } +} + +ghostscript_package() { + depends="gsfonts" + pkg_install() { + vmove etc + vmove usr/lib/cups + vmove usr/lib/ghostscript + vmove usr/bin + vmove usr/share/ghostscript + vmove usr/share/man/de + vmove usr/share/man/man1 + vmove usr/share/licenses + vmove usr/share/cups + } +} diff --git a/srcpkgs/giblib/giblib-devel.template b/srcpkgs/giblib/giblib-devel.template deleted file mode 100644 index e95b1bc03a8..00000000000 --- a/srcpkgs/giblib/giblib-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'giblib-devel'. -# -depends="imlib2-devel freetype-devel zlib-devel libX11-devel libXext-devel giblib-${version}_${revision}" -short_desc="${sourcepkg} - development files" -long_desc="${long_desc} - - This package contains files for development: headers, static libs, etc." - -noarch=yes - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/giblib/template b/srcpkgs/giblib/template index 09ae3f506b0..e87b7bfa750 100644 --- a/srcpkgs/giblib/template +++ b/srcpkgs/giblib/template @@ -1,8 +1,7 @@ # Template build file for 'giblib' pkgname=giblib version=1.2.4 -revision=3 -subpackages="$pkgname-devel" +revision=4 build_style=gnu-configure configure_args="--disable-static" make_install_args="docsdir=/usr/share/doc/giblib" @@ -20,3 +19,20 @@ long_desc=" gives you access to fontstyles, which can be loaded from files, saved to files, or defined dynamically through the API. It also, and more importantly, wraps imlib2's context API into a more compact form." + +giblib-devel_package() { + depends="imlib2-devel freetype-devel zlib-devel libX11-devel + libXext-devel giblib-${version}_${revision}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +giblib_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/giflib/giflib-devel.template b/srcpkgs/giflib/giflib-devel.template deleted file mode 100644 index fbb3488191b..00000000000 --- a/srcpkgs/giflib/giflib-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'giflib-devel'. -# -noarch=yes -depends="giflib-${version}_${revision}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/giflib/giflib-tools.template b/srcpkgs/giflib/giflib-tools.template deleted file mode 100644 index 865817364f0..00000000000 --- a/srcpkgs/giflib/giflib-tools.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'giflib-tools'. -# -short_desc="${short_desc} -- utilities" - -do_install() { - vmove usr/bin usr - vmove usr/share usr -} diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template index 565979c4e96..5a4d3156959 100644 --- a/srcpkgs/giflib/template +++ b/srcpkgs/giflib/template @@ -1,14 +1,35 @@ # Template file for 'giflib' pkgname=giflib version=5.0.3 -revision=2 -subpackages="${pkgname}-devel ${pkgname}-tools" +revision=3 build_style=gnu-configure configure_args="--disable-static" -makedepends="xmlto" +hostmakedepends="xmlto" short_desc="Library for GIF images" maintainer="Juan RP " homepage="http://sourceforge.net/projects/giflib/" license="MIT" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a0c03db63bec4a6d636084ff9ce3241313191a4053629fc4962646c8fbe84638 + +giflib-devel_package() { + depends="giflib-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + } +} + +giflib-tools_package() { + short_desc="${short_desc} -- utilities" + pkg_install() { + vmove usr/bin + vmove usr/share + } +} + +giflib_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/giggle/giggle-devel.template b/srcpkgs/giggle/giggle-devel.template deleted file mode 100644 index 2a4dcbbed06..00000000000 --- a/srcpkgs/giggle/giggle-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'giggle-devel'. -# -noarch=yes -depends="libgiggle>=$version" -short_desc="${short_desc} - Development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/giggle/libgiggle.template b/srcpkgs/giggle/libgiggle.template deleted file mode 100644 index f19ced11189..00000000000 --- a/srcpkgs/giggle/libgiggle.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libgiggle'. -# -short_desc="${short_desc} - Runtime libraries" -long_desc="${long_desc} - - This package contains the giggle runtime lib(s)." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template index 69d3d572d75..08e77175117 100644 --- a/srcpkgs/giggle/template +++ b/srcpkgs/giggle/template @@ -1,22 +1,45 @@ # Template file for 'giggle' pkgname=giggle version=0.6.1 -revision=3 +revision=4 homepage="http://live.gnome.org/giggle" short_desc="Git repository viewer" maintainer="Juan RP " license="GPL-2" -# Required by glib-2.32. -CFLAGS="-lgmodule-2.0" -build_style=gnu-configure -configure_args="--enable-evolution-data-server" -depends="desktop-file-utils hicolor-icon-theme" -makedepends="pkg-config itstool intltool gtksourceview-devel vte3-devel evolution-data-server-devel" -fulldepends="git" -subpackages="lib${pkgname} ${pkgname}-devel" - distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz" checksum=6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8 long_desc=" Giggle is a graphical frontend for the git content tracker (think of gitk on GTK+)." + +build_style=gnu-configure +configure_args="--enable-evolution-data-server" +hostmakedepends="pkg-config itstool intltool" +makedepends="gtksourceview-devel vte3-devel evolution-data-server-devel" + +# Required by glib-2.32. +CFLAGS="-lgmodule-2.0" + +libgiggle_package() { + short_desc="${short_desc} - Runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +giggle-devel_package() { + depends="libgiggle>=$version" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + } +} + +giggle_package() { + depends="desktop-file-utils hicolor-icon-theme" + pkg_install() { + vmove usr/bin + vmove usr/share + vmove usr/lib/giggle + } +} diff --git a/srcpkgs/gimp/gimp-devel.template b/srcpkgs/gimp/gimp-devel.template deleted file mode 100644 index d7f01f2a870..00000000000 --- a/srcpkgs/gimp/gimp-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'gimp-devel'. -# -noarch=yes -short_desc="${short_desc} -- development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/gimp/gimp-python.template b/srcpkgs/gimp/gimp-python.template deleted file mode 100644 index ed2313f306b..00000000000 --- a/srcpkgs/gimp/gimp-python.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'gimp-python'. -# -depends="pygtk" -pycompile_dirs="usr/lib/gimp/2.0/python" -short_desc="${short_desc} -- python bindings" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib/gimp/2.0/plug-ins - - mv ${SRCPKGDESTDIR}/usr/lib/gimp/2.0/python \ - ${DESTDIR}/usr/lib/gimp/2.0 - mv ${SRCPKGDESTDIR}/usr/lib/gimp/2.0/plug-ins/*.py \ - ${DESTDIR}//usr/lib/gimp/2.0/plug-ins -} diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index c104ff91faf..2104a038bf2 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,18 +1,15 @@ # Template build file for 'gimp'. pkgname=gimp version=2.8.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-aa --without-gvfs --enable-gimp-console --enable-python --with-gif-compression=lzw --with-libcurl --enable-mp" -depends="desktop-file-utils hicolor-icon-theme" makedepends="pkg-config intltool libpng-devel>=1.5.10 gtk+-devel lcms-devel alsa-lib-devel dbus-glib-devel libXmu-devel libXcursor-devel libexif-devel libsoup-devel webkit-gtk-devel libwmf-devel librsvg-devel libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel - libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel" -fulldepends="iso-codes" -subpackages="gimp-devel gimp-python" + libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel iso-codes" short_desc="The GNU image manipulation program" maintainer="Juan RP " homepage="http://www.gimp.org" @@ -25,11 +22,38 @@ long_desc=" at the same time. It comes with a lot of useful plug-ins. Missing is CMYK support and more than 8 bits per channel." -conf_files=" - /etc/gimp/2.0/gimprc - /etc/gimp/2.0/gtkrc - /etc/gimp/2.0/templaterc - /etc/gimp/2.0/unitrc - /etc/gimp/2.0/sessionrc - /etc/gimp/2.0/controllerrc - /etc/gimp/2.0/menurc" +gimp-devel_package() { + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + vmove usr/share/aclocal + } +} + +gimp-python_package() { + depends="pygtk" + pycompile_dirs="usr/lib/gimp/2.0/python" + short_desc="${short_desc} -- python bindings" + pkg_install() { + vmove usr/lib/gimp/2.0/python + vmove "usr/lib/gimp/2.0/plug-ins/*.py" + } +} + +gimp_package() { + conf_files=" + /etc/gimp/2.0/gimprc + /etc/gimp/2.0/gtkrc + /etc/gimp/2.0/templaterc + /etc/gimp/2.0/unitrc + /etc/gimp/2.0/sessionrc + /etc/gimp/2.0/controllerrc + /etc/gimp/2.0/menurc" + depends="desktop-file-utils hicolor-icon-theme iso-codes" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/git/git-docs.template b/srcpkgs/git/git-docs.template deleted file mode 100644 index 0ed787081f3..00000000000 --- a/srcpkgs/git/git-docs.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'git-docs'. -# -noarch=yes -short_desc="${sourcepkg} documentation" -long_desc="${long_desc} - - This package contains the full git documentation (manual pages)." - -do_install() { - for f in man1 man5 man7; do - vmove usr/share/man/${f} usr/share/man - done -} diff --git a/srcpkgs/git/git-perl.template b/srcpkgs/git/git-perl.template deleted file mode 100644 index 61fa3a2e720..00000000000 --- a/srcpkgs/git/git-perl.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'git-perl'. -# -noarch=yes -depends="git perl" -short_desc="${sourcepkg} perl bindings" -long_desc="${long_desc} - - This package contains the Perl bindings." - -do_install() { - vmove usr/share/perl5 usr/share - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/git/git-python.template b/srcpkgs/git/git-python.template deleted file mode 100644 index 9b5908610c2..00000000000 --- a/srcpkgs/git/git-python.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'git-python'. -# -noarch=yes -pycompile_module="git_remote_helpers" -depends="git python" -short_desc="${sourcepkg} python bindings" -long_desc="${long_desc} - - This package contains the Python bindings for GIT." - -do_install() { - vmove "usr/lib/python*" usr/lib -} diff --git a/srcpkgs/git/template b/srcpkgs/git/template index f53035e77e4..7d1fcf5f19e 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -12,15 +12,11 @@ license="GPL-2" distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" checksum=c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 -subpackages="git-docs git-perl git-python" -# Required by https:// -depends="ca-certificates" hostmakedepends="xmlto>=0.0.25_2 asciidoc perl" makedepends="openssl-devel libcurl-devel expat-devel python-devel" if [ "$CROSS_BUILD" ]; then - subpackages="git-perl" - configure_args="${configure_args} --without-python + configure_args+=" --without-python ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" hostmakedepends="perl" @@ -40,3 +36,44 @@ post_install() { vinstall contrib/completion/git-completion.bash 644 \ usr/share/bash-completion/completions git } + +if [ -z "$CROSS_BUILD" ]; then +git-docs_package() { + noarch=yes + short_desc+=" -- documentation" + pkg_install() { + for f in man1 man5 man7; do + vmove usr/share/man/${f} + done + } +} + +git-python_package() { + noarch=yes + pycompile_module="git_remote_helpers" + depends="git python" + short_desc+=" -- python bindings" + pkg_install() { + vmove "usr/lib/python*" + } +} +fi # !CROSS_BUILD + +git-perl_package() { + noarch=yes + depends="git perl" + short_desc+=" -- perl bindings" + pkg_install() { + vmove usr/share/perl5 + vmove usr/share/man/man3 + } +} + + +git_package() { + # Required by https:// + depends="ca-certificates" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template index f3bac8994cc..5602e30cf8f 100644 --- a/srcpkgs/gitflow/template +++ b/srcpkgs/gitflow/template @@ -6,8 +6,6 @@ short_desc="Git extensions to provide high-level repository operations" maintainer="pancake " license="Liberal BSD" homepage="https://github.com/nvie/gitflow" -depends="git" -noarch=yes checksum=654604b5ead726de0ebb1932b49785a6146c59d312f4931080a04e86b7afb177 nofetch=yes @@ -28,3 +26,11 @@ do_install() { mkdir -p ${DESTDIR} make install prefix=${DESTDIR}/usr } + +gitflow_package() { + noarch="yes" + depends="git" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/gjs/gjs-devel.template b/srcpkgs/gjs/gjs-devel.template deleted file mode 100644 index ae4f0ef8d89..00000000000 --- a/srcpkgs/gjs/gjs-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'gjs-devel'. -# -depends="libffi-devel libgirepository-devel dbus-glib-devel cairo-devel - readline-devel js-devel gjs>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index d4ec84ab516..fd4e8526d1c 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -2,7 +2,6 @@ pkgname=gjs version=1.36.0 revision=1 -subpackages="gjs-devel" build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libffi-devel libgirepository-devel dbus-glib-devel @@ -17,3 +16,19 @@ long_desc=" Makes it possible for applications to use all of GNOME's platform libraries using the Javascript language. It's mainly based on the Mozilla javascript engine and the GObject introsepection framework." + +gjs-devel_package() { + depends="libffi-devel libgirepository-devel dbus-glib-devel cairo-devel + readline-devel js-devel gjs>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +gjs_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/glade3/glade3-devel.template b/srcpkgs/glade3/glade3-devel.template deleted file mode 100644 index 3c1b7a21c77..00000000000 --- a/srcpkgs/glade3/glade3-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'glade3-devel'. -# -depends="gtk+3-devel libxml2-devel libgladeui3-${version}_${revision}" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gir-1.0 usr/share - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/glade3/libgladeui3.template b/srcpkgs/glade3/libgladeui3.template deleted file mode 100644 index 707e3048966..00000000000 --- a/srcpkgs/glade3/libgladeui3.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'libgladeui'. -# -depends="pygobject" -short_desc="GTK+ User Interface Build core library" -long_desc="${long_desc} - - This library provides all the widgets and core code, like parsing and - saving files." - - -do_install() { - vmove "usr/lib/*.so*" usr/lib - vmove usr/lib/glade usr/lib - vmove usr/lib/girepository-1.0 usr/lib -} diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index 83775402da2..e3f6036ded5 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -2,11 +2,9 @@ pkgname=glade3 version=3.14.1 wrksrc=glade-${version} -revision=2 -subpackages="libgladeui3 $pkgname-devel" +revision=3 build_style=gnu-configure configure_args="--disable-static" -depends="hicolor-icon-theme desktop-file-utils" makedepends="which pkg-config intltool gnome-doc-utils itstool gtk+3-devel libxml2-devel gobject-introspection python-devel pygobject-devel" short_desc="An User Interface Designer for GTK+" @@ -25,3 +23,36 @@ long_desc=" By using GtkBuilder, Glade XML files can be used in numerous programming languages including C, C++, C#, Vala, Java, Perl, Python and others." + +libgladeui3_package() { + depends="pygobject" + short_desc="GTK+ User Interface Build core library" + pkg_install() { + vmove "usr/lib/*.so*" + vmove usr/lib/glade + vmove usr/lib/girepository-1.0 + } +} + +glade3-devel_package() { + depends="gtk+3-devel libxml2-devel libgladeui3-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + vmove usr/share/gtk-doc + } +} + +glade3_package() { + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr/bin + vmove usr/share/help + vmove usr/share/icons + vmove usr/share/glade + vmove usr/share/applications + vmove usr/share/locale + } +} diff --git a/srcpkgs/glew/glew-devel.template b/srcpkgs/glew/glew-devel.template deleted file mode 100644 index f6f2f69f0cd..00000000000 --- a/srcpkgs/glew/glew-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'glew-devel'. -# -depends="glew-${version}_${revision}" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template index e629e02960f..ccaa2b78132 100644 --- a/srcpkgs/glew/template +++ b/srcpkgs/glew/template @@ -1,8 +1,9 @@ # Template build file for 'glew'. pkgname=glew version=1.9.0 -revision=1 -makedepends="pkg-config libXmu-devel libXi-devel libXext-devel MesaLib-devel" +revision=3 +hostmakedepends="pkg-config" +makedepends="libXext-devel libXmu-devel libXi-devel MesaLib-devel" short_desc="The OpenGL Extension Wrangler Library" maintainer="Juan RP " homepage="http://glew.sourceforge.net" @@ -16,8 +17,6 @@ long_desc=" on the target platform. OpenGL core and extension functionality is exposed in a single header file." -subpackages="glew-devel" - do_build() { sed -i -e "s|lib64|lib|" config/Makefile.linux make ${makejobs} @@ -29,3 +28,18 @@ do_install() { chmod 755 ${DESTDIR}/usr/lib/libGLEW.so* rm -f ${DESTDIR}/usr/lib/*.a } + +glew-devel_package() { + depends="glew-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +glew_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index 7912e147e2f..e00f195ff6b 100644 --- a/srcpkgs/glib-networking/template +++ b/srcpkgs/glib-networking/template @@ -9,12 +9,17 @@ configure_args="--disable-static --with-libproxy --with-gnome-proxy hostmakedepends="pkg-config intltool" makedepends="libglib-devel libproxy-devel libgpg-error-devel libgcrypt-devel p11-kit-devel gnutls-devel>=3.1.5 - gsettings-desktop-schemas-devel>=3.8.0" -depends="gsettings-desktop-schemas>=3.8.0" -fulldepends="ca-certificates" + gsettings-desktop-schemas-devel>=3.8.0 ca-certificates" short_desc="Network-related giomodules for glib" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/2.36/$pkgname-$version.tar.xz" checksum=190d66fbaeb023ba4f43c315f23c5372c43be6cbe857596e00990211514650d9 + +glib-networking_package() { + depends="ca-certificates gsettings-desktop-schemas>=3.8.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template deleted file mode 100644 index abe72ed198f..00000000000 --- a/srcpkgs/glib/glib-devel.template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'glib-devel'. -# -depends="python perl libglib-devel-${version}_${revision}" -short_desc="${short_desc} -- development files" -pycompile_dirs="/usr/share/glib-2.0" - -do_install() { - vmkdir usr/bin - vmkdir usr/share/man/man1 - - for f in $(find ${SRCPKGDESTDIR}/usr/bin -type f); do - [ "$(basename ${f})" = "gio-querymodules" ] && continue - [ "$(basename ${f})" = "gdbus" ] && continue - [ "$(basename ${f})" = "gsettings" ] && continue - [ "$(basename ${f})" = "glib-compile-schemas" ] && continue - [ "$(basename ${f})" = "gresource" ] && continue - [ "$(basename ${f})" = "gobject-query" ] && continue - mv ${f} ${DESTDIR}/usr/bin - done - for f in gtk-doc aclocal glib-2.0 gdb; do - vmove usr/share/${f} usr/share - done - for f in $(find ${SRCPKGDESTDIR}/usr/share/man/man1 -type f); do - [ "$(basename ${f})" = "gio-querymodules.1" ] && continue - [ "$(basename ${f})" = "gdbus.1" ] && continue - [ "$(basename ${f})" = "gsettings.1" ] && continue - [ "$(basename ${f})" = "glib-compile-schemas.1" ] && continue - [ "$(basename ${f})" = "gresource.1" ] && continue - [ "$(basename ${f})" = "gobject-query.1" ] && continue - mv ${f} ${DESTDIR}/usr/share/man/man1 - done -} diff --git a/srcpkgs/glib/libglib-devel.template b/srcpkgs/glib/libglib-devel.template deleted file mode 100644 index 13cbc9cd48e..00000000000 --- a/srcpkgs/glib/libglib-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libglib-devel'. -# -depends="zlib-devel pcre-devel libffi-devel glib-${version}_${revision}" -short_desc="${short_desc} -- development files" -replaces="glib-devel<2.34.3_3" - -do_install() { - vmove usr/include usr - vmove usr/lib/glib-2.0 usr/lib - vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 73157b5043f..6ef1b877dac 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -2,7 +2,6 @@ pkgname=glib version=2.36.0 revision=1 -subpackages="libglib-devel glib-devel" build_style=gnu-configure configure_args="--disable-fam --with-pcre=system --enable-static --enable-man" hostmakedepends="pkg-config perl python libxslt docbook-xsl" @@ -15,7 +14,7 @@ distfiles="${GNOME_SITE}/glib/2.36/glib-$version.tar.xz" checksum=455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227 if [ "$CROSS_BUILD" ]; then - configure_args="${configure_args} glib_cv_long_long_format=I64 + configure_args+=" glib_cv_long_long_format=I64 glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no glib_cv_uscore=no blib_cv_use_pid_surrogate=yes ac_cv_func_vsnprintf_c99=yes @@ -23,9 +22,54 @@ if [ "$CROSS_BUILD" ]; then ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes ac_cv_func_posix_getgrgid_r=yes" - hostmakedepends="${hostmakedepends} libtool automake which + hostmakedepends+=" libtool automake which gtk-doc gettext-devel glib-devel" pre_configure() { NOCONFIGURE=1 ./autogen.sh } fi + +libglib-devel_package() { + depends="zlib-devel pcre-devel libffi-devel glib-${version}_${revision}" + short_desc="${short_desc} -- development files" + replaces="glib-devel<2.34.3_3" + pkg_install() { + vmove usr/include + vmove usr/lib/glib-2.0 + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + } +} + +glib-devel_package() { + depends="python perl libglib-devel-${version}_${revision}" + short_desc="${short_desc} -- development files" + pycompile_dirs="/usr/share/glib-2.0" + pkg_install() { + vmove usr/bin/glib-compile-resources + vmove usr/bin/glib-genmarshal + vmove usr/bin/glib-mkenums + vmove usr/bin/gtester-report + vmove usr/bin/gdbus-codegen + vmove usr/bin/gtester + vmove usr/bin/glib-gettextize + vmove usr/share/man/man1/glib-compile-resources.1 + vmove usr/share/man/man1/glib-gettextize.1 + vmove usr/share/man/man1/gtester.1 + vmove usr/share/man/man1/glib-mkenums.1 + vmove usr/share/man/man1/gdbus-codegen.1 + vmove usr/share/man/man1/glib-genmarshal.1 + vmove usr/share/man/man1/gtester-report.1 + + for f in gtk-doc aclocal glib-2.0 gdb; do + vmove usr/share/${f} + done + } +} + +glib_package() { + pkg_install() { + vmove usr/share/locale + vmove usr/share/bash-completion + } +} diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template index 7d84ae939f2..e474bca64e7 100644 --- a/srcpkgs/intltool/template +++ b/srcpkgs/intltool/template @@ -2,11 +2,10 @@ pkgname=intltool version=0.50.2 revision=1 -noarch=yes homepage="https://edge.launchpad.net/intltool" distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz" build_style=gnu-configure -fulldepends="perl-XML-Parser>=2.41_1 gettext" +makedepends="perl-XML-Parser>=2.41_1 gettext" short_desc="Toolbox for internationalisation" maintainer="Juan RP " license="GPL-2" @@ -28,3 +27,11 @@ long_desc=" scripts and does the other magic to your module. So users building from tarballs don't need intltool, only folks building from cvs. (This is modeled on gettextize.)" + +intltool_package() { + depends="${makedepends}" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template deleted file mode 100644 index fedd60b97f1..00000000000 --- a/srcpkgs/libX11/libX11-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libX11-devel'. -# -depends="xproto kbproto libxcb-devel libX11>=$version" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/man usr/share -} diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 29b234ce25a..a5cb3318b17 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -8,7 +8,6 @@ configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto hostmakedepends="pkg-config" makedepends="xproto>=7.0.23 xextproto xtrans xcmiscproto kbproto bigreqsproto inputproto>=2.2 xf86bigfontproto libxcb-devel" -subpackages="$pkgname-devel" short_desc="Base X libraries from modular Xorg X11" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -27,3 +26,19 @@ fi post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +libX11-devel_package() { + depends="xproto kbproto libxcb-devel libX11>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/man + } +} + +libX11_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libXau/libXau-devel.template b/srcpkgs/libXau/libXau-devel.template deleted file mode 100644 index f1d766f762e..00000000000 --- a/srcpkgs/libXau/libXau-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libXau-devel'. -# -depends="xproto ${sourcepkg}-${version}_${revision}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/man/man3 usr/share/man - rm -rf ${SRCPKGDESTDIR}/usr/share -} diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template index af37492ad95..14922244100 100644 --- a/srcpkgs/libXau/template +++ b/srcpkgs/libXau/template @@ -2,7 +2,6 @@ pkgname=libXau version=1.0.5 revision=6 -subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" @@ -13,3 +12,19 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" checksum=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee + +libXau-devel_package() { + depends="xproto ${sourcepkg}-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 + } +} + +libXau_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libXdmcp/libXdmcp-devel.template b/srcpkgs/libXdmcp/libXdmcp-devel.template deleted file mode 100644 index f0b38d30050..00000000000 --- a/srcpkgs/libXdmcp/libXdmcp-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libXdmcp-devel'. -# -depends="xproto libXdmcp>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template index f97fe752889..47484e26a4c 100644 --- a/srcpkgs/libXdmcp/template +++ b/srcpkgs/libXdmcp/template @@ -4,7 +4,6 @@ version=1.1.1 revision=3 build_style=gnu-configure configure_args="--disable-static" -subpackages="$pkgname-devel" hostmakedepends="pkg-config" makedepends="xproto" short_desc="X Display Manager Control Protocol library from X.org" @@ -13,3 +12,18 @@ license="MIT" homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" checksum=9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e + +libXdmcp-devel_package() { + depends="xproto libXdmcp>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +libXdmcp_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template deleted file mode 100644 index 9de419bbd72..00000000000 --- a/srcpkgs/libarchive/bsdcpio.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'bsdcpio'. -# -short_desc="BSD cpio(1) using libarchive" - -do_install() { - vmove usr/bin usr - vmove usr/share/man/man1/bsdcpio.1.gz usr/share/man/man1 - vmove usr/share/man/man5/cpio.5.gz usr/share/man/man5 -} diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template deleted file mode 100644 index 6b9eaa79c46..00000000000 --- a/srcpkgs/libarchive/bsdtar.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'bsdtar'. -# -short_desc="BSD tar(1) using libarchive" - -do_install() { - vmove usr/bin/bsdtar usr/bin - vmove usr/share/man/man1/bsdtar.1.gz usr/share/man/man1 - vmove usr/share/man/man5/tar.5.gz usr/share/man/man5 -} diff --git a/srcpkgs/libarchive/libarchive-devel.template b/srcpkgs/libarchive/libarchive-devel.template deleted file mode 100644 index 434147d49ea..00000000000 --- a/srcpkgs/libarchive/libarchive-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libarchive-devel'. -# -depends="acl-devel zlib-devel bzip2-devel liblzma-devel - openssl-devel expat-devel libarchive>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib - vmove usr/share usr -} diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 34136308bb6..92f8b54b8bf 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -2,7 +2,6 @@ pkgname=libarchive version=3.1.2 revision=1 -subpackages="bsdtar bsdcpio $pkgname-devel" build_style=gnu-configure configure_args="--without-xml2 --without-nettle" makedepends="zlib-devel bzip2-devel acl-devel openssl-devel liblzma-devel expat-devel" @@ -19,3 +18,39 @@ if [ "$CROSS_BUILD" ]; then ./build/autogen.sh } fi + +bsdtar_package() { + short_desc="BSD tar(1) using libarchive" + pkg_install() { + vmove usr/bin/bsdtar + vmove usr/share/man/man1/bsdtar.1 + vmove usr/share/man/man5/tar.5 + } +} + +bsdcpio_package() { + short_desc="BSD cpio(1) using libarchive" + pkg_install() { + vmove usr/bin/bsdcpio + vmove usr/share/man/man1/bsdcpio.1 + vmove usr/share/man/man5/cpio.5 + } +} + +libarchive-devel_package() { + depends="acl-devel zlib-devel bzip2-devel liblzma-devel + openssl-devel expat-devel libarchive>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + vmove usr/share + } +} + +libarchive_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libgcrypt/libgcrypt-devel.template b/srcpkgs/libgcrypt/libgcrypt-devel.template deleted file mode 100644 index 1d406ca31be..00000000000 --- a/srcpkgs/libgcrypt/libgcrypt-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libgrypt-devel'. -# -depends="libgpg-error-devel libgcrypt>=${version}" -short_desc="${short_desc} -- development files" -noarch=yes - -do_install() { - vmove usr/bin/libgcrypt-config usr/bin - vmove usr/include usr - vmove usr/share usr -} diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template index a4bd46b2ea5..872e86176df 100644 --- a/srcpkgs/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -1,10 +1,9 @@ # Template build file for 'libgcrypt'. pkgname=libgcrypt version=1.5.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static" -subpackages="$pkgname-devel" makedepends="libgpg-error-devel" short_desc="GNU cryptographic library" maintainer="Juan RP " @@ -12,3 +11,19 @@ homepage="http://www.gnupg.org" license="LGPL-2.1" distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2" checksum=4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa + +libgcrypt-devel_package() { + depends="libgpg-error-devel libgcrypt>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/bin/libgcrypt-config + vmove usr/include + vmove usr/share + } +} + +libgcrypt_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libgpg-error/libgpg-error-devel.template b/srcpkgs/libgpg-error/libgpg-error-devel.template deleted file mode 100644 index 65eaf8dc497..00000000000 --- a/srcpkgs/libgpg-error/libgpg-error-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libgpg-error-devel'. -# -depends="libgpg-error>=${version}" -short_desc="${short_desc} - development files" -noarch=yes - -do_install() { - vmove usr/bin/gpg-error-config usr/bin - vmove usr/include usr - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template index 818e2e24848..0fa77311ea1 100644 --- a/srcpkgs/libgpg-error/template +++ b/srcpkgs/libgpg-error/template @@ -1,9 +1,8 @@ # Template build file for 'libgpg-error'. pkgname=libgpg-error version=1.11 -revision=1 +revision=2 build_style=gnu-configure -subpackages="$pkgname-devel" configure_args="--disable-static" short_desc="Library for error values used by GnuPG component" maintainer="Juan RP " @@ -15,3 +14,19 @@ checksum=ae3376480a073b120c7add08f1e6cfcc08500648ccf22461cd42db6224a218c0 post_install() { rm -rf ${DESTDIR}/usr/share/common-lisp } + +libgpg-error-devel_package() { + depends="libgpg-error>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/bin/gpg-error-config + vmove usr/include + vmove usr/share/aclocal + } +} + +libgpg-error_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template deleted file mode 100644 index 82bc984df60..00000000000 --- a/srcpkgs/libxcb/libxcb-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libxcb-devel'. -# -depends="libXdmcp-devel libXau-devel libxcb>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/share usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template index b0b6806d0bd..a8cdf0f33f2 100644 --- a/srcpkgs/libxcb/template +++ b/srcpkgs/libxcb/template @@ -2,7 +2,6 @@ pkgname=libxcb version=1.9 revision=3 -subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-build-docs --disable-static" hostmakedepends="pkg-config python libxslt docbook-xsl" @@ -21,3 +20,19 @@ if [ "$CROSS_BUILD" ]; then autoreconf -fi } fi + +libxcb-devel_package() { + depends="libXdmcp-devel libXau-devel libxcb>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/share + vmove usr/lib/pkgconfig + } +} + +libxcb_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libxml2/libxml2-devel.template b/srcpkgs/libxml2/libxml2-devel.template deleted file mode 100644 index 8b0e47a3c8f..00000000000 --- a/srcpkgs/libxml2/libxml2-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'libxml2-devel'. -# -depends="zlib-devel libxml2>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/bin/xml2-config usr/bin - vmove usr/lib/xml2Conf.sh usr/lib - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/aclocal usr/share - vmove usr/share/gtk-doc usr/share - vmove usr/share/doc/${sourcepkg}-${version} usr/share/doc - vmove "usr/share/man/man1/xml2-config*" usr/share/man/man1 - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/libxml2/libxml2-python.template b/srcpkgs/libxml2/libxml2-python.template deleted file mode 100644 index 543ffccb6ab..00000000000 --- a/srcpkgs/libxml2/libxml2-python.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libxml2-python'. -# -short_desc="${short_desc} -- python extension" - -do_install() { - vmove "usr/lib/python*" usr/lib - vmove usr/share/doc/${sourcepkg}-python-${version} usr/share/doc -} diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 48c73ea94b6..30b664fa9db 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -4,7 +4,6 @@ version=2.8.0 revision=2 build_style=gnu-configure configure_args="--disable-static --with-threads --with-history" -subpackages="$pkgname-devel $pkgname-python" makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel python-devel" short_desc="Library providing XML and HTML support" maintainer="Juan RP " @@ -29,3 +28,33 @@ fi post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +libxml2-devel_package() { + depends="zlib-devel libxml2>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/bin/xml2-config + vmove usr/lib/xml2Conf.sh + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + vmove usr/share/gtk-doc + vmove usr/share/doc/${sourcepkg}-${version} + vmove "usr/share/man/man1/xml2-config*" + vmove usr/share/man/man3 + } +} + +libxml2-python_package() { + short_desc="${short_desc} -- python extension" + pkg_install() { + vmove "usr/lib/python*" + vmove usr/share/doc/${sourcepkg}-python-${version} + } +} + +libxml2_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/libxslt/libxslt-devel.template b/srcpkgs/libxslt/libxslt-devel.template deleted file mode 100644 index dc8fb93f7c6..00000000000 --- a/srcpkgs/libxslt/libxslt-devel.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'libxslt-devel'. -# -depends="libxml2-devel libxslt-${version}_${revision}" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -noarch=yes - -do_install() { - vmove usr/bin/xslt-config usr/bin - vmove usr/lib/xsltConf.sh usr/lib - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/aclocal usr/share - vmove usr/share/doc/${sourcepkg}-${version} usr/share/doc - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/libxslt/libxslt-python.template b/srcpkgs/libxslt/libxslt-python.template deleted file mode 100644 index 9fc58d6594f..00000000000 --- a/srcpkgs/libxslt/libxslt-python.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'libxslt-python'. -# -short_desc="${short_desc} (python extension)" -long_desc="${long_desc} - - This package contains ${sourcepkg} python related files." - -pycompile_module="libxslt.py" - -do_install() { - vmove "usr/lib/python*" usr/lib - vmove usr/share/doc/${sourcepkg}-python-${version} usr/share/doc -} diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template index d2f440f9da8..46b07e1ae66 100644 --- a/srcpkgs/libxslt/template +++ b/srcpkgs/libxslt/template @@ -1,8 +1,7 @@ # Template build file for 'libxslt'. pkgname=libxslt version=1.1.28 -revision=1 -subpackages="${pkgname}-devel ${pkgname}-python" +revision=2 build_style=gnu-configure configure_args="--disable-static" makedepends="python-devel libxml2-devel libgcrypt-devel" @@ -22,3 +21,32 @@ long_desc=" post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +libxslt-devel_package() { + depends="libxml2-devel libxslt-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/bin/xslt-config + vmove usr/lib/xsltConf.sh + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + vmove usr/share/doc/${sourcepkg}-${version} + vmove usr/share/man/man3 + } +} + +libxslt-python_package() { + short_desc="${short_desc} -- python extension" + pycompile_module="libxslt.py" + pkg_install() { + vmove "usr/lib/python*" + vmove usr/share/doc/${sourcepkg}-python-${version} + } +} + +libxslt_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template index 9ab99d5dcb4..b072245f180 100644 --- a/srcpkgs/perl-XML-Parser/template +++ b/srcpkgs/perl-XML-Parser/template @@ -6,8 +6,7 @@ wrksrc="XML-Parser-$version" homepage="http://search.cpan.org/dist/XML-Parser/" distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz" build_style=perl-module -makedepends="expat-devel" -fulldepends="perl>=5.16" +makedepends="expat-devel perl>=5.16" short_desc="Perl extension interface to James Clark's XML parser, expat" maintainer="Juan RP " license="GPL-2" @@ -16,3 +15,10 @@ long_desc=" This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat, which is a lower level interface to James Clark's expat library." + +perl-XML-Parser_package() { + depends="perl>=5.16" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template index 56b4da9cd05..8bce2eb1d2b 100644 --- a/srcpkgs/xcb-proto/template +++ b/srcpkgs/xcb-proto/template @@ -3,8 +3,7 @@ pkgname=xcb-proto version=1.8 revision=2 build_style=gnu-configure -makedepends="libxml2" -fulldepends="python" +makedepends="python libxml2" short_desc="XML-XCB (X C Bindings) protocol descriptions" maintainer="Juan RP " homepage="http://xcb.freedesktop.org" @@ -30,5 +29,11 @@ long_desc=" libraries that are used to parse an XML description and create objects used by Python code generators in individual language bindings." -noarch=yes -pycompile_module="xcbgen" +xcb-proto_package() { + depends="python" + noarch="yes" + pycompile_module="xcbgen" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xextproto/template b/srcpkgs/xextproto/template index 10ff6594db6..23832a0ad2a 100644 --- a/srcpkgs/xextproto/template +++ b/srcpkgs/xextproto/template @@ -2,7 +2,6 @@ pkgname=xextproto version=7.2.0 revision=2 -noarch=yes build_style=gnu-configure hostmakedepends="xmlto" short_desc="XExt extension headers from X.org" @@ -13,3 +12,10 @@ distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5 long_desc=" This provides the XExt extension headers from modular X.org project." + +xextproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template index 62fe6a9399c..f6450e6b89a 100644 --- a/srcpkgs/xmlcatmgr/template +++ b/srcpkgs/xmlcatmgr/template @@ -20,12 +20,6 @@ long_desc=" local files or URIs. This allows you to tell the parser where to look for entities without having to modify the original document source." -conf_files=" - /etc/sgml/catalog - /etc/xml/catalog - /usr/share/sgml/catalog - /usr/share/xml/catalog" - if [ -n "$CROSS_BUILD" ]; then makedepends="xmlcatmgr" fi @@ -56,3 +50,15 @@ post_install() { install -Dm644 catalog.xml ${DESTDIR}/usr/share/xml/catalog install -Dm644 catalog.etc.xml ${DESTDIR}/etc/xml/catalog } + +xmlcatmgr_package() { + conf_files=" + /etc/sgml/catalog + /etc/xml/catalog + /usr/share/sgml/catalog + /usr/share/xml/catalog" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xmlto/template b/srcpkgs/xmlto/template index e58c05b4bfe..8c0559fe1c3 100644 --- a/srcpkgs/xmlto/template +++ b/srcpkgs/xmlto/template @@ -5,7 +5,7 @@ revision=3 homepage="http://cyberelk.net/tim/software/xmlto/" distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2" build_style=gnu-configure -fulldepends="libxslt docbook-xsl>=1.77.1_2" +makedepends="libxslt docbook-xsl>=1.77.1_2" short_desc="Tool to help transform XML documents into other formats" maintainer="Juan RP " license="GPL-2" @@ -19,3 +19,10 @@ post_install() { # Requires bash! sed -i "s|^#!/bin/sh|#!/bin/bash|" ${DESTDIR}/usr/bin/xmlto } + +xmlto_package() { + depends="${makedepends}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xz/liblzma-devel.template b/srcpkgs/xz/liblzma-devel.template deleted file mode 100644 index 62a101bc371..00000000000 --- a/srcpkgs/xz/liblzma-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'liblzma-devel'. -# -depends="glibc-devel liblzma>=${version}" -short_desc="XZ-format compression library - development files" -replaces="xz-devel>=0" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/xz/liblzma.template b/srcpkgs/xz/liblzma.template deleted file mode 100644 index f12242a1e39..00000000000 --- a/srcpkgs/xz/liblzma.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'liblzma'. -# -short_desc="XZ-format compression library" -replaces="xz<5.0.0" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index c0efe36f75f..037550cfeb6 100644 --- a/srcpkgs/xz/template +++ b/srcpkgs/xz/template @@ -1,13 +1,37 @@ # Template file for 'xz' pkgname=xz version=5.0.4 -revision=3 -conflicts="chroot-xz>=0" +revision=4 build_style=gnu-configure -subpackages="liblzma liblzma-devel" short_desc="The XZ utilities" maintainer="Juan RP " license="Public domain, GPL-2, GPL-3, LGPL-2.1" homepage="http://tukani.org/xz" distfiles="http://tukaani.org/xz/xz-${version}.tar.bz2" checksum=5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92 + +liblzma_package() { + short_desc="XZ-format compression library" + replaces="xz<5.0.0" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +liblzma-devel_package() { + depends="liblzma>=${version}" + short_desc="XZ-format compression library - development files" + replaces="xz-devel>=0" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} + +xz_package() { + conflicts="chroot-xz>=0" + pkg_install() { + vmove usr + } +}