diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
commit | 1fafdadaae260eaef7194102b5eb842466e63dd1 (patch) | |
tree | 734ab5c097f5a2ed36c2a7049d44f9c2bb46dede /core | |
parent | 1f52af629b1911ab027ef9c5d4d5903b48792050 (diff) | |
parent | 6dab5c46b00f624c7900ff6d11b75bcafbe251d0 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/unpaper/PKGBUILD
community/virtualbox/PKGBUILD
core/crda/PKGBUILD
core/eventlog/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/crda/PKGBUILD | 26 | ||||
-rw-r--r-- | core/eventlog/ChangeLog | 5 | ||||
-rw-r--r-- | core/eventlog/PKGBUILD | 14 |
3 files changed, 28 insertions, 17 deletions
diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index 643301cfb..f6fbdc8d7 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79865 2010-05-08 15:22:52Z thomas $ +# $Id: PKGBUILD 117670 2011-04-04 15:42:36Z stephane $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.1 -pkgrel=1 -pkgdesc="Central Regulatory Domain Agent" +pkgrel=3 +pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64 'mips64el') url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') @@ -17,17 +17,23 @@ md5sums=('5fc77af68b3e21736b8ef2f8b061c810' '014eef3f8655e9a130064ec6891317fc') build() { + msg "Compiling crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { # Install crda, regdbdump and udev rules - msg "Compiling and installing crda ..." - cd ${srcdir}/${pkgname}-${pkgver} - make crda regdbdump || return 1 - make DESTDIR=${pkgdir} install || return 1 + msg "Installing crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> ${pkgdir}/lib/udev/rules.d/85-regulatory.rules || return 1 + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules msg "Installing license ..." - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/crda/LICENSE || return 1 + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE msg "Installing boot script ..." - install -D -m755 ${srcdir}/crda.rc ${pkgdir}/etc/rc.d/wireless-regdom || return 1 + install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom } diff --git a/core/eventlog/ChangeLog b/core/eventlog/ChangeLog index f2f386dfe..d90a881d4 100644 --- a/core/eventlog/ChangeLog +++ b/core/eventlog/ChangeLog @@ -1,3 +1,8 @@ +2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> + + * Rebuild of old package + * Tidy up PKGBUILD + 2010-07-10 Dan McGee <dan@archlinux.org> * Updated PKGBUILD to be in line with standard style diff --git a/core/eventlog/PKGBUILD b/core/eventlog/PKGBUILD index ac804915b..f8ddb12dc 100644 --- a/core/eventlog/PKGBUILD +++ b/core/eventlog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85218 2010-07-10 21:39:54Z dan $ +# $Id: PKGBUILD 118142 2011-04-05 15:32:10Z stephane $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=eventlog pkgver=0.2.12 -pkgrel=1 -pkgdesc="A new API to format and send structured log messages" +pkgrel=2 +pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64' 'mips64el') url="http://www.balabit.com/support/community/products/" license=('BSD') @@ -17,13 +17,13 @@ md5sums=('3d6ebda8a161d36cb40d09328f78786b') sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } |