diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template index 8b56ddd15e..d603f9b88c 100644 --- a/srcpkgs/Twisted/template +++ b/srcpkgs/Twisted/template @@ -6,7 +6,6 @@ build_style=python-module pycompile_module="twisted" makedepends="python-devel" fulldepends="zope.interface>=4.0.1 pycrypto pyopenssl" -crossmakedepends="${makedepends}" short_desc="Event-driven networking engine written in Python" maintainer="Juan RP " homepage="http://twistedmatrix.com/" diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template index 817b853826..d0065ae7fa 100644 --- a/srcpkgs/acl/template +++ b/srcpkgs/acl/template @@ -7,14 +7,9 @@ build_style=gnu-configure configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" make_install_target="DIST_ROOT=${XBPS_DESTDIR}/${pkgname}-${version} install install-lib install-dev" makedepends="attr-devel" -crossmakedepends="attr-devel" short_desc="Access Control List filesystem support" maintainer="Juan RP " homepage="http://savannah.nongnu.org/projects/acl" license="LGPL-2.1" distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz" checksum=06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225 - -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - unset makedepends -fi diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template index fa69c763dd..99877a5e55 100644 --- a/srcpkgs/atop/template +++ b/srcpkgs/atop/template @@ -7,7 +7,6 @@ wrksrc=atop-${_distver}-${_patchver} revision=1 build_style=gnu-makefile makedepends="ncurses-devel zlib-devel" -crossmakedepends="${makedepends}" short_desc="A system and process level monitor" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 817cf2188b..bae8b058a4 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -18,8 +18,8 @@ distfiles="$homepage/download/avahi-$version.tar.gz" checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 depends="dbus" -makedepends="pkg-config intltool dbus-devel libcap-devel - libdaemon-devel gdbm-devel dbus-python pygtk-devel +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" # Create avahi and netdev system accounts. @@ -37,10 +37,10 @@ subpackages="avahi-autoipd avahi-discover avahi-compat-libs avahi-compat-libs-de avahi-ui-libs avahi-ui-libs-gtk3 avahi-ui-libs-devel avahi-utils avahi-ui-utils avahi-python-utils avahi-python" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX glib, gtk, introspection and python - makedepends="automake gettext-devel glib-devel pkg-config intltool" - crossmakedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel" + hostmakedepends="automake gettext-devel glib-devel pkg-config 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 diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index c4e7db31b9..35d1dcb81e 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -19,8 +19,8 @@ configure_args="--without-bash-malloc --with-curses --with-installed-readline bash_cv_sys_siglist=yes bash_cv_func_ctype_nonascii=no bash_cv_dup2_broken=no bash_cv_pgrp_pipe=no bash_cv_printf_a_format=yes bash_cv_func_strcoll_broken=no bash_cv_func_vsnprintf=yes" -makedepends="readline-devel bison" -crossmakedepends="readline-devel" +hostmakedepends="bison" +makedepends="readline-devel" short_desc="The GNU Bourne Again Shell" maintainer="Juan RP " homepage="http://www.gnu.org/software/bash/bash.html" diff --git a/srcpkgs/binfmt-support/template b/srcpkgs/binfmt-support/template index ce994bf4e1..6973a552fc 100644 --- a/srcpkgs/binfmt-support/template +++ b/srcpkgs/binfmt-support/template @@ -3,8 +3,8 @@ pkgname=binfmt-support version=2.0.13 revision=1 build_style=gnu-configure -makedepends="pkg-config libpipeline-devel" -crossmakedepends="libpipeline-devel" +hostmakedepends="pkg-config" +makedepends="libpipeline-devel" short_desc="Support for extra binary formats" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index d513c82bfc..87afb280df 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -2,7 +2,8 @@ pkgname=binutils version=2.23.51.0.3 revision=2 -makedepends="flex perl" +hostmakedepends="flex perl" +makedepends="libfl-devel zlib-devel" subpackages="$pkgname-devel" short_desc="GNU binary utilities" maintainer="Juan RP " @@ -11,12 +12,8 @@ license="GPL-3" distfiles="${KERNEL_SITE}/devel/binutils/$pkgname-$version.tar.xz" checksum=2162905dabf191a2a803eab8d31e7be52d96d6ccd1e0ce42e25d82c6be918cd0 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - crossmakedepends="libfl-devel zlib-devel" -fi - do_configure() { - if [ "${XBPS_MACHINE}" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then CONFIGFLAG="--enable-64-bit-bfd --enable-multilib" fi @@ -45,7 +42,7 @@ do_build() { } do_install() { - if [ "$XBPS_MACHINE" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then mkdir -p ${SRCPKGDESTDIR}/usr/lib cd ${SRCPKGDESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc} fi diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 46c42fe9cb..034363431e 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -4,7 +4,8 @@ version=0.8.1 revision=2 wrksrc="${pkgname}-${version}-linux" subpackages="bitcoin-qt" -makedepends="which db-devel openssl-devel qt-devel boost-devel automoc4 miniupnpc-devel" +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" maintainer="Juan RP " license="MIT" @@ -14,11 +15,10 @@ checksum=6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98 disable_debug=1 -if [ -n "$XBPS_CROSS_BUILD" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX -qt subpkg unset subpackages - makedepends="which" - crossmakedepends="db-devel openssl-devel boost-devel miniupnpc-devel" + akedepends="db-devel openssl-devel boost-devel miniupnpc-devel" fi do_build() { diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index a29a72f12a..0ef4a26bd9 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -20,15 +20,14 @@ long_desc=" disable_debug=yes -if [ -n "$XBPS_CROSS_BUILD" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX boost-jam and boost-python subpkgs. - unset makedepends subpackages="boost-build boost-devel" - crossmakedepends="zlib-devel icu-devel>=49.1" + makedepends="zlib-devel icu-devel>=49.1" fi do_build() { - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then echo "using gcc : arm : ${XBPS_CROSS_TRIPLET}-g++ ;" > \ tools/build/v2/user-config.jam fi @@ -38,11 +37,11 @@ do_build() { do_install() { # Install bjam - if [ "$XBPS_MACHINE" = "i686" ]; then + if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _bindir="bin.linuxx86" - elif [ "$XBPS_MACHINE" = "x86_64" ]; then + elif [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _bindir="bin.linuxx86_64" - elif [ "$XBPS_MACHINE" = "armv6l" ]; then + elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then _bindir="bin.linuxarm" fi [ -z "$XBPS_CROSS_BUILD" ] && vinstall bjam 755 usr/bin diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index 7af2c6ddda..1de8b87b0c 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -5,7 +5,6 @@ version=0.20rc1.1 revision=1 wrksrc="${pkgname}-${_distver}" makedepends="acl-devel libuuid-devel e2fsprogs-devel" -crossmakedepends="${makedepends}" short_desc="Btrfs filesystem utilities" maintainer="Juan RP " license="GPL-2" @@ -14,11 +13,6 @@ distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${_distver}.tar.x checksum=6d13ffd167ee1cc1a8844f7c656db0472730a3bb8fa561e9361957b1ec502f2b do_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then - CC="$XBPS_CROSS_TRIPLET-gcc" - else - CC="gcc" - fi make CC="$CC" CFLAGS="$CFLAGS" ${makejobs} } diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template index 7a3c7e7fc7..e400f550a6 100644 --- a/srcpkgs/cairo/template +++ b/srcpkgs/cairo/template @@ -24,14 +24,9 @@ long_desc=" antialiased text rendering." depends="pixman>=0.28" -makedepends="pkg-config libpng-devel>=1.5.10 fontconfig-devel - pixman-devel>=0.28 libXrender-devel>=0.9.7_3 glib-devel" +hostmakedepends="which automake pkg-config" +makedepends="libpng-devel>=1.5.10 fontconfig-devel pixman-devel>=0.28 libXrender-devel>=0.9.7_3 libglib-devel" -if [ "$XBPS_CROSS_BUILD" ]; then - makedepends="which automake pkg-config" - crossmakedepends="libpng-devel fontconfig-devel pixman-devel - libXrender-devel>=0.9.7_3 libglib-devel" - pre_configure() { - autoreconf -fi - } -fi +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/cairo/template.options b/srcpkgs/cairo/template.options index d34629491e..c3980303e0 100644 --- a/srcpkgs/cairo/template.options +++ b/srcpkgs/cairo/template.options @@ -23,6 +23,5 @@ do_options() { if [ "$build_option_opengl" -o "$build_option_gles2" ]; then makedepends="${makedepends} MesaLib-devel" - crossmakedepends="${makedepends}" fi } diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 6525d1934c..27de688f0d 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -5,7 +5,6 @@ revision=2 bootstrap=yes build_style=gnu-configure makedepends="zlib-devel" -crossmakedepends="${makedepends}" short_desc="A Fast C/C++ Compiler Cache" maintainer="Juan RP " homepage="http://ccache.samba.org" diff --git a/srcpkgs/chroot-binutils/template b/srcpkgs/chroot-binutils/template index 514f3f6135..22e6ec282a 100644 --- a/srcpkgs/chroot-binutils/template +++ b/srcpkgs/chroot-binutils/template @@ -10,10 +10,10 @@ license="GPL-3" distfiles="${KERNEL_SITE}/devel/binutils/binutils-$version.tar.xz" checksum=2162905dabf191a2a803eab8d31e7be52d96d6ccd1e0ce42e25d82c6be918cd0 -if [ -n "$IN_CHROOT" ]; then - makedepends="flex perl" +if [ "$IN_CHROOT" ]; then + hostmakedepends="flex perl" fi -crossmakedepends="zlib-devel" +makedepends="zlib-devel" noverifyrdeps=yes bootstrap=yes @@ -21,7 +21,7 @@ provides="binutils-${version}" conflicts="binutils>=0" do_configure() { - if [ "${XBPS_MACHINE}" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then CONFIGFLAG="--enable-64-bit-bfd --enable-multilib" fi @@ -35,7 +35,7 @@ do_build() { } do_install() { - if [ "$XBPS_MACHINE" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then mkdir -p ${DESTDIR}/usr/lib cd ${DESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc} fi diff --git a/srcpkgs/chroot-file/template b/srcpkgs/chroot-file/template index f282fa0365..0e0de1d242 100644 --- a/srcpkgs/chroot-file/template +++ b/srcpkgs/chroot-file/template @@ -5,7 +5,6 @@ revision=1 wrksrc="file-${version}" build_style=gnu-configure makedepends="zlib-devel" -crossmakedepends="${makedepends}" short_desc="File type identification utility -- for xbps-src use" maintainer="Juan RP " homepage="http://www.darwinsys.com/file/" diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 89cf238339..72efda1f4b 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -17,12 +17,12 @@ checksum=3753247dbfd802aaf1cb2c917b8e873b6ed13c009ab0fa5f7d90b3c759195ff1 conflicts="git>=0" bootstrap=yes -if [ -n "$CHROOT_READY" ]; then - makedepends="perl" +if [ "$CHROOT_READY" ]; then + hostmakedepends="perl" fi -if [ -n "$XBPS_CROSS_BUILD" ]; then - crossmakedepends="zlib-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + smakedepends="zlib-devel" configure_args="${configure_args} ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" diff --git a/srcpkgs/chroot-texinfo/template b/srcpkgs/chroot-texinfo/template index 7f31261089..84b42974fe 100644 --- a/srcpkgs/chroot-texinfo/template +++ b/srcpkgs/chroot-texinfo/template @@ -14,9 +14,8 @@ bootstrap=yes conflicts="texinfo>=0" provides="texinfo-${version}" -if [ -n "$IN_CHROOT" ]; then +if [ "$IN_CHROOT" ]; then makedepends="ncurses-devel" - crossmakedepends="${makedepends}" fi do_configure() { diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template index 272cb6dd3e..0bfdfc58ea 100644 --- a/srcpkgs/cloog/template +++ b/srcpkgs/cloog/template @@ -14,7 +14,6 @@ license="GPL-2" distfiles="http://www.bastoul.net/cloog/pages/download/cloog-$version.tar.gz" checksum=f265f5069830c03d2919a7673c0963495437d6d79a8cbd3474cde2d4e3291e04 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - configure_args="${configure_args} --with-gmp-exec-prefix=/usr/$XBPS_CROSS_TRIPLET" - crossmakedepends="${makedepends}" +if [ "$XBPS_CROSS_BUILD" ]; then + configure_args="${configure_args} --with-gmp-exec-prefix=$XBPS_CROSS_BASE" fi diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index 43c2aac5ac..af129765e6 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -15,12 +15,8 @@ homepage="http://connman.net/" distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz" checksum=8ca8a2ab5477b05821ee3e535320fce55409f7615313ccb785e672660b452314 -makedepends="pkg-config glib-devel dbus-devel iptables-devel>=1.4.18 - gnutls-devel>=3.1.5 readline-devel" - -crossmakedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 - gnutls-devel>=3.1.5 readline-devel" - +hostmakedepends="pkg-config" +makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 gnutls-devel>=3.1.5 readline-devel" fulldepends="bluez wpa_supplicant" post_install() { diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index 7115ca7cc6..3b1252ab65 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -11,17 +11,16 @@ checksum=adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18 subpackages="coreutils-doc" conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3" -makedepends="perl gmp-devel acl-devel libcap-devel" +hostmakedepends="perl" +makedepends="gmp-devel acl-devel libcap-devel" depends="coreutils-doc-${version}_${revision}" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then unset subpackages - makedepends="perl" - crossmakedepends="gmp-devel acl-devel libcap-devel" fi do_configure() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then _confargs="fu_cv_sys_stat_statfs2_bsize=yes \ gl_cv_func_working_mkstemp=yes gl_cv_func_working_acl_get_file=yes" @@ -37,7 +36,7 @@ do_configure() { } do_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then cp Makefile Makefile.orig sed '/src_make_prime_list/d' Makefile.orig > Makefile depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ @@ -57,7 +56,7 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then rm -rf ${DESTDIR}/usr/share/info fi } diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template index 333a9cb1e2..0ab77080c9 100644 --- a/srcpkgs/cracklib/template +++ b/srcpkgs/cracklib/template @@ -8,7 +8,6 @@ build_wrksrc="${pkgname}-${version}" build_style=gnu-configure configure_args="--disable-static" makedepends="python-devel" -crossmakedepends="${makedepends}" short_desc="Password Checking Library" maintainer="Juan RP " license="LGPL-2.1" @@ -20,8 +19,8 @@ checksum=" feaff49bfb513ec10b2618c00d2f7f60776ba93fcc5fa22dd3479dd9cad9f770 9b323c100780f2a817ab3de082b8bfaa4478bfa174dcbd016810ed8be60cbe16" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel ${makedepends}" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel" pre_configure() { sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" -i configure.in autoreconf -fi diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 94601b06bb..8721545927 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -14,7 +14,7 @@ checksum=bd7f6f118460c452bd1217a24b80fd3c000425d3de28731b98354a81a2133e92 makedepends="pam-devel" depends="run-parts" -crossmakedepends="pam-devel" +makedepends="pam-devel" conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" systemd_services="cronie.service on" diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index e6a57c94f6..ef5559edd2 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -5,8 +5,8 @@ revision=1 subpackages="libcryptsetup cryptsetup-devel" build_style=gnu-configure configure_args="--enable-pwquality" -makedepends="pkg-config popt-devel libuuid-devel device-mapper-devel - libgcrypt-devel libpwquality-devel" +hostmakedepends="pkg-config" +makedepends="popt-devel libuuid-devel device-mapper-devel libgcrypt-devel libpwquality-devel" short_desc="Setup virtual encryption devices under dm-crypt Linux" maintainer="Juan RP " license="GPL-3" @@ -14,10 +14,8 @@ homepage="http://code.google.com/p/cryptsetup" distfiles="https://cryptsetup.googlecode.com/files/$pkgname-$version.tar.bz2" checksum=dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel pkg-config libgcrypt-devel" - crossmakedepends="popt-devel libuuid-devel device-mapper-devel - libgcrypt-devel libpwquality-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel pkg-config libgcrypt-devel" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 1ba717a6dc..45c8710f7f 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -7,8 +7,8 @@ configure_args="--disable-ldaps --with-gssapi=/usr --enable-threaded-resolver --enable-ipv6 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" depends="ca-certificates" -makedepends="pkg-config perl groff libidn-devel openssl-devel mit-krb5-devel" -crossmakedepends="libidn-devel openssl-devel mit-krb5-devel" +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 " diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template index 74ba8b8003..764a202daf 100644 --- a/srcpkgs/cvs/template +++ b/srcpkgs/cvs/template @@ -5,8 +5,8 @@ revision=4 patch_args="-Np1" build_style=gnu-configure configure_args="--with-editor=/usr/bin/vi" -makedepends="mit-krb5-devel nvi" -crossmakedepends="mit-krb5-devel" +hostmakedepends="nvi" +makedepends="mit-krb5-devel" fulldepends="openssh>=6.1p1" short_desc="Concurrent Versions System" maintainer="Juan RP " diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 795cda2877..b8edf68e03 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -18,13 +18,13 @@ checksum=" create_wrksrc=yes subpackages="dbus-devel dbus-libs dbus-x11" -makedepends="pkg-config intltool gperf expat-devel libX11-devel libcap-devel" -crossmakedepends="expat-devel libX11-devel libcap-devel" +hostmakedepends="pkg-config intltool gperf" +makedepends="expat-devel libX11-devel libcap-devel" conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - _systemddir="/usr/$XBPS_CROSS_TRIPLET" - makedepends="automake gettext-devel pkg-config intltool gperf libgcrypt-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + _systemddir="$XBPS_CROSS_BASE" + hostmakedepends="automake gettext-devel ${hostmakedepends} libgcrypt-devel" else _systemddir="/usr" fi @@ -34,9 +34,9 @@ pre_configure() { [ ! -d dbus-bootstrap ] && mkdir dbus-bootstrap cd dbus-bootstrap - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then _confargs="--host=$XBPS_CROSS_TRIPLET - --with-libtool-sysroot=/usr/$XBPS_CROSS_TRIPLET" + --with-libtool-sysroot=$XBPS_CROSS_BASE" fi ../dbus-${version}/configure ${_confargs} \ @@ -46,7 +46,7 @@ pre_configure() { make install # Build a temporary systemd; we are only interested in libsystemd-login. - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then cd ${wrksrc}/systemd-${_systemd_version} && autoreconf -fi fi @@ -86,10 +86,10 @@ pre_configure() { do_configure() { cd ${wrksrc}/dbus-${version} - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then autoreconf -fi _confargs="--host=$XBPS_CROSS_TRIPLET - --with-libtool-sysroot=/usr/$XBPS_CROSS_TRIPLET + --with-libtool-sysroot=$XBPS_CROSS_BASE PKG_CONFIG_LIBDIR=${_systemddir}/lib/pkgconfig" fi ./configure ${CONFIGURE_SHARED_ARGS} \ diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index 773acca22b..131b149fd4 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -9,8 +9,8 @@ configure_args="--enable-htree --enable-elf-shlibs --disable-fsck --enable-symlink-build --enable-symlink-install --libdir=/usr/lib --libexecdir=/usr/lib" make_install_args="install-libs" -makedepends="pkg-config libuuid-devel libblkid-devel" -crossmakedepends="libuuid-devel libblkid-devel" +hostmakedepends="pkg-config" +makedepends="libuuid-devel libblkid-devel" subpackages="$pkgname-devel $pkgname-libs" conf_files="/etc/mke2fs.conf" short_desc="Ext2/3/4 Filesystem Utilities" diff --git a/srcpkgs/file/template b/srcpkgs/file/template index e8c1b3d763..64b51b1536 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -5,7 +5,7 @@ revision=1 conflicts="chroot-file>=0" subpackages="libmagic file-devel" build_style=gnu-configure -crossmakedepends="zlib-devel" +makedepends="zlib-devel" short_desc="File type identification utility" maintainer="Juan RP " homepage="http://www.darwinsys.com/file/" diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index b2142a64e2..f4c21678ad 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -5,7 +5,10 @@ revision=6 subpackages="libflac libflac-devel" build_style=gnu-configure configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin" -makedepends="nasm libogg-devel" +if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + hostmakedepends="nasm" +fi +makedepends="libogg-devel" short_desc="Free Lossless Audio Codec" maintainer="Juan RP " homepage="http://flac.sourceforge.net/" @@ -23,9 +26,8 @@ long_desc=" * input plugins for various music players (Winamp, XMMS, and more in the works)" -if [ -n "$XBPS_CROSS_BUILD" ]; then - makedepends="automake pkg-config" - crossmakedepends="libogg-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake pkg-config" pre_configure() { ./autogen.sh } diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template index 328a8f090b..df1dfdf296 100644 --- a/srcpkgs/fontconfig/template +++ b/srcpkgs/fontconfig/template @@ -6,8 +6,8 @@ conf_files="/etc/fonts/fonts.conf" subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/$pkgname" -makedepends="pkg-config expat-devel freetype-devel zlib-devel" -crossmakedepends="expat-devel zlib-devel freetype-devel" +hostmakedepends="pkg-config" +makedepends="expat-devel zlib-devel freetype-devel" short_desc="Library for configuring and customizing font access" maintainer="Juan RP " homepage="http://www.fontconfig.org" diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index bb9a245e8e..cea8fb0647 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -4,8 +4,8 @@ version=2.4.11 revision=2 patch_args="-Np1" build_style=gnu-configure -makedepends="pkg-config zlib-devel" -crossmakedepends="zlib-devel" +hostmakedepends="pkg-config" +makedepends="zlib-devel" subpackages="$pkgname-devel" short_desc="Font rendering engine and library API" maintainer="Juan RP " diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template index 4b47240d4c..eab6195411 100644 --- a/srcpkgs/gawk/template +++ b/srcpkgs/gawk/template @@ -6,7 +6,6 @@ conflicts="chroot-gawk>=0" build_style=gnu-configure configure_args="--with-readline" makedepends="readline-devel" -crossmakedepends="readline-devel" short_desc="The GNU awk utility" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 5c5488ebfb..73ddf1107c 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -3,8 +3,8 @@ pkgname=gcc _majorver=4.7 version=${_majorver}.2 revision=2 -makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel - ppl-devel>=1.0 cloog-devel" +hostmakedepends="perl flex" +makedepends="zlib-devel libfl-devel gmp-devel mpfr-devel mpc-devel ppl-devel>=1.0 cloog-devel" short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" @@ -13,7 +13,7 @@ distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}" checksum=8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084 -if [ "${XBPS_MACHINE}" = "x86_64" ]; then +if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then # Required stuff for multilib packages. _triplet="${XBPS_MACHINE}-unknown-linux-gnu" makedepends="${makedepends} glibc32-devel" @@ -21,7 +21,7 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then libgomp32 libmudflap32-devel libmudflap32 libobjc32 libssp32 libstdc++32-devel libstdc++32 libitm32" -elif [ "$XBPS_MACHINE" = "armv6l" ]; then +elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then _triplet="arm-linux-gnueabihf" else _triplet="${XBPS_MACHINE}-pc-linux-gnu" @@ -35,11 +35,8 @@ subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++ libobjc-devel libgfortran libgfortran-devel gcc-fortran gcc-c++ gcc-objc gcc-objc++ gcc-go" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX enable default langs: objc, obj-c++, fortran and go. - makedepends="perl flex" - crossmakedepends="libfl-devel zlib-devel gmp-devel mpfr-devel mpc-devel - ppl-devel>=1.0 cloog-devel" subpackages="libgcc libssp libssp-devel libstdc++ libstdc++-devel libgomp libgomp-devel libitm libmudflap libmudflap-devel gcc-c++" @@ -51,12 +48,12 @@ do_configure() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - if [ -n "$XBPS_CROSS_TRIPLET" ]; then - export CC="$XBPS_CROSS_TRIPLET-gcc --sysroot=/usr/$XBPS_CROSS_TRIPLET" + if [ "$XBPS_CROSS_BUILD" ]; then + export CC="$XBPS_CROSS_TRIPLET-gcc --sysroot=$XBPS_CROSS_BASE" export CC_FOR_TARGET="$CC" export GCC="$CC" export GCC_FOR_TARGET="$CC" - export CXX="$XBPS_CROSS_TRIPLET-g++ --sysroot=/usr/$XBPS_CROSS_TRIPLET" + export CXX="$XBPS_CROSS_TRIPLET-g++ --sysroot=$XBPS_CROSS_BASE" export CXX_FOR_TARGET="$CXX" export CFLAGS="$XBPS_CROSS_CFLAGS" export CXXFLAGS="$CFLAGS" @@ -81,7 +78,7 @@ do_build() { } do_install() { - if [ "$XBPS_MACHINE" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then vmkdir usr/lib cd ${DESTDIR}/usr && ln -sf lib lib64 fi @@ -111,7 +108,7 @@ do_install() { rm -f ${DESTDIR}/usr/share/man/man3/ffi* # Remove unused stuff for multilib. - if [ "${XBPS_MACHINE}" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ -d ${DESTDIR}/usr/lib32 ]; then rm -f ${DESTDIR}/usr/lib32/libffi* rm -f ${DESTDIR}/usr/lib32/libgfortran* diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index dbb76f161f..d20ca84494 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit" makedepends="ncurses-devel zlib-devel readline-devel python-devel" -crossmakedepends="${makedepends}" short_desc="The GNU Debugger" maintainer="Juan RP " homepage="http://www.gnu.org/software/gdb/" diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 5a9d1e20ac..7148fe4a52 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -15,26 +15,26 @@ checksum=c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 subpackages="git-docs git-perl git-python" # Required by https:// depends="ca-certificates" -makedepends="xmlto>=0.0.25_2 asciidoc perl openssl-devel libcurl-devel - expat-devel python-devel" +hostmakedepends="xmlto>=0.0.25_2 asciidoc perl" +makedepends="openssl-devel libcurl-devel expat-devel python-devel" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then subpackages="git-perl" configure_args="${configure_args} --without-python ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" - makedepends="perl" - crossmakedepends="openssl-devel libcurl-devel expat-devel" + hostmakedepends="perl" + makedepends="openssl-devel libcurl-devel expat-devel" fi post_build() { - if [ -z "$XBPS_CROSS_TRIPLET" ]; then + if [ -z "$XBPS_CROSS_BUILD" ]; then make ${makejobs} -C Documentation man fi } post_install() { - if [ -z "$XBPS_CROSS_TRIPLET" ]; then + if [ -z "$XBPS_CROSS_BUILD" ]; then make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc fi vinstall contrib/completion/git-completion.bash 644 \ diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index ad1dbd4531..80a599d49f 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -4,10 +4,9 @@ version=2.34.3 revision=3 subpackages="libglib-devel glib-devel" build_style=gnu-configure -configure_args="--disable-fam --with-pcre=system --enable-static - --enable-man" -makedepends="python pkg-config zlib-devel pcre-devel>=8.30 - libffi-devel libxslt docbook-xsl" +configure_args="--disable-fam --with-pcre=system --enable-static --enable-man" +hostmakedepends="pkg-config python libxslt docbook-xsl" +makedepends="zlib-devel pcre-devel>=8.30 libffi-devel" short_desc="The GNU library of C routines" maintainer="Juan RP " homepage="http://www.gtk.org/" @@ -15,7 +14,7 @@ license="LGPL-2.1" distfiles="${GNOME_SITE}/glib/2.34/glib-$version.tar.xz" checksum=855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then configure_args="${configure_args} glib_cv_long_long_format=I64 glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no glib_cv_uscore=no blib_cv_use_pid_surrogate=yes @@ -24,8 +23,8 @@ if [ -n "$XBPS_CROSS_TRIPLET" ]; then ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes ac_cv_func_posix_getgrgid_r=yes" - makedepends="automake gettext-devel which gtk-doc pkg-config glib-devel" - crossmakedepends="zlib-devel pcre-devel>=8.30 libffi-devel" + hostmakedepends="automake gettext-devel which gtk-doc pkg-config glib-devel" + makedepends="zlib-devel pcre-devel>=8.30 libffi-devel" pre_configure() { sed -e "s|AM_PROG_CC_STDC|AC_PROG_CC|g" -i configure.ac NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template index a77a588820..e637d0a45e 100644 --- a/srcpkgs/gmp/template +++ b/srcpkgs/gmp/template @@ -6,10 +6,11 @@ subpackages="gmp-devel" build_style=gnu-configure # Build with -fexceptions as suggested by ppl. CPPFLAGS="-fexceptions" -if [ "$XBPS_MACHINE" = "i686" ]; then +if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then cnfigure_args="ABI=32" fi configure_args="${configure_args} --enable-cxx --build=${XBPS_MACHINE}-unknown-linux-gnu" +makedepends="zlib-devel" short_desc="Library for arbitrary precision arithmetic" maintainer="Juan RP " license="LGPL-3" @@ -17,9 +18,8 @@ homepage="http://gmplib.org/" distfiles="ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.xz" checksum=4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake" - crossmakedepends="zlib-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template index c7d2870c35..ab219c772f 100644 --- a/srcpkgs/grep/template +++ b/srcpkgs/grep/template @@ -5,7 +5,6 @@ revision=3 conflicts="chroot-grep>=0" build_style=gnu-configure makedepends="pcre-devel>=8.30" -crossmakedepends="${makedepends}" short_desc="The GNU grep utility" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template index 968fa25c4c..875e2e8768 100644 --- a/srcpkgs/groff/template +++ b/srcpkgs/groff/template @@ -2,8 +2,8 @@ pkgname=groff version=1.22.2 revision=1 -makedepends="perl bison zlib-devel" -crossmakedepends="zlib-devel" +hostmakedepends="perl bison" +makedepends="zlib-devel" short_desc="The GNU troff text-formatting system" maintainer="Juan RP " license="GPL-2" @@ -12,12 +12,12 @@ distfiles="http://ftp.gnu.org/gnu/groff/groff-${version}.tar.gz" checksum=380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076 subpackages="groff-doc" -if [ "$XBPS_CROSS_TRIPLET" ]; then - makedepends="perl bison groff" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="perl bison groff" fi do_configure() { - if [ "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then sed -i \ -e '/^GROFFBIN=/s:=.*:=/usr/bin/groff:' \ -e '/^TROFFBIN=/s:=.*:=/usr/bin/troff:' \ @@ -31,7 +31,7 @@ do_configure() { } do_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make TROFFBIN=troff GROFFBIN=groff GROFF_BIN_PATH= ${makejobs} else make ${makejobs} diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index a6dce88224..11c7a2ad49 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -2,8 +2,8 @@ pkgname=iproute2 version=3.8.0 revision=2 -makedepends="pkg-config perl flex db-devel iptables-devel>=1.4.18" -crossmakedepends="libfl-devel db-devel iptables-devel>=1.4.18" +hostmakedepends="pkg-config perl flex" +makedepends="libfl-devel db-devel iptables-devel>=1.4.18" short_desc="IP Routing Utilities" maintainer="Juan RP " homepage="http://www.linux-foundation.org/en/Net:Iproute2" @@ -24,12 +24,12 @@ do_configure() { } do_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make CC="$XBPS_CROSS_TRIPLET-gcc" \ RANLIB="$XBPS_CROSS_TRIPLET-ranlib" \ AR="$XBPS_CROSS_TRIPLET-ar" \ LD="$XBPS_CROSS_TRIPLET-ld" \ - DBM_INCLUDE="/usr/$XBPS_CROSS_TRIPLET/include" \ + DBM_INCLUDE="$XBPS_CROSS_BASE/include" \ ${makejobs} else make ${makejobs} diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index f75be22428..d11c718128 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -5,7 +5,6 @@ revision=2 patch_args="-Np1" wrksrc="${pkgname}-s${version}" makedepends="openssl-devel libcap-devel" -crossmakedepends="${makedepends}" depends="libcap-progs" short_desc="IP Configuration Utilities (and ping)" maintainer="Juan RP " @@ -15,7 +14,7 @@ distfiles="http://www.skbuff.net/iputils/${pkgname}-s${version}.tar.bz2" checksum=450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f do_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make CC="$XBPS_CROSS_TRIPLET-gcc" LD="$XBPS_CROSS_TRIPLET-ld" \ USE_GNUTLS=no CCOPTOPT="$CFLAGS" ${makejobs} \ arping clockdiff ping ping6 rdisc tracepath tracepath6 diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index d6d9137416..7e700808f7 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -4,7 +4,8 @@ version=0.8.15 revision=6 build_style=gnu-configure configure_args="--disable-static --with-proxy --with-perl=module" -makedepends="perl>=5.16 pkg-config glib-devel openssl-devel ncurses-devel" +hostmakedepends="pkg-config perl>=5.16" +makedepends="libglib-devel openssl-devel ncurses-devel" conf_files="/etc/irssi.conf" subpackages="irssi-devel irssi-perl" homepage="http://www.irssi.org" @@ -14,10 +15,9 @@ license="GPL-2" distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2" checksum=c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX perl module - makedepends="pkg-config ncurses-devel" - crossmakedepends="libglib-devel openssl-devel ncurses-devel" + hostmakedepends="pkg-config" configure_args="${configure_args} --without-perl" subpackages="irssi-devel" fi diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template index 1f688154af..2b9faf918e 100644 --- a/srcpkgs/isl/template +++ b/srcpkgs/isl/template @@ -5,7 +5,6 @@ revision=2 build_style=gnu-configure subpackages="isl-devel" makedepends="gmp-devel" -crossmakedepends="${makedepends}" short_desc="Integer Set Library" maintainer="Juan RP " homepage="http://www.kotnet.org/~skimo/isl/" diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template index 6956262900..8d32ce15f1 100644 --- a/srcpkgs/iw/template +++ b/srcpkgs/iw/template @@ -3,8 +3,8 @@ pkgname=iw version=3.8 revision=1 build_style=gnu-makefile -makedepends="pkg-config libnl3-devel" -crossmakedepends="libnl3-devel" +hostmakedepends="pkg-config" +makedepends="libnl3-devel" short_desc="nl80211 based CLI configuration utility for wireless devices" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index 7cd83f30ce..9a9dc4644b 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -4,8 +4,8 @@ version=1.15.5 revision=2 build_style=gnu-configure configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale" -makedepends="flex pam-devel" -crossmakedepends="libfl-devel pam-devel" +hostmakedepends="flex" +makedepends="libfl-devel pam-devel" replaces="kbd-common<1.15.5" short_desc="Linux keyboard utilities" maintainer="Juan RP " diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template index 16a9c44316..744ee2e146 100644 --- a/srcpkgs/kmod/template +++ b/srcpkgs/kmod/template @@ -4,7 +4,8 @@ version=12 revision=2 build_style=gnu-configure configure_args="--with-zlib --with-xz" -makedepends="pkg-config zlib-devel liblzma-devel libxslt" +hostmakedepends="pkg-config libxslt" +makedepends="zlib-devel liblzma-devel" provides="module-init-tools-3.17" replaces="module-init-tools>=0" subpackages="libkmod libkmod-devel" @@ -21,9 +22,8 @@ make_dirs=" /usr/lib/depmod.d 0755 root root /usr/lib/modprobe.d 0755 root root" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake pkg-config libxslt" - crossmakedepends="zlib-devel liblzma-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake pkg-config libxslt" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/lame/template b/srcpkgs/lame/template index f416ff7851..32cd95adb7 100644 --- a/srcpkgs/lame/template +++ b/srcpkgs/lame/template @@ -6,10 +6,9 @@ subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--enable-nasm --enable-shared" makedepends="ncurses-devel" -if [ "$XBPS_MACHINE" = "i686" -o "$XBPS_MACHINE" = "x86_64" ]; then - makedepends="${makedepends} nasm" +if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + hostmakedepends="nasm" fi -crossmakedepends="ncurses-devel" short_desc="Fast, high quality MP3 encoder" maintainer="Juan RP " license="LGPL-2.1" diff --git a/srcpkgs/less/template b/srcpkgs/less/template index eaf2a0f581..bc599be73c 100644 --- a/srcpkgs/less/template +++ b/srcpkgs/less/template @@ -5,7 +5,6 @@ revision=2 build_style=gnu-configure configure_args="--with-regex=pcre" makedepends="ncurses-devel pcre-devel>=8.30" -crossmakedepends="${makedepends}" short_desc="Pager program similar to more(1)" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template index b5c40a46bb..6cff86f61b 100644 --- a/srcpkgs/libICE/template +++ b/srcpkgs/libICE/template @@ -4,8 +4,8 @@ version=1.0.8 revision=3 subpackages="$pkgname-devel" build_style=gnu-configure -makedepends="pkg-config xtrans xproto" -crossmakedepends="xtrans xproto" +hostmakedepends="pkg-config" +makedepends="xtrans xproto" short_desc="Inter Client Exchange (ICE) library for X" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template index 9d64f2f76c..f3389e8c22 100644 --- a/srcpkgs/libSM/template +++ b/srcpkgs/libSM/template @@ -4,8 +4,8 @@ version=1.2.1 revision=2 subpackages="$pkgname-devel" build_style=gnu-configure -makedepends="pkg-config libuuid-devel libICE-devel" -crossmakedepends="libuuid-devel libICE-devel" +hostmakedepends="pkg-config" +makedepends="libuuid-devel libICE-devel" short_desc="X Session Management Library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 898e387386..81c57bd634 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -4,8 +4,9 @@ version=1.5.0 revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto ---disable-secure-rpc --disable-static" -makedepends="pkg-config xproto>=7.0.23 xextproto xtrans xcmiscproto + --disable-secure-rpc --disable-static" +hostmakedepends="pkg-config" +makedepends="xproto>=7.0.23 xextproto xtrans xcmiscproto kbproto bigreqsproto inputproto>=2.2 xf86bigfontproto libxcb-devel" subpackages="$pkgname-devel" short_desc="Base X libraries from modular Xorg X11" @@ -15,11 +16,8 @@ license="MIT" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" checksum=c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake xorg-util-macros ${makedepends}" - crossmakedepends="xproto>=7.0.23 xextproto xtrans xcmiscproto - kbproto bigreqsproto inputproto>=2.2 - xf86bigfontproto libxcb-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake xorg-util-macros ${makedepends}" pre_configure() { sed -e 's|$(srcdir)/||g' -i nls/Makefile.am autoreconf -fi diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template index 6f1b3cf720..454ed859cd 100644 --- a/srcpkgs/libXau/template +++ b/srcpkgs/libXau/template @@ -5,8 +5,8 @@ revision=5 subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config xproto" -crossmakedepends="xproto" +hostmakedepends="pkg-config" +makedepends="xproto" short_desc="Authorization Protocol for X" homepage="$XORG_SITE" license="MIT" diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template index 8735fff54d..31097a1435 100644 --- a/srcpkgs/libXcomposite/template +++ b/srcpkgs/libXcomposite/template @@ -4,8 +4,8 @@ version=0.4.4 revision=2 subpackages="${pkgname}-devel" build_style=gnu-configure -makedepends="pkg-config xproto fixesproto compositeproto libXfixes-devel" -crossmakedepends="xproto fixesproto compositeproto libXfixes-devel" +hostmakedepends="pkg-config" +makedepends="xproto fixesproto compositeproto libXfixes-devel" short_desc="X Composite Library" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template index 3d54d43212..f6bb148a85 100644 --- a/srcpkgs/libXcursor/template +++ b/srcpkgs/libXcursor/template @@ -4,8 +4,8 @@ version=1.1.13 revision=3 build_style=gnu-configure subpackages="$pkgname-devel" -makedepends="pkg-config fixesproto>=5.0_1 libXfixes-devel libXrender-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="fixesproto>=5.0_1 libXfixes-devel libXrender-devel" short_desc="Client-side cursor loading library for X" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/wiki/" diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template index aaea39a789..38265b4871 100644 --- a/srcpkgs/libXdamage/template +++ b/srcpkgs/libXdamage/template @@ -4,8 +4,8 @@ version=1.1.4 revision=2 subpackages="${pkgname}-devel" build_style=gnu-configure -makedepends="pkg-config xproto damageproto libXfixes-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="xproto damageproto libXfixes-devel" short_desc="The Xdamage extension Library" maintainer="Juan RP " distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2" diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template index 748866b031..6638503791 100644 --- a/srcpkgs/libXdmcp/template +++ b/srcpkgs/libXdmcp/template @@ -5,8 +5,8 @@ revision=2 build_style=gnu-configure configure_args="--disable-static" subpackages="$pkgname-devel" -makedepends="pkg-config xproto" -crossmakedepends="xproto" +hostmakedepends="pkg-config" +makedepends="xproto" short_desc="X Display Manager Control Protocol library from X.org" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template index a6f380b73a..0e0b022017 100644 --- a/srcpkgs/libXext/template +++ b/srcpkgs/libXext/template @@ -5,8 +5,8 @@ revision=3 subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config xextproto libX11-devel" -crossmakedepends="xextproto libX11-devel" +hostmakedepends="pkg-config" +makedepends="xextproto libX11-devel" short_desc="X Extension library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template index afa066692f..d51ca8b080 100644 --- a/srcpkgs/libXfixes/template +++ b/srcpkgs/libXfixes/template @@ -4,8 +4,8 @@ version=5.0 revision=3 build_style=gnu-configure subpackages="$pkgname-devel" -makedepends="pkg-config xproto xextproto fixesproto libX11-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="xproto xextproto fixesproto libX11-devel" short_desc="Xfixes library and extension of X RandR from modular X.org" maintainer="Juan RP " homepage="${XORG_SITE}" diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template index 4c1dc62371..173cefdab3 100644 --- a/srcpkgs/libXi/template +++ b/srcpkgs/libXi/template @@ -4,8 +4,8 @@ version=1.6.2 revision=2 subpackages="$pkgname-devel" build_style=gnu-configure -makedepends="pkg-config inputproto>=2.2 libXext-devel xmlto" -crossmakedepends="inputproto>=2.2 libXext-devel" +hostmakedepends="pkg-config xmlto" +makedepends="inputproto>=2.2 libXext-devel" short_desc="X Input extension library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template index b98cda1b09..fd84b69541 100644 --- a/srcpkgs/libXinerama/template +++ b/srcpkgs/libXinerama/template @@ -4,8 +4,8 @@ version=1.1.2 revision=2 subpackages="$pkgname-devel" build_style=gnu-configure -makedepends="pkg-config xineramaproto libXext-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="xineramaproto libXext-devel" short_desc="X PanoramiX extension library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template index 2e9b6db907..6e222ee405 100644 --- a/srcpkgs/libXrandr/template +++ b/srcpkgs/libXrandr/template @@ -5,8 +5,8 @@ revision=3 build_style=gnu-configure configure_args="--disable-static" subpackages="$pkgname-devel" -makedepends="pkg-config randrproto>=1.4.0 libXext-devel libXrender-devel" -crossmakedepends="randrproto>=1.4.0 libXext-devel libXrender-devel" +hostmakedepends="pkg-config" +makedepends="randrproto>=1.4.0 libXext-devel libXrender-devel" short_desc="X RandR Library from X.org" maintainer="Juan RP " homepage="${XORG_SITE}" diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template index 31dea6873a..50adf9d2a0 100644 --- a/srcpkgs/libXrender/template +++ b/srcpkgs/libXrender/template @@ -3,8 +3,8 @@ pkgname=libXrender version=0.9.7 revision=3 build_style=gnu-configure -makedepends="pkg-config renderproto libXext-devel" -crossmakedepends="renderproto libXext-devel" +hostmakedepends="pkg-config" +makedepends="renderproto libXext-devel" short_desc="X Render Library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template index 668e9d095a..a26ea702a8 100644 --- a/srcpkgs/libXt/template +++ b/srcpkgs/libXt/template @@ -3,7 +3,8 @@ pkgname=libXt version=1.1.3 revision=2 build_style=gnu-configure -makedepends="pkg-config xproto kbproto libSM-devel libX11-devel" +hostmakedepends="pkg-config" +makedepends="xproto kbproto libSM-devel libX11-devel" subpackages="$pkgname-devel" short_desc="X Toolkit Intrinsics library" maintainer="Juan RP " @@ -17,8 +18,7 @@ long_desc=" widgets. It also provides functions for handling events, initializing windows, and interpreting resource files." -if [ -n "$XBPS_CROSS_BUILD" ]; then - makedepends="pkg-config xproto" - crossmakedepends="xproto kbproto libSM-devel libX11-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="pkg-config xproto" configure_args="CC_FOR_BUILD=cc CFLAGS_FOR_BUILD=" fi diff --git a/srcpkgs/libXv/template b/srcpkgs/libXv/template index 2fc4a7f4b8..8ffef1bf38 100644 --- a/srcpkgs/libXv/template +++ b/srcpkgs/libXv/template @@ -4,8 +4,8 @@ version=1.0.7 revision=2 build_style=gnu-configure subpackages="$pkgname-devel" -makedepends="pkg-config videoproto libX11-devel libXext-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="videoproto libX11-devel libXext-devel" short_desc="Xv Extension library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template index c52129ec6b..1410fe2165 100644 --- a/srcpkgs/libXvMC/template +++ b/srcpkgs/libXvMC/template @@ -4,8 +4,8 @@ version=1.0.7 revision=2 build_style=gnu-configure subpackages="$pkgname-devel" -makedepends="pkg-config videoproto libX11-devel libXext-devel libXv-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="videoproto libX11-devel libXext-devel libXv-devel" short_desc="XVideo Motion Compensation Library" maintainer="Juan RP " license="MIT" diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 845b5b55be..32937f3b16 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -13,10 +13,8 @@ license="BSD" distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz" checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e -if [ -n "${XBPS_CROSS_TRIPLET}" ]; then - makedepends="automake" - crossmakedepends="zlib-devel bzip2-devel acl-devel openssl-devel - liblzma-devel expat-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake" pre_configure() { ./build/autogen.sh } diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index d5c3cdc000..49ebddb069 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -3,8 +3,8 @@ pkgname=libcap version=2.22 revision=8 subpackages="$pkgname-devel $pkgname-pam $pkgname-progs" -makedepends="gperf perl pam-devel attr-devel" -crossmakedepends="pam-devel attr-devel" +hostmakedepends="gperf perl" +makedepends="pam-devel attr-devel" short_desc="POSIX.1e capabilities suite" maintainer="Juan RP " homepage="http://sites.google.com/site/fullycapable/" @@ -14,7 +14,7 @@ distfiles="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz checksum=e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f do_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make CC="$XBPS_CROSS_TRIPLET-gcc" BUILD_CC=gcc else make diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 986b0f41ff..511f3ab0b1 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -6,8 +6,8 @@ patch_args="-Np1" build_style=gnu-configure configure_args="--enable-udev --enable-omap-experimental-api --enable-exynos-experimental-api" -makedepends="automake pkg-config libudev-devel libpciaccess-devel" -crossmakedepends="libudev-devel libpciaccess-devel" +hostmakedepends="automake pkg-config" +makedepends="libudev-devel libpciaccess-devel" subpackages="$pkgname-devel" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 421ddb1186..2e0159a904 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -7,7 +7,6 @@ subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-static" makedepends="openssl-devel" -crossmakedepends="${makedepends}" short_desc="Abstract asynchronous event notification library" maintainer="Juan RP " homepage="http://www.monkey.org/~provos/libevent/" diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index 1d5699304a..d08f838e7f 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -5,7 +5,6 @@ revision=1 build_style=gnu-makefile subpackages="${pkgname}-devel" makedepends="openssl-devel" -crossmakedepends="$makedepends" short_desc="File Transfer Library for URLs" maintainer="Juan RP " homepage="http://www.FreeBSD.org" diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template index 223203da52..a4bd46b2ea 100644 --- a/srcpkgs/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--disable-static" subpackages="$pkgname-devel" makedepends="libgpg-error-devel" -crossmakedepends="${makedepends}" short_desc="GNU cryptographic library" maintainer="Juan RP " homepage="http://www.gnupg.org" diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template index 5e5f8a6581..8f98063b32 100644 --- a/srcpkgs/libnl3/template +++ b/srcpkgs/libnl3/template @@ -5,7 +5,7 @@ revision=2 wrksrc=libnl-${version} build_style=gnu-configure configure_args="--disable-static" -makedepends="flex" +hostmakedepends="flex" subpackages="${pkgname}-progs ${pkgname}-devel" conf_files="/etc/libnl/pktloc /etc/libnl/classid" short_desc="Netlink Protocol Library Suite" @@ -15,9 +15,9 @@ homepage="http://www.infradead.org/~tgr/libnl" distfiles="${homepage}/files/libnl-${version}.tar.gz" checksum=9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake flex" - crossmakedepends="libfl-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake flex" + makedepends="libfl-devel" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template index 8b5b430593..6a239f4e24 100644 --- a/srcpkgs/libpcap/template +++ b/srcpkgs/libpcap/template @@ -4,8 +4,8 @@ version=1.3.0 revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --with-libnl --with-pcap=linux" -makedepends="automake pkg-config flex libnl3-devel" -crossmakedepends="libfl-devel libnl3-devel" +hostmakedepends="automake pkg-config flex" +makedepends="libfl-devel libnl3-devel" subpackages="$pkgname-devel" short_desc="System-independent interface for user-level packet capture" maintainer="Juan RP " diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template index 6ac4ad8700..d313016cd2 100644 --- a/srcpkgs/libpng/template +++ b/srcpkgs/libpng/template @@ -6,7 +6,6 @@ patch_args="-Np1" build_style=gnu-configure configure_args="--disable-static" makedepends="zlib-devel" -crossmakedepends="zlib-devel" subpackages="$pkgname-devel" short_desc="Library for manipulating PNG images" maintainer="Juan RP " diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index 6455090a60..c400f41907 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -15,9 +15,8 @@ license="GPL-2" distfiles="https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$version.tar.bz2" checksum=32cfbe302ade7e7271ed44bcae8aae3b6b55ca56ff642c4ece1752ffaa8003ee -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel" - crossmakedepends="pam-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template index d0db6de9d3..33da8a494e 100644 --- a/srcpkgs/libtirpc/template +++ b/srcpkgs/libtirpc/template @@ -7,8 +7,8 @@ conf_files="/etc/netconfig" subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--enable-gss --disable-static" -makedepends="automake pkg-config libgssglue-devel" -crossmakedepends="libgssglue-devel" +hostmakedepends="automake pkg-config" +makedepends="libgssglue-devel" short_desc="Transport Independent RPC library (SunRPC replacement)" maintainer="Juan RP " license="BSD" diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template index 1538454ec9..742df19fb3 100644 --- a/srcpkgs/libudev/template +++ b/srcpkgs/libudev/template @@ -14,21 +14,19 @@ configure_args="--libexecdir=/usr/lib --disable-selinux --disable-quotacheck --disable-randomseed --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-myhostname --disable-gudev --disable-keymap --without-python" -makedepends="pkg-config intltool gperf dbus-devel libcap-devel liblzma-devel - libgcrypt-devel libxslt docbook-xsl" +hostmakedepends="pkg-config intltool gperf libxslt docbook-xsl" +makedepends="dbus-devel libcap-devel liblzma-devel libgcrypt-devel" subpackages="libudev-devel systemd-libs systemd-devel" short_desc="udev shared library" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" license="LGPL-2.1, GPL-2, MIT" -#distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" -distfiles="http://pkgs.fedoraproject.org/repo/pkgs/systemd/systemd-${version}.tar.xz/26a75e2a310f8c1c1ea9ec26ddb171c5/systemd-${version}.tar.xz" +distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" checksum=444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel pkg-config intltool +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel pkg-config intltool gperf libxslt docbook-xsl libgcrypt-devel" - crossmakedepends="dbus-devel libcap-devel liblzma-devel libgcrypt-devel" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template index 168c6eabc4..66778f177b 100644 --- a/srcpkgs/libvorbis/template +++ b/srcpkgs/libvorbis/template @@ -4,7 +4,8 @@ version=1.3.3 revision=2 build_style=gnu-configure subpackages="$pkgname-devel" -makedepends="pkg-config libogg-devel" +hostmakedepends="pkg-config" +makedepends="libogg-devel" short_desc="The Vorbis General Audio Compression Codec" maintainer="Juan RP " license="BSD" @@ -19,9 +20,8 @@ long_desc=" The libvorbis package contains runtime libraries for use in programs that support Ogg Vorbis." -if [ -n "$XBPS_CROSS_BUILD" ]; then - makedepends="automake pkg-config" - crossmakedepends="libogg-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake pkg-config" pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac ./autogen.sh diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template index e788e73578..6f4d939602 100644 --- a/srcpkgs/libxcb/template +++ b/srcpkgs/libxcb/template @@ -5,9 +5,8 @@ revision=2 subpackages="$pkgname-devel" build_style=gnu-configure configure_args="--disable-build-docs --disable-static" -makedepends="pkg-config python libxslt docbook-xsl xcb-proto>=1.8 - libXdmcp-devel libXau-devel" -crossmakedepends="libXdmcp-devel libXau-devel" +hostmakedepends="pkg-config python libxslt docbook-xsl" +makedepends="xcb-proto>=1.8 libXdmcp-devel libXau-devel" short_desc="X protocol C-language Binding" maintainer="Juan RP " license="GPL-2" @@ -15,8 +14,8 @@ homepage="http://xcb.freedesktop.org" distfiles="$homepage/dist/$pkgname-$version.tar.bz2" checksum=8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake ${makedepends}" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake ${hostmakedepends}" pre_configure() { sed -e "s|pthread-stubs ||" -i configure.ac autoreconf -fi diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 68084f292f..505360a717 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -5,8 +5,7 @@ revision=2 build_style=gnu-configure configure_args="--disable-static --with-threads --with-history" subpackages="$pkgname-devel $pkgname-python" -makedepends="ncurses-devel readline-devel liblzma-devel python-devel" -crossmakedepends="zlib-devel ${makedepends}" +makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel python-devel" short_desc="Library providing XML and HTML support" maintainer="Juan RP " homepage="http://www.xmlsoft.org/" @@ -14,15 +13,15 @@ license="MIT" distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" checksum=f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel ${makedepends}" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel" pre_configure() { sed -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" -i configure.in autoreconf -fi } pre_build() { - sed -e "s|/usr/\(include/python2.7\)|/usr/$XBPS_CROSS_TRIPLET/\1|g" \ - -e "s|/usr/\(lib/python2.7/site-packages\)|/usr/$XBPS_CROSS_TRIPLET/\1|g" \ + sed -e "s|/usr/\(include/python2.7\)|$XBPS_CROSS_BUILD/\1|g" \ + -e "s|/usr/\(lib/python2.7/site-packages\)|$XBPS_CROSS_BASE/\1|g" \ -i python/Makefile } fi diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template index f7b6f1fc35..3cbd5c3410 100644 --- a/srcpkgs/lua/template +++ b/srcpkgs/lua/template @@ -5,7 +5,6 @@ revision=2 patch_args="-Np1" distfiles="http://www.lua.org/ftp/$pkgname-$version.tar.gz" makedepends="ncurses-devel readline-devel" -crossmakedepends="${makedepends}" short_desc="Lua is a powerful, fast, lightweight, embeddable scripting language." maintainer="Robert Djubek " homepage="http://www.lua.org" diff --git a/srcpkgs/lutok/template b/srcpkgs/lutok/template index bc9fb57dc2..8f48f9fb45 100644 --- a/srcpkgs/lutok/template +++ b/srcpkgs/lutok/template @@ -5,8 +5,8 @@ revision=2 build_style=gnu-configure configure_args="--with-doxygen" subpackages="lutok-devel" -makedepends="pkg-config doxygen lua-devel" -crossmakedepends="lua-devel" +hostmakedepends="pkg-config doxygen" +makedepends="lua-devel" short_desc="Lightweight C++ API for Lua" maintainer="Juan RP " license="BSD" diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 8d23180dee..59a31fd195 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -11,7 +11,8 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-default-locking-dir=/run/lock/lvm --enable-lvmetad" -makedepends="pkg-config readline-devel libudev-devel>=183" +hostmakedepends="pkg-config" +makedepends="readline-devel libudev-devel>=183" subpackages="liblvm2app liblvm2app-devel device-mapper device-mapper-devel" conf_files="/etc/lvm/lvm.conf" short_desc="Logical Volume Manager 2 utilities" @@ -22,12 +23,10 @@ distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" checksum=71030a58fef7e00d82ca4144334548e46aad24551a3cfbe7c3059b1bd137d864 make_dirs=" -/etc/lvm/archive 0755 root root -/etc/lvm/backup 0755 root root" + /etc/lvm/archive 0755 root root + /etc/lvm/backup 0755 root root" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="pkg-config" - crossmakedepends="readline-devel libudev-devel" +if [ "$XBPS_CROSS_BUILD" ]; then configure_args="${configure_args} ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" fi diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template index 87d5b40d4f..23b1adc25c 100644 --- a/srcpkgs/man-db/template +++ b/srcpkgs/man-db/template @@ -7,8 +7,8 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix --with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid --without-included-regex --enable-automatic-create" -makedepends="pkg-config groff gdbm-devel zlib-devel libpipeline-devel" -crossmakedepends="gdbm-devel zlib-devel libpipeline-devel" +hostmakedepends="pkg-config groff" +makedepends="gdbm-devel zlib-devel libpipeline-devel" depends="bzip2 gzip less groff grep coreutils" conf_files="/etc/man_db.conf" short_desc="The on-line manual database" diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 60b973206b..fe86519297 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -4,7 +4,6 @@ version=2.5.2 revision=1 build_style=python-module makedepends="python-devel" -crossmakedepends="python-devel" pycompile_module="${pkgname} hgext" short_desc="Fast, lightweight source control management system" maintainer="Juan RP " diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index b12fbc83b6..0cfcfaee24 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -9,7 +9,8 @@ configure_script="./src/configure" configure_args="--disable-rpath --with-system-et --with-system-ss --with-system-db --enable-shared" depends="mit-krb5-client-${version}_${revision}" -makedepends="perl flex db-devel e2fsprogs-devel openssl-devel" +hostmakedepends="perl flex" +makedepends="libfl-devel db-devel e2fsprogs-devel openssl-devel" subpackages="${pkgname}-devel ${pkgname}-libs ${pkgname}-client" conflicts="heimdal>=0" short_desc="MIT Kerberos 5 implementation" @@ -19,9 +20,8 @@ homepage="http://web.mit.edu/Kerberos" distfiles="$homepage/dist/krb5/1.11/krb5-$version-signed.tar" checksum=fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="perl flex e2fsprogs-devel" - crossmakedepends="libfl-devel db-devel e2fsprogs-devel openssl-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="${hostmakedepends} e2fsprogs-devel" configure_args="${configure_args} ac_cv_func_pthread_once=yes ac_cv_func_pthread_rwlock_init=yes diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template index 1cde2ef9b0..20d0dd95ce 100644 --- a/srcpkgs/mpc/template +++ b/srcpkgs/mpc/template @@ -6,7 +6,6 @@ build_style=gnu-configure subpackages="mpc-devel" configure_args="EGREP=egrep" makedepends="gmp-devel mpfr-devel" -crossmakedepends="${makedepends}" short_desc="C library for the arithmetic of complex numbers" maintainer="Juan RP " homepage="http://www.multiprecision.org" diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template index e2f8a415ff..0c2f2cb7b4 100644 --- a/srcpkgs/mpfr/template +++ b/srcpkgs/mpfr/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--enable-thread-safe" subpackages="$pkgname-devel" makedepends="gmp-devel" -crossmakedepends="${makedepends}" short_desc="Library for multiple-precision floating-point computations" maintainer="Juan RP " license="LGPL-3" diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template index 84c0c83c3a..3d0ca4f160 100644 --- a/srcpkgs/mpg123/template +++ b/srcpkgs/mpg123/template @@ -7,7 +7,8 @@ build_style=gnu-configure configure_args="--with-module-suffix=.so --with-optimization=4 --with-default-audio=alsa --enable-ipv6=yes --enable-network=yes" depends="mpg123-alsa>=1.14.1" -makedepends="pkg-config libltdl-devel alsa-lib-devel" +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel libltdl-devel" short_desc="Fast console mpeg audio decoder/player" maintainer="davehome " homepage="http://www.mpg123.de/" diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template index 8c5a055b45..1baad07f00 100644 --- a/srcpkgs/mtd-utils/template +++ b/srcpkgs/mtd-utils/template @@ -3,7 +3,6 @@ pkgname=mtd-utils version=1.5.0 revision=2 makedepends="zlib-devel lzo-devel acl-devel libuuid-devel" -crossmakedepends="${makedepends}" short_desc="Memory Technology Device Utilities" maintainer="pancake " license="GPL-2" @@ -16,7 +15,7 @@ long_desc=" (journaling flash file system) filesystems." do_build() { - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs} else make ${makejobs} @@ -24,7 +23,7 @@ do_build() { } do_install() { - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make CROSS=${XBPS_CROSS_TRIPLET}- DESTDIR=${DESTDIR} install else make DESTDIR=${DESTDIR} install diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index ca136a964a..f09bb3d21d 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -3,8 +3,8 @@ pkgname=nano version=2.3.1 revision=5 build_style=gnu-configure -makedepends="ncurses-devel groff" -crossmakedepends="ncurses-devel" +hostmakedepends="groff" +makedepends="ncurses-devel" short_desc="The GNU nano editor" maintainer="davehome " homepage="http://www.nano-editor.org/" diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index 78f20ce077..7a61920d47 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -2,8 +2,8 @@ pkgname=newlisp version=10.4.5 revision=2 -makedepends="which readline-devel libffi-devel" -crossmakedepends="readline-devel libffi-devel" +hostmakedepends="which" +makedepends="readline-devel libffi-devel" short_desc="Lisp-like, general-purpose scripting language" maintainer="Juan RP " license="GPL-3, zlib, $pkgname" @@ -19,7 +19,7 @@ long_desc=" support for distributed and parallel processing, and Bayesian statistics." do_build() { - if [ "$XBPS_MACHINE" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then export CFLAGS="$CFLAGS -DNEWLISP64" fi make -f makefile_linuxLP64_utf8_ffi ${makejobs} diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 3cbe91f807..253f2867e7 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -5,7 +5,6 @@ revision=7 build_style=gnu-configure configure_args="--enable-linuxcap" makedepends="readline-devel openssl-devel libcap-devel" -crossmakedepends="${makedepends}" short_desc="The Network Time Protocol daemon and utilities" license="BSD" maintainer="Juan RP " diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template index 0859a495fa..a0f325585e 100644 --- a/srcpkgs/nvi/template +++ b/srcpkgs/nvi/template @@ -6,7 +6,7 @@ patch_args="-Np1" build_style=gnu-configure build_wrksrc=dist configure_args="--enable-widechar --enable-threads --disable-static - vi_cv_path_preserve=/var/tmp" + vi_cv_path_preserve=/var/tmp vi_cv_sprintf_count=yes" makedepends="ncurses-devel db-devel" short_desc="The Berkeley Vi Editor" maintainer="Juan RP " @@ -15,11 +15,6 @@ homepage="http://garage.linux.student.kuleuven.be/~skimo/nvi" distfiles="${homepage}/devel/nvi-$version.tar.bz2" checksum=3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - crossmakedepends="${makedepends}" - configure_args="${configure_args} vi_cv_sprintf_count=yes" -fi - pre_build() { sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' pathnames.h } diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index d0d6a65c50..e9ec7d4b7f 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -9,8 +9,8 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh --with-kerberos5=/usr --with-pid-dir=/run --with-pam LD=$CC" replaces="openssh-client<6.1p1" -makedepends="perl openssl-devel pam-devel e2fsprogs-devel mit-krb5-devel" -crossmakedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel" +hostmakedepends="perl" +makedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel" conf_files="/etc/ssh/moduli /etc/ssh/ssh_config" subpackages="$pkgname-server" short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2 (client)" diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index b5cd083ec6..ae3742a082 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -4,7 +4,7 @@ _openssl_version=1.0.1 version=${_openssl_version}e revision=3 fulldepends="perl" -crossmakedepends="zlib-devel" +makedepends="zlib-devel" conf_files="/etc/ssl/openssl.cnf" subpackages="libssl openssl-devel" short_desc="Secure Socket Layer and cryptographic library - runtime utilities" diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template index d46c66c130..bcbeb370c5 100644 --- a/srcpkgs/opusfile/template +++ b/srcpkgs/opusfile/template @@ -11,8 +11,8 @@ distfiles="http://downloads.xiph.org/releases/opus/${pkgname}-${version}.tar.gz" checksum=b4a678b3b6c4adfb6aff1f67ef658becfe146ea7c7ff228e99543762171557f9 subpackages="${pkgname}-devel" -makedepends="pkg-config libogg-devel opus-devel openssl-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="libogg-devel opus-devel openssl-devel" post_install() { rm -rf ${DESTDIR}/usr/share diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template index f96e2ce06a..da25d7a525 100644 --- a/srcpkgs/pam/template +++ b/srcpkgs/pam/template @@ -7,8 +7,8 @@ build_style=gnu-configure configure_args="--libdir=/usr/lib --sbindir=/usr/sbin --docdir=/usr/share/doc/pam" depends="cracklib" subpackages="pam-devel pam-userdb pam-libs" -makedepends="flex cracklib-devel db-devel libtirpc-devel" -crossmakedepends="libfl-devel cracklib-devel db-devel libtirpc-devel" +hostmakedepends="flex" +makedepends="libfl-devel cracklib-devel db-devel libtirpc-devel" short_desc="A flexible mechanism for authenticating users" maintainer="Juan RP " homepage="http://www.kernel.org/pub/linux/libs/pam/" @@ -26,8 +26,8 @@ conf_files=" /etc/security/pam_env.conf /etc/security/time.conf" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="flex automake gettext-devel pkg-config" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="flex automake gettext-devel pkg-config" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template index 2a10dcedd1..e61b6fd1c9 100644 --- a/srcpkgs/parted/template +++ b/srcpkgs/parted/template @@ -5,9 +5,8 @@ revision=3 subpackages="libparted libparted-devel" build_style=gnu-configure configure_args="--without-included-regex --disable-rpath" -makedepends="pkg-config libuuid-devel libblkid-devel ncurses-devel - readline-devel device-mapper-devel" -crossmakedepends="${makedepends}" +hostmakedepends="pkg-config" +makedepends="libuuid-devel libblkid-devel ncurses-devel readline-devel device-mapper-devel" short_desc="The GNU Parted disk partition resizing program" homepage="http://www.gnu.org/software/parted/" license="GPL-3" diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template index b5496eaa72..2b12419b0b 100644 --- a/srcpkgs/pcre/template +++ b/srcpkgs/pcre/template @@ -9,7 +9,6 @@ configure_args="--enable-utf8 --enable-unicode-properties --with-pic --enable-pcretest-libreadline --disable-pcregrep-jit --enable-jit --disable-static" makedepends="zlib-devel bzip2-devel readline-devel" -crossmakedepends="${makedepends}" short_desc="Perl Compatible Regular Expressions" maintainer="Juan RP " homepage="http://www.pcre.org/" @@ -17,11 +16,9 @@ license="BSD" distfiles="${SOURCEFORGE_SITE}/pcre/pcre-$version.tar.bz2" checksum=a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55 -if [ "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake ${makedepends}" - -pre_configure() { - autoreconf -fi -} - +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake" + pre_configure() { + autoreconf -fi + } fi diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template index 6a0eaee7cc..070826d7db 100644 --- a/srcpkgs/pelican/template +++ b/srcpkgs/pelican/template @@ -9,8 +9,8 @@ build_style=python-module depends="python>=2.7 python-feedgenerator python-jinja python-Pygments python-docutils python-blinker python-Unidecode python-Markdown" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Static site generator, written in Python" maintainer="Juan RP " homepage="https://github.com/getpelican/pelican" diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 89b96274d7..b5fc692ffa 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -2,7 +2,8 @@ pkgname=perl version=5.16.3 revision=2 -makedepends="which gdbm-devel db-devel less groff" +hostmakedepends="which less groff" +makedepends="gdbm-devel db-devel" short_desc="Practical Extraction and Report Language" maintainer="Juan RP " homepage="http://www.perl.org" @@ -153,9 +154,9 @@ for _f in ${_provides}; do replaces="${replaces} ${_p}>=0" done -if [ -n "$XBPS_CROSS_BUILD" ]; then - makedepends="perl>=${version} which less groff" - crossmakedepends="zlib-devel bzip2-devel db-devel gdbm-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="${hostmakedepends} perl>=${version}" + makedepends="zlib-devel bzip2-devel ${makedepends}" fi do_configure() { @@ -171,7 +172,7 @@ do_configure() { -Dvendorscript=/usr/lib/perl5/vendor_perl/bin -Dinc_version_list=none -Dman1ext=1p -Dman3ext=3p" - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then # Copy target files if [ ! -d $FILESDIR/$XBPS_CROSS_TRIPLET ]; then msg_error "$pkgver: cannot be cross built for $XBPS_CROSS_TRIPLET, contact $maintainer.\n" @@ -194,7 +195,7 @@ do_configure() { } do_build() { - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then export HOST_PERL=/usr/bin/perl export PERL_TO_USE=$HOST_PERL export HOST_PERL_LIBS=/usr/lib/perl5/core_perl @@ -215,7 +216,7 @@ do_build() { } do_install() { - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then export HOST_PERL=/usr/bin/perl export PERL_TO_USE=$HOST_PERL export HOST_PERL_LIBS=/usr/lib/perl5/core_perl diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template index 0a5a8bca23..ae7314d663 100644 --- a/srcpkgs/ppl/template +++ b/srcpkgs/ppl/template @@ -5,8 +5,8 @@ revision=2 subpackages="ppl-devel" build_style=gnu-configure configure_args="--enable-interfaces=c,cxx" -makedepends="automake gmp-devel>=5.1.1" -crossmakedepends="gmp-devel>=5.1.1" +hostmakedepends="automake" +makedepends="gmp-devel>=5.1.1" short_desc="The Parma Polyhedra Library" homepage="http://bugseng.com/products/ppl" license="GPL-3" diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index 43436992c0..272f7c0d7d 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -17,10 +17,10 @@ replaces="procps>=0" provides="procps-${version}" conflicts="coreutils<8.21_3" -makedepends="automake gettext-devel pkg-config ncurses-devel" -crossmakedepends="ncurses-devel" +hostmakedepends="automake gettext-devel pkg-config" +makedepends="ncurses-devel" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then configure_args="${configure_args} ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" fi diff --git a/srcpkgs/proplib/template b/srcpkgs/proplib/template index d6e042fa54..9ccabde524 100644 --- a/srcpkgs/proplib/template +++ b/srcpkgs/proplib/template @@ -4,7 +4,7 @@ version=0.6.3 revision=1 build_style=gnu-configure subpackages="$pkgname-devel" -crossmakedepends="zlib-devel" +makedepends="zlib-devel" short_desc="Portable Property container object library" maintainer="Juan RP " license="Simplified BSD" diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template index 1f7efc483e..dd12ae6957 100644 --- a/srcpkgs/psmisc/template +++ b/srcpkgs/psmisc/template @@ -4,7 +4,6 @@ version=22.19 revision=1 build_style=gnu-configure makedepends="ncurses-devel" -crossmakedepends="${makedepends}" short_desc="Small set of utilities that use the linux proc filesystem" maintainer="Juan RP " homepage="http://psmisc.sourceforge.net/index.html" @@ -12,7 +11,7 @@ license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=e112ccadd4694c98f5ea4a02cd6944fdc5a2a1985f20e2b3f74f4dbca83a2a31 -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then configure_args="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes ac_cv_func_memcmp_working=yes" diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template index fde6b4aa38..6bf2d972d3 100644 --- a/srcpkgs/pycrypto/template +++ b/srcpkgs/pycrypto/template @@ -5,7 +5,6 @@ revision=1 build_style=python-module pycompile_module="Crypto" makedepends="gmp-devel python-devel" -crossmakedepends="${makedepends}" short_desc="The Python Cryptography Toolkit" maintainer="Juan RP " homepage="https://www.dlitz.net/software/pycrypto/" @@ -17,7 +16,7 @@ long_desc=" base for writing Python programs that require cryptographic functions." pre_build() { - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then sed -e "s|'/usr/include/'|''|g" -i setup.py _args="ac_cv_func_malloc_0_nonnull=yes" fi diff --git a/srcpkgs/pyopenssl/template b/srcpkgs/pyopenssl/template index 2679bcc516..4d6196833c 100644 --- a/srcpkgs/pyopenssl/template +++ b/srcpkgs/pyopenssl/template @@ -6,7 +6,6 @@ wrksrc="pyOpenSSL-${version}" build_style=python-module pycompile_module="OpenSSL" makedepends="openssl-devel python-devel" -crossmakedepends="${makedepends}" short_desc="Python interface to the OpenSSL library" maintainer="Juan RP " homepage="https://launchpad.net/pyopenssl" diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template index 60bd5fcd83..f4f3317ab1 100644 --- a/srcpkgs/python-Markdown/template +++ b/srcpkgs/python-Markdown/template @@ -7,8 +7,8 @@ pycompile_module="markdown" wrksrc="Markdown-${version}" build_style=python-module depends="python>=2.7" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Python implementation of John Gruber's Markdown" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/Markdown" diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template index 313843749e..2e8799ff79 100644 --- a/srcpkgs/python-MarkupSafe/template +++ b/srcpkgs/python-MarkupSafe/template @@ -5,8 +5,8 @@ revision=1 pycompile_module="markupsafe" wrksrc="MarkupSafe-${version}" build_style=python-module -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Implements a XML/HTML/XHTML Markup safe string for Python" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/MarkupSafe" diff --git a/srcpkgs/python-Pygments/template b/srcpkgs/python-Pygments/template index a1d773a37b..ee8d9fbfc2 100644 --- a/srcpkgs/python-Pygments/template +++ b/srcpkgs/python-Pygments/template @@ -8,7 +8,6 @@ wrksrc="Pygments-${version}" build_style=python-module depends="python>=2.7 python-distribute" makedepends="python-devel python-distribute" -crossmakedepends="python-devel" short_desc="Python syntax highlighter" maintainer="Juan RP " homepage="http://pygments.org/" diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template index 4284a7000a..72f5566336 100644 --- a/srcpkgs/python-Unidecode/template +++ b/srcpkgs/python-Unidecode/template @@ -7,8 +7,8 @@ pycompile_module="unidecode" wrksrc="Unidecode-${version}" build_style=python-module depends="python>=2.7" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Python ASCII transliterations of Unicode text" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/Unidecode" diff --git a/srcpkgs/python-blinker/template b/srcpkgs/python-blinker/template index 745edb7be1..0c8e9f3c1e 100644 --- a/srcpkgs/python-blinker/template +++ b/srcpkgs/python-blinker/template @@ -7,8 +7,8 @@ pycompile_module="blinker" wrksrc="blinker-${version}" build_style=python-module depends="python>=2.7" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Fast, simple object-to-object and broadcast signaling for Python" maintainer="Juan RP " homepage="http://discorporate.us/projects/Blinker/" diff --git a/srcpkgs/python-feedgenerator/template b/srcpkgs/python-feedgenerator/template index ef0b2f841c..b64f132fbe 100644 --- a/srcpkgs/python-feedgenerator/template +++ b/srcpkgs/python-feedgenerator/template @@ -7,8 +7,8 @@ pycompile_module="feedgenerator" wrksrc="feedgenerator-${version}" build_style=python-module depends="python>=2.7 python-pytz python-six" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Python Standalone version of django.utils.feedgenerator" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/feedgenerator" diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template index 1074468292..2a04788d3e 100644 --- a/srcpkgs/python-pytz/template +++ b/srcpkgs/python-pytz/template @@ -7,8 +7,8 @@ pycompile_module="pytz" wrksrc="pytz-${version}" build_style=python-module depends="python>=2.7" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Python timezone library" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/pytz" diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python-simplejson/template index a3760f4c80..11fb79c408 100644 --- a/srcpkgs/python-simplejson/template +++ b/srcpkgs/python-simplejson/template @@ -6,7 +6,6 @@ nofetch=yes noextract=yes build_style=python-module makedepends="python-devel" -crossmakedepends="python-devel" pycompile_module="simplejson" short_desc="Simple, fast, extensible JSON encoder/decoder for Python" maintainer="Juan RP " diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template index 7c8c6d9b58..46cc0f591a 100644 --- a/srcpkgs/python-six/template +++ b/srcpkgs/python-six/template @@ -7,8 +7,8 @@ pycompile_module="six.py" wrksrc="six-${version}" build_style=python-module depends="python>=2.7" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="Python 2 and 3 compatibility utilities" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/six" diff --git a/srcpkgs/python-sqlalchemy/template b/srcpkgs/python-sqlalchemy/template index 6082296b72..c1241170cf 100644 --- a/srcpkgs/python-sqlalchemy/template +++ b/srcpkgs/python-sqlalchemy/template @@ -5,7 +5,6 @@ revision=2 wrksrc="SQLAlchemy-${version}" build_style=python-module makedepends="python-devel" -crossmakedepends="python-devel" pycompile_module="sqlalchemy" short_desc="The Python SQL Toolkit and Object Relational Mapper" maintainer="Juan RP " diff --git a/srcpkgs/python/template b/srcpkgs/python/template index d0e2772285..c12f9a4481 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -14,8 +14,7 @@ pycompile_dirs="usr/lib/python2.7" subpackages="${pkgname}-devel" makedepends="libffi-devel readline-devel gdbm-devel openssl-devel - expat-devel db-devel sqlite-devel bzip2-devel" -crossmakedepends="${makedepends}" + expat-devel db-devel sqlite-devel bzip2-devel zlib-devel" # Force posix semaphores by default; sem_open requires /dev/shm and # it's not mounted in chroot. @@ -23,10 +22,7 @@ _confargs="--with-threads --enable-ipv6 --with-signal-module --enable-shared --with-system-ffi --enable-unicode=ucs4 --with-system-expat --with-wctype-functions ac_cv_posix_semaphores_enabled=yes" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - # Don't need host makedepends. - unset makedepends - +if [ "$XBPS_CROSS_BUILD" ]; then # cross build; have to build it in 2 stages: native and host. do_build() { # Native build @@ -39,15 +35,15 @@ if [ -n "$XBPS_CROSS_TRIPLET" ]; then # Cross build patch -Np1 -i ${FILESDIR}/Python-2.7.3-xcompile.patch sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py - CFLAGS="$CFLAGS -I/usr/$XBPS_CROSS_TRIPLET/include" \ - LDFLAGS="$LDFLAGS -L/usr/$XBPS_CROSS_TRIPLET/lib" \ + CFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/include" \ + LDFLAGS="$LDFLAGS -L$XBPS_CROSS_BASE/lib" \ ./configure ${CONFIGURE_SHARED_ARGS} \ ${_confargs} ac_cv_buggy_getaddrinfo=no || return 1 make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen \ BLDSHARED="${XBPS_CROSS_TRIPLET}-gcc -shared" \ CROSS_COMPILE=$XBPS_CROSS_TARGET CROSS_COMPILE_TARGET=yes \ HOSTARCH=$XBPS_CROSS_TRIPLET BUILDARCH=$XBPS_MACHINE-unknown-linux-gnu \ - PYTHON_XCOMPILE_DEPENDENCIES_PREFIX="/usr/$XBPS_CROSS_TRIPLET" \ + PYTHON_XCOMPILE_DEPENDENCIES_PREFIX="$XBPS_CROSS_BASE" \ ${makejobs} || return 1 } do_install() { diff --git a/srcpkgs/qrencode/template b/srcpkgs/qrencode/template index ef7b959380..3b5b4cec7a 100644 --- a/srcpkgs/qrencode/template +++ b/srcpkgs/qrencode/template @@ -3,8 +3,8 @@ pkgname=qrencode version=3.4.2 revision=1 build_style=gnu-configure -makedepends="pkg-config libpng-devel" -crossmakedepends="libpng-devel" +hostmakedepends="pkg-config" +makedepends="libpng-devel" subpackages="${pkgname}-devel lib${pkgname}" short_desc="Library for encoding data in a QR Code symbol" maintainer="Juan RP " diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 4eea31c3fd..c62b304eb9 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -11,7 +11,6 @@ build_style=gnu-configure configure_args="--disable-static --with-curses --enable-multibyte" make_build_args="SHLIB_LIBS=-lncurses" makedepends="ncurses-devel" -crossmakedepends="${makedepends}" short_desc="The GNU Readline Library" maintainer="Juan RP " homepage="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template index 22a80e580d..b1ece4e290 100644 --- a/srcpkgs/rsync/template +++ b/srcpkgs/rsync/template @@ -3,8 +3,8 @@ pkgname=rsync version=3.0.9 revision=2 build_style=gnu-configure -makedepends="perl>=0 zlib-devel acl-devel popt-devel" -crossmakedepends="zlib-devel acl-devel popt-devel" +hostmakedepends="perl" +makedepends="zlib-devel acl-devel popt-devel" short_desc="Remote fast incremental file transfer tool" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template index 73a3a80842..a85b4608f6 100644 --- a/srcpkgs/sed/template +++ b/srcpkgs/sed/template @@ -6,7 +6,6 @@ conflicts="chroot-sed>=0" build_style=gnu-configure configure_args="--enable-acl" makedepends="acl-devel" -crossmakedepends="acl-devel" short_desc="The GNU stream editor" maintainer="Juan RP " license="GPL-3" @@ -14,8 +13,7 @@ homepage="http://www.gnu.org/software/sed" distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" checksum=fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff -if [ -n "$XBPS_CROSS_BUILD" ]; then - unset makedepends +if [ "$XBPS_CROSS_BUILD" ]; then configure_args="${configure_args} ac_cv_func_aclsort=yes" LDFLAGS="-L${XBPS_CROSS_BASE}/lib -lacl" fi diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index 3d56b6d6bd..b508dbd2c1 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -8,7 +8,6 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/sbin --with-libpam --without-selinux --with-acl --with-attr" depends="pam" makedepends="acl-devel pam-devel" -crossmakedepends="${makedepends}" short_desc="Shadow password file utilities" maintainer="Juan RP " license="BSD" @@ -37,8 +36,8 @@ conf_files=" CFLAGS="-fPIE" LDFLAGS="-pie" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 8f381ceaa3..762516fa9e 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -14,18 +14,13 @@ _amalgamationver=3071600 distfiles="http://www.sqlite.org/2013/sqlite-autoconf-${_amalgamationver}.tar.gz" checksum=3509c20fa2b1725734997b1dbb3dbfc825cfa7a09194cbac8f6fe33ed187ad34 -if [ -n "$XBPS_CROSS_BUILD" ]; then - unset makedepends - crossmakedepends="readline-devel tcl-devel" -fi - do_configure() { export CFLAGS="$XBPS_CFLAGS -DSQLITE_ENABLE_FTS3=1 \ -DSQLITE_ENABLE_COLUMN_METADATA=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - if [ -n "$XBPS_CROSS_BUILD" ]; then - _tcldir="--with-tcl=/usr/$XBPS_CROSS_TRIPLET/lib" + if [ "$XBPS_CROSS_BUILD" ]; then + _tcldir="--with-tcl=$XBPS_CROSS_BASE/lib" fi cd ${wrksrc}/sqlite-autoconf-${_amalgamationver} diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template index 9fa20825da..ab63db47d3 100644 --- a/srcpkgs/squashfs-tools/template +++ b/srcpkgs/squashfs-tools/template @@ -1,12 +1,10 @@ # Template file for 'squashfs-tools' pkgname=squashfs-tools version=4.2 -wrksrc="squashfs${version}" revision=3 +wrksrc="squashfs${version}" makedepends="zlib-devel lzo-devel liblzma-devel" -crossmakedepends="${makedepends}" license="GPL" -makedepends="zlib-devel lzo-devel liblzma-devel" homepage="http://squashfs.sf.net/" short_desc="Tool to create and append to squashfs filesystems" maintainer="Juan RP " diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 0facdf6ee8..e4d6e63165 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -7,7 +7,6 @@ configure_args="--with-ignore-dot -with-all-insults --with-env-editor --enable-shell-sets-home --enable-noargs-shell --without-sendmail --with-logfac=auth --disable-root-mailer" makedepends="zlib-devel pam-devel" -crossmakedepends="${makedepends}" conf_files="/etc/pam.d/sudo /etc/sudoers" short_desc="Allow others to run commands as root" maintainer="Juan RP " diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index ef24f17345..e30183a8ee 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -8,10 +8,10 @@ configure_args="--libexecdir=/usr/lib --with-sysvinit-path= --with-sysvrcnd-path= --disable-audit --disable-static --disable-ima" depends="dbus kbd libcap-progs libudev>=${version} systemd-libs>=${version}" -makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel pam-devel - dbus-devel libcap-devel libkmod-devel liblzma-devel cryptsetup-devel - libblkid-devel glib-devel libgcrypt-devel python-devel qrencode-devel - gobject-introspection which" +hostmakedepends="which pkg-config intltool gperf libxslt docbook-xsl" +makedepends="acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel + crypsetup-devel libblkid-devel glib-devel libgcrypt-devel python-devel qrencode-devel + gobject-introspection" short_desc="A system and service manager for Linux" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" @@ -34,12 +34,12 @@ conf_files=" /etc/systemd/bootchart.conf /etc/udev/udev.conf" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX add support to gudev, introspection and python. unset subpackages - makedepends="automake gettext-devel pkg-config intltool + hostmakedepends="automake gettext-devel pkg-config intltool gperf libxslt docbook-xsl libgcrypt-devel" - crossmakedepends="acl-devel pam-devel dbus-devel libcap-devel + smakedepends="acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel cryptsetup-devel libblkid-devel libgcrypt-devel libglib-devel qrencode-devel" diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template index 2003e128e9..084800f747 100644 --- a/srcpkgs/tcpdump/template +++ b/srcpkgs/tcpdump/template @@ -12,8 +12,6 @@ homepage="http://www.tcpdump.org" distfiles="http://www.tcpdump.org/release/${pkgname}-${version}.tar.gz" checksum=efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286 -if [ -n "$XBPS_CROSS_BUILD" ]; then - unset makedepends - crossmakedepends="libpcap-devel openssl-devel" +if [ "$XBPS_CROSS_BUILD" ]; then configure_args="${configure_args} ac_cv_linux_vers=$(uname -r 2>&1 | sed -n -e '$s/.* //' -e '$s/\..*//p') td_cv_buggygetaddrinfo=no" fi diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template index 498fdddca5..e489530302 100644 --- a/srcpkgs/texinfo/template +++ b/srcpkgs/texinfo/template @@ -4,9 +4,8 @@ version=4.13a revision=10 wrksrc="$pkgname-4.13" conflicts="chroot-texinfo>=0" -makedepends="ncurses-devel" -crossmakedepends="ncurses-devel" depends="gzip" +makedepends="ncurses-devel" short_desc="The GNU Documentation System" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template index 14ee360048..5a9c4cf3c2 100644 --- a/srcpkgs/tiff/template +++ b/srcpkgs/tiff/template @@ -13,9 +13,8 @@ homepage="http://www.remotesensing.org/libtiff/" distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz" checksum=ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872 -if [ -n "$XBPS_CROSS_BUILD" ]; then - makedepends="automake" - crossmakedepends="zlib-devel libjpeg-turbo-devel liblzma-devel" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake" pre_configure() { autoreconf -fi } diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template index b7f19ae0ab..f77be8881b 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -6,7 +6,6 @@ build_style=gnu-configure make_build_args="PREFIX=/usr" make_install_args="PREFIX=/usr" makedepends="ncurses-devel libevent-devel" -crossmakedepends="${makedepends}" short_desc="Terminal Multiplexer" maintainer="Juan RP " homepage="http://tmux.sourceforge.net" diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index ea43d010a1..9618ca05a5 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -12,7 +12,8 @@ checksum=929b517fa39b16a61ec536514e08940a381b92befc629d0348e3097920dd2f12 conflicts="chroot-util-linux>=0 coreutils<8.21_3" depends="coreutils shadow>=4.1.5.1_3" -makedepends="pkg-config zlib-devel ncurses-devel pam-devel" +hostmakedepends="pkg-config" +makedepends="zlib-devel ncurses-devel pam-devel>=1.1.6_3" replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" provides="eject-${version}" @@ -28,10 +29,8 @@ conf_files=" /etc/pam.d/su-l /etc/pam.d/login" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="automake gettext-devel pkg-config" - crossmakedepends="zlib-devel ncurses-devel pam-devel>=1.1.6_3" - _confargs="PKG_CONFIG_LIB_DIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig" +if [ "$XBPS_CROSS_BUILD" ]; then + hostmakedepends="automake gettext-devel pkg-config" pre_configure() { ./autogen.sh } @@ -47,7 +46,7 @@ do_configure() { --enable-vipw --enable-newgrp --enable-chfn-chsh \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --without-udev --enable-write \ - --enable-socket-activation --disable-static ${_confargs} \ + --enable-socket-activation --disable-static \ SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie" } diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template index 6526192efb..29035740f9 100644 --- a/srcpkgs/vanitygen/template +++ b/srcpkgs/vanitygen/template @@ -4,7 +4,6 @@ version=0.21 revision=2 build_style=makefile makedepends="pcre-devel openssl-devel" -crossmakedepends="${makedepends}" short_desc="Bitcoin vanity address generator" maintainer="pancake " homepage="https://github.com/samr7/vanitygen" diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 37ed5f6b97..2c721f4af3 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -6,7 +6,8 @@ version=${_distver}.${_patchver} revision=1 subpackages="vim-common vim-x11 gvim" depends="vim-common>=$version" -makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel gtk+-devel" +hostmakedepends="mercurial pkg-config" +makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel" short_desc="Vim editor (vi clone)" maintainer="Juan RP " homepage="http://www.vim.org" @@ -15,11 +16,10 @@ license="GPL-2" nofetch=yes noextract=yes -if [ -n "$XBPS_CROSS_BUILD" ]; then +if [ "$XBPS_CROSS_BUILD" ]; then # XXX x11 and gvim subpkgs. subpackages="vim-common" - makedepends="mercurial pkg-config" - crossmakedepends="ncurses-devel acl-devel" + makedepends="ncurses-devel acl-devel" fi do_fetch() { @@ -46,7 +46,7 @@ do_configure() { --with-tlib=ncursesw --with-ex-name=vim-ex --with-view-name=vim-view" - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then crossargs="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=yes @@ -59,7 +59,7 @@ do_configure() { ./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \ --enable-gui=no --with-x=no - [ -n "$XBPS_CROSS_BUILD" ] && return 0 + [ "$XBPS_CROSS_BUILD" ] && return 0 # X11 version. cd $wrksrc/vim-x11 @@ -74,7 +74,7 @@ do_configure() { do_build() { cd $wrksrc && make ${makejobs} - [ -n "$XBPS_CROSS_BUILD" ] && return 0 + [ "$XBPS_CROSS_BUILD" ] && return 0 for f in vim-x11 gvim; do cd $wrksrc/$f && make ${makejobs} diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index a542204181..cd69cbd0d3 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -13,12 +13,11 @@ checksum=f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269 conf_files="/etc/wgetrc" depends="ca-certificates" -makedepends="perl>=0 openssl-devel libidn-devel" -crossmakedepends="openssl-devel libidn-devel" +hostmakedepends="perl" +makedepends="openssl-devel libidn-devel" -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - configure_args="${configure_args} - --with-libssl-prefix=/usr/$XBPS_CROSS_TRIPLET" +if [ "$XBPS_CROSS_BUILD" ]; then + configure_args="${configure_args} --with-libssl-prefix=$XBPS_CROSS_BASE" fi post_install() { diff --git a/srcpkgs/wok/template b/srcpkgs/wok/template index 23326f5057..04cee309b1 100644 --- a/srcpkgs/wok/template +++ b/srcpkgs/wok/template @@ -6,10 +6,9 @@ create_srcdir=yes noarch=yes pycompile_module="wok" build_style=python-module -depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown - python-Pygments" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="A simple static site generator in python" maintainer="Juan RP " homepage="https://github.com/mythmon/wok" diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 32b12be896..bd9fa03107 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -10,15 +10,15 @@ homepage="http://hostap.epitest.fi" distfiles="$homepage/releases/$pkgname-$version.tar.gz" checksum=2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 -makedepends="pkg-config libnl3-devel openssl-devel dbus-devel readline-devel" -crossmakedepends="libnl3-devel openssl-devel dbus-devel readline-devel" +hostmakedepends="pkg-config" +makedepends="libnl3-devel openssl-devel dbus-devel readline-devel" conf_files="/etc/${pkgname}.conf" do_build() { sed -i 's|/usr/local|$(PREFIX)|g' Makefile cp -f ${FILESDIR}/config .config - if [ -n "$XBPS_CROSS_TRIPLET" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then make CC="$XBPS_CROSS_TRIPLET-gcc" LD="$XBPS_CROSS_TRIPLET-ld" \ AR="$XBPS_CROSS_TRIPLET-ar" RANLIB="$XBPS_CROSS_TRIPLET-ranlib" \ PREFIX=/usr ${makejobs} diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template index 9ad40c252a..697c26870d 100644 --- a/srcpkgs/xbps-git/template +++ b/srcpkgs/xbps-git/template @@ -24,11 +24,6 @@ do_fetch() { } depends="xbps-triggers libxbps-git-${version}_${revision}" -makedepends="which pkg-config proplib-devel openssl-devel libfetch-devel +hostmakedepends="which pkg-config" +makedepends="proplib-devel openssl-devel libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel" - -if [ "$XBPS_CROSS_BUILD" ]; then - makedepends="which pkg-config" - crossmakedepends="proplib-devel openssl-devel libfetch-devel - libarchive-devel>=3.1.2 confuse-devel atf-devel" -fi diff --git a/srcpkgs/xbps-src-utils/template b/srcpkgs/xbps-src-utils/template index 9d26773f9d..a40abf9d9c 100644 --- a/srcpkgs/xbps-src-utils/template +++ b/srcpkgs/xbps-src-utils/template @@ -4,7 +4,8 @@ version=20130321 revision=1 homepage="https://github.com/davehome/xbps-src-utils" depends="libxbps>=0.21" -makedepends="pkg-config flex libxbps-devel>=0.21" +hostmakedepends="pkg-config flex" +makedepends="libfl-devel libxbps-devel>=0.21" short_desc="Various tools for xbps-src in C (like repo-checkvers)" maintainer="davehome " license="Simplified BSD" @@ -19,11 +20,6 @@ long_desc=" nofetch=yes noextract=yes -if [ -n "$XBPS_CROSS_TRIPLET" ]; then - makedepends="pkg-config flex" - crossmakedepends="libfl-devel libxbps-devel" -fi - do_fetch() { local url="git://github.com/davehome/xbps-src-utils.git" msg_normal " Fetching source from $url ...\n" @@ -31,7 +27,7 @@ do_fetch() { } do_configure() { - if [ -n "$XBPS_CROSS_BUILD" ]; then + if [ "$XBPS_CROSS_BUILD" ]; then _pcenv="env PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig" fi ${_pcenv} ./configure --prefix=/usr --etcdir=/etc diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 210041ce7c..c2ed975c97 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -6,7 +6,8 @@ build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --enable-static --enable-debug --enable-tests" depends="xbps-triggers" -makedepends="which pkg-config proplib-devel>=0.6.3 openssl-devel +hostmakedepends="which pkg-config" +makedepends="proplib-devel>=0.6.3 openssl-devel libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel" conf_files="/etc/xbps/xbps.conf" subpackages="libxbps libxbps-devel xbps-static xbps-tests" @@ -17,9 +18,3 @@ homepage="http://code.google.com/p/xbps" license="Simplified BSD" distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz" checksum=717cd34e0ee42215e23d32e00098d64493488a247b631384fa233f12e647f6ca - -if [ "$XBPS_CROSS_BUILD" ]; then - makedepends="which pkg-config" - crossmakedepends="proplib-devel>=0.6.2 openssl-devel libfetch-devel - libarchive-devel>=3.1.2 confuse-devel atf-devel" -fi diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index e277345cbc..752e289292 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -3,7 +3,6 @@ pkgname=xfsprogs version=3.1.10 revision=1 makedepends="libuuid-devel libblkid-devel readline-devel" -crossmakedepends="${makedepends}" short_desc="Utilities for managing the XFS filesystem" maintainer="Juan RP " license="LGPL-2.1" diff --git a/srcpkgs/xrandr/template b/srcpkgs/xrandr/template index bb694ef0aa..f28bb92735 100644 --- a/srcpkgs/xrandr/template +++ b/srcpkgs/xrandr/template @@ -3,8 +3,8 @@ pkgname=xrandr version=1.4.0 revision=1 build_style=gnu-configure -makedepends="pkg-config libXrandr-devel" -crossmakedepends="libXrandr-devel" +hostmakedepends="pkg-config" +makedepends="libXrandr-devel" short_desc="Primitive command line interface to RandR extension" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" diff --git a/srcpkgs/zope.interface/template b/srcpkgs/zope.interface/template index cf807372df..68e6ec4b94 100644 --- a/srcpkgs/zope.interface/template +++ b/srcpkgs/zope.interface/template @@ -4,8 +4,8 @@ version=4.0.1 revision=2 build_style=python-module pycompile_module="zope/interface" -makedepends="python-devel python-distribute" -crossmakedepends="python-devel" +hostmakedepends="python-distribute" +makedepends="python-devel" short_desc="zope.interface package from Zope 3" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/zope.interface"