From 59cc3e0d45dc7552999e2d86cd58e9c7884d9300 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 1 Nov 2014 13:10:22 +0100 Subject: [PATCH] replace nonfree=yes with repository=nonfree. This way it is possible to set up package specific repositories for i.e. specific devices. --- common/environment/setup/sourcepkg.sh | 2 +- common/hooks/do-pkg/00-gen-pkg.sh | 8 ++++---- common/hooks/post-install/06-strip-and-debug-pkgs.sh | 6 +++--- common/hooks/post-pkg/00-register-pkg.sh | 8 ++++---- common/xbps-src/shutils/common.sh | 2 +- srcpkgs/adobe-flash-plugin/template | 2 +- srcpkgs/broadcom-wl-dkms/template | 2 +- srcpkgs/catalyst/template | 6 +++--- srcpkgs/chromium-pepper-flash/template | 2 +- srcpkgs/doom3/template | 2 +- srcpkgs/foomatic-db-nonfree/template | 2 +- srcpkgs/minecraft/template | 2 +- srcpkgs/nvidia-stable/template | 6 +++--- srcpkgs/nvidia/template | 6 +++--- srcpkgs/nvidia304/template | 6 +++--- srcpkgs/oracle-jdk-arm/template | 2 +- srcpkgs/oracle-jdk/template | 2 +- srcpkgs/oracle-jre/template | 2 +- srcpkgs/quake4/template | 2 +- srcpkgs/sdlmame/template | 2 +- srcpkgs/skype/template | 2 +- srcpkgs/steam/template | 2 +- srcpkgs/sublime-text3/template | 2 +- srcpkgs/unrar/template | 2 +- srcpkgs/wineasio/template | 2 +- srcpkgs/xvba-video/template | 2 +- 26 files changed, 42 insertions(+), 42 deletions(-) diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index 396ec95f5e1..15d686d55e6 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -3,7 +3,7 @@ ## VARIABLES unset -v pkgname version revision short_desc homepage license maintainer -unset -v only_for_archs distfiles checksum build_style nonfree nocross broken +unset -v only_for_archs distfiles checksum build_style repository nocross broken unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_versions unset -v patch_args disable_parallel_build keep_libtool_archives diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh index 9c907e2f090..e3da4ea8d15 100644 --- a/common/hooks/do-pkg/00-gen-pkg.sh +++ b/common/hooks/do-pkg/00-gen-pkg.sh @@ -135,8 +135,8 @@ hook() { binpkg=${pkgver}.${arch}.xbps - if [ -n "$nonfree" ]; then - repo=$XBPS_REPOSITORY/nonfree + if [ -n "$repository" ]; then + repo=$XBPS_REPOSITORY/$repository else repo=$XBPS_REPOSITORY fi @@ -170,8 +170,8 @@ hook() { fi if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh - if [ -n "$nonfree" ]; then - repo=$XBPS_REPOSITORY/multilib/nonfree + if [ -n "$repository" ]; then + repo=$XBPS_REPOSITORY/multilib/$repository else repo=$XBPS_REPOSITORY/multilib fi diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh index 0dc45a5a2db..da0512fe5a8 100644 --- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh +++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh @@ -6,7 +6,7 @@ make_debug() { local dname= fname= dbgfile= - [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0 + [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0 dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g") fname="$(basename $1)" @@ -25,7 +25,7 @@ make_debug() { attach_debug() { local dname= fname= dbgfile= - [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0 + [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0 dname=$(echo "$(dirname $1)"|sed -e "s|${PKGDESTDIR}||g") fname="$(basename $1)" @@ -41,7 +41,7 @@ attach_debug() { create_debug_pkg() { local _pkgname= _destdir= - [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o -n "$nonfree" ] && return 0 + [ -z "$XBPS_DEBUG_PKGS" -o -n "$disable_debug" -o "$repository" = "nonfree" ] && return 0 [ ! -d "${PKGDESTDIR}/usr/lib/debug" ] && return 0 _pkgname="${pkgname}-dbg-${version}" diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh index 1308fb84184..4082067bbe8 100644 --- a/common/hooks/post-pkg/00-register-pkg.sh +++ b/common/hooks/post-pkg/00-register-pkg.sh @@ -33,8 +33,8 @@ hook() { if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then arch=${XBPS_ARCH} fi - if [ -n "$nonfree" ]; then - pkgdir=$XBPS_REPOSITORY/nonfree + if [ -n "$repository" ]; then + pkgdir=$XBPS_REPOSITORY/$repository else pkgdir=$XBPS_REPOSITORY fi @@ -58,8 +58,8 @@ hook() { if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then return fi - if [ -n "$nonfree" ]; then - pkgdir=$XBPS_REPOSITORY/multilib/nonfree + if [ -n "$repository" ]; then + pkgdir=$XBPS_REPOSITORY/multilib/$repository else pkgdir=$XBPS_REPOSITORY/multilib fi diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 6f89221f43a..8f1d3e2a2ec 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -320,7 +320,7 @@ setup_pkg() { fi # For nonfree/bootstrap pkgs there's no point in building -dbg pkgs, disable them. - if [ -z "$XBPS_DEBUG_PKGS" -o -n "$nonfree" -o -n "$bootstrap" ]; then + if [ -z "$XBPS_DEBUG_PKGS" -o -n "$repository" = "nonfree" -o -n "$bootstrap" ]; then disable_debug=yes fi # If a package sets force_debug_pkgs, always build -dbg pkgs. diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 3561bd88578..5fedca302a9 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -20,7 +20,7 @@ short_desc="Adobe Flash Player plugin for Netscape compatible browsers" maintainer="Juan RP " homepage="http://www.adobe.com" license="Adobe License (non free)" -nonfree="yes" +repository="nonfree" depends="curl hicolor-icon-theme desktop-file-utils" create_wrksrc=yes diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index 3e6906bf395..ab04f947112 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -8,7 +8,7 @@ license="Proprietary Broadcom license" homepage="http://broadcom.com" only_for_archs="i686 x86_64" -nonfree=yes +repository="nonfree" create_wrksrc=yes short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module" diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index faf31a20e9f..f0221891714 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -15,7 +15,7 @@ conflicts="nvidia>=0" provides="libGL-${version}_${revision}" replaces="libGL>=0" short_desc="${_desc} - Libraries and Utilities" -nonfree=yes +repository="nonfree" create_wrksrc=yes update_pkgname="fglrx-installer" @@ -105,7 +105,7 @@ catalyst-dkms_package() { triggers="dkms" depends="dkms" dkms_modules="fglrx ${version}_${revision}" - nonfree=yes + repository="nonfree" pkg_install() { local _fglrx=fglrx-${version}_${revision} @@ -132,7 +132,7 @@ catalyst-dkms_package() { catalyst-opencl_package() { short_desc="${_desc} - OpenCL implementation" depends="libOpenCL" - nonfree=yes + repository="nonfree" pkg_install() { cd ${wrksrc}/arch/${_ARCHDIR} diff --git a/srcpkgs/chromium-pepper-flash/template b/srcpkgs/chromium-pepper-flash/template index 10d0cd5549a..a907439a17d 100644 --- a/srcpkgs/chromium-pepper-flash/template +++ b/srcpkgs/chromium-pepper-flash/template @@ -10,7 +10,7 @@ maintainer="Enno Boland " homepage="http://www.google.com/chrome" license="chrome" lib32disabled=yes -nonfree=yes +repository="nonfree" only_for_archs="i686 x86_64" depends="chromium binutils" create_wrksrc=yes diff --git a/srcpkgs/doom3/template b/srcpkgs/doom3/template index cffa4cba1bb..f88258dd335 100644 --- a/srcpkgs/doom3/template +++ b/srcpkgs/doom3/template @@ -13,7 +13,7 @@ checksum=2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4 # 32bit package for x86_64 built on x86 :-) only_for_archs="i686" -nonfree="yes" +repository="nonfree" nostrip="yes" create_wrksrc=yes diff --git a/srcpkgs/foomatic-db-nonfree/template b/srcpkgs/foomatic-db-nonfree/template index da0219e7f6a..d7db150d08e 100644 --- a/srcpkgs/foomatic-db-nonfree/template +++ b/srcpkgs/foomatic-db-nonfree/template @@ -3,7 +3,7 @@ pkgname=foomatic-db-nonfree version=20140930 revision=1 noarch=yes -nonfree=yes +repository="nonfree" build_style=gnu-configure short_desc="OpenPrinting printer support - nonfree database" homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic" diff --git a/srcpkgs/minecraft/template b/srcpkgs/minecraft/template index 04d1f29d3f6..3c1b19fd86a 100644 --- a/srcpkgs/minecraft/template +++ b/srcpkgs/minecraft/template @@ -2,7 +2,7 @@ pkgname=minecraft version=0.5 revision=1 -nonfree="yes" +repository="nonfree" noarch="yes" depends="wmname wget" short_desc="Launcher for the famous Minecraft game" diff --git a/srcpkgs/nvidia-stable/template b/srcpkgs/nvidia-stable/template index ff7b25c79ea..2889910382a 100644 --- a/srcpkgs/nvidia-stable/template +++ b/srcpkgs/nvidia-stable/template @@ -10,7 +10,7 @@ license="Propietary NVIDIA license" homepage="http://www.nvidia.com" only_for_archs="i686 x86_64" -nonfree=yes +repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" depends="virtual?xserver-abi-video<19 nvidia-stable-dkms-${version}_${revision} pkg-config" @@ -161,7 +161,7 @@ nvidia-stable-dkms_package() { depends="dkms" provides="nvidia-dkms-${version}_${revision}" replaces="nvidia-dkms>=0" - nonfree=yes + repository="nonfree" pkg_install() { vmove usr/src vmove usr/lib/modules-load.d @@ -174,7 +174,7 @@ nvidia-stable-opencl_package() { provides="nvidia-opencl-${version}_${revision}" replaces="nvidia-opencl>=0" depends="libOpenCL" - nonfree=yes + repository="nonfree" pkg_install() { vmove "usr/lib/libnvidia-compiler*" vmove "usr/lib/libnvidia-opencl*" diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 011a890cfbf..18f9998ecce 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -10,7 +10,7 @@ license="Propietary NVIDIA license" homepage="http://www.nvidia.com" only_for_archs="i686 x86_64" -nonfree=yes +repository="nonfree" create_wrksrc=yes short_desc="${_desc} - Libraries and Utilities" depends="virtual?xserver-abi-video<19 nvidia-dkms-${version}_${revision} pkg-config" @@ -159,7 +159,7 @@ nvidia-dkms_package() { triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" - nonfree=yes + repository="nonfree" pkg_install() { vmove usr/src vmove usr/lib/modules-load.d @@ -170,7 +170,7 @@ nvidia-dkms_package() { nvidia-opencl_package() { short_desc="${_desc} - OpenCL implementation" depends="libOpenCL" - nonfree=yes + repository="nonfree" pkg_install() { vmove "usr/lib/libnvidia-compiler*" vmove "usr/lib/libnvidia-opencl*" diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index d5df2876377..b8e7b485c38 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -8,7 +8,7 @@ maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" -nonfree=yes +repository="nonfree" create_wrksrc=yes only_for_archs="i686 x86_64" short_desc="${_desc} - Libraries and Utilities" @@ -151,7 +151,7 @@ nvidia304-dkms_package() { dkms_modules="nvidia ${version}" provides="nvidia-dkms-${version}_${revision}" replaces="nvidia-dkms>=0" - nonfree=yes + repository="nonfree" pkg_install() { vmove usr/src vmove usr/lib/modules-load.d @@ -164,7 +164,7 @@ nvidia304-opencl_package() { provides="nvidia-opencl-${version}_${revision}" replaces="nvidia-openctl>=0" depends="libOpenCL" - nonfree=yes + repository="nonfree" pkg_install() { vmove "usr/lib/libnvidia-compiler*" vmove "usr/lib/libnvidia-opencl*" diff --git a/srcpkgs/oracle-jdk-arm/template b/srcpkgs/oracle-jdk-arm/template index f6fdd96ef6e..f579809919a 100644 --- a/srcpkgs/oracle-jdk-arm/template +++ b/srcpkgs/oracle-jdk-arm/template @@ -10,7 +10,7 @@ maintainer="Enno Boland " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" license="oracle" lib32disabled=yes -nonfree=yes +repository="nonfree" only_for_archs="armv7l armv6l" depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget" hostmakedepends="wget" diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template index aa838262c20..b82df6d2b3b 100644 --- a/srcpkgs/oracle-jdk/template +++ b/srcpkgs/oracle-jdk/template @@ -10,7 +10,7 @@ maintainer="Enno Boland " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" license="oracle" lib32disabled=yes -nonfree=yes +repository="nonfree" only_for_archs="i686 x86_64" depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget" hostmakedepends="wget" diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template index 0f9f2f0c6bb..3bb8b6ecb5f 100644 --- a/srcpkgs/oracle-jre/template +++ b/srcpkgs/oracle-jre/template @@ -9,7 +9,7 @@ maintainer="Enno Boland " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" license="oracle" lib32disabled=yes -nonfree=yes +repository="nonfree" only_for_archs="i686 x86_64" depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget" hostmakedepends="wget" diff --git a/srcpkgs/quake4/template b/srcpkgs/quake4/template index e691b99cc3e..c82f2fa336f 100644 --- a/srcpkgs/quake4/template +++ b/srcpkgs/quake4/template @@ -13,7 +13,7 @@ checksum=9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a # 32bit package for x86_64 built on x86 :-) only_for_archs="i686" -nonfree="yes" +repository="nonfree" nostrip="yes" create_wrksrc=yes diff --git a/srcpkgs/sdlmame/template b/srcpkgs/sdlmame/template index 65636a42d68..46fefc605d4 100644 --- a/srcpkgs/sdlmame/template +++ b/srcpkgs/sdlmame/template @@ -15,7 +15,7 @@ checksum=2f0adeec277e15e93ba3abc653b2220182e51a1eeea344c97e05d5d050a10649 hostmakedepends="which unzip perl pkg-config python automoc4" makedepends="SDL_ttf-devel fontconfig-devel libXinerama-devel qt-devel alsa-lib-devel" depends="liberation-fonts-ttf" -nonfree=yes +repository="nonfree" nocross=yes do_extract() { diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 975b13e882c..b531c169ec8 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -11,7 +11,7 @@ distfiles="http://download.skype.com/linux/${pkgname}-${version}.tar.bz2" checksum=8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d only_for_archs="i686" -nonfree="yes" +repository="nonfree" nostrip="yes" makedepends="qt>=4.8.4_4 hicolor-icon-theme>=0" diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template index 37cb251f8f8..e56d0a85ffb 100644 --- a/srcpkgs/steam/template +++ b/srcpkgs/steam/template @@ -7,7 +7,7 @@ version=1.0.0.49 revision=1 wrksrc=steam depends="curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils liberation-fonts-ttf" -nonfree="yes" +repository="nonfree" short_desc="Digital distribution client bootstrap package - Valve's steam client" maintainer="Juan RP " license="Propietary license" diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template index 796e29c3c89..ee95e84f8f0 100644 --- a/srcpkgs/sublime-text3/template +++ b/srcpkgs/sublime-text3/template @@ -15,7 +15,7 @@ homepage="http://www.sublimetext.com/3dev" license="Propietary" short_desc="Sophisticated text editor for code, markup and prose" -nonfree="yes" +repository="nonfree" only_for_archs="i686 x86_64" wrksrc="sublime_text_3" diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template index 067a93090db..46549783947 100644 --- a/srcpkgs/unrar/template +++ b/srcpkgs/unrar/template @@ -3,7 +3,7 @@ pkgname=unrar version=5.2.2 revision=1 wrksrc=unrar -nonfree=yes +repository="nonfree" homepage="http://www.rarlab.com/rar" update_pkgname=unrarsrc update_site="http://www.rarlab.com/rar_add.htm" diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template index adb32ec45aa..75e372adcee 100644 --- a/srcpkgs/wineasio/template +++ b/srcpkgs/wineasio/template @@ -2,7 +2,7 @@ pkgname=wineasio version=0.9.2 revision=5 -nonfree=yes +repository="nonfree" only_for_archs=i686 wrksrc=${pkgname} homepage="http://sourceforge.net/projects/wineasio" diff --git a/srcpkgs/xvba-video/template b/srcpkgs/xvba-video/template index eeaae5d3d24..ef36cbf6869 100644 --- a/srcpkgs/xvba-video/template +++ b/srcpkgs/xvba-video/template @@ -9,7 +9,7 @@ maintainer="John Galt " license="Proprietary AMD license" homepage="http://www.amd.com" only_for_archs="i686 x86_64" -nonfree=yes +repository="nonfree" distfiles="https://launchpad.net/ubuntu/+archive/primary/+files/xvba-video_0.7.8.orig.tar.gz" checksum=e4bea33edaf73b1c164f76295ac77fc1fb9f4c4a8269fc756937f00454bfd50f