diff --git a/srcpkgs/a2jmidid/template b/srcpkgs/a2jmidid/template index 989901e981..73528ee1c5 100644 --- a/srcpkgs/a2jmidid/template +++ b/srcpkgs/a2jmidid/template @@ -13,3 +13,9 @@ checksum=2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f long_desc=" a2jmidid is daemon for exposing legacy ALSA sequencer applications in JACK MIDI system." + +a2jmidid_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/aalib/aalib-devel.template b/srcpkgs/aalib/aalib-devel.template deleted file mode 100644 index 9d3e113b2e..0000000000 --- a/srcpkgs/aalib/aalib-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'aalib-devel'. -# -depends="aalib>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/bin/aalib-config usr/bin - vmove usr/include usr - vmove usr/share/aclocal/ - vmove "usr/lib/*.a" usr/lib - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/aalib/template b/srcpkgs/aalib/template index 6ab6f7fd8b..1b87ce77cd 100644 --- a/srcpkgs/aalib/template +++ b/srcpkgs/aalib/template @@ -2,20 +2,37 @@ pkgname=aalib version=1.4rc4 revision=2 +wrksrc="aalib-1.4.0" build_style=gnu-configure -subpackages="${pkgname}-devel" short_desc="Portable ASCII art GFX library" maintainer="pancake " homepage="http://aa-project.sourceforge.net/aalib/" license="LGPL" distfiles="http://prdownloads.sourceforge.net/aa-project/${pkgname}-${version}.tar.gz" checksum=0b214b98850f559e0a9ef7282de2ff336b094e1aacedefff3ffa50f07711db58 -wrksrc=aalib-1.4.0 if [ -n "$CROSS_BUILD" ]; then - makedepends="automake" + makedepends="libtool automake" pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.in autoreconf -fi } fi + +aalib-devel_package() { + depends="aalib>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/bin/aalib-config + vmove usr/include + vmove usr/share/aclocal + vmove "usr/lib/*.a" + vmove usr/share/man/man3 + } +} + +aalib_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template index 0a0913e785..c78be27c24 100644 --- a/srcpkgs/abGate/template +++ b/srcpkgs/abGate/template @@ -1,17 +1,20 @@ # Template file for 'abGate' pkgname=abGate version=1.1.6 -homepage="http://abgate.sourceforge.net/" build_style=gnu-makefile -distfiles="${SOURCEFORGE_SITE}/abgate/${pkgname}-${version}.tar.gz" -revision=1 -makedepends="pkg-config qt-devel gtkmm2-devel atkmm-devel glibmm-devel libsigc++-devel gtk+-devel glib-devel libstdc++-devel" -fulldepends="lv2" +revision=2 +hostmakedepends="pkg-config" +makedepends="qt-devel gtkmm2-devel lv2" short_desc="LV2 Noise Gate plugin" maintainer="davehome " license="GPL-3" +homepage="http://abgate.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/abgate/${pkgname}-${version}.tar.gz" checksum=df1e0457757ba3c01ba55eba975fd04f8b96c10157ae1955738c0a77106dafa4 -long_desc=" - abGate: LV2 Noise Gate plugin." - +abGate_package() { + depends="lv2" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/abiword/abiword-devel.template b/srcpkgs/abiword/abiword-devel.template deleted file mode 100644 index 3ec449029f..0000000000 --- a/srcpkgs/abiword/abiword-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'abiword-devel'. -# -depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel - librsvg-devel libabiword>=${version}" -short_desc="${short_desc} - Development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/abiword/libabiword.template b/srcpkgs/abiword/libabiword.template deleted file mode 100644 index f2ea2ffcb4..0000000000 --- a/srcpkgs/abiword/libabiword.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libabiword'. -# -short_desc="${short_desc} - Runtime library" -long_desc="${long_desc} - - This package contains the runtime libraries." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template index 633207b786..aeb31535c6 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -7,8 +7,6 @@ configure_args="--enable-shave --enable-collab-backend-telepathy --enable-collab-backend-tcp --enable-collab-backend-service --enable-templates --enable-clipart --enable-plugins --with-gio --disable-static" -subpackages="lib${pkgname} ${pkgname}-devel" -depends="hicolor-icon-theme desktop-file-utils" hostmakedepends="automake libtool flex pkg-config" makedepends="libjpeg-turbo-devel libpng-devel>=1.5.10 fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel @@ -25,3 +23,27 @@ CPPFLAGS="-I/usr/include/boost" pre_configure() { autoreconf -fi } + +libabiword_package() { + short_desc="${short_desc} - Runtime library" + pkg_install() { + vmove "usr/lib/*.so*" usr/lib + } +} + +abiword-devel_package() { + depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel + librsvg-devel libabiword>=${version}" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +abiword_package() { + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/accountsservice/accountsservice-devel.template b/srcpkgs/accountsservice/accountsservice-devel.template deleted file mode 100644 index 71a9aaabdd..0000000000 --- a/srcpkgs/accountsservice/accountsservice-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'accountsservice-devel'. -# -noarch=yes -depends="accountsservice>=$version" -short_desc="${sourcepkg} - 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/gir-1.0 usr/share - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template index e2221c25e5..e91fb5b478 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -1,13 +1,12 @@ # Template file for 'accountsservice' pkgname=accountsservice version=0.6.30 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-systemdsystemunitdir=/usr/lib/systemd/system" -makedepends="pkg-config intltool gobject-introspection polkit-devel - systemd-devel" -subpackages="$pkgname-devel" +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="polkit-devel systemd-devel" short_desc="D-Bus interfaces for querying and manipulating user account information" maintainer="Juan RP " homepage="http://cgit.freedesktop.org/accountsservice/" @@ -19,6 +18,22 @@ long_desc=" querying and manipulating user account information and an implementation of these interfaces, based on the useradd, usermod and userdel commands." -make_dirs=" -/var/lib/AccountsService/users 755 root root -/var/lib/AccountsService/icons 755 root root" +accountsservice-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + vmove usr/share/gtk-doc + } +} + +accountsservice_package() { + make_dirs=" + /var/lib/AccountsService/users 755 root root + /var/lib/AccountsService/icons 755 root root" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/acct/template b/srcpkgs/acct/template index ef2cdf2219..08d7742ee3 100644 --- a/srcpkgs/acct/template +++ b/srcpkgs/acct/template @@ -1,22 +1,26 @@ # Template file for 'acct' pkgname=acct version=6.5.5 -distfiles="http://ftp.gnu.org/gnu/acct/acct-$version.tar.gz" build_style=gnu-configure revision=2 short_desc="GNU Accounting Utilities" homepage="https://www.gnu.org/software/acct/" license="GPL-3" maintainer="Juan RP " +distfiles="http://ftp.gnu.org/gnu/acct/acct-$version.tar.gz" checksum=4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5 long_desc=" The GNU Accounting Utilities provide login and process accounting utilities for GNU/Linux and other systems." - -post_install() -{ - # The last(1) command is provided by sysvinit. +post_install() { + # The last(1) command is provided by busybox. rm ${DESTDIR}/usr/bin/last rm ${DESTDIR}/usr/share/man/man1/last.1 } + +acct_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index 111d718265..61e49d8a3d 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -2,15 +2,15 @@ pkgname=acpica-utils version=20100121 wrksrc=acpica-unix-${version} -# Sigh, can't use official URL! -#distfiles="http://acpica.org/downloads/acpica-unix-${version}.tar.gz" -distfiles="http://xbps.nopcode.org/distfiles/acpica-unix-${version}.tar.gz" revision=2 -makedepends="flex" +hostmakedepends="flex" short_desc="Intel ACPI CA Unix utilities" homepage="https://www.acpica.org/" license="GPL-2" maintainer="Juan RP " +# Sigh, can't use official URL! +#distfiles="http://acpica.org/downloads/acpica-unix-${version}.tar.gz" +distfiles="http://xbps.nopcode.org/distfiles/acpica-unix-${version}.tar.gz" checksum=97fdbf6768f26f15ebf6aa106461e10f8e84bfb2766c7f8fe313fcd08e381d2e long_desc=" This package provides the ACPICA user-space utilities built upon @@ -21,22 +21,28 @@ long_desc=" * ACPI Simulator (AcpiExec) * ACPI Table Extractor" +do_build() { + cd ${wrksrc}/tools/acpiexec + make + cp -f acpiexec ${wrksrc} + make clean -do_build() -{ - cd ${wrksrc}/tools/acpiexec && make && \ - cp -f acpiexec ${wrksrc} && make clean || return 1 cd ${wrksrc} for _dir_ in compiler tools/acpisrc tools/acpixtract; do - make -C ${_dir_} || return 1 + make -C ${_dir_} done } -do_install() -{ +do_install() { install -d ${DESTDIR}/usr/sbin install -m755 ${wrksrc}/acpiexec ${DESTDIR}/usr/sbin install -m755 ${wrksrc}/tools/acpisrc/acpisrc ${DESTDIR}/usr/sbin install -m755 ${wrksrc}/tools/acpixtract/acpixtract ${DESTDIR}/usr/sbin install -m755 ${wrksrc}/compiler/iasl ${DESTDIR}/usr/sbin } + +acpica-utils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template index f27d4bb18d..6ddc04bcc4 100644 --- a/srcpkgs/acpid/template +++ b/srcpkgs/acpid/template @@ -3,8 +3,6 @@ pkgname=acpid version=2.0.16 revision=2 build_style=gnu-configure -systemd_services="acpid.socket on" -conf_files="/etc/conf.d/acpid" short_desc="The ACPI Daemon (acpid) With Netlink Support" maintainer="Juan RP " license="GPL-2" @@ -24,3 +22,12 @@ post_install() { vinstall ${FILESDIR}/handler.sh 755 etc/acpi vinstall ${FILESDIR}/anything 644 etc/acpi/events } + +acpid_package() { + conf_files="/etc/conf.d/acpid" + systemd_services="acpid.socket on" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template index ebffc8d544..c80ddd8804 100644 --- a/srcpkgs/acr/template +++ b/srcpkgs/acr/template @@ -2,7 +2,6 @@ pkgname=acr version=0.9.4 revision=1 -noarch=yes build_style=gnu-configure short_desc="AutoConf Replacement" maintainer="pancake " @@ -14,3 +13,10 @@ long_desc=" ACR tries to replace autoconf functionality generating a full-compatible 'configure' script (runtime flags). But using shell-script instead of m4. This means that ACR is faster, smaller and easy to use." + +acr_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index e3ad3bb9b8..9ded00bef6 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -21,13 +21,10 @@ maintainer="Juan RP " homepage="http://www.adobe.com" license="Adobe License (non free)" -nonfree=yes # restricted use disable_debug=yes create_srcdir=yes create_wrksrc=yes -depends="curl hicolor-icon-theme desktop-file-utils" - do_install() { vinstall libflashplayer.so 755 usr/lib/mozilla/plugins #vinstall usr/lib/kde4/kcm_adobe_flash_player.so 755 usr/lib/kde4 @@ -43,3 +40,11 @@ do_install() { vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \ usr/share/licenses/${pkgname} LICENSE.pdf } + +adobe-flash-plugin_package() { + nonfree="yes" + depends="curl hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/adobe-flash-plugin11.1/template b/srcpkgs/adobe-flash-plugin11.1/template index d46e3add6a..4f9deef852 100644 --- a/srcpkgs/adobe-flash-plugin11.1/template +++ b/srcpkgs/adobe-flash-plugin11.1/template @@ -21,13 +21,8 @@ homepage="http://www.adobe.com" license="Propietary license - adobe" maintainer="Juan RP " -nonfree=yes # restricted use create_srcdir=yes create_wrksrc=yes -provides="adobe-flash-plugin-${version}" -replaces="adobe-flash-plugin>=0" - -depends="curl hicolor-icon-theme desktop-file-utils" do_install() { vinstall usr/lib/mozilla/plugins/libflashplayer.so 755 usr/lib/mozilla/plugins @@ -44,3 +39,13 @@ do_install() { vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \ usr/share/licenses/${pkgname} LICENSE.pdf } + +adobe-flash-plugin11.1_package() { + nonfree="yes" + replaces="adobe-flash-plugin>=0" + provides="adobe-flash-plugin-11.1.102.63" + depends="curl hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/agar/agar-devel.template b/srcpkgs/agar/agar-devel.template deleted file mode 100644 index 12ce80bd98..0000000000 --- a/srcpkgs/agar/agar-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'agar-devel'. -# -depends="glibc freetype-devel libjpeg-turbo-devel MesaLib-devel SDL-devel agar" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} - mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{aclocal,man} ${DESTDIR}/usr/share -} diff --git a/srcpkgs/agar/template b/srcpkgs/agar/template index 080f09b300..ecb936d011 100644 --- a/srcpkgs/agar/template +++ b/srcpkgs/agar/template @@ -1,19 +1,19 @@ # Template file for 'agar' pkgname=agar version=1.4.0 -revision=3 -distfiles="${SOURCEFORGE_SITE}/agar/agar-$version.tar.gz" +revision=4 build_style=configure configure_args="--prefix=/usr --without-db4 --enable-nls --with-gettext --enable-threads --with-sdl --with-jpeg --with-freetype --with-manpages --with-manlinks --with-glx --with-gl" make_build_target="depend all" -depends="glibc freetype jpeg libGL SDL" -makedepends="perl groff freetype-devel libjpeg-turbo-devel MesaLib-devel SDL-devel" +hostmakedepends="perl groff" +makedepends="freetype-devel libjpeg-turbo-devel MesaLib-devel SDL-devel" short_desc="Modern open-source, cross-platform toolkit" homepage="http://libagar.org/" license="BSD" maintainer="Juan RP " +distfiles="${SOURCEFORGE_SITE}/agar/agar-$version.tar.gz" checksum=6af24c3ffecdddc04f28f707065f6fa66c5a8f83062faf62563db09eec1842c4 long_desc=" Agar is a modern open-source, cross-platform toolkit for graphical @@ -27,14 +27,28 @@ long_desc=" support." disable_parallel_build=yes -subpackages="$pkgname-devel" - - -pre_install() -{ +pre_install() { # Pre-create the dirs, otherwise install will fail! for d in bin lib share/man/man3 share/man/man5 share/man/man8; do vmkdir usr/${d} done } + +agar-devel_package() { + depends="agar>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/share/aclocal + vmove usr/share/man + } +} + +agar_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/alsa-lib/alsa-lib-devel.template b/srcpkgs/alsa-lib/alsa-lib-devel.template deleted file mode 100644 index 02b1c0140f..0000000000 --- a/srcpkgs/alsa-lib/alsa-lib-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'alsa-lib-devel'. -# -noarch=yes -depends="glibc-devel alsa-lib>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/alsa-lib/alsa-lib-python.template b/srcpkgs/alsa-lib/alsa-lib-python.template deleted file mode 100644 index 7627c94d30..0000000000 --- a/srcpkgs/alsa-lib/alsa-lib-python.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'alsa-lib-python'. -# -short_desc="${short_desc} - python smixer plugin" -replaces="alsa-lib<=1.0.25" - -do_install() { - vmove usr/lib/alsa-lib/smixer/smixer-python.so \ - usr/lib/alsa-mixer/smixer -} diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 7ef76bb60d..e230c17a7b 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,10 +1,10 @@ # Template build file for 'alsa-lib'. pkgname=alsa-lib version=1.0.26 -revision=2 -subpackages="$pkgname-devel $pkgname-python" +revision=3 build_style=gnu-configure -makedepends="pkg-config python-devel" +hostmakedepends="pkg-config" +makedepends="python-devel" short_desc="The Advanced Linux Sound Architecture (ALSA) library" maintainer="Juan RP " license="LGPL-2.1" @@ -21,11 +21,37 @@ long_desc=" if [ -n "$CROSS_BUILD" ]; then # XXX python plugin - makedepends="automake pkg-config" - configure_args="--disable-python" - subpackages="$pkgname-devel" + unset makedepends + hostmakedepends+=" libtool automake" + configure_args+=" --disable-python" pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.in autoreconf -fi } fi + +alsa-lib-devel_package() { + depends="alsa-lib>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + } +} + +alsa-lib_package() { + pkg_install() { + vmove usr + } +} + +if [ -z "$CROSS_BUILD" ]; then + alsa-lib-python_package() { + short_desc="${short_desc} - python smixer plugin" + replaces="alsa-lib<=1.0.25" + pkg_install() { + vmove usr/lib/alsa-lib/smixer/smixer-python.so + } + } +fi diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index ccf4934b60..2be7210025 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -4,7 +4,8 @@ version=1.0.26 revision=2 build_style=gnu-configure configure_args="--disable-maemo-plugin --with-speex=lib" -makedepends="pkg-config alsa-lib-devel speex-devel ffmpeg-devel>=1.0.1 +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel speex-devel ffmpeg-devel>=1.0.1 libsamplerate-devel pulseaudio-devel jack-devel" short_desc="Advanced Linux Sound Architecture (ALSA) extra plugins" maintainer="Juan RP " @@ -19,8 +20,14 @@ long_desc=" This package includes some ALSA extra plugins for PulseAudio, Speex, FFmpeg's libavcodec library and libsamplerate." -conf_files="/etc/asound.conf" - post_install() { vinstall ${FILESDIR}/asound.conf 644 etc } + +alsa-plugins_package() { + conf_files="/etc/asound.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template index d6ecc57fb1..3c2ccd573b 100644 --- a/srcpkgs/alsa-utils/template +++ b/srcpkgs/alsa-utils/template @@ -3,7 +3,6 @@ pkgname=alsa-utils version=1.0.26 revision=2 build_style=gnu-configure -make_dirs="/var/lib/alsa 0750 root root" configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system --with-udev-rules-dir=/usr/lib/udev/rules.d" hostmakedepends="pkg-config xmlto" @@ -19,3 +18,10 @@ long_desc=" functionality to the Linux operating system. This package includes the ALSA runtime utilities." + +alsa-utils_package() { + make_dirs="/var/lib/alsa 0750 root root" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/amd-ucode/template b/srcpkgs/amd-ucode/template index 47a0b3f2fe..e07587c06d 100644 --- a/srcpkgs/amd-ucode/template +++ b/srcpkgs/amd-ucode/template @@ -3,7 +3,6 @@ pkgname=amd-ucode _distver=2012-09-10 version=$(echo ${_distver}|sed 's|-|.|g') wrksrc=${pkgname}-${_distver} -noarch=yes revision=2 short_desc="Microcode update files for AMD CPUs" maintainer="Juan RP " @@ -20,3 +19,10 @@ do_install() { vinstall microcode_amd_fam15h.bin 644 usr/lib/firmware/amd-ucode vinstall LICENSE 644 usr/share/licenses/${pkgname} } + +amd-ucode_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template index 1cc14b4f26..cf8525b4d5 100644 --- a/srcpkgs/apache-mpm-event/template +++ b/srcpkgs/apache-mpm-event/template @@ -4,14 +4,12 @@ . ${XBPS_SRCPKGDIR}/apache/template # Unset unused stuff. -unset subpackages conf_files system_accounts systemd_services +unset conf_files system_accounts systemd_services unset post_install pre_configure depends # Override some vars. pkgname=apache-mpm-event -configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=event" -# dlopen(3) run-time dependencies. -depends="apache>=$version" +configure_args+=" --enable-modules= --prefix=/usr --with-mpm=event" revision=1 maintainer="Juan RP " homepage="http://httpd.apache.org/" @@ -28,8 +26,6 @@ long_desc=" This MPM is experimental and less tested than the worker and prefork MPMs." -systemd_services="apache-mpm-event.service on" - pre_configure() { cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout } @@ -41,3 +37,12 @@ post_install() { vinstall httpd 755 usr/sbin httpd.event vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } + +apache-mpm-event_package() { + # dlopen(3) run-time dependencies. + depends="apache>=$version" + systemd_services="apache-mpm-event.service on" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template index 702998cf86..3964ba74f8 100644 --- a/srcpkgs/apache-mpm-worker/template +++ b/srcpkgs/apache-mpm-worker/template @@ -4,14 +4,13 @@ . ${XBPS_SRCPKGDIR}/apache/template # Unset unused stuff. -unset subpackages conf_files system_accounts systemd_services +unset conf_files system_accounts systemd_services unset post_install pre_configure depends +unset apache_package apache-devel_package # Override some vars. pkgname=apache-mpm-worker -configure_args="${configure_args} --enable-modules= --prefix=/usr --with-mpm=worker" -# dlopen(3) run-time dependencies. -depends="apache>=$version" +configure_args+=" --enable-modules= --prefix=/usr --with-mpm=worker" revision=1 maintainer="Juan RP " homepage="http://httpd.apache.org/" @@ -25,8 +24,6 @@ long_desc=" recommended especially for high-traffic sites because it is faster and has a smaller memory footprint than the traditional prefork MPM." -systemd_services="${pkgname}.service on" - pre_configure() { cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout } @@ -38,3 +35,12 @@ post_install() { vinstall httpd 755 usr/sbin httpd.worker vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } + +apache-mpm-worker_package() { + # dlopen(3) run-time dependencies. + depends="apache>=$version" + systemd_services="apache-mpm-worker.service on" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/apache/apache-devel.template b/srcpkgs/apache/apache-devel.template deleted file mode 100644 index b82aeb50cb..0000000000 --- a/srcpkgs/apache/apache-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'apache-devel'. -# -depends="apr-devel apr-util-devel perl" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/share/apache-httpd/build usr/share/apache-httpd - vmove usr/bin/apxs usr/bin - vmove "usr/share/man/man1/apxs*" usr/share/man/man1 -} diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 51843a6277..e0447f0485 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -3,29 +3,30 @@ pkgname=apache version=2.4.4 revision=1 wrksrc=httpd-${version} -distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2" build_style=gnu-configure configure_args="--prefix= --enable-pie --enable-modules=all ---enable-mods-shared=all --enable-authn-dbm --enable-authn-anon ---enable-authn-dbd --enable-authn-alias --enable-authz-dbm ---enable-authz-owner --enable-authnz-ldap --enable-auth-digest -enable-isapi ---enable-file-cache --enable-cache --enable-disk-cache --enable-mem-cache ---enable-dbd --enable-bucketeer --enable-dumpio --enable-echo --enable-reqtimeout ---enable-ext-filter --enable-substitute --enable-deflate --enable-charset-lite ---enable-ldap --enable-log-forensic --enable-logio --enable-mime-magic ---enable-cern-meta --enable-expires --enable-headers --enable-ident ---enable-usertrack --enable-unique-id --enable-proxy --enable-proxy-connect ---enable-proxy-ftp --enable-proxy-http --enable-proxy-scgi --enable-proxy-ajp ---enable-proxy-balancer --enable-ssl --enable-http --enable-speling ---enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs ---enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so ---enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd" -makedepends="pkg-config perl>=0 zlib-devel libuuid-devel pcre-devel>=8.30 -openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-devel apr-util-devel" + --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon + --enable-authn-dbd --enable-authn-alias --enable-authz-dbm + --enable-authz-owner --enable-authnz-ldap --enable-auth-digest -enable-isapi + --enable-file-cache --enable-cache --enable-disk-cache --enable-mem-cache + --enable-dbd --enable-bucketeer --enable-dumpio --enable-echo --enable-reqtimeout + --enable-ext-filter --enable-substitute --enable-deflate --enable-charset-lite + --enable-ldap --enable-log-forensic --enable-logio --enable-mime-magic + --enable-cern-meta --enable-expires --enable-headers --enable-ident + --enable-usertrack --enable-unique-id --enable-proxy --enable-proxy-connect + --enable-proxy-ftp --enable-proxy-http --enable-proxy-scgi --enable-proxy-ajp + --enable-proxy-balancer --enable-ssl --enable-http --enable-speling + --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs + --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so + --enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd" +hostmakedepends="pkg-config perl" +makedepends="zlib-devel libuuid-devel pcre-devel>=8.30 + openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel" short_desc="The Number One HTTP Server On The Internet" maintainer="Juan RP " homepage="http://httpd.apache.org/" license="Apache-2.0" +distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2" checksum=92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c long_desc=" The Apache HTTP Server Project is an effort to develop and maintain an @@ -34,30 +35,6 @@ long_desc=" extensible server that provides HTTP services in sync with the current HTTP standards." -subpackages="apache-devel" - -conf_files=" -/etc/httpd/extra/httpd-autoindex.conf -/etc/httpd/extra/httpd-dav.conf -/etc/httpd/extra/httpd-manual.conf -/etc/httpd/extra/httpd-vhosts.conf -/etc/httpd/extra/httpd-info.conf -/etc/httpd/extra/httpd-languages.conf -/etc/httpd/extra/httpd-userdir.conf -/etc/httpd/extra/httpd-ssl.conf -/etc/httpd/extra/httpd-mpm.conf -/etc/httpd/extra/httpd-default.conf -/etc/httpd/extra/httpd-multilang-errordoc.conf -/etc/httpd/httpd.conf -/etc/httpd/magic -/etc/httpd/mime.types" - -systemd_services="apache.service on" - -system_accounts="httpd" -httpd_descr="Apache HTTP server" -httpd_homedir="/srv/httpd" - pre_configure() { # set default user sed -e 's#User daemon#User httpd#' \ @@ -99,3 +76,39 @@ post_install() { rm -rf ${DESTDIR}/etc/httpd/original } + +apache-devel_package() { + depends="apr-devel apr-util-devel perl" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/share/apache-httpd/build + vmove usr/bin/apxs + vmove "usr/share/man/man1/apxs*" + } +} + +apache_package() { + conf_files=" + /etc/httpd/extra/httpd-autoindex.conf + /etc/httpd/extra/httpd-dav.conf + /etc/httpd/extra/httpd-manual.conf + /etc/httpd/extra/httpd-vhosts.conf + /etc/httpd/extra/httpd-info.conf + /etc/httpd/extra/httpd-languages.conf + /etc/httpd/extra/httpd-userdir.conf + /etc/httpd/extra/httpd-ssl.conf + /etc/httpd/extra/httpd-mpm.conf + /etc/httpd/extra/httpd-default.conf + /etc/httpd/extra/httpd-multilang-errordoc.conf + /etc/httpd/httpd.conf + /etc/httpd/magic + /etc/httpd/mime.types" + systemd_services="apache.service on" + system_accounts="httpd" + httpd_descr="Apache HTTP server" + httpd_homedir="/srv/httpd" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/apg/template b/srcpkgs/apg/template index de302a77ca..c65464fb5c 100644 --- a/srcpkgs/apg/template +++ b/srcpkgs/apg/template @@ -1,28 +1,31 @@ # Template file for 'apg' pkgname=apg version=2.2.3 -distfiles="http://www.adel.nursat.kz/apg/download/apg-$version.tar.gz" revision=2 short_desc="Automated Password Generator" homepage="http://www.adel.nursat.kz/apg/" license="BSD" maintainer="Juan RP " +distfiles="http://www.adel.nursat.kz/apg/download/apg-$version.tar.gz" checksum=69c9facde63958ad0a7630055f34d753901733d55ee759d08845a4eda2ba7dba long_desc=" APG (Automated Password Generator) is the tool set for random password generation." - -do_build() -{ +do_build() { sed -i 's:^#\(CS_LIBS = -lnsl\)$:\1:' Makefile make ${makejobs} } -do_install() -{ +do_install() { for i in apg apgbfm; do install -D -m755 $i ${DESTDIR}/usr/bin/$i install -D -m644 doc/man/$i.1 ${DESTDIR}/usr/share/man/man1/$i.1 done } + +apg_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/apr-util/apr-util-db.template b/srcpkgs/apr-util/apr-util-db.template deleted file mode 100644 index 3612605c55..0000000000 --- a/srcpkgs/apr-util/apr-util-db.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'apr-util-db'. -# -depends="apr-util" -short_desc="${short_desc} - Berkeley DB module" -long_desc=" - ${long_desc} - - This packages contains APR Utility module for Berkeley DB." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/apr-util-1 - mv ${SRCPKGDESTDIR}/usr/lib/apr-util-1/apr_dbm_db* \ - ${DESTDIR}/usr/lib/apr-util-1 -} diff --git a/srcpkgs/apr-util/apr-util-devel.template b/srcpkgs/apr-util/apr-util-devel.template deleted file mode 100644 index 9c1ac28d78..0000000000 --- a/srcpkgs/apr-util/apr-util-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'apr-util-devel'. -# -noarch=yes -depends="apr-devel expat-devel libldap-devel ${sourcepkg}>=${version}" -short_desc="${short_desc} - development files" -long_desc=" - ${long_desc} - - This packages contains files for development, static files, headers, etc." - -do_install() { - vmove usr/bin usr - vmove usr/include usr - vmove "usr/lib/*.exp" usr/lib - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/apr-util/apr-util-gdbm.template b/srcpkgs/apr-util/apr-util-gdbm.template deleted file mode 100644 index 35572e7aa0..0000000000 --- a/srcpkgs/apr-util/apr-util-gdbm.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'apr-util-gdbm'. -# -depends="apr-util" -short_desc="${short_desc} - GDBM module" -long_desc=" - ${long_desc} - - This packages contains the APR Utility module for GDBM." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/apr-util-1 - mv ${SRCPKGDESTDIR}/usr/lib/apr-util-1/apr_dbm_gdbm* \ - ${DESTDIR}/usr/lib/apr-util-1 -} diff --git a/srcpkgs/apr-util/apr-util-ldap.template b/srcpkgs/apr-util/apr-util-ldap.template deleted file mode 100644 index d50c44d835..0000000000 --- a/srcpkgs/apr-util/apr-util-ldap.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'apr-util-ldap'. -# -depends="apr-util" -short_desc="${short_desc} - LDAP support" -long_desc=" - ${long_desc} - - This packages contains APR Utility support for LDAP." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/apr-util-1 ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/apr-util/apr-util-mysql.template b/srcpkgs/apr-util/apr-util-mysql.template deleted file mode 100644 index 9a89ea4b5f..0000000000 --- a/srcpkgs/apr-util/apr-util-mysql.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'apr-util-mysql'. -# -depends="apr-util" -short_desc="${short_desc} - MySQL module" -long_desc=" - ${long_desc} - - This packages contains the APR Utility module for MySQL." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/apr-util-1 - mv ${SRCPKGDESTDIR}/usr/lib/apr-util-1/apr_dbd_mysql* \ - ${DESTDIR}/usr/lib/apr-util-1 -} diff --git a/srcpkgs/apr-util/apr-util-pgsql.template b/srcpkgs/apr-util/apr-util-pgsql.template deleted file mode 100644 index 1a42c09dce..0000000000 --- a/srcpkgs/apr-util/apr-util-pgsql.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'apr-util-pgsql'. -# -depends="apr-util" -short_desc="${short_desc} - PostgreSQL module" -long_desc=" - ${long_desc} - - This packages contains the APR Utility module for PostgreSQL." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/apr-util-1 - mv ${SRCPKGDESTDIR}/usr/lib/apr-util-1/apr_dbd_pgsql* \ - ${DESTDIR}/usr/lib/apr-util-1 -} diff --git a/srcpkgs/apr-util/apr-util-sqlite.template b/srcpkgs/apr-util/apr-util-sqlite.template deleted file mode 100644 index 75a6c4e0ea..0000000000 --- a/srcpkgs/apr-util/apr-util-sqlite.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'apr-util-sqlite'. -# -depends="apr-util" -short_desc="${short_desc} - SQLite module" -long_desc=" - ${long_desc} - - This packages contains the APR Utility module for SQLite." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/apr-util-1 - mv ${SRCPKGDESTDIR}/usr/lib/apr-util-1/apr_dbd_sqlite* \ - ${DESTDIR}/usr/lib/apr-util-1 -} diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index 6f8b8d8a07..b7dbef0418 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,8 +1,9 @@ # Template file for 'apr-util' pkgname=apr-util version=1.3.12 -revision=5 +revision=6 build_style=gnu-configure +# XXX: add freetds and unixodbc modules. configure_args="--with-pgsql --with-mysql --with-sqlite3 --with-ldap --with-berkeley-db --with-gdbm --with-apr=/usr --without-odbc --with-expat=/usr --without-oracle" @@ -22,11 +23,72 @@ long_desc=" APR Util is a utilities library implemented on top of APR, providing database access, xml parsing, and other useful functionality." -# XXX: add freetds and unixodbc modules. -subpackages="${pkgname}-db ${pkgname}-gdbm ${pkgname}-sqlite ${pkgname}-mysql - ${pkgname}-pgsql ${pkgname}-ldap ${pkgname}-devel" - post_install() { # remove static libs find ${DESTDIR} -type f -name \*.a -delete } + +apr-util-db_package() { + depends="apr-util>=${version}" + short_desc="${short_desc} - Berkeley DB module" + pkg_install() { + vmove "usr/lib/apr-util-1/apr_dbm_db*" + } +} + +apr-util-gdbm_package() { + depends="apr-util>=${version}" + short_desc="${short_desc} - GDBM module" + pkg_install() { + vmove "usr/lib/apr-util-1/apr_dbm_gdbm*" + } +} + +apr-util-sqlite_package() { + depends="apr-util>=${version}" + short_desc="${short_desc} - SQLite module" + pkg_install() { + vmove "usr/lib/apr-util-1/apr_dbd_sqlite*" + } +} + +apr-util-mysql_package() { + depends="apr-util>=${version}" + short_desc="${short_desc} - MySQL module" + pkg_install() { + vmove "usr/lib/apr-util-1/apr_dbd_mysql*" + } +} + +apr-util-pgsql_package() { + depends="apr-util>=${version}" + short_desc="${short_desc} - PostgreSQL module" + pkg_install() { + vmove "usr/lib/apr-util-1/apr_dbd_pgsql*" + } +} + +apr-util-ldap_package() { + depends="apr-util>=${version}" + short_desc="${short_desc} - LDAP support" + pkg_install() { + vmove usr/lib/apr-util-1 + } +} + +apr-util-devel_package() { + depends="apr-devel expat-devel libldap-devel ${sourcepkg}>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove "usr/lib/*.exp" + vmove usr/lib/pkgconfig + } +} + +apr-util_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/apr/apr-devel.template b/srcpkgs/apr/apr-devel.template deleted file mode 100644 index 942e729d4f..0000000000 --- a/srcpkgs/apr/apr-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'apr-devel'. -# -depends="libuuid-devel apr>=1.4.6" -short_desc="${short_desc} - development files" -long_desc=" - ${long_desc} - - This packages contains files for development, static files, headers, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.{a,exp} ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/{include,bin,share} ${DESTDIR}/usr -} diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template index 1592b6e0fb..d467d7b1fa 100644 --- a/srcpkgs/apr/template +++ b/srcpkgs/apr/template @@ -1,21 +1,35 @@ # Template file for 'apr' pkgname=apr version=1.4.6 -distfiles="http://www.apache.org/dist/apr/apr-$version.tar.bz2" -build_style=gnu-configure -configure_args="--with-devrandom=/dev/urandom ---with-installbuilddir=/usr/share/apr-1/build" -makedepends="libuuid-devel" revision=1 +build_style=gnu-configure +configure_args="--with-devrandom=/dev/urandom --with-installbuilddir=/usr/share/apr-1/build" +makedepends="libuuid-devel" short_desc="Apache Portable Runtime Library" maintainer="Juan RP " -checksum=9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc homepage="http://apr.apache.org/" license="Apache-2.0" +distfiles="http://www.apache.org/dist/apr/apr-$version.tar.bz2" +checksum=9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc long_desc=" APR is Apache's Portable Runtime Library, designed to be a support library that provides a predictable and consistent interface to underlying platform-specific implementations." -subpackages="apr-devel" +apr-devel_package() { + depends="libuuid-devel apr>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/bin + vmove usr/share + vmove "usr/lib/*.{a,exp}" + vmove usr/lib/pkgconfig + } +} +apr_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template index 9d6f398ad0..f85d78414f 100644 --- a/srcpkgs/aqemu/template +++ b/srcpkgs/aqemu/template @@ -1,20 +1,25 @@ # Template file for 'aqemu' pkgname=aqemu version=0.8.2 -distfiles="${SOURCEFORGE_SITE}/aqemu/aqemu-$version.tar.bz2" +revision=1 build_style=cmake configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1" -revision=1 -makedepends="cmake qt-devel" -fulldepends="qemu desktop-file-utils" +hostmakedepends="cmake" +makedepends="qt-devel qemu desktop-file-utils" short_desc="GUI to QEMU and KVM emulators, written in Qt4" maintainer="Juan RP " homepage="http://aqemu.sourceforge.net" license="GPL-2" +distfiles="${SOURCEFORGE_SITE}/aqemu/aqemu-$version.tar.bz2" checksum=03c4a95328f78238021168ca4887f9735641f10eb4eb1eff58b08c15b748bf03 long_desc=" AQEMU is GUI to QEMU and KVM emulators, written in Qt4. The program has user-friendly interface and allows to set up the majority of QEMU and KVM options." - +aqemu_package() { + depends="qemu desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template index 81aaf03d2b..cd8aac40ee 100644 --- a/srcpkgs/asciidoc/template +++ b/srcpkgs/asciidoc/template @@ -3,7 +3,7 @@ pkgname=asciidoc version=8.6.8 revision=1 build_style=gnu-configure -fulldepends="python>=0 libxslt docbook-xsl" +makedepends="python libxslt docbook-xsl" short_desc="Text based document generation" maintainer="Juan RP " homepage="http://www.methods.co.nz/asciidoc/" @@ -19,29 +19,35 @@ long_desc=" and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user." -noarch=yes -conf_files=" -/etc/asciidoc/asciidoc.conf -/etc/asciidoc/docbook45.conf -/etc/asciidoc/filters/code/code-filter.conf -/etc/asciidoc/filters/graphviz/graphviz-filter.conf -/etc/asciidoc/filters/latex/latex-filter.conf -/etc/asciidoc/filters/music/music-filter.conf -/etc/asciidoc/filters/source/source-highlight-filter.conf -/etc/asciidoc/help.conf -/etc/asciidoc/html4.conf -/etc/asciidoc/lang-de.conf -/etc/asciidoc/lang-en.conf -/etc/asciidoc/lang-es.conf -/etc/asciidoc/lang-fr.conf -/etc/asciidoc/lang-hu.conf -/etc/asciidoc/lang-it.conf -/etc/asciidoc/lang-pt-BR.conf -/etc/asciidoc/lang-ru.conf -/etc/asciidoc/lang-uk.conf -/etc/asciidoc/latex.conf -/etc/asciidoc/slidy.conf -/etc/asciidoc/text.conf -/etc/asciidoc/wordpress.conf -/etc/asciidoc/xhtml11.conf -/etc/asciidoc/xhtml11-quirks.conf" +asciidoc_package() { + depends="python libxslt docbook-xsl" + conf_files=" + /etc/asciidoc/asciidoc.conf + /etc/asciidoc/docbook45.conf + /etc/asciidoc/filters/code/code-filter.conf + /etc/asciidoc/filters/graphviz/graphviz-filter.conf + /etc/asciidoc/filters/latex/latex-filter.conf + /etc/asciidoc/filters/music/music-filter.conf + /etc/asciidoc/filters/source/source-highlight-filter.conf + /etc/asciidoc/help.conf + /etc/asciidoc/html4.conf + /etc/asciidoc/lang-de.conf + /etc/asciidoc/lang-en.conf + /etc/asciidoc/lang-es.conf + /etc/asciidoc/lang-fr.conf + /etc/asciidoc/lang-hu.conf + /etc/asciidoc/lang-it.conf + /etc/asciidoc/lang-pt-BR.conf + /etc/asciidoc/lang-ru.conf + /etc/asciidoc/lang-uk.conf + /etc/asciidoc/latex.conf + /etc/asciidoc/slidy.conf + /etc/asciidoc/text.conf + /etc/asciidoc/wordpress.conf + /etc/asciidoc/xhtml11.conf + /etc/asciidoc/xhtml11-quirks.conf" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/aspell/aspell-devel.template b/srcpkgs/aspell/aspell-devel.template deleted file mode 100644 index a8158f60db..0000000000 --- a/srcpkgs/aspell/aspell-devel.template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'aspell-devel'. -# -depends="ncurses-devel libstdc++-devel aspell" -short_desc="${sourcepkg} development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/bin - mkdir -p ${DESTDIR}/usr/share/info ${DESTDIR}/usr/share/man/man1 - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/bin/pspell-config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/info/aspell-dev* \ - ${DESTDIR}/usr/share/info - touch -f ${DESTDIR}/usr/share/info/dir - mv ${SRCPKGDESTDIR}/usr/share/man/man1/pspell-config.1 \ - ${DESTDIR}/usr/share/man/man1 -} diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template index 633541d6cf..645ad32bae 100644 --- a/srcpkgs/aspell/template +++ b/srcpkgs/aspell/template @@ -1,16 +1,16 @@ # Template file for 'aspell' pkgname=aspell version=0.60.6.1 -distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +revision=4 build_style=gnu-configure configure_args="--enable-compile-in-filters" +hostmakedepends="perl" makedepends="ncurses-devel" -fulldepends="perl>=0" -revision=3 short_desc="Spell checker with good multi-language support" homepage="http://aspell.net/" license="LGPL-2.1" maintainer="Juan RP " +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 long_desc=" GNU Aspell is a Free and Open Source spell checker designed to eventually @@ -22,4 +22,20 @@ long_desc=" and intelligently handling personal dictionaries when more than one Aspell process is open at once." -subpackages="$pkgname-devel" +aspell-devel_package() { + depends="ncurses-devel libstdc++-devel aspell>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove usr/bin/pspell-config + vmove usr/share/info + vmove usr/share/man/man1/pspell-config.1 + } +} + +aspell_package() { + depends="perl" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/at-spi2-atk/at-spi2-atk-devel.template b/srcpkgs/at-spi2-atk/at-spi2-atk-devel.template deleted file mode 100644 index 24dccfc3f0..0000000000 --- a/srcpkgs/at-spi2-atk/at-spi2-atk-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'at-spi2-atk-devel'. -# -depends="libglib-devel at-spi2-core-devel ${sourcepkg}-${version}_${revision}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template index 03cedc07a5..e95634e62c 100644 --- a/srcpkgs/at-spi2-atk/template +++ b/srcpkgs/at-spi2-atk/template @@ -2,10 +2,8 @@ pkgname=at-spi2-atk version=2.8.0 revision=1 -subpackages="${pkgname}-devel" build_style=gnu-configure hostmakedepends="pkg-config intltool" -depends="at-spi2-core>=2.8" makedepends="libglib-devel atk-devel>=2.8 at-spi2-core-devel>=2.8" short_desc="A GTK+ module that bridges ATK to D-Bus at-spi" maintainer="Juan RP " @@ -20,3 +18,19 @@ long_desc=" These libraries depend on the at-spi2-core code that contains the daemon for registering applications, D-Bus helper libraries and te AT-SPI D-Bus specifications." + +at-spi2-atk-devel_package() { + depends="libglib-devel at-spi2-core-devel ${sourcepkg}-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +at-spi2-atk_package() { + depends="at-spi2-core>=2.8" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/at-spi2-core/at-spi2-core-devel.template b/srcpkgs/at-spi2-core/at-spi2-core-devel.template deleted file mode 100644 index cec7ba3784..0000000000 --- a/srcpkgs/at-spi2-core/at-spi2-core-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'at-spi2-core-devel'. -# -depends="dbus-devel ${sourcepkg}-${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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index e512b967de..09e28a41a6 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -18,5 +18,20 @@ long_desc=" Also included is the daemon neccessary for forwarding device events and registering accessible applicaitons." -conf_files="/etc/at-spi2/accessibility.conf" -subpackages="${pkgname}-devel" +at-spi2-core-devel_package() { + depends="dbus-devel ${sourcepkg}-${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 + } +} + +at-spi2-core_package() { + conf_files="/etc/at-spi2/accessibility.conf" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/atf/atf-devel.template b/srcpkgs/atf/atf-devel.template deleted file mode 100644 index d8445750df..0000000000 --- a/srcpkgs/atf/atf-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'atf-devel'. -# -depends="atf-libs>=$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/aclocal usr/share -} diff --git a/srcpkgs/atf/atf-libs.template b/srcpkgs/atf/atf-libs.template deleted file mode 100644 index 76e46410e1..0000000000 --- a/srcpkgs/atf/atf-libs.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'atf-libs'. -# -short_desc="${short_desc} - runtime libraries" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template index 6d5da34243..50addcff11 100644 --- a/srcpkgs/atf/template +++ b/srcpkgs/atf/template @@ -3,9 +3,7 @@ pkgname=atf version=0.17 revision=1 build_style=gnu-configure -subpackages="atf-libs atf-devel" -xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd" -fulldepends="gdb xmlcatmgr" +makedepends="gdb xmlcatmgr" short_desc="Automated Testing Framework" maintainer="Juan RP " homepage="http://www.netbsd.org/~jmmv/atf/" @@ -24,3 +22,29 @@ if [ -n "$XBPS_CROSS_TRIPLET" ]; then autoreconf -fi } fi + +atf-devel_package() { + depends="atf-libs>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + } +} + +atf-libs_package() { + short_desc="${short_desc} - runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +atf_package() { + depends="gdb xmlcatmgr" + xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/atk/atk-devel.template b/srcpkgs/atk/atk-devel.template deleted file mode 100644 index 3e05733c33..0000000000 --- a/srcpkgs/atk/atk-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'atk-devel'. -# -depends="libglib-devel atk>=${version}" -short_desc="${short_desc} - development files" -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/share/gir-*" usr/share - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template index 8955861661..995892eeaf 100644 --- a/srcpkgs/atk/template +++ b/srcpkgs/atk/template @@ -1,8 +1,7 @@ # Template build file for 'atk'. pkgname=atk version=2.8.0 -revision=1 -subpackages="atk-devel" +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libglib-devel>=2.34.0 gobject-introspection" @@ -23,3 +22,20 @@ long_desc=" classes of widgets and whose existence can be queried at run time. It also provides interfaces which an application can use to provide additional accessibility information to assistive technology tools." + +atk-devel_package() { + depends="libglib-devel atk>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/share/gir-*" + vmove usr/share/gtk-doc + } +} + +atk_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/atkmm/atkmm-devel.template b/srcpkgs/atkmm/atkmm-devel.template deleted file mode 100644 index 7c295047e7..0000000000 --- a/srcpkgs/atkmm/atkmm-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'atkmm-devel'. -# -depends="glibmm-devel atk-devel atkmm" -short_desc="${sourcepkg} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -replaces="gtkmm-devel<2.22" - - -do_install() -{ - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/lib/atkmm-1.6 usr/lib -} diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template index d84366e4be..5c006d6839 100644 --- a/srcpkgs/atkmm/template +++ b/srcpkgs/atkmm/template @@ -1,15 +1,16 @@ # Template build file for 'atkmm'. pkgname=atkmm version=2.22.6 -distfiles="${GNOME_SITE}/atkmm/2.22/$pkgname-$version.tar.xz" +revision=3 build_style=gnu-configure configure_args="--disable-documentation" -revision=2 -makedepends="pkg-config atk-devel glibmm-devel libsigc++-devel" +hostmakedepends="pkg-config" +mnakedepends="atk-devel glibmm-devel libsigc++-devel" short_desc="Set of interfaces for accessibility (C++ bindings)" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" +distfiles="${GNOME_SITE}/atkmm/2.22/$pkgname-$version.tar.xz" checksum=0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6 long_desc=" The ATK library provides a set of interfaces for accessibility. @@ -25,6 +26,20 @@ long_desc=" This package provides the C++ bindings for the ATK library." -subpackages="atkmm-devel" -replaces="gtkmm<2.22" +atkmm-devel_package() { + depends="glibmm-devel atk-devel atkmm>=${version}" + short_desc="${sourcepkg} - development files" + replaces="gtkmm-devel<2.22" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/atkmm-1.6 + } +} +atkmm_package() { + replaces="gtkmm<2.22" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template index 99877a5e55..c965837e51 100644 --- a/srcpkgs/atop/template +++ b/srcpkgs/atop/template @@ -14,8 +14,6 @@ homepage="http://www.atoptool.nl/" distfiles="http://www.atoptool.nl/download/atop-${_distver}-${_patchver}.tar.gz" checksum=b4679525f241d3c51fa9b827a40db21cc7df8a3d88e55ee3b7d01ec501acbee6 -systemd_services="atop.service true" - post_install() { # Remove unused stuff. rm -f ${DESTDIR}/usr/bin/atop{,sar}-2.0 @@ -23,3 +21,11 @@ post_install() { # systemd service vinstall atop.service 644 usr/lib/systemd/system } + +atop_package() { + systemd_services="atop.service true" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/aubio/aubio-devel.template b/srcpkgs/aubio/aubio-devel.template deleted file mode 100644 index dda9766327..0000000000 --- a/srcpkgs/aubio/aubio-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'aubio-devel'. -# -noarch=yes -depends="libaubio-${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 -} diff --git a/srcpkgs/aubio/libaubio.template b/srcpkgs/aubio/libaubio.template deleted file mode 100644 index 48e1734394..0000000000 --- a/srcpkgs/aubio/libaubio.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libaubio'. -# -short_desc="${short_desc} - Runtime libraries" -long_desc="${long_desc} - - This package contains the rubberband runtime lib(s)." - - -do_install() -{ - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template index 9a11a0a2e5..68521322ab 100644 --- a/srcpkgs/aubio/template +++ b/srcpkgs/aubio/template @@ -1,12 +1,12 @@ # Template file for 'aubio' pkgname=aubio version=0.3.2 -revision=4 -subpackages="lib${pkgname} ${pkgname}-devel" +revision=5 build_style=gnu-configure configure_args="--disable-static" # XXX lash, pure and swig support. -makedepends="pkg-config libsamplerate-devel fftw-devel jack-devel" +hostmakedepends="pkg-config" +makedepends="libsamplerate-devel fftw-devel jack-devel" short_desc="A library for audio labelling" maintainer="davehome " license="GPL-2" @@ -18,3 +18,25 @@ long_desc=" Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio." + +libaubio_package() { + short_desc="${short_desc} - Runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +aubio-devel_package() { + depends="libaubio-${version}_${revision}" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +aubio_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index 5b08586b76..595d8ac088 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -15,3 +15,9 @@ distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar checksum=3906a70090edb09b94504fa37c823635b752b408e129fc0156286d409d350f8f long_desc=" This package contains some plugins for the Audacious media player." + +audacious-plugins_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/audacious/audacious-devel.template b/srcpkgs/audacious/audacious-devel.template deleted file mode 100644 index 622e3600c7..0000000000 --- a/srcpkgs/audacious/audacious-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'audacious-devel'. -# -noarch=yes -depends="audacious>=${version}" -short_desc="${sourcepkg} 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/audacious/template b/srcpkgs/audacious/template index b0bb635562..1e01d46a87 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious/template @@ -1,10 +1,9 @@ # Template file for 'audacious'. pkgname=audacious version=3.3.3 -revision=1 -subpackages="audacious-devel" -depends="desktop-file-utils hicolor-icon-theme" -makedepends="pkg-config libSM-devel gtk+3-devel dbus-glib-devel libguess-devel" +revision=2 +hostmakedepends="pkg-config" +makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel" build_style=gnu-configure short_desc="Lightweight, advanced audio player focused on audio quality" maintainer="davehome " @@ -22,3 +21,19 @@ long_desc=" modern GTK-themed interface or change things up with Winamp classic skins. Use the plugins included with Audacious to fetch lyrics for your music, to set an alarm in the morning, and more." + +audacious-devel_package() { + depends="audacious>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +audacious_package() { + depends="desktop-file-utils hicolor-icon-theme" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/automoc4/template b/srcpkgs/automoc4/template index b37ff365cd..48323c4dbf 100644 --- a/srcpkgs/automoc4/template +++ b/srcpkgs/automoc4/template @@ -1,15 +1,21 @@ # Template file for 'automoc4' pkgname=automoc4 version=0.9.88 -distfiles="ftp://ftp.kde.org/pub/kde/stable/$pkgname/$version/$pkgname-$version.tar.bz2" build_style=cmake revision=2 -makedepends="pkg-config cmake qt-devel" +hostmakedepends="pkg-config cmake" +makedepends="qt-devel" short_desc="Automatic moc for Qt 4 packages" homepage="http://techbase.kde.org/Development/Tools/Automoc4" license="BSD" maintainer="Juan RP " +distfiles="ftp://ftp.kde.org/pub/kde/stable/$pkgname/$version/$pkgname-$version.tar.bz2" checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49 long_desc=" automoc4 tool, used to build KDE4 and related packages." +automoc4_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/avahi/avahi-autoipd.template b/srcpkgs/avahi/avahi-autoipd.template deleted file mode 100644 index e44c1bbe97..0000000000 --- a/srcpkgs/avahi/avahi-autoipd.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'avahi-autoipd'. -# -depends="net-tools" -short_desc="Avahi IPv4LL network address configuration daemon" - -do_install() { - vmove usr/sbin/avahi-autoipd usr/sbin - vmove "usr/share/man/man8/avahi-autoipd*" usr/share/man/man8 - vmove etc/avahi/avahi-autoipd.action etc/avahi -} diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template deleted file mode 100644 index 79a22295c3..0000000000 --- a/srcpkgs/avahi/avahi-compat-libs-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'avahi-compat-libs-devel'. -# -depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}" -short_desc="Avahi compat libraries -- development files" - -do_install() { - vmove "usr/include/avahi-compat*" usr/include - vmove "usr/lib/pkgconfig/avahi-compat*" usr/lib/pkgconfig -} diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template deleted file mode 100644 index b734e5fdf0..0000000000 --- a/srcpkgs/avahi/avahi-compat-libs.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'avahi-compat-libs'. -# -short_desc="Avahi compatiblity shared libraries" - -do_install() { - vmove "usr/lib/libhowl.so*" usr/lib - vmove "usr/lib/libdns_sd.so*" usr/lib -} diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template deleted file mode 100644 index c4433162ec..0000000000 --- a/srcpkgs/avahi/avahi-discover.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'avahi-discover'. -# -depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils" -short_desc="Service discover user interface for avahi" -noarch=yes -pycompile_module="avahi_discover" - -do_install() { - vmove usr/bin/avahi-discover usr/bin - vmove "usr/share/man/man1/avahi-discover*" usr/share/man/man1 - vmove usr/share/applications/avahi-discover.desktop \ - usr/share/applications - vmove usr/lib/python2.7/site-packages/avahi_discover \ - usr/lib/python2.7/site-packages - vmove usr/share/avahi/interfaces/avahi-discover.ui \ - usr/share/avahi/interfaces -} diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template deleted file mode 100644 index c4a122a6f0..0000000000 --- a/srcpkgs/avahi/avahi-glib-libs-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'avahi-glib-libs-devel'. -# -depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}" -short_desc="Avahi glib libraries -- development files" - -do_install() { - vmove "usr/include/avahi-g*" usr/include - vmove "usr/lib/pkgconfig/avahi-g*" usr/lib/pkgconfig - vmove "usr/share/gir-*" usr/share -} diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template deleted file mode 100644 index de19e9ae91..0000000000 --- a/srcpkgs/avahi/avahi-glib-libs.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'avahi-glib-libs'. -# -short_desc="Avahi glib shared libraries" - -do_install() { - vmove "usr/lib/libavahi-glib.so*" usr/lib - vmove "usr/lib/libavahi-gobject.so*" usr/lib - vmove "usr/lib/girepository*" usr/lib -} diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template deleted file mode 100644 index 5b95c21f4e..0000000000 --- a/srcpkgs/avahi/avahi-libs-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'avahi-libs-devel'. -# -depends="dbus-devel avahi-libs-${version}_${revision}" -short_desc="Avahi core libraries -- development files" - -do_install() { - for f in common client core; do - vmove usr/include/avahi-${f} usr/include - done - vmove usr/lib/pkgconfig/avahi-core.pc usr/lib/pkgconfig - vmove usr/lib/pkgconfig/avahi-client.pc usr/lib/pkgconfig -} diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template deleted file mode 100644 index 15305855bd..0000000000 --- a/srcpkgs/avahi/avahi-libs.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'avahi-libs'. -# -short_desc="Avahi shared libraries" - -do_install() { - vmove "usr/lib/libavahi-client.so*" usr/lib - vmove "usr/lib/libavahi-core.so*" usr/lib - vmove "usr/lib/libavahi-common.so*" usr/lib -} diff --git a/srcpkgs/avahi/avahi-python-utils.template b/srcpkgs/avahi/avahi-python-utils.template deleted file mode 100644 index a9e347da0a..0000000000 --- a/srcpkgs/avahi/avahi-python-utils.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'avahi-python-utils'. -# -noarch=yes -depends="avahi-python>=$version" -short_desc="Avahi python utilities" - -do_install() { - vmove usr/bin/avahi-bookmarks usr/bin - vmove "usr/share/man/man1/avahi-bookmarks*" usr/share/man/man1 -} diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template deleted file mode 100644 index 31979c764f..0000000000 --- a/srcpkgs/avahi/avahi-python.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'avahi-python'. -# -depends="python dbus-python" -short_desc="Python utility package for Avahi" -noarch=yes -pycompile_module="avahi" - -do_install() { - vmove "usr/lib/python*" usr/lib -} diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template deleted file mode 100644 index c4760b0d87..0000000000 --- a/srcpkgs/avahi/avahi-ui-libs-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'avahi-ui-libs-devel'. -# -depends="gtk+-devel gtk+3-devel avahi-libs-devel-${version}_${revision} - avahi-ui-libs-${version}_${revision} avahi-ui-libs-gtk3-${version}_${revision}" - -short_desc="Avahi UI libraries -- development files" - -do_install() { - vmove "usr/include/avahi-ui*" usr/include - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template deleted file mode 100644 index 7ca0e09ccd..0000000000 --- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'avahi-ui-libs-gtk3'. -# -short_desc="Avahi UI GTK+3 shared libraries" - -do_install() { - vmove "usr/lib/libavahi-ui-gtk3.so*" usr/lib -} diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template deleted file mode 100644 index 6a447a1067..0000000000 --- a/srcpkgs/avahi/avahi-ui-libs.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'avahi-ui-libs'. -# -short_desc="Avahi UI shared libraries" - -do_install() { - vmove "usr/lib/libavahi-ui.so*" usr/lib -} diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template deleted file mode 100644 index 46b1200fff..0000000000 --- a/srcpkgs/avahi/avahi-ui-utils.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'avahi-ui-utils'. -# -depends="desktop-file-utils avahi>=$version" -short_desc="Avahi GTK+ utilities" - -do_install() { - vmove "usr/bin/b*" usr/bin - vmove "usr/share/man/man1/b*" usr/share/man/man1 - vmove usr/share/applications usr/share - vmove usr/bin/avahi-discover-standalone usr/bin -} diff --git a/srcpkgs/avahi/avahi-utils.template b/srcpkgs/avahi/avahi-utils.template deleted file mode 100644 index f283a9c00b..0000000000 --- a/srcpkgs/avahi/avahi-utils.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'avahi-utils'. -# -short_desc="Avahi browsing, publishing and discovery utilities" -long_desc="${long_desc} - - This package contains several utilities that allow you to interact with the - Avahi daemon, including publish, browsing and discovering services." - -do_install() { - for f in browse publish resolve set-host-name; do - vmove "usr/bin/avahi-${f}*" usr/bin - vmove "usr/share/man/man1/avahi-${f}*" \ - usr/share/man/man1 - done -} diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index ed99bd3467..74c45b1c37 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -17,35 +17,184 @@ homepage="http://www.avahi.org" distfiles="$homepage/download/avahi-$version.tar.gz" checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 -depends="dbus" hostmakedepends="pkg-config intltool" makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel dbus-python pygtk-devel gtk+3-devel>=3.6.0_5 gobject-introspection" -systemd_services="avahi-daemon.service on" - -conf_files=" -/etc/avahi/services/ssh.service -/etc/avahi/services/sftp-ssh.service -/etc/avahi/avahi-daemon.conf -/etc/avahi/hosts -/etc/avahi/avahi-dnsconfd.action" - -subpackages="avahi-autoipd avahi-discover avahi-compat-libs avahi-compat-libs-devel - avahi-libs avahi-libs-devel avahi-glib-libs avahi-glib-libs-devel - avahi-ui-libs avahi-ui-libs-gtk3 avahi-ui-libs-devel avahi-utils - avahi-ui-utils avahi-python-utils avahi-python" - if [ "$CROSS_BUILD" ]; then # XXX glib, gtk, introspection and python - hostmakedepends="libtool automake gettext-devel glib-devel pkg-config intltool" + hostmakedepends+=" automake gettext-devel glib-devel intltool" makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel" - subpackages="avahi-autoipd avahi-compat-libs avahi-compat-libs-devel - avahi-libs avahi-libs-devel avahi-utils" - configure_args="${configure_args} --disable-glib --disable-gobject - --disable-gtk --disable-gtk3 --disable-introspection - --disable-python --disable-pygtk" + configure_args+=" --disable-glib --disable-gobject + --disable-gtk --disable-gtk3 --disable-introspection + --disable-python --disable-pygtk" pre_configure() { autoreconf -fi } fi + +# XXX disabled packages in cross builds. +if [ -z "$CROSS_BUILD" ]; then + +avahi-discover_package() { + depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils" + short_desc="Service discover user interface for avahi" + noarch=yes + pycompile_module="avahi_discover" + pkg_install() { + vmove usr/bin/avahi-discover + vmove "usr/share/man/man1/avahi-discover*" + vmove usr/share/applications/avahi-discover.desktop + vmove usr/lib/python2.7/site-packages/avahi_discover + vmove usr/share/avahi/interfaces/avahi-discover.ui + } +} + +avahi-glib-libs_package() { + short_desc="Avahi glib shared libraries" + pkg_install() { + vmove "usr/lib/libavahi-glib.so*" + vmove "usr/lib/libavahi-gobject.so*" + vmove "usr/lib/girepository*" + } +} + +avahi-glib-libs-devel_package() { + depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}" + short_desc="Avahi glib libraries -- development files" + pkg_install() { + vmove "usr/include/avahi-g*" + vmove "usr/lib/pkgconfig/avahi-g*" + vmove "usr/share/gir-*" + } +} + +avahi-ui-libs_package() { + short_desc="Avahi UI shared libraries" + pkg_install() { + vmove "usr/lib/libavahi-ui.so*" + } +} + +avahi-ui-libs-gtk3_package() { + short_desc="Avahi UI GTK+3 shared libraries" + pkg_install() { + vmove "usr/lib/libavahi-ui-gtk3.so*" + } +} + +avahi-ui-libs-devel_package() { + depends="gtk+-devel gtk+3-devel avahi-libs-devel-${version}_${revision} + avahi-ui-libs-${version}_${revision} avahi-ui-libs-gtk3-${version}_${revision}" + short_desc="Avahi UI libraries -- development files" + pkg_install() { + vmove "usr/include/avahi-ui*" + vmove usr/lib/pkgconfig + } +} + +avahi-ui-utils_package() { + depends="desktop-file-utils avahi>=$version" + short_desc="Avahi GTK+ utilities" + pkg_install() { + vmove "usr/bin/b*" usr/bin + vmove "usr/share/man/man1/b*" + vmove usr/share/applications + vmove usr/bin/avahi-discover-standalone + } +} + +avahi-python-utils_package() { + noarch=yes + depends="avahi-python>=$version" + short_desc="Avahi python utilities" + pkg_install() { + vmove usr/bin/avahi-bookmarks + vmove "usr/share/man/man1/avahi-bookmarks*" + } +} + +avahi-python_package() { + depends="python dbus-python" + short_desc="Python utility package for Avahi" + noarch=yes + pycompile_module="avahi" + pkg_install() { + vmove "usr/lib/python*" + } +} + +fi # !CROSS_BUILD + +avahi-autoipd_package() { + depends="net-tools" + short_desc="Avahi IPv4LL network address configuration daemon" + pkg_install() { + vmove usr/sbin/avahi-autoipd + vmove "usr/share/man/man8/avahi-autoipd*" + vmove etc/avahi/avahi-autoipd.action + } +} + +avahi-compat-libs_package() { + short_desc="Avahi compatiblity shared libraries" + pkg_install() { + vmove "usr/lib/libhowl.so*" + vmove "usr/lib/libdns_sd.so*" + } +} + +avahi-compat-libs-devel_package() { + depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}" + short_desc="Avahi compat libraries -- development files" + pkg_install() { + vmove "usr/include/avahi-compat*" + vmove "usr/lib/pkgconfig/avahi-compat*" + } +} + +avahi-libs_package() { + short_desc="Avahi shared libraries" + pkg_install() { + vmove "usr/lib/libavahi-client.so*" + vmove "usr/lib/libavahi-core.so*" + vmove "usr/lib/libavahi-common.so*" + } +} + +avahi-libs-devel_package() { + depends="dbus-devel avahi-libs-${version}_${revision}" + short_desc="Avahi core libraries -- development files" + pkg_install() { + for f in common client core; do + vmove usr/include/avahi-${f} + done + vmove usr/lib/pkgconfig/avahi-core.pc + vmove usr/lib/pkgconfig/avahi-client.pc + } +} + +avahi-utils_package() { + short_desc="Avahi browsing, publishing and discovery utilities" + pkg_install() { + for f in browse publish resolve set-host-name; do + vmove "usr/bin/avahi-${f}*" + vmove "usr/share/man/man1/avahi-${f}*" + done + } +} + +avahi_package() { + systemd_services="avahi-daemon.service on" + conf_files=" + /etc/avahi/services/ssh.service + /etc/avahi/services/sftp-ssh.service + /etc/avahi/avahi-daemon.conf + /etc/avahi/hosts + /etc/avahi/avahi-dnsconfd.action" + depends="dbus" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index ddee073c21..5d0a71c27e 100644 --- a/srcpkgs/awesome/template +++ b/srcpkgs/awesome/template @@ -4,15 +4,12 @@ version=3.5 revision=1 build_style=cmake configure_args="-DSYSCONFDIR=/etc" -conf_files="/etc/xdg/awesome/rc.lua" -depends="dbus-x11" makedepends="cmake which xmlto asciidoc>=8.6.8 libxcb-devel pango-devel xcb-util-devel>=0.3.9 xcb-util-image-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 startup-notification-devel>=0.12_3 imlib2-devel ImageMagick>=6.7.9.6_2 libxdg-basedir-devel>=1.1.1_1 gdk-pixbuf-devel libXcursor-devel - lua-devel>=5.1<5.2 dbus-devel" -fulldepends="lgi>=0.6.2_2" + lua-devel>=5.1<5.2 dbus-devel lgi>=0.6.2_2" short_desc="Highly configurable, next gen framework window manager for X" maintainer="davehome " license="GPL-2" @@ -24,3 +21,11 @@ pre_configure() { # Russian manpages fail to build. sed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt } + +awesome_package() { + conf_files="/etc/xdg/awesome/rc.lua" + depends="dbus-x11 lgi>=0.6.2_2" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/babl/babl-devel.template b/srcpkgs/babl/babl-devel.template deleted file mode 100644 index 2de0bd472d..0000000000 --- a/srcpkgs/babl/babl-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'babl-devel'. -# -depends="glibc-devel babl>=0.1.10" -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/babl/template b/srcpkgs/babl/template index e5439531b5..54a0666af8 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,14 +1,15 @@ # Template build file for 'babl'. pkgname=babl version=0.1.10 -distfiles="ftp://ftp.gimp.org/pub/babl/0.1/babl-$version.tar.bz2" +revision=2 build_style=gnu-configure -makedepends="pkg-config vala-devel" -revision=1 +hostmakedepends="pkg-config" +makedepends="vala-devel" short_desc="Dynamic pixel format translation library" maintainer="Juan RP " homepage="http://gegl.org/babl/" license="LGPL-3" +distfiles="ftp://ftp.gimp.org/pub/babl/0.1/babl-$version.tar.bz2" checksum=943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 long_desc=" babl is a dynamic, any to any, pixel format translation library. @@ -20,5 +21,17 @@ long_desc=" A vocabulary to formulate new pixel formats from existing primitives is provided as well as the framework to add new color models and data types." -subpackages="babl-devel" +babl-devel_package() { + depends="babl>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + } +} +babl_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template index 729386e477..253fb302b2 100644 --- a/srcpkgs/backintime/template +++ b/srcpkgs/backintime/template @@ -2,15 +2,21 @@ pkgname=backintime version=1.0.8 revision=2 -noarch=yes -pycompile_dirs="/usr/share/${pkgname}" -build_style=gnu-configure -makedepends="which" -depends="python rsync cron-daemon" wrksrc=$pkgname-$version/common +build_style=gnu-configure +hostmakedepends="which" short_desc="A simple backup tool for Linux" maintainer="tripledes " license="GPL-2" homepage="http://$pkgname.le-web.org" distfiles="http://$pkgname.le-web.org/download/$pkgname/$pkgname-${version}_src.tar.gz" checksum=fb83736ae0671b0d63468a9d39a29334320d93df004911cc192b1989df97d931 + +backintime_package() { + noarch="yes" + pycompile_dirs="/usr/share/backintime" + depends="python rsync cron-daemon" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index ef4896aa7b..ff2f13b127 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -4,13 +4,19 @@ version=3.8.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" -depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.8.0" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends="gtk+3-devel vala-devel>=0.20 gsettings-desktop-schemas-devel>=3.8" -replaces="gnome-utils>=3.0" short_desc="A graphical directory tree analyzer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=3b311b7dc4e2ed2f6c5a8ecff91c0b8a91dc7189901e0001f59d0acb32831d2f + +baobab_package() { + replaces="gnome-utils>=3.0" + depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.8.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template index bac1df1d40..620fcf304a 100644 --- a/srcpkgs/base-chroot/template +++ b/srcpkgs/base-chroot/template @@ -2,6 +2,7 @@ pkgname=base-chroot version=0.34 revision=1 +bootstrap=yes build_style=meta-template homepage="http://www.voidlinux.eu" short_desc="Bootstrap packages for xbps-src" @@ -11,18 +12,14 @@ long_desc=" This package installs all necessary packages to be able to build packages inside of a chroot with xbps-src." -noarch=yes -bootstrap=yes - -_deps="xbps-triggers base-files kernel-libc-headers chroot-glibc +makedepends="xbps-triggers base-files kernel-libc-headers chroot-glibc chroot-binutils>=2.22.52.0.4_1 chroot-gcc chroot-patch chroot-bash chroot-grep chroot-coreutils chroot-diffutils chroot-gettext chroot-texinfo chroot-sed chroot-gawk chroot-findutils chroot-make chroot-gzip chroot-bzip2 chroot-file chroot-tar chroot-m4 chroot-xz chroot-fakeroot mpfr-devel gmp-devel zlib-devel ccache chroot-distcc chroot-git xbps-src>=20130317_4" -if [ -n "$IN_CHROOT" ]; then - depends="${_deps}" -else - fulldepends="${_deps}" -fi +base-chroot_package() { + noarch="yes" + depends="${makedepends}" +} diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index bd58c0db09..414e0f4979 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -2,32 +2,13 @@ pkgname=base-files version=0.82 revision=1 -fulldepends="base-directories xbps-triggers" +bootstrap=yes +makedepends="base-directories xbps-triggers" short_desc="Void Linux base system files" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public domain" -noarch=yes -bootstrap=yes - -conf_files=" - /etc/inputrc - /etc/profile - /etc/hosts - /etc/host.conf - /etc/securetty - /etc/skel/.bash_profile - /etc/skel/.bash_logout - /etc/skel/.bashrc - /etc/skel/.inputrc - /etc/issue - /etc/passwd - /etc/group - /etc/fstab - /etc/crypttab - /etc/nsswitch.conf" - do_install() { # Install misc config files. for f in bash_logout bash_profile bashrc inputrc; do @@ -61,3 +42,28 @@ do_install() { # Create /proc/self/mounts -> /etc/mtab symlink. ln -sf /proc/self/mounts ${DESTDIR}/etc/mtab } + +base-files_package() { + conf_files=" + /etc/inputrc + /etc/profile + /etc/hosts + /etc/host.conf + /etc/securetty + /etc/skel/.bash_profile + /etc/skel/.bash_logout + /etc/skel/.bashrc + /etc/skel/.inputrc + /etc/issue + /etc/passwd + /etc/group + /etc/fstab + /etc/crypttab + /etc/nsswitch.conf" + noarch="yes" + depends="base-directories xbps-triggers" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index 7f90a1f423..f0a5f5d197 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -4,17 +4,11 @@ version=1.20.2 revision=4 wrksrc="busybox-${version}" homepage="http://www.busybox.net" -distfiles="${homepage}/downloads/busybox-$version.tar.bz2" makedepends="perl pam-devel" -replaces="base-busybox>=0 base-system-live-busybox>=0" -conflicts="base-system>=0 run-parts>=0 coreutils>=0 util-linux>=0 -dosfstools>=0 grep>=0 findutils>=0 sed>=0 procps>=0" -provides="coreutils-${version} util-linux-${version} run-parts-${version} -dosfstools-${version} grep-${version} findutils-${version} sed-${version} -procps-${version}" short_desc="The Swiss Army Knife of Embedded Linux - for base-system-live" maintainer="Juan RP " license="GPL-2" +distfiles="${homepage}/downloads/busybox-$version.tar.bz2" checksum=eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 long_desc=" BusyBox combines tiny versions of many common UNIX utilities into a single @@ -46,3 +40,16 @@ do_install() { vinstall ${FILESDIR}/udhcpc@.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/udhcpc-default.script 755 usr/share/udhcpc default.script } + +base-system-busybox_package() { + replaces="base-busybox>=0 base-system-live-busybox>=0" + provides="coreutils-1.20.2 util-linux-1.20.2 run-parts-1.20.2 + dosfstools-1.20.2 grep-1.20.2 findutils-1.20.2 sed-1.20.2 + procps-1.20.2" + conflicts="base-system>=0 run-parts>=0 coreutils>=0 util-linux>=0 + dosfstools>=0 grep>=0 findutils>=0 sed>=0 procps>=0" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/base-system-live/template b/srcpkgs/base-system-live/template index 5ed4944740..0cb654bf87 100644 --- a/srcpkgs/base-system-live/template +++ b/srcpkgs/base-system-live/template @@ -2,12 +2,7 @@ pkgname=base-system-live version=0.24 revision=1 -noarch=yes build_style=meta-template -depends="base-files base-system-busybox>=1.20.2_4 ncurses-base - shadow kmod libmount e2fsprogs btrfs-progs xfsprogs parted dialog - sudo iana-etc systemd wpa_supplicant xbps wifi-firmware - linux-firmware-network void-artwork void-installer>=20120730" short_desc="Void Linux live base system meta package" maintainer="Juan RP " license="Public domain" @@ -18,3 +13,13 @@ long_desc=" Dont install it manually. It is only meant to be installed automatically by the void-mklive utility." + +makedepends="base-files base-system-busybox>=1.20.2_4 ncurses-base + shadow kmod libmount e2fsprogs btrfs-progs xfsprogs parted dialog + sudo iana-etc systemd wpa_supplicant xbps wifi-firmware + linux-firmware-network void-artwork void-installer>=20120730" + +base-system-live_package() { + noarch="yes" + depends="${makedepends}" +} diff --git a/srcpkgs/base-system-rpi/template b/srcpkgs/base-system-rpi/template index 39123324b8..f287478f57 100644 --- a/srcpkgs/base-system-rpi/template +++ b/srcpkgs/base-system-rpi/template @@ -2,18 +2,18 @@ pkgname=base-system-rpi version=0.5 revision=1 -depends="base-files ncurses coreutils findutils diffutils dash bash grep - texinfo file sed gawk less util-linux which tar man-pages man-db shadow - e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata ntp-daemon - iana-etc systemd cron-daemon openssh>=6.1p1 dhcpcd iproute2 iputils - bridge-utils ifenslave iw wpa_supplicant xbps netbsd-wtf nvi - wifi-firmware nss-mdns traceroute ethtool kernel-rpi rpi-firmware" homepage="http://www.voidlinux.eu/" short_desc="Void Linux base system meta package for the Raspberry Pi" maintainer="Juan RP " license="Public domain" only_for_archs="armv6l" -provides="base-system-${version}" + +makedepends="base-files ncurses coreutils findutils diffutils dash bash grep + texinfo file sed gawk less util-linux which tar man-pages man-db shadow + e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata ntp-daemon + iana-etc systemd cron-daemon openssh>=6.1p1 dhcpcd iproute2 iputils + bridge-utils ifenslave iw wpa_supplicant xbps netbsd-wtf nvi + wifi-firmware nss-mdns traceroute ethtool kernel-rpi rpi-firmware" do_install() { # Load the audio module by default. @@ -24,3 +24,12 @@ do_install() { echo 'SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"' > \ ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules } + +base-system-rpi_package() { + provides="base-system-${version}" + depends="${makedepends}" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template index 8fafcc408d..49def6c96c 100644 --- a/srcpkgs/base-system/template +++ b/srcpkgs/base-system/template @@ -3,14 +3,19 @@ pkgname=base-system version=0.72 revision=1 build_style=meta-template -depends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep +homepage="https://www.voidlinux.eu/" +short_desc="Void Linux base system meta package" +maintainer="Juan RP " +license="Public domain" + +makedepends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep texinfo file sed gawk less util-linux which tar man-pages man-db shadow e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata iana-etc systemd cron-daemon openssh>=6.1p1 dhcpcd iproute2 iputils bridge-utils ifenslave iw wpa_supplicant xbps netbsd-wtf nvi wifi-firmware kernel void-artwork nss-mdns traceroute ethtool" -replaces="xbps-base-system>=0" -homepage="https://www.voidlinux.eu/" -short_desc="Void Linux base system meta package" -maintainer="Juan RP " -license="Public domain" + +base-system_package() { + replaces="xbps-base-system>=0" + depends="${makedepends}" +} diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template index a3dd103517..7f25e87c45 100644 --- a/srcpkgs/base-voidstrap/template +++ b/srcpkgs/base-voidstrap/template @@ -2,13 +2,18 @@ pkgname=base-voidstrap version=0.2 revision=1 -noarch=yes build_style=meta-template -depends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep - texinfo file sed gawk less util-linux which tar man-pages man-db shadow - e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata - iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi" homepage="http://www.voidlinux.eu" short_desc="Void Linux base system for the voidstrap script" maintainer="Juan RP " license="Public domain" + +makedepends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep + texinfo file sed gawk less util-linux which tar man-pages man-db shadow + e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata + iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi" + +base-voidstrap_package() { + noarch="yes" + depends="${makedepends}" +} diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index f0f09f12d5..589d5f609e 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,14 +1,14 @@ # Template file for 'bash-completion' pkgname=bash-completion version=1.99 -homepage="http://bash-completion.alioth.debian.org/" -distfiles="http://${pkgname}.alioth.debian.org/files/${pkgname}-${version}.tar.bz2" -build_style=gnu-configure -fulldepends="bash" revision=1 +build_style=gnu-configure +makedepends="bash" short_desc="Programmable completion for the GNU Bash shell" maintainer="Juan RP " license="GPL-2" +homepage="http://bash-completion.alioth.debian.org/" +distfiles="http://${pkgname}.alioth.debian.org/files/${pkgname}-${version}.tar.bz2" checksum=a2baf5130fa015527f435e145949029c653f0106c89ccfd20ad8987f292ed314 long_desc=" bash completion extends bash's standard completion behavior to achieve @@ -17,4 +17,11 @@ long_desc=" commands, reducing the amount of typing sysadmins and programmers need to do on a daily basis." -noarch=yes +bash-completion_package() { + depends="bash" + noarch="yes" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index 35d1dcb81e..72141016b9 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -28,9 +28,6 @@ license="GPL-3" distfiles="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}.tar.gz" checksum=a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 -conflicts="chroot-bash>=0" -register_shell="/bin/bash" - pre_configure() { local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches" local ver=$(echo ${_bash_distver}|sed "s|\.||g") @@ -49,3 +46,11 @@ pre_configure() { msg_normal " Applying patch bash${ver}-$p.\n" done } + +bash_package() { + conflicts="chroot-bash>=0" + register_shell="/bin/bash" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template index 61d5d17bfd..992b50c35c 100644 --- a/srcpkgs/bc/template +++ b/srcpkgs/bc/template @@ -1,15 +1,16 @@ # Template file for 'bc' pkgname=bc version=1.06.95 -distfiles="http://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.bz2" +revision=1 build_style=gnu-configure configure_args="--with-readline" -makedepends="flex readline-devel" -revision=1 +hostmakedepends="flex" +makedepends="readline-devel" short_desc="An arbitrary precision numeric processing language." maintainer="davehome " homepage="http://www.gnu.org/software/${pkgname}/" license="GPL-3" +distfiles="http://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc long_desc=" bc is an arbitrary precision numeric processing language. Syntax is similar @@ -23,8 +24,12 @@ long_desc=" language and runs the resulting byte code. The byte code is not the dc language." - -do_build() -{ +do_build() { make ${makejobs} LEX="flex -I" } + +bc_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template index d36d819604..c6220d1b42 100644 --- a/srcpkgs/bdftopcf/template +++ b/srcpkgs/bdftopcf/template @@ -1,14 +1,15 @@ # Template build file for 'bdftopcf'. pkgname=bdftopcf version=1.0.3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" build_style=gnu-configure revision=2 -makedepends="pkg-config libXfont-devel" +hostmakedepends="pkg-config" +makedepends="libXfont-devel" short_desc="BDF to PCF font converter for X11" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=9c90b408b2fe079495697bfc8fb13da940b2b70f4907213bf5dcc9e3024a1d0a long_desc=" The bdftopcf tool converts X fonts from Bitmap Distribution Format @@ -20,3 +21,8 @@ long_desc=" allows fast reading on the appropriate machine, but the files are still portable (but read more slowly) on other machines." +bdftopcf_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bigreqsproto/template b/srcpkgs/bigreqsproto/template index 6a90d09c93..111ed4e4fc 100644 --- a/srcpkgs/bigreqsproto/template +++ b/srcpkgs/bigreqsproto/template @@ -1,15 +1,20 @@ # Template build for 'bigreqsproto'. pkgname=bigreqsproto version=1.1.0 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu-configure revision=2 short_desc="BigReqs extension headers from modular Xorg X11" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd long_desc=" BigReqs extension headers from modular Xorg X11." -noarch=yes +bigreqsproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template index a55005a73d..6d29c30086 100644 --- a/srcpkgs/bin86/template +++ b/srcpkgs/bin86/template @@ -20,3 +20,9 @@ do_install() { vmkdir usr/share/man/man1 make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install } + +bin86_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bind/bind-devel.template b/srcpkgs/bind/bind-devel.template deleted file mode 100644 index 21f09c2867..0000000000 --- a/srcpkgs/bind/bind-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'bind-devel'. -# -noarch=yes -depends="bind-libs>=$version" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains development files, static files, headers, etc." - -do_install() { - vmove usr/bin/isc-config.sh usr/bin - vmove usr/share/man/man1/isc-config.sh.1 usr/share/man/man1 - vmove usr/include usr - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/bind/bind-libs.template b/srcpkgs/bind/bind-libs.template deleted file mode 100644 index 5030082f4c..0000000000 --- a/srcpkgs/bind/bind-libs.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'bind-libs'. -# -short_desc="${short_desc} - Runtime libraries" -long_desc="${long_desc} - - This package contains the runtime libraries." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/bind/bind-utils.template b/srcpkgs/bind/bind-utils.template deleted file mode 100644 index 6b642fadb5..0000000000 --- a/srcpkgs/bind/bind-utils.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'bind-utils'. -# -short_desc="${short_desc} - DNS utils" -long_desc="${long_desc} - - This package contains dig(1), host(1) and nslookup(1) utilities - provided by bind, containing a set of useful DNS related applications." - -do_install() { - for f in dig host nslookup; do - vmove usr/bin/${f} usr/bin - vmove usr/share/man/man1/${f}.1 usr/share/man/man1 - done -} diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index a9f3f1819f..bef5fc0973 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -4,12 +4,13 @@ _distver=9.9.2 _patchver=P1 version="${_distver}.${_patchver}" wrksrc="bind-${_distver}-${_patchver}" -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-openssl --with-libxml2 --enable-threads --enable-largefile --enable-ipv6 --with-libtool --enable-atomic --sysconfdir=/etc/named" -makedepends="perl openssl-devel mit-krb5-devel libxml2-devel +hostmakedepends="perl" +makedepends="openssl-devel mit-krb5-devel libxml2-devel libcap-devel readline-devel" short_desc="Berkeley Internet Name Domain server" maintainer="Juan RP " @@ -23,15 +24,6 @@ long_desc=" distributed computing systems with the knowledge that those systems are fully compliant with published DNS standards." -subpackages="bind-libs bind-utils bind-devel" -systemd_services="named.service true" -conf_files="/etc/named/named.conf" -system_accounts="named" -named_desc="BIND DNS server" -named_homedir="/var/named" -named_shell="/bin/false" -make_dirs="/var/named 0770 root named" - post_install() { vinstall ${FILESDIR}/named.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named @@ -41,3 +33,45 @@ post_install() { vinstall ${FILESDIR}/127.0.0.zone 640 var/named vinstall ${FILESDIR}/localhost.zone 640 var/named } + +bind-libs_package() { + short_desc="${short_desc} - Runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +bind-utils_package() { + short_desc="${short_desc} - DNS utils" + pkg_install() { + for f in dig host nslookup; do + vmove usr/bin/${f} + vmove usr/share/man/man1/${f}.1 + done + } +} + +bind-devel_package() { + depends="bind-libs>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/bin/isc-config.sh + vmove usr/share/man/man1/isc-config.sh.1 + vmove usr/include + vmove usr/share/man/man3 + } +} + +bind_package() { + systemd_services="named.service true" + conf_files="/etc/named/named.conf" + system_accounts="named" + named_desc="BIND DNS server" + named_homedir="/var/named" + named_shell="/bin/false" + make_dirs="/var/named 0770 root named" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/binfmt-support/template b/srcpkgs/binfmt-support/template index 6973a552fc..e155be1f62 100644 --- a/srcpkgs/binfmt-support/template +++ b/srcpkgs/binfmt-support/template @@ -23,3 +23,9 @@ long_desc=" maintainers can register interpreters to be used with this module without having to worry about writing their own init scripts, and which sysadmins can use for a slightly higher-level interface to this module." + +binfmt-support_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/binutils/binutils-devel.template b/srcpkgs/binutils/binutils-devel.template deleted file mode 100644 index 78f3e59da0..0000000000 --- a/srcpkgs/binutils/binutils-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'binutils-devel'. -# -depends="binutils>=$version" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/libbfd.so usr/lib - vmove usr/lib/libopcodes.so usr/lib -} diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index 87afb280df..fcefe753e3 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -3,8 +3,7 @@ pkgname=binutils version=2.23.51.0.3 revision=2 hostmakedepends="flex perl" -makedepends="libfl-devel zlib-devel" -subpackages="$pkgname-devel" +makedepends="zlib-devel" short_desc="GNU binary utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/binutils/" @@ -12,6 +11,10 @@ license="GPL-3" distfiles="${KERNEL_SITE}/devel/binutils/$pkgname-$version.tar.xz" checksum=2162905dabf191a2a803eab8d31e7be52d96d6ccd1e0ce42e25d82c6be918cd0 +if [ "$CROSS_BUILD" ]; then + makedepends+=" libfl-devel" +fi + do_configure() { if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then CONFIGFLAG="--enable-64-bit-bfd --enable-multilib" @@ -89,3 +92,20 @@ do_install() { # from bfd.h... wth? sed -i 35,+3d ${DESTDIR}/usr/include/bfd.h } + +binutils-devel_package() { + depends="binutils>=$version" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/libbfd.so + vmove usr/lib/libopcodes.so + } +} + +binutils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bison25/template b/srcpkgs/bison25/template index 71927cc4a8..f88ce80b4f 100644 --- a/srcpkgs/bison25/template +++ b/srcpkgs/bison25/template @@ -4,9 +4,6 @@ version=2.5.1 revision=1 wrksrc="bison-$version" build_style=gnu-configure -depends="m4" -provides="bison-$version" -conflicts="bison>=0" short_desc="GNU yacc(1) replacement" maintainer="Juan RP " homepage="http://www.gnu.org/software/bison/bison.html" @@ -16,3 +13,12 @@ checksum=fec90caed650270484955ba6ee73ddb01186608799a27fcaaf868e5274c030d8 long_desc=" Bison is the GNU replacement for yacc(1). Some programs depend on extensions present in Bison." + +bison25_package() { + provides="bison-2.5.1" + conflicts="bison>=0" + depends="m4" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bitcoin/bitcoin-qt.template b/srcpkgs/bitcoin/bitcoin-qt.template deleted file mode 100644 index 3c1ab859d1..0000000000 --- a/srcpkgs/bitcoin/bitcoin-qt.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'bitcoin-qt'. -# -depends="desktop-file-utils" -short_desc="${short_desc} -- QT GUI" - -do_install() { - vinstall src/bitcoin-qt 755 usr/bin - vinstall src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications - vinstall src/share/pixmaps/bitcoin80.xpm 644 usr/share/pixmaps -} diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index fe76f0f361..81fb9ba998 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -3,7 +3,6 @@ pkgname=bitcoin version=0.8.1 revision=2 wrksrc="${pkgname}-${version}-linux" -subpackages="bitcoin-qt" hostmakedepends="which" makedepends="db-devel openssl-devel qt-devel boost-devel automoc4 miniupnpc-devel" short_desc="Bitcoin is a peer-to-peer network based digital currency" @@ -17,8 +16,7 @@ disable_debug=1 if [ "$CROSS_BUILD" ]; then # XXX -qt subpkg - unset subpackages - akedepends="db-devel openssl-devel boost-devel miniupnpc-devel" + makedepends="db-devel openssl-devel boost-devel miniupnpc-devel" fi do_build() { @@ -41,3 +39,21 @@ do_install() { vinstall src/contrib/debian/manpages/bitcoin.conf.5 644 usr/share/man/man5 vinstall COPYING 644 usr/share/licenses/$pkgname } + +bitcoin_package() { + pkg_install() { + vmove usr + } +} + +if [ -z "$CROSS_BUILD" ]; then + bitcoin-qt_package() { + depends="desktop-file-utils" + short_desc="${short_desc} -- QT GUI" + pkg_install() { + vinstall src/bitcoin-qt 755 usr/bin + vinstall src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications + vinstall src/share/pixmaps/bitcoin80.xpm 644 usr/share/pixmaps + } + } +fi # !CROSS_BUILD diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index 3f85b6d3ee..195b255a7c 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -4,12 +4,8 @@ version=1.23 revision=1 build_style=gnu-configure configure_args="--enable-polkit=yes --enable-hal=no" -pycompile_module="$pkgname" - -depends="pygtk desktop-file-utils hicolor-icon-theme" makedepends="intltool Pyrex libbluetooth-devel startup-notification-devel -gtk+-devel pygtk-devel" -fulldepends="bluez notify-python dbus-python obexd" + gtk+-devel pygtk-devel bluez notify-python dbus-python obexd" short_desc="GTK+ Bluetooth Manager" maintainer="Juan RP " homepage="http://blueman-project.org/" @@ -26,3 +22,13 @@ long_desc=" * Connecting to audio devices * Sending/Receiving/Browsing files via OBEX * Pairing" + +blueman_package() { + pycompile_module="blueman" + depends="pygtk desktop-file-utils hicolor-icon-theme + bluez notify-python dbus-python obexd" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/bluez/libbluetooth-devel.template b/srcpkgs/bluez/libbluetooth-devel.template deleted file mode 100644 index abff1936b7..0000000000 --- a/srcpkgs/bluez/libbluetooth-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libbluetooth-devel'. -# -depends="libbluetooth-${version}_${revision}" -short_desc="Development files to use the BlueZ Linux Bluetooth library" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/bluez/libbluetooth.template b/srcpkgs/bluez/libbluetooth.template deleted file mode 100644 index 27df968b5b..0000000000 --- a/srcpkgs/bluez/libbluetooth.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libbluetooth'. -# -short_desc="Library to use the Bluez Linux Bluetooth Stack" -long_desc=" - BlueZ is the official Linux Bluetooth Stack. It is an Open Source project - distributed under GNU General Public License (GPL)." - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libbluetooth.so* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 40de782b55..caab470425 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pie --enable-threads --enable-library" -subpackages="libbluetooth libbluetooth-devel" hostmakedepends="pkg-config flex" makedepends="libglib-devel libudev-devel>=183 dbus-devel libusb-compat-devel cups-devel libical-devel readline-devel @@ -22,3 +21,31 @@ long_desc=" BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source project distributed under GNU General Public License (GPL)." + +libbluetooth_package() { + short_desc="Library to use the Bluez Linux Bluetooth Stack" + pkg_install() { + vmove "usr/lib/libbluetooth.so*" + } +} + +libbluetooth-devel_package() { + depends="libbluetooth-${version}_${revision}" + short_desc="Development files to use the BlueZ Linux Bluetooth library" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +bluez_package() { + pkg_install() { + vmove etc + vmove usr/bin + vmove usr/share + vmove usr/libexec + vmove usr/lib/cups + vmove usr/lib/dbus + vmove usr/lib/systemd + } +} diff --git a/srcpkgs/bokken/template b/srcpkgs/bokken/template index e983ce824f..c363efa4d9 100644 --- a/srcpkgs/bokken/template +++ b/srcpkgs/bokken/template @@ -9,9 +9,7 @@ homepage="http://inguma.eu/projects/bokken/" distfiles="http://inguma.eu/attachments/download/197/${pkgname}-${version}.tar.gz" checksum=4770602585b3e77b2977a8a6906c91ae0d64373eae328f42688106224c8bbc12 -noarch=yes -depends="pygtk pygtksourceview radare2 r2-bindings" -pycompile_dirs="/usr/lib/bokken" +makedepends="pygtk pygtksourceview radare2 r2-bindings" do_install() { vmkdir usr/lib/bokken @@ -19,3 +17,12 @@ do_install() { cp -rf * ${DESTDIR}/usr/lib/bokken ln -frs ${DESTDIR}/usr/lib/bokken/bokken.py ${DESTDIR}/usr/bin/bokken } + +bokken_package() { + noarch="yes" + pycompile_dirs="/usr/lib/bokken" + depends="${makedepends}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/boost/boost-build.template b/srcpkgs/boost/boost-build.template deleted file mode 100644 index f38b13a235..0000000000 --- a/srcpkgs/boost/boost-build.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'boost-build'. -# -noarch=yes -conf_files="/etc/site-config.jam" -depends="boost-jam>=$version boost-devel>=$version" -short_desc="${short_desc} - Boost.Build framework" - -do_install() { - mkdir -p ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/share/boost-build ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/etc ${DESTDIR} -} diff --git a/srcpkgs/boost/boost-devel.template b/srcpkgs/boost/boost-devel.template deleted file mode 100644 index 12f566f146..0000000000 --- a/srcpkgs/boost/boost-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'boost-devel'. -# -depends="libstdc++-devel boost-${version}_${revision}" -short_desc="${short_desc} - development files" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/boost/boost-jam.template b/srcpkgs/boost/boost-jam.template deleted file mode 100644 index 0c6adf9b44..0000000000 --- a/srcpkgs/boost/boost-jam.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'boost-jam'. -# -short_desc="${short_desc} - Boost.Jam utility" - -do_install() { - mkdir -p ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/bin/bjam ${DESTDIR}/usr/bin -} diff --git a/srcpkgs/boost/boost-python.template b/srcpkgs/boost/boost-python.template deleted file mode 100644 index db96834008..0000000000 --- a/srcpkgs/boost/boost-python.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'boost-python'. -# -depends="boost>=${version} python" -short_desc="${short_desc} - python bindings" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libboost_python* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 6cc6ac43d5..2e2391042b 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -4,7 +4,6 @@ version=1.50.0 revision=2 _boostver="$(echo $version|sed 's|\.|_|g')" wrksrc="${pkgname}_${_boostver}" -subpackages="boost-build boost-devel boost-jam boost-python" makedepends="zlib-devel icu-devel>=49.1 python-devel" short_desc="Free peer-reviewed portable C++ source libraries" maintainer="Juan RP " @@ -22,7 +21,6 @@ disable_debug=yes if [ "$CROSS_BUILD" ]; then # XXX boost-jam and boost-python subpkgs. - subpackages="boost-build boost-devel" makedepends="zlib-devel icu-devel>=49.1" fi @@ -63,3 +61,48 @@ do_install() { # license vinstall LICENSE_1_0.txt 644 usr/share/licenses/boost } + +if [ -z "$CROSS_BUILD" ]; then + +boost-jam_package() { + short_desc="${short_desc} - Boost.Jam utility" + pkg_install() { + vmove usr/bin/bjam + } +} + +boost-python_package() { + depends="boost>=${version} python" + short_desc="${short_desc} - python bindings" + pkg_install() { + vmove "usr/lib/libboost_python*" + } +} + +fi # !CROSS_BUILD + +boost-build_package() { + noarch=yes + conf_files="/etc/site-config.jam" + depends="boost-jam>=$version boost-devel>=$version" + short_desc="${short_desc} - Boost.Build framework" + pkg_install() { + vmove usr/share/boost-build + vmove etc + } +} + +boost-devel_package() { + depends="boost-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +boost_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bootchart/template b/srcpkgs/bootchart/template index 48da79e00f..ba7d15654f 100644 --- a/srcpkgs/bootchart/template +++ b/srcpkgs/bootchart/template @@ -16,3 +16,9 @@ long_desc=" by passing \"init=/usr/sbin/bootchartd\" to the kernel. Bootchart will then fork init off to resume normal system startup, while monitoring and logging startup information in the background." + +bootchart_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/boxfs/template b/srcpkgs/boxfs/template index 59ac39c213..97a127b966 100644 --- a/srcpkgs/boxfs/template +++ b/srcpkgs/boxfs/template @@ -9,8 +9,8 @@ homepage="https://code.google.com/p/boxfs/" nofetch=yes noextract=yes -makedepends="pkg-config subversion libxml2-devel libzip-devel - libapp-devel fuse-devel libcurl-devel" +hostmakedepends="pkg-config subversion" +makedepends="libxml2-devel libzip-devel libapp-devel fuse-devel libcurl-devel" do_fetch() { local _svnrev=90 @@ -24,3 +24,9 @@ do_build() { do_install() { vinstall boxfs 755 usr/bin } + +boxfs_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/brasero/brasero-devel.template b/srcpkgs/brasero/brasero-devel.template deleted file mode 100644 index 9aaa2e1781..0000000000 --- a/srcpkgs/brasero/brasero-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'brasero-devel'. -# -depends="gtk+3-devel brasero>=${version}" -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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template index c2377afbe8..c858650214 100644 --- a/srcpkgs/brasero/template +++ b/srcpkgs/brasero/template @@ -5,7 +5,6 @@ revision=2 subpackages="${pkgname}-devel" build_style=gnu-configure configure_args="--disable-schemas-compile --disable-caches" -depends="cdrtools dconf>=0 shared-mime-info hicolor-icon-theme desktop-file-utils" hostmakedepends="pkg-config intltool which gnome-doc-utils itstool gobject-introspection" makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel @@ -28,3 +27,21 @@ long_desc=" * supports joliet extension * can write the image to the hard drive * can check disc file integrity" + +brasero-devel_package() { + depends="gtk+3-devel brasero>=${version}" + 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 + } +} + +brasero_package() { + depends="cdrtools dconf>=0 shared-mime-info hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template index 60cef4b7a5..a78cb3aeb9 100644 --- a/srcpkgs/bridge-utils/template +++ b/srcpkgs/bridge-utils/template @@ -3,7 +3,7 @@ pkgname=bridge-utils version=1.5 revision=2 build_style=gnu-configure -makedepends="automake" +hostmakedepends="automake" short_desc="Layer2 ethernet bridging for Linux" maintainer="Juan RP " license="GPL-2" @@ -14,3 +14,9 @@ checksum=42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 pre_configure() { autoreconf -fi } + +bridge-utils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template index b3c0eda856..4ee5fa1171 100644 --- a/srcpkgs/bsdbuild/template +++ b/srcpkgs/bsdbuild/template @@ -2,11 +2,9 @@ pkgname=bsdbuild version=3.0 revision=1 -noarch=yes build_style=gnu-configure configure_args="--with-manpages --with-manlinks" -makedepends="groff" -fulldepends="perl>=0" +hostmakedepends="groff perl" short_desc="Simple, self-contained and portable build system" maintainer="Juan RP " homepage="http://hypertriton.com/bsdbuild/" @@ -32,3 +30,11 @@ pre_install() { vmkdir usr/share/man/man1 vmkdir usr/share/man/man5 } + +bsdbuild_package() { + depends="perl" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bsdiff/template b/srcpkgs/bsdiff/template index 7bf1b9dc57..afe2fa36ed 100644 --- a/srcpkgs/bsdiff/template +++ b/srcpkgs/bsdiff/template @@ -15,11 +15,9 @@ long_desc=" binary patches 50-80% smaller than those produced by Xdelta, and 15% smaller than those produced by .RTPatch (a $2750/seat commercial patch tool)." - do_build() { for i in diff patch; do - gcc ${XBPS_CFLAGS} -Wall \ - -lbz2 ${XBPS_LDFLAGS} bs${i}.c -o bs${i} + $CC $CFLAGS -Wall -lbz2 $LDFLAGS bs${i}.c -o bs${i} done } @@ -29,3 +27,9 @@ do_install() { vinstall bs${i}.1 644 usr/share/man/man1 done } + +bsdiff_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 1de8b87b0c..8e9fd61705 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -19,3 +19,9 @@ do_build() { do_install() { make prefix=${DESTDIR}/usr mandir=${DESTDIR}/usr/share/man install } + +btrfs-progs_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template index 68bb171b1d..56d7a4a455 100644 --- a/srcpkgs/buildbot-slave/template +++ b/srcpkgs/buildbot-slave/template @@ -3,7 +3,7 @@ pkgname=buildbot-slave version=0.8.7p1 revision=1 build_style=python-module -fulldepends="python Twisted" +makedepends="python Twisted" short_desc="BuildBot Slave Daemon" maintainer="Juan RP " homepage="http://trac.buildbot.net/" @@ -26,5 +26,11 @@ long_desc=" This package contains only the buildslave implementation. The buildbot master is available in the buildbot package." -noarch=yes -pycompile_module="buildslave" +buildbot-slave_package() { + noarch="yes" + pycompile_module="buildslave" + depends="${makedepends}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template index 6982289b7c..e82d2d8514 100644 --- a/srcpkgs/buildbot/template +++ b/srcpkgs/buildbot/template @@ -3,7 +3,7 @@ pkgname=buildbot version=0.8.7p1 revision=1 build_style=python-module -fulldepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted" +makedepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted" short_desc="A system to automate the compile/test cycle" maintainer="Juan RP " homepage="http://trac.buildbot.net/" @@ -23,9 +23,6 @@ long_desc=" lint checks, image size, compile time, and other build parameters can be tracked over time, are more visible, and are therefore easier to improve." -noarch=yes -pycompile_module="$pkgname" - post_install() { # Install all contrib modules. local contribdir=${DESTDIR}/usr/share/buildbot/contrib @@ -33,3 +30,12 @@ post_install() { vmkdir usr/share/buildbot/contrib install -m755 ${wrksrc}/contrib/*.py ${contribdir} } + +buildbot_package() { + noarch="yes" + pycompile_module="buildbot" + depends="${makedepends}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index 174feb70f8..2fc46491d8 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -2,7 +2,7 @@ pkgname=busybox version=1.20.2 revision=2 -makedepends="perl" +hostmakedepends="perl" short_desc="The Swiss Army Knife of Embedded Linux" maintainer="Juan RP " license="GPL-2" @@ -27,3 +27,9 @@ do_install() { vinstall busybox 755 usr/bin vinstall docs/busybox.1 644 usr/share/man/man1 } + +busybox_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template index 8d5b277845..488b2d6230 100644 --- a/srcpkgs/bzr/template +++ b/srcpkgs/bzr/template @@ -3,9 +3,7 @@ pkgname=bzr version=2.5.1 revision=2 build_style=python-module -pycompile_module="bzrlib" -depends="ca-certificates" -makedepends="zlib-devel python-devel Cython" +makedepends="zlib-devel python-devel Cython ca-certificates" short_desc="Distributed version control system that Just Works" maintainer="Juan RP " license="GPL-2" @@ -16,3 +14,11 @@ checksum=967346fa6cc52971a8dfd5171ec22e1928cf455fb4317013b05b0915ff927982 pre_install() { sed -i -e "s|man/man1|share/man/man1|" setup.py } + +bzr_package() { + pycompile_module="bzrlib" + depends="ca-certificates" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template index df5e17e649..5dd9b1fcbf 100644 --- a/srcpkgs/bzrtools/template +++ b/srcpkgs/bzrtools/template @@ -2,18 +2,23 @@ pkgname=bzrtools version=2.4.1 wrksrc=$pkgname +revision=1 +build_style=python-module +makedepends="python bzr" homepage="http://bazaar-vcs.org/BzrTools" license="GPL-2" distfiles="http://launchpad.net/$pkgname/stable/$version/+download/$pkgname-$version.tar.gz" -build_style=python-module -fulldepends="python bzr" -revision=1 short_desc="Plugin providing a collection of utilities for bzr" maintainer="Juan RP " checksum=f62771dd221ad820e0363386608985e282cb88b52b5a6f0ed7b7fb2e99804def long_desc=" This is a plugin providing a collection of utilities for bzr." -pycompile_module="bzrlib/plugins/bzrtools" -noarch=yes - +bzrtools_package() { + noarch="yes" + pycompile_module="bzrlib/plugins/bzrtools" + depends="${makedepends}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 4b8c94faf2..e244df15f9 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -2,10 +2,7 @@ pkgname=ca-certificates version=20121105 revision=4 -noarch=yes -makedepends="python" -fulldepends="openssl run-parts" -conf_files="/etc/ca-certificates.conf" +makedepends="python openssl run-parts" short_desc="Common CA certificates" maintainer="Juan RP " homepage="http://packages.qa.debian.org/c/ca-certificates.html" @@ -35,3 +32,12 @@ do_install() { find . -name '*.crt' | sort | cut -b3- \ > ${DESTDIR}/etc/ca-certificates.conf } + +ca-certificates_package() { + conf_files="/etc/ca-certificates.conf" + depends="openssl run-parts" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cabextract/template b/srcpkgs/cabextract/template index 41b88b3f34..adec2773de 100644 --- a/srcpkgs/cabextract/template +++ b/srcpkgs/cabextract/template @@ -11,3 +11,9 @@ distfiles="http://www.cabextract.org.uk/${pkgname}-${version}.tar.gz" checksum=f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e long_desc=" A program to extract Microsoft cabinet (.CAB) files." + +cabextract_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cairomm/cairomm-devel.template b/srcpkgs/cairomm/cairomm-devel.template deleted file mode 100644 index 47e420bb26..0000000000 --- a/srcpkgs/cairomm/cairomm-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'cairomm-devel'. -# -noarch=yes -depends="pkg-config libsigc++-devel cairo-devel>=1.12.2_2 - ${sourcepkg}-${version}_${revision}" -short_desc="${sourcepkg} (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/cairomm*" usr/lib - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/cairomm/template b/srcpkgs/cairomm/template index e045305856..ce02760733 100644 --- a/srcpkgs/cairomm/template +++ b/srcpkgs/cairomm/template @@ -1,12 +1,11 @@ # Template build file for 'cairomm'. pkgname=cairomm version=1.10.0 -revision=5 +revision=6 build_style=gnu-configure -depends="cairo>=1.12.2_2" -makedepends="pkg-config libsigc++-devel fontconfig-devel +hostmakedepends="pkg-config" +makedepends="libsigc++-devel fontconfig-devel libpng-devel>=1.5.10 libXrender-devel cairo-devel>=1.12.2_2" -subpackages="$pkgname-devel" short_desc="C++ bindings to Cairo vector graphics library" maintainer="Juan RP " homepage="http://www.cairographics.org" @@ -17,3 +16,21 @@ long_desc=" cairomm is a C++ wrapper for the cairo graphics library. It offers all the power of cairo with an interface familiar to C++ developers, including use of the Standard Template Library where it makes sense." + +cairomm-devel_package() { + depends="libsigc++-devel cairo-devel>=1.12.2_2 ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/share + vmove "usr/lib/cairomm*" + vmove usr/lib/pkgconfig + } +} + +cairomm_package() { + depends="cairo>=1.12.2_2" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template index 4b39c1a72f..ca15ae2853 100644 --- a/srcpkgs/calf/template +++ b/srcpkgs/calf/template @@ -1,17 +1,17 @@ # Template file for 'calf' pkgname=calf version=0.0.18.6 -homepage="http://calf.sourceforge.net" +revision=1 build_style=gnu-configure configure_args="--enable-experimental" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -revision=1 makedepends="expat-devel dssi-devel jack-devel glib-devel gtk+-devel -libglade-devel cairo-devel ladish-devel>=1_3" -fulldepends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme" + libglade-devel cairo-devel ladish-devel>=1_3 + ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme" +homepage="http://calf.sourceforge.net" short_desc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host" maintainer="davehome " license="LGPL-2" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=304733efbafc00c94807a0f8d5a56125893769231db48f8d6a889b9ca794860f long_desc=" The Calf project aims at providing a set of high quality open source audio @@ -20,5 +20,9 @@ long_desc=" boxes (and not as single modules in a modular synthesizer, which was a primary design goal in some other open source plugin packages)." - - +calf_package() { + depends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template index 6e4f192473..1bfdb8a06e 100644 --- a/srcpkgs/cantarell-fonts/template +++ b/srcpkgs/cantarell-fonts/template @@ -2,10 +2,9 @@ pkgname=cantarell-fonts version=0.0.12 revision=2 -noarch=yes build_style=gnu-configure -makedepends="pkg-config" -fulldepends="fontconfig" +hostmakedepends="pkg-config" +makedepends="fontconfig" short_desc="Cantarell family of TrueType fonts" maintainer="Juan RP " homepage="http://abattis.org/cantarell/" @@ -22,3 +21,11 @@ post_install() { vinstall ${FILESDIR}/21-cantarell-hinting.conf 644 etc/fonts/conf.avail ln -s ../conf.avail/21-cantarell-hinting.conf ${DESTDIR}/etc/fonts/conf.d } + +cantarell-fonts_package() { + depends="fontconfig" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/caribou/caribou-devel.template b/srcpkgs/caribou/caribou-devel.template deleted file mode 100644 index 7c9207bd71..0000000000 --- a/srcpkgs/caribou/caribou-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'caribou-devel'. -# -depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel libxml2-devel caribou>=${version}" -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 - vmove usr/share/vala usr/share -} diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template index 96fbb17bc6..8887f69daf 100644 --- a/srcpkgs/caribou/template +++ b/srcpkgs/caribou/template @@ -7,10 +7,6 @@ configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection" makedepends="vala-devel>=0.20 libxklavier-devel libgee08-devel pygobject-devel>=3.4.2 clutter-devel gtk+3-devel libXtst-devel gir-freedesktop" -depends="pygobject>=3.4.2 pyatspi dbus-python gir-freedesktop - at-spi2-atk desktop-file-utils" -pycompile_module="$pkgname" -subpackages="$pkgname-devel" short_desc="An alternative to the Gnome On-screen Keyboard" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -26,3 +22,23 @@ long_desc=" The initial goal is to make an in-place on-screen keyboard suitable for people who can use a mouse but not a hardware keyboard. This on-screen keyboard may also be useful for touch screen or tablet users." + +caribou-devel_package() { + depends="libXtst-devel libgee08-devel libxklavier-devel gtk+3-devel libxml2-devel caribou>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + vmove usr/share/vala + } +} + +caribou_package() { + depends="pygobject>=3.4.2 pyatspi dbus-python gir-freedesktop + at-spi2-atk desktop-file-utils" + pycompile_module="$pkgname" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/catalyst/catalyst-dkms.template b/srcpkgs/catalyst/catalyst-dkms.template deleted file mode 100644 index 3e4569ba4a..0000000000 --- a/srcpkgs/catalyst/catalyst-dkms.template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'nvidia-dkms'. -# -short_desc="AMD catalyst driver for Linux -- DKMS kernel module" -nonfree=yes -triggers="dkms" -dkms_modules="fglrx ${version}_${revision}" - -do_install() { - local _fglrx=fglrx-${version}_${revision} - - vmkdir usr/lib/modprobe.d - vmkdir usr/lib/modules-load.d - vmkdir usr/src/${_fglrx} - - cd ${wrksrc}/fglrx - patch -Np0 -i ${FILESDIR}/uapi_linux_version_make.patch - cp -r common/lib/modules/fglrx/build_mod/* ${DESTDIR}/usr/src/${_fglrx} - - vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a \ - 644 usr/src/${_fglrx} - - vinstall ${FILESDIR}/dkms.conf 644 usr/src/${_fglrx} - - sed -i -e "s/@VERSION@/${version}-${revision}/" \ - ${DESTDIR}/usr/src/${_fglrx}/dkms.conf - - echo "blacklist radeon" > ${DESTDIR}/usr/lib/modprobe.d/catalyst.conf - echo "fglrx" > ${DESTDIR}/usr/lib/modules-load.d/catalyst.conf -} diff --git a/srcpkgs/catalyst/catalyst-opencl.template b/srcpkgs/catalyst/catalyst-opencl.template deleted file mode 100644 index a5939a94fc..0000000000 --- a/srcpkgs/catalyst/catalyst-opencl.template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'nvidia-opencl'. -# -short_desc="AMD catalyst driver for Linux -- OpenCL implementation" -nonfree=yes -provides="libOpenCL-${version}" -replaces="libOpenCL>=0" - -do_install() { - cd ${wrksrc}/fglrx/arch/${_ARCHDIR} - - vinstall usr/bin/clinfo 755 usr/bin - - vmkdir usr/lib - vmkdir etc/OpenCL/vendors - - install -m644 etc/OpenCL/vendors/amdocl*.icd \ - ${DESTDIR}/etc/OpenCL/vendors - - install -m755 usr/lib${_ARCHLIB}/libamdocl*.so ${DESTDIR}/usr/lib/ - install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 ${DESTDIR}/usr/lib/ - ln -s libOpenCL.so.1 ${DESTDIR}/usr/lib/libOpenCL.so -} diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 32320f06c6..a99285bf47 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -8,11 +8,7 @@ license="Propietary AMD license" homepage="http://www.amd.com" create_wrksrc=yes -nonfree=yes -subpackages="${pkgname}-dkms ${pkgname}-opencl" -depends="${pkgname}-dkms-${version}_${revision}" makedepends="unzip" -conflicts="nvidia>=0" distfiles=http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${version}-linux-x86.x86_64.zip checksum=67898a922b6b58f25a276a144f16b19014f79c39e4d44d8d2883a467d31e34ad @@ -103,3 +99,60 @@ do_install() { install -Dm644 ${wrksrc}/fglrx/common/usr/share/doc/amdcccle/ccc_copyrights.txt \ ${DESTDIR}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt } + +catalyst-dkms_package() { + nonfree=yes + short_desc="AMD catalyst driver for Linux -- DKMS kernel module" + triggers="dkms" + dkms_modules="fglrx ${version}_${revision}" + pkg_install() { + local _fglrx=fglrx-${version}_${revision} + + vmkdir usr/lib/modprobe.d + vmkdir usr/lib/modules-load.d + vmkdir usr/src/${_fglrx} + + cd ${wrksrc}/fglrx + patch -Np0 -i ${FILESDIR}/uapi_linux_version_make.patch + cp -r common/lib/modules/fglrx/build_mod/* ${PKGDESTDIR}/usr/src/${_fglrx} + + vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 644 usr/src/${_fglrx} + + vinstall ${FILESDIR}/dkms.conf 644 usr/src/${_fglrx} + + sed -i -e "s/@VERSION@/${version}-${revision}/" ${PKGDESTDIR}/usr/src/${_fglrx}/dkms.conf + + echo "blacklist radeon" > ${PKGDESTDIR}/usr/lib/modprobe.d/catalyst.conf + echo "fglrx" > ${PKGDESTDIR}/usr/lib/modules-load.d/catalyst.conf + } +} + +catalyst-opencl_package() { + nonfree=yes + short_desc="AMD catalyst driver for Linux -- OpenCL implementation" + provides="libOpenCL-${version}" + replaces="libOpenCL>=0" + pkg_install() { + cd ${wrksrc}/fglrx/arch/${_ARCHDIR} + + vinstall usr/bin/clinfo 755 usr/bin + + vmkdir usr/lib + vmkdir etc/OpenCL/vendors + + install -m644 etc/OpenCL/vendors/amdocl*.icd ${PKGDESTDIR}/etc/OpenCL/vendors + + install -m755 usr/lib${_ARCHLIB}/libamdocl*.so ${PKGDESTDIR}/usr/lib/ + install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 ${PKGDESTDIR}/usr/lib/ + ln -s libOpenCL.so.1 ${PKGDESTDIR}/usr/lib/libOpenCL.so + } +} + +catalyst_package() { + nonfree=yes + depends="${pkgname}-dkms-${version}_${revision}" + conflicts="nvidia>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 27de688f0d..49566df57e 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -18,3 +18,9 @@ post_install() { ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${f} done } + +ccache_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cdparanoia/cdparanoia-devel.template b/srcpkgs/cdparanoia/cdparanoia-devel.template deleted file mode 100644 index 912ba20594..0000000000 --- a/srcpkgs/cdparanoia/cdparanoia-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'cdparanoia-devel'. -# -depends="cdparanoia" -short_desc="${sourcepkg} development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template index 4b45cd8fee..cd9208d66a 100644 --- a/srcpkgs/cdparanoia/template +++ b/srcpkgs/cdparanoia/template @@ -1,16 +1,14 @@ # Template file for 'cdparanoia'. pkgname=cdparanoia version=10.2 -revision=3 -wrksrc=$pkgname-III-$version -distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz" -build_style=gnu-configure -make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr - MANDIR=$XBPS_DESTDIR/$pkgname-$version/usr/share/man install" +revision=4 +wrksrc="${pkgname}-III-${version}" +makedepends="libtool automake" short_desc="CDDA reading utility with extra data verification features" homepage="https://www.xiph.org/paranoia/" license="GPL-2" maintainer="pancake " +distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz" checksum=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df long_desc=" Cdparanoia retrieves audio tracks from CDDA capable CDROM drives. @@ -23,11 +21,33 @@ long_desc=" data verification, synchronization, error handling and scratch reconstruction capability." -disable_parallel_build=yes -subpackages="$pkgname-devel" -makedepends="automake" - - pre_configure() { autoreconf -i } + +do_configure() { + ./configure ${CONFIGURE_SHARED_ARGS} +} + +do_build() { + make +} + +do_install() { + make prefix=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install +} + +cdparanoia-devel_package() { + depends="cdparanoia>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +cdparanoia_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template index 0fe5e75d98..01a8fe1df3 100644 --- a/srcpkgs/cdrtools/template +++ b/srcpkgs/cdrtools/template @@ -1,16 +1,16 @@ # Template file for 'cdrtools' pkgname=cdrtools version=3.00 -distfiles="ftp://ftp.berlios.de/pub/cdrecord/$pkgname-$version.tar.bz2" +revision=2 build_style=gnu-makefile make_build_args="CCOM=gcc RUNPATH= LDPATH= NOWARN=true" make_install_args="INS_BASE=/usr MANDIR=/man" -revision=2 makedepends="acl-devel" short_desc="Highly portable CD/DVD/BluRay command line recording software" homepage="http://cdrecord.berlios.de/" license="CDDL" maintainer="Juan RP " +distfiles="ftp://ftp.berlios.de/pub/cdrecord/$pkgname-$version.tar.bz2" checksum=7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d long_desc=" $pkgname is a set of command line programs that allows to record @@ -29,12 +29,15 @@ long_desc=" isovfy A program to verify the ISO-9660 structures rscsi A Remote SCSI enabling daemon" -conf_files="/etc/default/rscsi /etc/default/cdrecord" - - -post_install() -{ +post_install() { # Remove useless stuff rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/lib/lib* ${DESTDIR}/usr/lib/profiled } + +cdrtools_package() { + conf_files="/etc/default/rscsi /etc/default/cdrecord" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/celt/celt-devel.template b/srcpkgs/celt/celt-devel.template deleted file mode 100644 index d680df61fb..0000000000 --- a/srcpkgs/celt/celt-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'celt-devel'. -# -depends="libogg-devel celt" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/celt/template b/srcpkgs/celt/template index 91a20faf86..7dd796092f 100644 --- a/srcpkgs/celt/template +++ b/srcpkgs/celt/template @@ -1,15 +1,16 @@ # Template file for 'celt' pkgname=celt version=0.11.1 -distfiles="http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" +revision=2 build_style=gnu-configure configure_args="--enable-float-approx --enable-custom-modes --disable-oggtest" +hostmakedepends="pkg-config" +makedepends="libogg-devel" +short_desc="An audio codec for use in low-delay speech and audio communication" homepage="http://www.celt-codec.org/" license="BSD" -revision=2 -makedepends="pkg-config libogg-devel" -short_desc="An audio codec for use in low-delay speech and audio communication" maintainer="Juan RP " +distfiles="http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" checksum=01c2579fba8b283c9068cb704a70a6e654aa74ced064c091cafffbe6fb1d4cbf long_desc=" CELT (Constrained Energy Lapped Transform) is an ultra-low delay audio @@ -17,4 +18,18 @@ long_desc=" This is meant to close the gap between traditional speech codecs (such as Speex) and traditional audio codecs (such as Vorbis)." -subpackages="$pkgname-devel" +celt-devel_package() { + depends="libogg-devel celt>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + } +} + +celt_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/celt051/celt051-devel.template b/srcpkgs/celt051/celt051-devel.template deleted file mode 100644 index e660a7217a..0000000000 --- a/srcpkgs/celt051/celt051-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'celt501-devel'. -# -depends="libogg-devel celt051" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/celt051/template b/srcpkgs/celt051/template index e6469f3bc5..2500001ec4 100644 --- a/srcpkgs/celt051/template +++ b/srcpkgs/celt051/template @@ -3,13 +3,14 @@ pkgname=celt051 version=0.5.1.3 revision=4 wrksrc=celt-${version} -distfiles="http://downloads.us.xiph.org/releases/celt/celt-${version}.tar.gz" build_style=gnu-configure -makedepends="pkg-config libogg-devel" +hostmakedepends="pkg-config" +makedepends="libogg-devel" short_desc="An audio codec for use in low-delay speech and audio communication" homepage="http://www.celt-codec.org/" license="BSD" maintainer="Juan RP " +distfiles="http://downloads.us.xiph.org/releases/celt/celt-${version}.tar.gz" checksum=fc2e5b68382eb436a38c3104684a6c494df9bde133c139fbba3ddb5d7eaa6a2e long_desc=" CELT (Constrained Energy Lapped Transform) is an ultra-low delay audio @@ -22,4 +23,18 @@ long_desc=" renamed from 'celt*' to 'celt051*' so that it is parallel installable with the normal celt for packages requiring this particular bitstream format." -subpackages="$pkgname-devel" +celt051-devel_package() { + depends="libogg-devel celt051>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + } +} + +celt051_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template index b40b21694b..266f0a5d9c 100644 --- a/srcpkgs/cgminer/template +++ b/srcpkgs/cgminer/template @@ -3,10 +3,9 @@ pkgname=cgminer version=2.10.4 revision=1 build_style=gnu-configure -conf_files="/etc/cgminer.conf" configure_args="--disable-adl --enable-cpumining --enable-scrypt" -makedepends="pkg-config yasm libcurl-devel opencl-headers libudev-devel - ncurses-devel nvidia-opencl" +hostmakedepends="pkg-config yasm" +makedepends="libcurl-devel opencl-headers libudev-devel ncurses-devel nvidia-opencl" short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin" maintainer="Juan RP " license="GPL-3" @@ -19,3 +18,11 @@ post_install() { sed -i -e 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf vinstall ${FILESDIR}/cgminer.service 644 usr/lib/systemd/system } + +cgminer_package() { + conf_files="/etc/cgminer.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/cheese/cheese-devel.template b/srcpkgs/cheese/cheese-devel.template deleted file mode 100644 index e0dd5d2d17..0000000000 --- a/srcpkgs/cheese/cheese-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'cheese-devel'. -# -depends="gst-plugins-base1-devel libcanberra-devel clutter-gst-devel>=2.0.2 - clutter-gtk-devel>=1.4.4 libcheese-${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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/cheese/libcheese.template b/srcpkgs/cheese/libcheese.template deleted file mode 100644 index dd8b4ff71a..0000000000 --- a/srcpkgs/cheese/libcheese.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'libcheese'. -# -short_desc="${sourcepkg} - shared libraries" -long_desc="${long_desc} - - This package contains the shared libraries." - -replaces="cheese<=3.2.2" # for the typelib file - -do_install() { - vmove "usr/lib/*.so*" usr/lib - vmove usr/lib/girepository-1.0 usr/lib -} diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index f5e037a6be..fbd8fb954b 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -2,15 +2,14 @@ pkgname=cheese version=3.8.0 revision=2 -subpackages="lib${pkgname} ${pkgname}-devel" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" -depends="desktop-file-utils hicolor-icon-theme" -hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" -makedepends="gst-plugins-base1-devel clutter-gtk-devel>=1.4.4 clutter-gst-devel>=2.0.2_2 - libgee08-devel>=0.10 libcanberra-devel librsvg-devel libgudev-devel - gnome-desktop-devel>=3.8.0 gst-plugins-bad1-devel" -fulldepends="gst-plugins-good1 gnome-video-effects" +hostmakedepends="which pkg-config intltool gnome-doc-utils itstool + gobject-introspection" +makedepends="gst-plugins-base1-devel clutter-gtk-devel>=1.4.4 + clutter-gst-devel>=2.0.2_2 libgee08-devel>=0.10 libcanberra-devel + librsvg-devel libgudev-devel gnome-desktop-devel>=3.8.0 gst-plugins-bad1-devel + gst-plugins-good1 gnome-video-effects" short_desc="GNOME tool to take pictures and videos from your webcam" maintainer="Juan RP " homepage="http://www.gnome.org/projects/cheese/" @@ -22,3 +21,32 @@ long_desc=" take photos and videos of you, your friends, pets or whatever you want. Allows you to apply fancy visual effects, fine-control image settings and has features such as Multi-Burst mode, Countdown timer for photos." + +libcheese_package() { + short_desc+=" -- shared libraries" + replaces="cheese<=3.2.2" # for the typelib file + pkg_install() { + vmove "usr/lib/*.so*" + vmove usr/lib/girepository-1.0 + } +} + +cheese-devel_package() { + depends="gst-plugins-base1-devel libcanberra-devel clutter-gst-devel>=2.0.2 + clutter-gtk-devel>=1.4.4 libcheese-${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 + } +} + +cheese_package() { + depends="desktop-file-utils hicolor-icon-theme + gst-plugins-good1 gnome-video-effects" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cherokee/cherokee-devel.template b/srcpkgs/cherokee/cherokee-devel.template deleted file mode 100644 index e3ca41665b..0000000000 --- a/srcpkgs/cherokee/cherokee-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'cherokee-devel'. -# -depends="libcherokee" -short_desc="${short_desc} (Development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - - -do_install() { - vmove usr/bin/cherokee-config usr/bin - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/cherokee/libcherokee.template b/srcpkgs/cherokee/libcherokee.template deleted file mode 100644 index 9ca942463f..0000000000 --- a/srcpkgs/cherokee/libcherokee.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'libcherokee'. -# -short_desc="${short_desc} (Runtime library)" -long_desc="${long_desc} - - This package contains the cherokee runtime lib(s)." - -do_install() -{ - vmove "usr/lib/*.so*" usr/lib - vmove usr/lib/cherokee usr/lib -} - - diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template index 4b88ae80f4..543f7d0a2e 100644 --- a/srcpkgs/cherokee/template +++ b/srcpkgs/cherokee/template @@ -6,7 +6,8 @@ build_style=gnu-configure configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd --with-wwwgroup=httpd --with-python=python --enable-os-string=Linux" -makedepends="pcre-devel>=8.30 python-devel libldap-devel pam-devel libmysqlclient-devel ffmpeg-devel geoip-devel" +makedepends="pcre-devel>=8.30 python-devel libldap-devel pam-devel + libmysqlclient-devel ffmpeg-devel geoip-devel" short_desc="An innovative, feature rich, and yet easy to configure open source Web Server" maintainer="davehome " homepage="http://www.cherokee-project.com/" @@ -23,20 +24,6 @@ long_desc=" cherokee-admin, and a modular light-weight design. Cherokee is maintained and developed by an Open Source Community." -subpackages="${pkgname}-devel lib${pkgname}" - -conf_files="/etc/${pkgname}/${pkgname}.conf" -systemd_services="cherokee.service on" - -system_accounts="httpd" -httpd_descr="Cherokee HTTP server" -httpd_homedir="/srv/httpd" - -make_dirs=" -/etc/cherokee/ssl 0755 httpd httpd -/var/log/cherokee 0755 httpd httpd -/var/lib/cherokee/graphs/images 0755 httpd httpd" - pre_configure() { # use /var/log/cherokee instead of /var/log sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' \ @@ -50,3 +37,37 @@ post_install() { # Install systemd service vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } + +cherokee-devel_package() { + depends="libcherokee>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/bin/cherokee-config + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + } +} + +libcherokee_package() { + short_desc="${short_desc} (Runtime library)" + pkg_install() { + vmove "usr/lib/*.so*" + vmove usr/lib/cherokee + } +} + +cherokee_package() { + conf_files="/etc/${pkgname}/${pkgname}.conf" + systemd_services="cherokee.service on" + system_accounts="httpd" + httpd_descr="Cherokee HTTP server" + httpd_homedir="/srv/httpd" + make_dirs=" + /etc/cherokee/ssl 0755 httpd httpd + /var/log/cherokee 0755 httpd httpd + /var/lib/cherokee/graphs/images 0755 httpd httpd" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chicken/chicken-devel.template b/srcpkgs/chicken/chicken-devel.template deleted file mode 100644 index 7510f6d54c..0000000000 --- a/srcpkgs/chicken/chicken-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'chicken-devel'. -# -depends="libchicken" -short_desc="Chiken 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/chicken/libchicken.template b/srcpkgs/chicken/libchicken.template deleted file mode 100644 index 75229516d4..0000000000 --- a/srcpkgs/chicken/libchicken.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libchiken'. -# -short_desc="${short_desc} - runtime library" -long_desc="${long_desc} - - This package contains the Chiken runtime library." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/chicken/template b/srcpkgs/chicken/template index 7ba9e99be1..8d38f2e1c7 100644 --- a/srcpkgs/chicken/template +++ b/srcpkgs/chicken/template @@ -1,15 +1,15 @@ # Template file for 'chicken' pkgname=chicken version=4.7.0 -homepage="http://www.call-cc.org" -distfiles="http://code.call-cc.org/releases/$version/$pkgname-$version.tar.gz" +revision=2 build_style=gnu-makefile make_build_args="PREFIX=/usr PLATFORM=linux" make_install_args="PREFIX=/usr PLATFORM=linux" -revision=1 short_desc="A practical and portable Scheme system" maintainer="Juan RP " license="BSD" +homepage="http://www.call-cc.org" +distfiles="http://code.call-cc.org/releases/$version/$pkgname-$version.tar.gz" checksum=56afdbff812febe3f98ae437716ecaa96115732f21db5063ce413e4c7449a26c long_desc=" CHICKEN is a compiler for the Scheme programming language. CHICKEN produces @@ -18,8 +18,29 @@ long_desc=" Linux, MacOS X, Windows, and many Unix flavours." disable_parallel_build=yes -subpackages="lib${pkgname} ${pkgname}-devel" post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} } + +libchicken_package() { + short_desc="${short_desc} - runtime library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +chicken-devel_package() { + depends="libchicken>=${version}" + short_desc="Chiken development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +chicken_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chromium-bsu/template b/srcpkgs/chromium-bsu/template index 7b74f82ad8..652fcb50dd 100644 --- a/srcpkgs/chromium-bsu/template +++ b/srcpkgs/chromium-bsu/template @@ -4,7 +4,6 @@ version=0.9.15 revision=4 build_style=gnu-configure configure_args="--enable-openal --disable-sdlmixer --disable-glpng" -fulldepends="desktop-file-utils" short_desc="Fast paced, arcade-style, top-scrolling space shooter" maintainer="Juan RP " license="${pkgname}" @@ -20,8 +19,15 @@ long_desc=" safety of the Chromium vessel." makedepends="ftgl-devel>=2.1.3rc5_4 fontconfig-devel SDL-devel - SDL_image-devel libopenal-devel freealut-devel" + SDL_image-devel libopenal-devel freealut-devel desktop-file-utils" post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +chromium-bsu_package() { + depends="desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 7a972fd7c6..92e3f361de 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -33,7 +33,6 @@ create_wrksrc=yes create_srcdir=yes build_wrksrc=${pkgname}-${version} -depends="desktop-file-utils hicolor-icon-theme" makedepends="pkg-config which unzip yasm bison25 flex gperf perl python libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel elfutils-devel mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel @@ -42,8 +41,9 @@ makedepends="pkg-config which unzip yasm bison25 flex gperf perl python libvpx-devel speex-devel libwebp-devel>=0.2.0 pulseaudio-devel cups-devel hunspell-devel libflac-devel icu-devel libxslt-devel libusb-devel v8-devel libXrandr-devel" + if [ "$XBPS_MACHINE" = "x86_64" ]; then - makedepends="${makedepends} gcc-multilib" + makedepends+=" gcc-multilib" fi pre_configure() { @@ -126,3 +126,10 @@ do_install() { vinstall ${FILESDIR}/chromium.sh 755 usr/bin chromium vinstall LICENSE 644 usr/share/licenses/${pkgname} } + +chromium_package() { + depends="desktop-file-utils hicolor-icon-theme" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template index 4b5b144e51..1bf64d835c 100644 --- a/srcpkgs/chrony/template +++ b/srcpkgs/chrony/template @@ -3,7 +3,8 @@ pkgname=chrony version=1.27 revision=1 build_style=gnu-configure -makedepends="pkg-config nss-devel libcap-devel readline-devel" +hostmakedepends="pkg-config" +makedepends="nss-devel libcap-devel readline-devel" short_desc="Sets your computer's clock from time servers on the Net" maintainer="Juan RP " license="GPL-2" @@ -11,13 +12,6 @@ homepage="http://chrony.tuxfamily.org/" distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz" checksum=d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d -system_accounts="chrony" -systemd_services="chrony.service on" -conf_files="/etc/chrony.conf" -make_dirs=" - /var/log/chrony 0755 chrony chrony - /var/db/chrony 0755 chrony chrony" - post_install() { vinstall ${FILESDIR}/chrony.conf 644 etc vinstall ${FILESDIR}/chrony.service 644 usr/lib/systemd/system @@ -27,3 +21,16 @@ post_install() { vmkdir usr/lib/systemd/ntp-units.d echo "chrony.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/50-chrony.list } + +chrony_package() { + conf_files="/etc/chrony.conf" + system_accounts="chrony" + systemd_services="chrony.service on" + make_dirs=" + /var/log/chrony 0755 chrony chrony + /var/db/chrony 0755 chrony chrony" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template index 1328f0ad14..63d9e042cd 100644 --- a/srcpkgs/chroot-bash/template +++ b/srcpkgs/chroot-bash/template @@ -36,9 +36,15 @@ long_desc=" broken_as_needed=yes bootstrap=yes -provides="bash-${version}" -conflicts="bash>=0" post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-bash_package() { + provides="bash-4.2" + conflicts="bash>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-binutils/template b/srcpkgs/chroot-binutils/template index 22e6ec282a..bde26f99e2 100644 --- a/srcpkgs/chroot-binutils/template +++ b/srcpkgs/chroot-binutils/template @@ -14,11 +14,7 @@ if [ "$IN_CHROOT" ]; then hostmakedepends="flex perl" fi makedepends="zlib-devel" - -noverifyrdeps=yes bootstrap=yes -provides="binutils-${version}" -conflicts="binutils>=0" do_configure() { if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then @@ -46,3 +42,12 @@ do_install() { rm -f ${DESTDIR}/usr/lib/*.a rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/include } + +chroot-binutils_package() { + provides="binutils-2.23.51.0.3" + conflicts="binutils>=0" + noverifyrdeps=yes + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-bzip2/template b/srcpkgs/chroot-bzip2/template index 6ea32d4603..741e94e630 100644 --- a/srcpkgs/chroot-bzip2/template +++ b/srcpkgs/chroot-bzip2/template @@ -10,10 +10,7 @@ license="BSD" maintainer="Juan RP " checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd -noverifyrdeps=yes bootstrap=yes -provides="bzip2-${version} bzip2-devel-${version}" -conflicts="bzip2>=0" do_build() { make ${makejobs} -f Makefile-libbz2_so @@ -35,3 +32,12 @@ do_install() { vinstall libbz2.a 644 usr/lib vinstall bzlib.h 644 usr/include } + +chroot-bzip2_package() { + provides="bzip2-${version} bzip2-devel-${version}" + conflicts="bzip2>=0" + noverifyrdeps=yes + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-coreutils/template b/srcpkgs/chroot-coreutils/template index 48ea1a9f08..00e236f92f 100644 --- a/srcpkgs/chroot-coreutils/template +++ b/srcpkgs/chroot-coreutils/template @@ -16,9 +16,15 @@ distfiles="http://ftp.gnu.org/gnu/coreutils/coreutils-$version.tar.xz" checksum=4e075a0d238072a5bd079046e1f024dc5e0d9133d43a39c73d0b86b0d1e2c5e5 bootstrap=yes -conflicts="coreutils>=0" -provides="coreutils-${version}" pre_configure() { sed -i 's/^\(SUBDIRS =\).*/\1 lib src/g' Makefile.in } + +chroot-coreutils_package() { + provides="coreutils-${version}" + conflicts="coreutils>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-diffutils/template b/srcpkgs/chroot-diffutils/template index 3b5b8be539..f7dcc2d238 100644 --- a/srcpkgs/chroot-diffutils/template +++ b/srcpkgs/chroot-diffutils/template @@ -13,8 +13,6 @@ distfiles="${GNU_SITE}/diffutils/diffutils-$version.tar.xz" checksum=ab4fb75d0ef35f3c8c9a148cd3526ba6f4db71d10467a041eb45006436079149 bootstrap=yes -conflicts="diffutils>=0" -provides="diffutils-${version}" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h @@ -23,3 +21,11 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-diffutils_package() { + conflicts="diffutils>=0" + provides="diffutils-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template index f7793f995a..6847015841 100644 --- a/srcpkgs/chroot-distcc/template +++ b/srcpkgs/chroot-distcc/template @@ -11,7 +11,6 @@ distfiles="http://distcc.googlecode.com/files/distcc-${version}.tar.bz2" checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30 bootstrap=yes -conflicts="distcc>=0" do_configure() { sed -i -e 's|^\(all: $(bin_PROGRAMS)\) pump include-server|\1|g' Makefile.in @@ -40,3 +39,10 @@ do_install() { ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f} done } + +chroot-distcc_package() { + conflicts="distcc>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-fakeroot/template b/srcpkgs/chroot-fakeroot/template index 41b406c307..d75f224f6c 100644 --- a/srcpkgs/chroot-fakeroot/template +++ b/srcpkgs/chroot-fakeroot/template @@ -4,15 +4,13 @@ version=1.18.4 revision=1 bootstrap=yes wrksrc="fakeroot-${version}" -distfiles="${DEBIAN_SITE}/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2" build_style=gnu-configure -fulldepends="chroot-util-linux" -conflicts="fakeroot>=0" -provides="fakeroot-${version}_${revision}" +makedepends="chroot-util-linux" short_desc="Gives a fake root environment -- for xbps-src use" maintainer="Juan RP " homepage="http://packages.debian.org/fakeroot" license="GPL-3" +distfiles="${DEBIAN_SITE}/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2" checksum=0a359efa3e9496c33234b3e9c89306a09bb4da9d33de43c261f1d8447e6ebea2 long_desc=" This package is intended to remove the need to become root for a package build. @@ -26,3 +24,12 @@ post_install() { rm -rf ${DESTDIR}/usr/share rm -f ${DESTDIR}/usr/lib/*.a } + +chroot-fakeroot_package() { + depends="chroot-util-linux" + provides="fakeroot-${version}_${revision}" + conflicts="fakeroot>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-file/template b/srcpkgs/chroot-file/template index 5d15786ea3..6ab8d60f52 100644 --- a/srcpkgs/chroot-file/template +++ b/srcpkgs/chroot-file/template @@ -12,11 +12,17 @@ license="BSD" distfiles="ftp://ftp.astron.com/pub/file/file-$version.tar.gz" checksum=461ba01dd0900a3b7c2dcd901b04903192c07887a9c1928af0be507572c77fe4 -noverifyrdeps=yes bootstrap=yes -conflicts="file>=0" -provides="file-${version} file-devel-${version}" post_install() { rm -rf ${DESTDIR}/usr/share/man } + +chroot-file_package() { + noverifyrdeps=yes + conflicts="file>=0" + provides="file-${version} file-devel-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-findutils/template b/srcpkgs/chroot-findutils/template index 33b38401d1..c8a96521ae 100644 --- a/srcpkgs/chroot-findutils/template +++ b/srcpkgs/chroot-findutils/template @@ -14,8 +14,6 @@ distfiles="http://ftp.gnu.org/gnu/findutils/findutils-$version.tar.gz" checksum=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a bootstrap=yes -conflicts="findutils>=0" -provides="findutils-${version}" post_install() { for f in locate oldfind updatedb; do @@ -23,3 +21,11 @@ post_install() { done rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec } + +chroot-findutils_package() { + conflicts="findutils>=0" + provides="findutils-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template index a6ca11215a..b0222edafd 100644 --- a/srcpkgs/chroot-gawk/template +++ b/srcpkgs/chroot-gawk/template @@ -13,9 +13,15 @@ distfiles="http://ftp.gnu.org/gnu/gawk/gawk-$version.tar.gz" checksum=c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5 bootstrap=yes -conflicts="gawk>=0" -provides="gawk-${version}" post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-gawk_package() { + conflicts="gawk>=0" + provides="gawk-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template index b703e12c05..41a44c1a89 100644 --- a/srcpkgs/chroot-gcc/template +++ b/srcpkgs/chroot-gcc/template @@ -25,16 +25,12 @@ checksum=" ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7" create_wrksrc=yes -noverifyrdeps=yes bootstrap=yes -provides="libgcc-${version} libstdc++-${version} libstdc++-devel-${version} - gcc-${version} gcc-c++-${version}" -conflicts="libgcc>=0 libstdc++>=0 libstdc++-devel>=0 gcc>=0 gcc-c++>=0" makedepends="chroot-binutils>=2.22.52.0.4" if [ -n "$IN_CHROOT" ]; then - makedepends="${makedepends} perl flex" + makedepends+=" perl flex" fi pre_configure() { @@ -200,3 +196,13 @@ do_install() { # Remove all python scripts in libdir. rm -f ${DESTDIR}/usr/lib/*.py } + +chroot-gcc_package() { + provides="libgcc-${version} libstdc++-${version} libstdc++-devel-${version} + gcc-${version} gcc-c++-${version}" + conflicts="libgcc>=0 libstdc++>=0 libstdc++-devel>=0 gcc>=0 gcc-c++>=0" + noverifyrdeps=yes + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-gettext/template b/srcpkgs/chroot-gettext/template index 956018d42b..b48ec24660 100644 --- a/srcpkgs/chroot-gettext/template +++ b/srcpkgs/chroot-gettext/template @@ -19,9 +19,15 @@ distfiles="http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz" checksum=516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c bootstrap=yes -conflicts="gettext>=0" -provides="gettext-${version}" post_install() { rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/lib ${DESTDIR}/usr/include } + +chroot-gettext_package() { + conflicts="gettext>=0" + provides="gettext-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index ba544db11b..8746f88b61 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -14,8 +14,6 @@ license="GPL-2" distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" checksum=c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 -conflicts="git>=0" -provides="git-${version}" bootstrap=yes if [ "$CHROOT_READY" ]; then @@ -24,9 +22,7 @@ fi if [ "$CROSS_BUILD" ]; then makedepends="zlib-devel" - configure_args="${configure_args} - ac_cv_fread_reads_directories=no - ac_cv_snprintf_returns_bogus=no" + configure_args+=" ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" fi post_install() { @@ -35,3 +31,11 @@ post_install() { rm -rf ${DESTDIR}/usr/share/man rm -rf ${DESTDIR}/usr/share/perl5 } + +chroot-git_package() { + conflicts="git>=0" + provides="git-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-glibc/template b/srcpkgs/chroot-glibc/template index e4ddbe97a7..880f01940a 100644 --- a/srcpkgs/chroot-glibc/template +++ b/srcpkgs/chroot-glibc/template @@ -11,22 +11,7 @@ license="GPL-2, LGPL-2.1, BSD" distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz" checksum=6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e -noverifyrdeps=yes bootstrap=yes -provides="glibc-${version} glibc-devel-${version}" -conflicts="glibc>=0 glibc-devel>=0" - -#Do not strip these files (objcopy errors out). -nostrip_files=" - XBS5_ILP32_OFFBIG - XBS5_ILP32_OFF32 - POSIX_V6_ILP32_OFF32 - POSIX_V6_ILP32_OFFBIG - POSIX_V7_ILP32_OFF32 - POSIX_V7_ILP32_OFFBIG - POSIX_V6_LP64_OFF64 - POSIX_V7_LP64_OFF64 - XBS5_LP64_OFF64" if [ "$IN_CHROOT" ]; then hostmakedepends="bison perl" @@ -108,3 +93,23 @@ do_install() { # Remove unused stuff. rm -rf ${DESTDIR}/var } + +chroot-glibc_package() { + # Do not strip these files (objcopy errors out). + nostrip_files=" + XBS5_ILP32_OFFBIG + XBS5_ILP32_OFF32 + POSIX_V6_ILP32_OFF32 + POSIX_V6_ILP32_OFFBIG + POSIX_V7_ILP32_OFF32 + POSIX_V7_ILP32_OFFBIG + POSIX_V6_LP64_OFF64 + POSIX_V7_LP64_OFF64 + XBS5_LP64_OFF64" + provides="glibc-${version} glibc-devel-${version}" + conflicts="glibc>=0 glibc-devel>=0" + noverifyrdeps=yes + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template index 6cb4f7ecfa..48d9f3a811 100644 --- a/srcpkgs/chroot-grep/template +++ b/srcpkgs/chroot-grep/template @@ -2,11 +2,11 @@ pkgname=chroot-grep version=2.10 revision=4 +build_style=gnu-configure wrksrc=grep-${version} homepage="http://www.gnu.org/software/grep/" distfiles="http://ftp.gnu.org/gnu/grep/grep-$version.tar.xz" short_desc="The GNU grep utility - for use with xbps-src" -build_style=gnu-configure configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep" maintainer="Juan RP " license="GPL-3" @@ -22,9 +22,15 @@ long_desc=" don't have to install it manually." bootstrap=yes -conflicts="grep>=0" -provides="grep-${version}" post_install() { rm -rf ${DESTDIR}/usr/share/info ${DESTDIR}/usr/share/man } + +chroot-grep_package() { + conflicts="grep>=0" + provides="grep-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-gzip/template b/srcpkgs/chroot-gzip/template index a3164aa960..9ba787550d 100644 --- a/srcpkgs/chroot-gzip/template +++ b/srcpkgs/chroot-gzip/template @@ -1,9 +1,9 @@ # Template file for 'chroot-gzip' pkgname=chroot-gzip version=1.4 +revision=1 wrksrc="gzip-${version}" build_style=gnu-configure -revision=1 homepage="http://www.gnu.org/software/gzip/" license="GPL-3" short_desc="GNU compression utility -- for xbps-src use" @@ -12,8 +12,6 @@ distfiles="http://ftp.gnu.org/gnu/gzip/gzip-$version.tar.gz" checksum=d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee bootstrap=yes -conflicts="gzip>=0" -provides="gzip-${version}" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h @@ -22,3 +20,11 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-gzip_package() { + conflicts="gzip>=0" + provides="gzip-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-m4/template b/srcpkgs/chroot-m4/template index e41c7fd0d6..9129a80361 100644 --- a/srcpkgs/chroot-m4/template +++ b/srcpkgs/chroot-m4/template @@ -13,8 +13,6 @@ distfiles="http://ftp.gnu.org/gnu/m4/m4-$version.tar.bz2" checksum=42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c bootstrap=yes -conflicts="m4>=0" -provides="m4-${version}" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h @@ -23,3 +21,11 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-m4_package() { + conflicts="m4>=0" + provides="m4-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-make/template b/srcpkgs/chroot-make/template index 018c487677..5c7eb4a845 100644 --- a/srcpkgs/chroot-make/template +++ b/srcpkgs/chroot-make/template @@ -19,9 +19,15 @@ long_desc=" This package is only meant to be used by xbps-src, don't install it manually." bootstrap=yes -conflicts="make>=0" -provides="make-${version}" post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-make_package() { + conflicts="make>=0" + provides="make-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-patch/template b/srcpkgs/chroot-patch/template index 41598e3ec7..d33be34f89 100644 --- a/srcpkgs/chroot-patch/template +++ b/srcpkgs/chroot-patch/template @@ -13,9 +13,15 @@ distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.bz2" checksum=aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11 bootstrap=yes -conflicts="patch>=0" -provides="patch-${version}" post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-patch_package() { + conflicts="patch>=0" + provides="patch-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-sed/template b/srcpkgs/chroot-sed/template index 0f3efa8ee1..af559f1b97 100644 --- a/srcpkgs/chroot-sed/template +++ b/srcpkgs/chroot-sed/template @@ -1,13 +1,13 @@ # Template file for 'chroot-sed' pkgname=chroot-sed version=4.2.1 +revision=1 wrksrc="sed-${version}" -distfiles="http://ftp.gnu.org/gnu/sed/sed-$version.tar.gz" build_style=gnu-configure configure_args="--disable-acl --disable-nls --disable-i18n --without-included-regex" -revision=1 short_desc="The GNU stream editor -- for xbps-src use" maintainer="Juan RP " +distfiles="http://ftp.gnu.org/gnu/sed/sed-$version.tar.gz" checksum=8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060 homepage="http://www.gnu.org/software/sed/" license="GPL-3" @@ -18,9 +18,15 @@ long_desc=" This package is only meant to be used by xbps-src, don't install it manually." bootstrap=yes -conflicts="sed>=0" -provides="sed-${version}" post_install() { rm -rf ${DESTDIR}/usr/share } + +chroot-sed_package() { + conflicts="sed>=0" + provides="sed-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-tar/template b/srcpkgs/chroot-tar/template index 8410273e63..2eece061ee 100644 --- a/srcpkgs/chroot-tar/template +++ b/srcpkgs/chroot-tar/template @@ -12,8 +12,6 @@ distfiles="http://ftp.gnu.org/gnu/tar/tar-$version.tar.bz2" checksum=5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41 bootstrap=yes -conflicts="tar>=0" -provides="tar-${version}" pre_configure() { sed -i -e '/gets is a/d' gnu/stdio.in.h @@ -22,3 +20,11 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec } + +chroot-tar_package() { + conflicts="tar>=0" + provides="tar-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-texinfo/template b/srcpkgs/chroot-texinfo/template index 84b42974fe..7437b48606 100644 --- a/srcpkgs/chroot-texinfo/template +++ b/srcpkgs/chroot-texinfo/template @@ -11,8 +11,6 @@ distfiles="http://ftp.gnu.org/gnu/texinfo/texinfo-$version.tar.gz" checksum=1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68 bootstrap=yes -conflicts="texinfo>=0" -provides="texinfo-${version}" if [ "$IN_CHROOT" ]; then makedepends="ncurses-devel" @@ -38,3 +36,11 @@ do_install() { rm -f ${DESTDIR}/usr/bin/infokey rm -rf ${DESTDIR}/usr/share } + +chroot-texinfo_package() { + conflicts="texinfo>=0" + provides="texinfo-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template index 4f305e95b6..a62ef3aa88 100644 --- a/srcpkgs/chroot-util-linux/template +++ b/srcpkgs/chroot-util-linux/template @@ -1,6 +1,7 @@ # Template file for 'chroot-util-linux' pkgname=chroot-util-linux version=2.21 +revision=1 wrksrc="util-linux-${version}" build_style=gnu-configure configure_args="--without-ncurses --without-udev --disable-libuuid @@ -8,12 +9,11 @@ configure_args="--without-ncurses --without-udev --disable-libuuid --disable-fsck --disable-partx --disable-uuidd --disable-mountpoint --disable-fallocate --disable-unshare --disable-nls --disable-wall scanf_cv_alloc_modifier=as" -distfiles="${KERNEL_SITE}/utils/util-linux/v2.21/util-linux-${version}.tar.xz" -revision=1 short_desc="Miscellaneous linux utilities -- for xbps-src use" maintainer="Juan RP " homepage="http://userweb.kernel.org/~kzak/util-linux-ng" license="GPL-2" +distfiles="${KERNEL_SITE}/utils/util-linux/v2.21/util-linux-${version}.tar.xz" checksum=5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f long_desc=" The util-linux package contains miscellaneous utility programs. Among @@ -23,9 +23,6 @@ long_desc=" This package is only meant to be used by xbps-src, don't install it manually." bootstrap=yes -conflicts="util-linux>=0" -provides="util-linux-${version}" -replaces="chroot-gnu-getopt>=0" post_install() { # Remove unused stuff. @@ -34,3 +31,12 @@ post_install() { rm -rf ${DESTDIR}/usr/sbin rm -rf ${DESTDIR}/usr/share/man } + +chroot-util-linux_package() { + conflicts="util-linux>=0" + provides="util-linux-${version}" + replaces="chroot-gnu-getopt>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chroot-xz/template b/srcpkgs/chroot-xz/template index f8b35f00d1..255c6deda7 100644 --- a/srcpkgs/chroot-xz/template +++ b/srcpkgs/chroot-xz/template @@ -29,9 +29,15 @@ long_desc=" files easy. The scripts were adapted from gzip and bzip2." bootstrap=yes -conflicts="xz>=0" -provides="xz-${version}" post_install() { rm -rf ${DESTDIR}/usr/lib ${DESTDIR}/usr/share ${DESTDIR}/usr/include } + +chroot-xz_package() { + conflicts="xz>=0" + provides="xz-${version}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/chrpath/template b/srcpkgs/chrpath/template index b7c0e048a3..286c4678f6 100644 --- a/srcpkgs/chrpath/template +++ b/srcpkgs/chrpath/template @@ -12,3 +12,9 @@ checksum="c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b" long_desc=" chrpath allows you to modify the dynamic library load path (rpath and runpath) of compiled programs and libraries." + +chrpath_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template index 347d61fa2c..9f57da15cd 100644 --- a/srcpkgs/cifs-utils/template +++ b/srcpkgs/cifs-utils/template @@ -21,3 +21,9 @@ post_install() { vmove "sbin/*" usr/sbin chmod +s ${DESTDIR}/usr/sbin/mount.cifs } + +cifs-utils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 0f3c43fc69..543bc4467b 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -30,13 +30,9 @@ makedepends="dbus-glib-devel libxml2-devel gtk+3-devel gnome-desktop-devel>=3.6.0 gnome-bluetooth-devel>=3.6.0 pulseaudio-devel startup-notification-devel" -depends="desktop-file-utils caribou pulseaudio mesa-demos - libmuffin>=1.1.2_2 muffin>=1.1.2_2 python-gconf python-lxml python-imaging" - nofetch=yes noextract=yes -pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor" LDFLAGS="-lgthread-2.0" do_fetch() { @@ -63,3 +59,14 @@ pre_configure() { sed -i -e "s|Gtk.CellRendererAccelMode.MODIFIER_TAP|Gtk.CellRendererAccelMode.GTK|g" \ files/usr/lib/cinnamon-settings/cinnamon-settings.py } + +cinnamon_package() { + pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor" + depends="desktop-file-utils caribou pulseaudio mesa-demos + libmuffin>=1.1.2_2 muffin>=1.1.2_2 python-gconf + python-lxml python-imaging" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/clucene/clucene-devel.template b/srcpkgs/clucene/clucene-devel.template deleted file mode 100644 index ac47623443..0000000000 --- a/srcpkgs/clucene/clucene-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'clucene-devel'. -# -depends="libstdc++-devel clucene" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/CLucene ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template index 6004b8fdb1..b8397708c7 100644 --- a/srcpkgs/clucene/template +++ b/srcpkgs/clucene/template @@ -3,13 +3,12 @@ pkgname=clucene version=0.9.21b revision=4 wrksrc=${pkgname}-core-${version} -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.bz2" build_style=gnu-configure -makedepends="libstdc++-devel" short_desc="Text search engine written in C++" homepage="http://clucene.sourceforge.net/" license="LGPL-2+/ASL-2.0" maintainer="Juan RP " +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.bz2" checksum=202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317 long_desc=" CLucene is a high-performance, scalable, cross platform, full-featured, @@ -19,5 +18,18 @@ long_desc=" search engine yourself, and any specialized queries to pull it back for display or further processing." -subpackages="${pkgname}-devel" +clucene-devel_package() { + depends="libstdc++-devel clucene>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/CLucene + } +} +clucene_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/clutter-gst/clutter-gst-devel.template b/srcpkgs/clutter-gst/clutter-gst-devel.template deleted file mode 100644 index 83e15f8826..0000000000 --- a/srcpkgs/clutter-gst/clutter-gst-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'clutter-gst--devel'. -# -depends="clutter-devel>=1.14 gst-plugins-base1-devel - ${sourcepkg}-${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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/clutter-gst/template b/srcpkgs/clutter-gst/template index 49d2adc1a8..0844cdc7a4 100644 --- a/srcpkgs/clutter-gst/template +++ b/srcpkgs/clutter-gst/template @@ -6,10 +6,26 @@ build_style=gnu-configure configure_args="--disable-debug" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="clutter-devel>=1.14 gst-plugins-base1-devel gst-plugins-bad1-devel" -subpackages="${pkgname}-devel" short_desc="GStreamer bindings for the Clutter Toolkit" maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4 + +clutter-gst-devel_package() { + depends="clutter-devel>=1.14 gst-plugins-base1-devel ${sourcepkg}-${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 + } +} + +clutter-gst_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/clutter-gtk/clutter-gtk-devel.template b/srcpkgs/clutter-gtk/clutter-gtk-devel.template deleted file mode 100644 index 3873627106..0000000000 --- a/srcpkgs/clutter-gtk/clutter-gtk-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'clutter-gtk--devel'. -# -depends="gtk+3-devel>=3.8.0 clutter-devel>=1.14 - ${sourcepkg}-${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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template index d6b97f03c0..57e7ce0b64 100644 --- a/srcpkgs/clutter-gtk/template +++ b/srcpkgs/clutter-gtk/template @@ -2,14 +2,30 @@ pkgname=clutter-gtk version=1.4.4 revision=1 -subpackages="$pkgname-devel" build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gtk+3-devel>=3.8.0 clutter-devel>=1.14" -depends="gtk+3>=3.8.0" short_desc="GTK+3 bindings for the Clutter Tolkit" maintainer="Juan RP " homepage="http://clutter-project.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e + +clutter-gtk-devel_package() { + depends="gtk+3-devel>=3.8.0 clutter-devel>=1.14 ${sourcepkg}-${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 + } +} + +clutter-gtk_package() { + depends="gtk+3>=3.8.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/clutter/clutter-devel.template b/srcpkgs/clutter/clutter-devel.template deleted file mode 100644 index f076562e3c..0000000000 --- a/srcpkgs/clutter/clutter-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'clutter-devel'. -# -depends="cogl-devel>=1.14 cairo-devel atk-devel pango-devel json-glib-devel - libX11-devel libXext-devel libXfixes-devel libXdamage-devel - libXcomposite-devel libXi-devel clutter-${version}_${revision}" - -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/gir-*" usr/share -} diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index e9db624747..299a76255f 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--enable-introspection" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel cogl-devel>=1.14" -subpackages="clutter-devel" short_desc="OpenGL based interactive canvas library" maintainer="Juan RP " homepage="http://www.clutter-project.org" @@ -16,3 +15,22 @@ checksum=3b7a07373c27fad4f0cf59fd66a6855d66f9a42b7b570a00ca51a8b488af64d5 long_desc=" Clutter is an open source software library for creating fast, visually rich and animated graphical user interfaces." + +clutter-devel_package() { + depends="cogl-devel>=1.14 cairo-devel atk-devel pango-devel json-glib-devel + libX11-devel libXext-devel libXfixes-devel libXdamage-devel + libXcomposite-devel libXi-devel clutter-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + vmove "usr/share/gir-*" + } +} + +clutter_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 8c90a2b618..3297170320 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -32,3 +32,9 @@ post_install() { done rm -rf ${DESTDIR}/usr/share/{doc,cmake*,aclocal} } + +cmake-gui_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 52277d0e47..1036f2764b 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -19,3 +19,9 @@ license="BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v2.8/$pkgname-$version.tar.gz" checksum=ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 + +cmake_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 18d15ff16c..06455aa90a 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -16,3 +16,9 @@ makedepends="pkg-config faad2-devel libflac-devel libao-devel libmad-devel libmodplug-devel libmp4v2-devel>=2.0.0 libmpcdec-devel pulseaudio-devel opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel ncurses-devel" + +cmus_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cogl/cogl-devel.template b/srcpkgs/cogl/cogl-devel.template deleted file mode 100644 index 11266ec240..0000000000 --- a/srcpkgs/cogl/cogl-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'cogl-devel'. -# -depends="libdrm-devel libXcomposite-devel libXdamage-devel - libXrandr-devel gdk-pixbuf-devel glib-devel cogl>=${version}" -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/cogl/template b/srcpkgs/cogl/template index 8e4b6bf044..9e0bf6addb 100644 --- a/srcpkgs/cogl/template +++ b/srcpkgs/cogl/template @@ -4,7 +4,6 @@ version=1.14.0 revision=2 build_style=gnu-configure configure_args="--enable-introspection" -subpackages="cogl-devel" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libXcomposite-devel libXrandr-devel libXdamage-devel pango-devel gdk-pixbuf-devel" short_desc="Library for using 3D graphics hardware for rendering" @@ -13,3 +12,20 @@ homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/cogl/${version%.*}/cogl-${version}.tar.xz" checksum=276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 + +cogl-devel_package() { + depends="libdrm-devel libXcomposite-devel libXdamage-devel + libXrandr-devel gdk-pixbuf-devel glib-devel cogl>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + } +} + +cogl_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/colord-gtk/colord-gtk-devel.template b/srcpkgs/colord-gtk/colord-gtk-devel.template deleted file mode 100644 index d0434fa8b6..0000000000 --- a/srcpkgs/colord-gtk/colord-gtk-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'colord-gtk-devel'. -# -depends="colord-devel>=0.1.31 gtk+3-devel>=3.8.0 ${sourcepkg}>=${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/colord-gtk/template b/srcpkgs/colord-gtk/template index bc37b97969..d1024d60d2 100644 --- a/srcpkgs/colord-gtk/template +++ b/srcpkgs/colord-gtk/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="vala-devel>=0.20 colord-devel>=0.1.31 gtk+3-devel>=3.8" -subpackages="$pkgname-devel" short_desc="GTK support library for colord" maintainer="Juan RP " homepage="http://www.freedesktop.org/software/colord" @@ -16,3 +15,19 @@ checksum=bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a long_desc=" colord-gtk is a support library for colord and provides additional functionality that requires GTK+." + +colord-gtk-devel_package() { + depends="colord-devel>=0.1.31 gtk+3-devel>=3.8.0 ${sourcepkg}>=${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + } +} + +colord-gtk_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/colord/colord-devel.template b/srcpkgs/colord/colord-devel.template deleted file mode 100644 index 95c8f17261..0000000000 --- a/srcpkgs/colord/colord-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'colord-devel'. -# -depends="dbus-devel glib-devel lcms2-devel libcolord-${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 - vmove usr/share/vala usr/share -} diff --git a/srcpkgs/colord/libcolord.template b/srcpkgs/colord/libcolord.template deleted file mode 100644 index 465ad67449..0000000000 --- a/srcpkgs/colord/libcolord.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'colord-devel'. -# -short_desc="${short_desc} -- runtime library" -replaces="colord<0.1.23_3" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index a48adc0eb0..203e31376d 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -9,16 +9,40 @@ configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-volume-search --with-daemon-user=colord" hostmakedepends="pkg-config intltool gobject-introspection docbook2x" makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel - libusb-devel libgusb-devel>=0.1.6 systemd-devel sqlite-devel" -fulldepends="shared-color-profiles" -conf_files="/etc/colord.conf" -system_accounts="colord" -colord_homedir="/var/lib/colord" -make_dirs="/var/lib/colord 0755 colord colord" -subpackages="libcolord colord-devel" + libusb-devel libgusb-devel>=0.1.6 systemd-devel sqlite-devel shared-color-profiles" short_desc="System daemon for managing color devices" maintainer="Juan RP " homepage="http://www.freedesktop.org/software/colord" license="GPL-2" distfiles="$homepage/releases/$pkgname-$version.tar.xz" checksum=a370b667a761f86ec2277f11f03a320e120130e472caace9f278eb246b103f11 + +libcolord_package() { + short_desc="${short_desc} -- runtime library" + replaces="colord<0.1.23_3" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +colord-devel_package() { + depends="dbus-devel glib-devel lcms2-devel libcolord-${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/vala + } +} + +colord_package() { + conf_files="/etc/colord.conf" + system_accounts="colord" + colord_homedir="/var/lib/colord" + make_dirs="/var/lib/colord 0755 colord colord" + depends="shared-color-profiles" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/compositeproto/template b/srcpkgs/compositeproto/template index 0aedd339f6..67de8c2804 100644 --- a/srcpkgs/compositeproto/template +++ b/srcpkgs/compositeproto/template @@ -1,16 +1,21 @@ # Template build file for 'compositeproto'. pkgname=compositeproto version=0.4.1 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="Composite extension headers from modular X.org" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984 long_desc=" This package provides Composite extension headers from the modular X.org X11 project." -noarch=yes +compositeproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/confuse/confuse-devel.template b/srcpkgs/confuse/confuse-devel.template deleted file mode 100644 index 2042243965..0000000000 --- a/srcpkgs/confuse/confuse-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'confuse-devel'. -# -depends="confuse" -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 - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/confuse/template b/srcpkgs/confuse/template index d909065075..c582ae834a 100644 --- a/srcpkgs/confuse/template +++ b/srcpkgs/confuse/template @@ -1,14 +1,14 @@ # Template file for 'confuse' pkgname=confuse version=2.7 -revision=2 -distfiles="http://savannah.nongnu.org/download/confuse/confuse-2.7.tar.gz" +revision=3 build_style=gnu-configure configure_args="--enable-shared --enable-static --disable-nls" short_desc="C-library for parsing configuration files" maintainer="davehome " homepage="http://www.nongnu.org/confuse/" license="ISC" +distfiles="http://savannah.nongnu.org/download/confuse/confuse-2.7.tar.gz" checksum=e32574fd837e950778dac7ade40787dd2259ef8e28acd6ede6847ca895c88778 long_desc=" libConfuse is a configuration file parser library, licensed under the terms @@ -24,4 +24,18 @@ long_desc=" to integrate with your code. libConfuse was called libcfg before, but its name was changed to not confuse itself with other similar libraries." -subpackages="$pkgname-devel" +confuse-devel_package() { + depends="confuse>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} + +confuse_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/connman/connman-devel.template b/srcpkgs/connman/connman-devel.template deleted file mode 100644 index 3c1d376634..0000000000 --- a/srcpkgs/connman/connman-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'connman-devel'. -# -noarch=yes -depends="dbus-devel glib-devel" -short_desc="${sourcepkg} 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/connman/template b/srcpkgs/connman/template index af129765e6..2f8ee08c31 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -1,8 +1,7 @@ # Template file for 'connman' pkgname=connman version=1.12 -revision=2 -subpackages="$pkgname-devel" +revision=3 build_style=gnu-configure configure_args="--enable-pie --enable-threads --enable-ethernet --enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat @@ -16,10 +15,27 @@ distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz" checksum=8ca8a2ab5477b05821ee3e535320fce55409f7615313ccb785e672660b452314 hostmakedepends="pkg-config" -makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 gnutls-devel>=3.1.5 readline-devel" -fulldepends="bluez wpa_supplicant" +makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 + gnutls-devel>=3.1.5 readline-devel bluez wpa_supplicant" post_install() { # Install the client connmanctl. vinstall client/connmanctl 755 usr/bin } + +connman-devel_package() { + depends="dbus-devel glib-devel" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +connman_package() { + depends="bluez wpa_supplicant" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template index aa47a8024a..613a661ccc 100644 --- a/srcpkgs/cpio/template +++ b/srcpkgs/cpio/template @@ -1,11 +1,11 @@ # Template file for 'cpio' pkgname=cpio version=2.11 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure revision=1 short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support" maintainer="Juan RP " +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" checksum=601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978 homepage="http://www.gnu.org/software/cpio/" license="GPL-3" @@ -14,9 +14,13 @@ long_desc=" local magnetic tapes, and both tar and cpio format archives in files or on tapes." - -post_install() -{ +post_install() { # Remove rmt that conflicts with the one from tar. rm -rf ${DESTDIR}/usr/libexec } + +cpio_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 03c97f4b50..266552f32d 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -11,3 +11,9 @@ license="GPL-2" homepage="http://cppcheck.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=3a6665a2cd63815ec34dfc671e66faa6f9e341ee1309e5aaaa3904a6f6f273a7 + +cppcheck_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cpufrequtils/libcpufreq-devel.template b/srcpkgs/cpufrequtils/libcpufreq-devel.template deleted file mode 100644 index d6e5876364..0000000000 --- a/srcpkgs/cpufrequtils/libcpufreq-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'libcpufreq-devel'. -# -depends="glibc-devel libcpufreq" -short_desc="libcpufreq - development tools" -long_desc=" - This package provides everything that is needed for developing own - programs using libcpufreq." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/{lib,include} ${DESTDIR}/usr -} diff --git a/srcpkgs/cpufrequtils/libcpufreq.template b/srcpkgs/cpufrequtils/libcpufreq.template deleted file mode 100644 index 1b6d6e45d9..0000000000 --- a/srcpkgs/cpufrequtils/libcpufreq.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libcpufreq'. -# -short_desc="Library for the kernel cpufreq subsystem" -long_desc=" - This library provide an unified method to access the CPUFreq kernel interface." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template index f68992fe90..dc73490c52 100644 --- a/srcpkgs/cpufrequtils/template +++ b/srcpkgs/cpufrequtils/template @@ -1,18 +1,16 @@ # Template file for 'cpufrequtils' pkgname=cpufrequtils version=008 -distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$version.tar.bz2" revision=3 short_desc="Userspace tools for the Linux kernel cpufreq subsystem" homepage="ftp://ftp.archlinux.org/other/cpufrequtils/" license="GPL-2" maintainer="Juan RP " +distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$version.tar.bz2" checksum=1b9daa591d977679fb09ffb9b4d58afa94b9387f3c0be92ec077080e328130f1 long_desc=" Userspace tools for the Linux kernel cpufreq subsystem." -subpackages="libcpufreq libcpufreq-devel" - do_build() { make V=1 } @@ -21,3 +19,24 @@ do_install() { sed -i "s|/usr/bin/install|install|g" Makefile make DESTDIR=${DESTDIR} mandir=/usr/share/man install } + +libcpufreq_package() { + short_desc="Library for the kernel cpufreq subsystem" + pkg_install() { + vmove "usr/lib/*.so*" usr/lib + } +} + +libcpufreq-devel_package() { + depends="libcpufreq>=${version}" + short_desc="libcpufreq - development tools" + pkg_install() { + vmove usr/include + } +} + +cpufrequtils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 8721545927..b626d1c942 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -12,14 +12,7 @@ license="BSD" distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz" checksum=bd7f6f118460c452bd1217a24b80fd3c000425d3de28731b98354a81a2133e92 -makedepends="pam-devel" -depends="run-parts" -makedepends="pam-devel" - -conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" -systemd_services="cronie.service on" -provides="cron-daemon-0" -replaces="cron-daemon>=0" +makedepends="pam-devel run-parts" post_install() { install -d ${DESTDIR}/etc/cron.{d,hourly,daily,weekly,monthly} @@ -36,3 +29,16 @@ post_install() { touch ${DESTDIR}/etc/cron.deny chmod 644 ${DESTDIR}/etc/cron.deny } + +cronie_package() { + conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" + replaces="cron-daemon>=0" + provides="cron-daemon-0" + systemd_services="cronie.service on" + depends="run-parts" + pkg_install() { + vmove etc + vmove usr + vmove var + } +} diff --git a/srcpkgs/cross-arm-linux-musleabi/cross-arm-linux-musleabi-libc.template b/srcpkgs/cross-arm-linux-musleabi/cross-arm-linux-musleabi-libc.template deleted file mode 100644 index 172f413f28..0000000000 --- a/srcpkgs/cross-arm-linux-musleabi/cross-arm-linux-musleabi-libc.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'cross-arm-linux-musleabi-libc'. -# -short_desc="${short_desc} -- libc files" - -noarch=yes -noverifydeps=yes - -do_install() { - vmove usr/${_CROSS_TARGET} usr - mkdir -p ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ - mv ${DESTDIR}/usr/${_CROSS_TARGET}/usr/bin \ - ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ -} diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index 88d1e318fd..dd5a74db55 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -38,10 +38,7 @@ checksum=" create_wrksrc=yes disable_debug=yes -nostrip_files="libgcc.a libgcov.a libgcc_eh.a" -subpackages="${pkgname}-libc" makedepends="perl flex" -depends="${pkgname}-libc-${version}_${revision}" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -237,3 +234,20 @@ do_clean() { rm -rf /usr/lib/gcc/${_CROSS_TARGET} rm -rf /usr/libexec/gcc/${_CROSS_TARGET} } + +cross-arm-linux-musleabi-libc_package() { + short_desc="${short_desc} -- libc files" + noarch=yes + noverifydeps=yes + pkg_install() { + vmove usr/${_CROSS_TARGET} + } +} + +cross-arm-linux-musleabi_package() { + nostrip_files="libgcc.a libgcov.a libgcc_eh.a" + depends="${pkgname}-libc-${version}_${revision}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cross-i686-pc-linux-gnu/cross-i686-pc-linux-gnu-libc.template b/srcpkgs/cross-i686-pc-linux-gnu/cross-i686-pc-linux-gnu-libc.template deleted file mode 100644 index 70d29cee6a..0000000000 --- a/srcpkgs/cross-i686-pc-linux-gnu/cross-i686-pc-linux-gnu-libc.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'cross-i686-pc-linux-gnu-libc'. -# -short_desc="${short_desc} -- glibc files" - -noarch=yes -nostrip=yes -noverifydeps=yes - -do_install() { - vmove usr/${_CROSS_TARGET} usr - mkdir -p ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ - mv ${DESTDIR}/usr/${_CROSS_TARGET}/usr/bin \ - ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ -} diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index bc569a239e..b83d855ced 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -37,10 +37,7 @@ checksum=" create_wrksrc=yes disable_debug=yes -nostrip_files="libgcc.a libgcov.a libgcc_eh.a" -subpackages="${pkgname}-libc" makedepends="perl flex gmp-devel mpc-devel cloog-ppl-devel" -depends="${pkgname}-libc-${version}_${revision}" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -281,3 +278,21 @@ do_clean() { rm -rf /usr/lib/gcc/${_CROSS_TARGET} rm -rf /usr/libexec/gcc/${_CROSS_TARGET} } + +cross-i686-pc-linux-gnu-libc_package() { + short_desc="${short_desc} -- glibc files" + noarch=yes + nostrip=yes + noverifydeps=yes + pkg_install() { + vmove usr/${_CROSS_TARGET} usr + } +} + +cross-i686-pc-linux-gnu_package() { + depends="${pkgname}-libc-${version}_${revision}" + nostrip_files="libgcc.a libgcov.a libgcc_eh.a" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/cross-mips-softfloat-linux-gnu-libc.template b/srcpkgs/cross-mips-softfloat-linux-gnu/cross-mips-softfloat-linux-gnu-libc.template deleted file mode 100644 index db09b7c4f0..0000000000 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/cross-mips-softfloat-linux-gnu-libc.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'cross-arm-linux-gnueabihf-libc'. -# -short_desc="${short_desc} -- glibc files" - -noarch=yes -nostrip=yes -noverifydeps=yes - -do_install() { - vmove usr/${_CROSS_TARGET} usr - mkdir -p ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ - mv ${DESTDIR}/usr/${_CROSS_TARGET}/usr/bin \ - ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ -} diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template index 57c09e212a..7979b366c3 100644 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template @@ -38,10 +38,7 @@ checksum=" create_wrksrc=yes disable_debug=yes -nostrip_files="libgcc.a libgcov.a libgcc_eh.a" -subpackages="${pkgname}-libc" makedepends="perl flex" -depends="${pkgname}-libc-${version}_${revision}" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -273,3 +270,21 @@ do_clean() { rm -rf /usr/lib/gcc/${_CROSS_TARGET} rm -rf /usr/libexec/gcc/${_CROSS_TARGET} } + +cross-mips-softfloat-linux-gnu-libc_package() { + short_desc="${short_desc} -- glibc files" + noarch=yes + nostrip=yes + noverifydeps=yes + pkg_install() { + vmove usr/${_CROSS_TARGET} + } +} + +cross-mips-softfloat-linux-gnu_package() { + depends="${pkgname}-libc-${version}_${revision}" + nostrip_files="libgcc.a libgcov.a libgcc_eh.a" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/cross-mipsel-softfloat-linux-gnu-libc.template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/cross-mipsel-softfloat-linux-gnu-libc.template deleted file mode 100644 index db09b7c4f0..0000000000 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/cross-mipsel-softfloat-linux-gnu-libc.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'cross-arm-linux-gnueabihf-libc'. -# -short_desc="${short_desc} -- glibc files" - -noarch=yes -nostrip=yes -noverifydeps=yes - -do_install() { - vmove usr/${_CROSS_TARGET} usr - mkdir -p ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ - mv ${DESTDIR}/usr/${_CROSS_TARGET}/usr/bin \ - ${SRCPKGDESTDIR}/usr/${_CROSS_TARGET}/usr/ -} diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template index c621744ee7..6f29a4b38b 100644 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template @@ -38,10 +38,7 @@ checksum=" create_wrksrc=yes disable_debug=yes -nostrip_files="libgcc.a libgcov.a libgcc_eh.a" -subpackages="${pkgname}-libc" makedepends="perl flex" -depends="${pkgname}-libc-${version}_${revision}" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -273,3 +270,21 @@ do_clean() { rm -rf /usr/lib/gcc/${_CROSS_TARGET} rm -rf /usr/libexec/gcc/${_CROSS_TARGET} } + +cross-mipsel-softfloat-linux-gnu-libc_package() { + short_desc="${short_desc} -- glibc files" + noarch=yes + nostrip=yes + noverifydeps=yes + pkg_install() { + vmove usr/${_CROSS_TARGET} + } +} + +cross-mipsel-softfloat-linux-gnu_package() { + depends="${pkgname}-libc-${version}_${revision}" + nostrip_files="libgcc.a libgcov.a libgcc_eh.a" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cryptsetup/cryptsetup-devel.template b/srcpkgs/cryptsetup/cryptsetup-devel.template deleted file mode 100644 index 3b729532dd..0000000000 --- a/srcpkgs/cryptsetup/cryptsetup-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'cryptsetup-devel'. -noarch=yes -depends="libcryptsetup-${version}_${revision}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/cryptsetup/libcryptsetup.template b/srcpkgs/cryptsetup/libcryptsetup.template deleted file mode 100644 index 324703fbe5..0000000000 --- a/srcpkgs/cryptsetup/libcryptsetup.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libcryptsetup'. -# -short_desc="${short_desc} - runtime libraries" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index c31e6244a3..f86173bf1a 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,8 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup version=1.6.0 -revision=1 -subpackages="libcryptsetup cryptsetup-devel" +revision=2 build_style=gnu-configure configure_args="--enable-pwquality" hostmakedepends="pkg-config" @@ -15,8 +14,30 @@ distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2" checksum=dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406 if [ "$CROSS_BUILD" ]; then - hostmakedepends="automake gettext-devel pkg-config libgcrypt-devel" + hostmakedepends+=" automake gettext-devel libgcrypt-devel" pre_configure() { autoreconf -fi } fi + +libcryptsetup_package() { + short_desc="${short_desc} - runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +cryptsetup-devel_package() { + depends="libcryptsetup-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +cryptsetup_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 80ee0b740c..6464eea2e6 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -5,8 +5,7 @@ revision=2 build_style=gnu-configure makedepends="pkg-config lcms2-devel libpng-devel>=1.5.10 libqpdf-devel poppler-cpp-devel>=0.22.2 fontconfig-devel avahi-glib-libs-devel ghostscript-devel - cups-devel" -fulldepends="ghostscript poppler-utils" + cups-devel ghostscript poppler-utils" short_desc="The OpenPrinting CUPS Filters" maintainer="Juan RP " license="GPL-2, LGPL-2.1, MIT" @@ -22,3 +21,11 @@ post_install() { rm -rf ${DESTDIR}/etc/rc.d vinstall ${FILESDIR}/cups-browsed.service 644 usr/lib/systemd/system } + +cups-filters_package() { + depends="ghostscript poppler-utils" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/cups/cups-devel.template b/srcpkgs/cups/cups-devel.template deleted file mode 100644 index a395fbcf5c..0000000000 --- a/srcpkgs/cups/cups-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'cups-devel'. -# -noarch=yes -depends="gnutls-devel libcups>=$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/bin/cups-config usr/bin -} diff --git a/srcpkgs/cups/libcups.template b/srcpkgs/cups/libcups.template deleted file mode 100644 index 53348cfef8..0000000000 --- a/srcpkgs/cups/libcups.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'libcups'. -# -short_desc="${short_desc} -- client runtime shared libraries" -conf_files="/etc/cups/client.conf" -long_desc="${long_desc} - - This package contains the client runtime shared libraries." - -replaces="cups<1.6.0_1" - -do_install() { - vmove "usr/lib/*.so*" usr/lib - vmove etc/cups/client.conf etc/cups - vmove usr/share/man/man5/client.conf.5 usr/share/man/man5 -} diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 326437ff4e..e3243fb7df 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,9 +1,8 @@ # Template file for 'cups' pkgname=cups version=1.6.1 -revision=6 +revision=7 patch_args="-Np1" -depends="libcups>=${version}_${revision} cups-filters bc" makedepends="automake pkg-config acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel systemd-devel gnutls-devel>=3.1.5 @@ -15,25 +14,6 @@ license="GPL-2" distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2" checksum=5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790 -make_dirs=" -/var/cache/cups/rss 0750 root lp -/var/run/cups/certs 0750 root lp -/var/log/cups 0750 root root -/var/spool/cups 0755 root lp -/etc/cups/ssl 0700 root lp" - -subpackages="libcups cups-devel" -systemd_services="cups.socket on" - -conf_files=" -/etc/cups/cupsd.conf -/etc/cups/snmp.conf -/etc/cups/printers.conf -/etc/cups/classes.conf -/etc/cups/subscriptions.conf -/etc/dbus-1/system.d/cups.conf -/etc/pam.d/cups" - pre_configure() { aclocal -I config-scripts autoconf -I config-scripts @@ -86,3 +66,52 @@ do_install() { perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \ ${DESTDIR}/usr/share/cups/mime/mime.convs } + +libcups_package() { + short_desc="${short_desc} -- client runtime shared libraries" + conf_files="/etc/cups/client.conf" + replaces="cups<1.6.0_1" + pkg_install() { + vmove "usr/lib/*.so*" + vmove etc/cups/client.conf + vmove usr/share/man/man5/client.conf.5 + } +} + +cups-devel_package() { + depends="gnutls-devel libcups>=$version" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/bin/cups-config + } +} + +cups_package() { + systemd_services="cups.socket on" + conf_files=" + /etc/cups/cupsd.conf + /etc/cups/snmp.conf + /etc/cups/printers.conf + /etc/cups/classes.conf + /etc/cups/subscriptions.conf + /etc/dbus-1/system.d/cups.conf + /etc/pam.d/cups" + make_dirs=" + /var/cache/cups/rss 0750 root lp + /var/run/cups/certs 0750 root lp + /var/log/cups 0750 root root + /var/spool/cups 0755 root lp + /etc/cups/ssl 0700 root lp" + depends="libcups>=${version}_${revision} cups-filters bc" + pkg_install() { + vmove etc/cups/classes.conf + vmove etc/cups/snmp.conf + vmove etc/cups/subscriptions.conf + vmove etc/cups/cupsd.conf + vmove etc/cups/printers.conf + vmove etc/pam.d/cups + vmove etc/cups/cupsd.conf.default + vmove usr + } +} diff --git a/srcpkgs/curl/libcurl-devel.template b/srcpkgs/curl/libcurl-devel.template deleted file mode 100644 index 5058dc6ba3..0000000000 --- a/srcpkgs/curl/libcurl-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'curl-devel'. -# -replaces="curl-devel<7.20.1" -depends="libidn-devel openssl-devel mit-krb5-devel libcurl-${version}_${revision}" -short_desc="The multiprotocol file transfer library - development files" - -do_install() { - vmove usr/bin/curl-config usr/bin - vmove "usr/share/man/man1/curl-config*" usr/share/man/man1 - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/curl/libcurl.template b/srcpkgs/curl/libcurl.template deleted file mode 100644 index 820cbb37e8..0000000000 --- a/srcpkgs/curl/libcurl.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libcurl'. -# -replaces="curl-libs<7.20.1" -short_desc="The multiprotocol file transfer library" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 45c8710f7f..bb3c37c8cd 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -6,13 +6,40 @@ build_style=gnu-configure configure_args="--disable-ldaps --with-gssapi=/usr --enable-threaded-resolver --enable-ipv6 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" -depends="ca-certificates" hostmakedepends="pkg-config perl groff" makedepends="libidn-devel openssl-devel mit-krb5-devel" -subpackages="libcurl libcurl-devel" short_desc="Client that groks URLs" maintainer="Juan RP " license="MIT" homepage="http://curl.haxx.se" distfiles="$homepage/download/$pkgname-$version.tar.bz2" checksum=9d78e8bac6fa101679ca82e72a24e55918c5d495d29acb1eff62610929d3832f + +libcurl_package() { + replaces="curl-libs<7.20.1" + short_desc="The multiprotocol file transfer library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +libcurl-devel_package() { + replaces="curl-devel<7.20.1" + depends="libidn-devel openssl-devel mit-krb5-devel libcurl-${version}_${revision}" + short_desc="The multiprotocol file transfer library - development files" + pkg_install() { + vmove usr/bin/curl-config + vmove "usr/share/man/man1/curl-config*" + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 + } +} + +curl_package() { + depends="ca-certificates" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/curlftpfs/template b/srcpkgs/curlftpfs/template index 47ab6615ff..3b99675276 100644 --- a/srcpkgs/curlftpfs/template +++ b/srcpkgs/curlftpfs/template @@ -1,15 +1,15 @@ # Template file for 'curlftpfs' pkgname=curlftpfs version=0.9.2 -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" +revision=1 build_style=gnu-configure configure_args="ac_cv_func_working_mktime=yes" -revision=1 makedepends="pkg-config glib-devel fuse-devel libcurl-devel" short_desc="A FTP filesystem based on cURL and FUSE" maintainer="Juan RP " homepage="http://curlftpfs.sourceforge.net/" license="GPL-2" +distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 long_desc=" CurlFtpFS differentiates itself from other FTP filesystems because it features: @@ -19,5 +19,8 @@ long_desc=" automatically reconnection if the server times out transform absolute symlinks to point back into the ftp file system " - - +curlftpfs_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template index 764a202daf..2d0b98a30a 100644 --- a/srcpkgs/cvs/template +++ b/srcpkgs/cvs/template @@ -6,8 +6,7 @@ patch_args="-Np1" build_style=gnu-configure configure_args="--with-editor=/usr/bin/vi" hostmakedepends="nvi" -makedepends="mit-krb5-devel" -fulldepends="openssh>=6.1p1" +makedepends="mit-krb5-devel openssh>=6.1p1" short_desc="Concurrent Versions System" maintainer="Juan RP " homepage="http://www.nongnu.org/cvs/" @@ -22,3 +21,10 @@ long_desc=" CVS is a production quality system in wide use around the world, including many free software projects." + +cvs_package() { + depends="openssh>=6.1p1" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template index e732432b5f..7ec256c428 100644 --- a/srcpkgs/cvs2svn/template +++ b/srcpkgs/cvs2svn/template @@ -6,11 +6,9 @@ XBPS_FETCH_CMD="wget" pkgname=cvs2svn version=2.3.0 revision=2 -noarch=yes build_style=gnu-makefile make_build_args="man" -makedepends="wget" -fulldepends="cvs python>=0" +makedepends="wget cvs python" short_desc="CVS to Subversion, git and bazaar repository conversion tool" maintainer="Juan RP " homepage="http://cvs2svn.tigris.org/" @@ -35,3 +33,11 @@ post_install() { install -m644 *.1 ${DESTDIR}/usr/share/man/man1 vinstall COPYING 644 usr/share/licenses/cvs2svn } + +cvs2svn_package() { + depends="cvs python>=0" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/cyrus-sasl/cyrus-sasl-modules-gssapi.template b/srcpkgs/cyrus-sasl/cyrus-sasl-modules-gssapi.template deleted file mode 100644 index 8c6bdb57a0..0000000000 --- a/srcpkgs/cyrus-sasl/cyrus-sasl-modules-gssapi.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'cyrus-sasl-modules-sql'. -# -depends="cyrus-sasl>=${version}_${revision}" -short_desc="Cyrus SASL - pluggable authentication modules (GSSAPI)" - -do_install() { - vmove "usr/lib/sasl2/libgssapi*" usr/lib/sasl2 -} diff --git a/srcpkgs/cyrus-sasl/cyrus-sasl-modules-ldap.template b/srcpkgs/cyrus-sasl/cyrus-sasl-modules-ldap.template deleted file mode 100644 index 7bc0f693cd..0000000000 --- a/srcpkgs/cyrus-sasl/cyrus-sasl-modules-ldap.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'cyrus-sasl-modules-ldap'. -# -depends="cyrus-sasl>=${version}_${revision}" -short_desc="Cyrus SASL - pluggable authentication modules (LDAP)" - -do_install() { - vmove "usr/lib/sasl2/libldapdb.*" usr/lib/sasl2 -} diff --git a/srcpkgs/cyrus-sasl/cyrus-sasl-modules-sql.template b/srcpkgs/cyrus-sasl/cyrus-sasl-modules-sql.template deleted file mode 100644 index 1ddcf18101..0000000000 --- a/srcpkgs/cyrus-sasl/cyrus-sasl-modules-sql.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'cyrus-sasl-modules-sql'. -# -depends="cyrus-sasl>=${version}_${revision}" -short_desc="Cyrus SASL - pluggable authentication modules (SQL)" - -do_install() { - vmove "usr/lib/sasl2/libsql.*" usr/lib/sasl2 -} diff --git a/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template b/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template deleted file mode 100644 index 9f7eafd517..0000000000 --- a/srcpkgs/cyrus-sasl/cyrus-sasl-modules.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'cyrus-sasl-plugins'. -# -depends="cyrus-sasl>=${version}_${revision}" -short_desc="Cyrus SASL - pluggable authentication modules" - -do_install() { - vmove usr/lib/sasl2 usr/lib -} diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index a2201072c5..dab8d033a8 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -23,18 +23,10 @@ long_desc=" disable_parallel_build=yes -depends="libsasl>=${version}" - hostmakedepends="groff" - makedepends="openssl-devel db-devel libldap-devel mit-krb5-devel pam-devel postgresql-libs-devel libmysqlclient-devel>=5.5.27 sqlite-devel" -subpackages="${pkgname}-modules-ldap ${pkgname}-modules-sql - ${pkgname}-modules-gssapi ${pkgname}-modules" - -systemd_services="saslauthd.service on" - do_configure() { ./configure ${CONFIGURE_SHARED_ARGS} --disable-static --enable-shared \ --enable-alwaystrue --enable-checkapop --enable-cram \ @@ -67,3 +59,43 @@ do_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +cyrus-sasl-modules-ldap_package() { + depends="cyrus-sasl>=${version}_${revision}" + short_desc="Cyrus SASL - pluggable authentication modules (LDAP)" + pkg_install() { + vmove "usr/lib/sasl2/libldapdb.*" + } +} + +cyrus-sasl-modules-sql_package() { + depends="cyrus-sasl>=${version}_${revision}" + short_desc="Cyrus SASL - pluggable authentication modules (SQL)" + pkg_install() { + vmove "usr/lib/sasl2/libsql.*" + } +} + +cyrus-sasl-modules-gssapi_package() { + depends="cyrus-sasl>=${version}_${revision}" + short_desc="Cyrus SASL - pluggable authentication modules (GSSAPI)" + pkg_install() { + vmove "usr/lib/sasl2/libgssapi*" + } +} + +cyrus-sasl-modules_package() { + depends="cyrus-sasl>=${version}_${revision}" + short_desc="Cyrus SASL - pluggable authentication modules" + pkg_install() { + vmove usr/lib/sasl2 + } +} + +cyrus-sasl_package() { + systemd_services="saslauthd.service on" + depends="libsasl>=${version}" + pkg_install() { + vmove usr + } +}