From 3ad18cc4c05350c87e49204926aac38425699594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves=20Fern=C3=A1ndez=20=28Gallaecio=29?= Date: Mon, 5 Aug 2013 07:24:26 +0200 Subject: [PATCH] =?UTF-8?q?$startdir/pkg,=20$startdir/src=20=E2=86=92=20${?= =?UTF-8?q?pkgdir},=20${srcdir}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aspell-da/PKGBUILD | 8 ++++---- aspell-ml/PKGBUILD | 4 ++-- aspell-nb/PKGBUILD | 4 ++-- aubio/PKGBUILD | 4 ++-- cegui/PKGBUILD | 2 +- doxygen/PKGBUILD | 2 +- espeak/PKGBUILD | 2 +- facile/PKGBUILD | 6 +++--- geoip/PKGBUILD | 2 +- hfsprogs/PKGBUILD | 2 +- hsqldb-java/PKGBUILD | 10 +++++----- id3lib/PKGBUILD | 10 +++++----- ispell/PKGBUILD | 34 +++++++++++++++++----------------- libart-lgpl/PKGBUILD | 4 ++-- libksba/PKGBUILD | 4 ++-- libmad/PKGBUILD | 2 +- log4cxx/PKGBUILD | 6 +++--- lynx/PKGBUILD | 4 ++-- madwifi-utils/PKGBUILD | 6 +++--- nss-mdns/PKGBUILD | 4 ++-- ocaml/PKGBUILD | 2 +- packagekit/PKGBUILD | 2 +- pinentry/PKGBUILD | 4 ++-- portaudio-svn/PKGBUILD | 2 +- rarian/PKGBUILD | 4 ++-- re2c/PKGBUILD | 4 ++-- sbcl/PKGBUILD | 4 ++-- speex/PKGBUILD | 4 ++-- strigi-git/PKGBUILD | 2 +- tls/PKGBUILD | 6 +++--- tsocks/PKGBUILD | 4 ++-- umfpack/PKGBUILD | 10 +++++----- xcalib/PKGBUILD | 8 ++++---- xplanet/PKGBUILD | 6 +++--- 34 files changed, 91 insertions(+), 91 deletions(-) diff --git a/aspell-da/PKGBUILD b/aspell-da/PKGBUILD index e9146ea28..f11c063e0 100644 --- a/aspell-da/PKGBUILD +++ b/aspell-da/PKGBUILD @@ -17,15 +17,15 @@ md5sums=('128d8a58de5f6edfcedccc565f73dcc6') build() { - cd $startdir/src/new_$pkgname-$pkgver + cd ${srcdir}/new_$pkgname-$pkgver ./configure make } package() { - cd $startdir/src/new_$pkgname-$pkgver + cd ${srcdir}/new_$pkgname-$pkgver - mkdir -p $startdir/pkg/usr/lib/aspell - make DESTDIR=$startdir/pkg install + mkdir -p ${pkgdir}/usr/lib/aspell + make DESTDIR=${pkgdir} install } diff --git a/aspell-ml/PKGBUILD b/aspell-ml/PKGBUILD index f473dfd93..02b5836bc 100644 --- a/aspell-ml/PKGBUILD +++ b/aspell-ml/PKGBUILD @@ -16,9 +16,9 @@ depends=('aspell') source=(ftp://ftp.gnu.org/gnu/aspell/dict/ml/aspell6-ml-${pkgver}-1.tar.bz2) build() { - cd $startdir/src/aspell6-ml-${pkgver}-1 + cd ${srcdir}/aspell6-ml-${pkgver}-1 ./configure make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install } md5sums=('5ac03b3b0d0618b0aa470c9f5ac46866') \ No newline at end of file diff --git a/aspell-nb/PKGBUILD b/aspell-nb/PKGBUILD index 76dbe62af..5f5bd88c2 100644 --- a/aspell-nb/PKGBUILD +++ b/aspell-nb/PKGBUILD @@ -15,8 +15,8 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/nb/${pkgname}-${pkgver}-0.tar.bz2) md5sums=('d1173a5ce04f39e9c93183da691e7ce8') build() { - cd $startdir/src/${pkgname}-${pkgver}-0 + cd ${srcdir}/${pkgname}-${pkgver}-0 ./configure /usr/bin/make || return 1 - /usr/bin/make DESTDIR=$startdir/pkg install + /usr/bin/make DESTDIR=${pkgdir} install } diff --git a/aubio/PKGBUILD b/aubio/PKGBUILD index 45becb397..fd38f43f8 100644 --- a/aubio/PKGBUILD +++ b/aubio/PKGBUILD @@ -11,9 +11,9 @@ source=(http://aubio.piem.org/pub/${pkgname}-${pkgver}.tar.gz) md5sums=('ffc3e5e4880fec67064f043252263a44') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} export LDFLAGS='-lm' ./configure --prefix=/usr make || return 1 - make DESTDIR=${startdir}/pkg install + make DESTDIR=${pkgdir} install } diff --git a/cegui/PKGBUILD b/cegui/PKGBUILD index 71d65492c..9d2f06aba 100644 --- a/cegui/PKGBUILD +++ b/cegui/PKGBUILD @@ -36,5 +36,5 @@ package() { cd $srcdir/CEGUI-0.6.2 make DESTDIR=$pkgdir install - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } diff --git a/doxygen/PKGBUILD b/doxygen/PKGBUILD index 23bbef2d8..2e2e6b4e1 100644 --- a/doxygen/PKGBUILD +++ b/doxygen/PKGBUILD @@ -23,5 +23,5 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install + make INSTALL=${pkgdir}/usr MAN1DIR=share/man/man1 install } diff --git a/espeak/PKGBUILD b/espeak/PKGBUILD index 367c7efec..7fe0d445a 100644 --- a/espeak/PKGBUILD +++ b/espeak/PKGBUILD @@ -16,7 +16,7 @@ sha256sums=('ef8beba25bd261718582d5cbb1f10293007eb525b705ff79c9fb3f505dd954ba') build() { - cd $startdir/src/$pkgname-$pkgver-source/src + cd ${srcdir}/$pkgname-$pkgver-source/src cp portaudio19.h portaudio.h make CXXFLAGS="$CXXFLAGS" AUDIO=runtime } diff --git a/facile/PKGBUILD b/facile/PKGBUILD index 69ccbaaa7..f388fa7a5 100644 --- a/facile/PKGBUILD +++ b/facile/PKGBUILD @@ -17,10 +17,10 @@ source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver ./configure make || return 1 - mkdir -p $startdir/pkg/usr/lib/ocaml/facile + mkdir -p ${pkgdir}/usr/lib/ocaml/facile cd src - install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a $startdir/pkg/usr/lib/ocaml/facile + install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a ${pkgdir}/usr/lib/ocaml/facile } diff --git a/geoip/PKGBUILD b/geoip/PKGBUILD index 17edf3342..c650ec497 100644 --- a/geoip/PKGBUILD +++ b/geoip/PKGBUILD @@ -34,7 +34,7 @@ check() { } package() { - cd "${startdir}/src/GeoIP-${pkgver}" + cd "${srcdir}/GeoIP-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/hfsprogs/PKGBUILD b/hfsprogs/PKGBUILD index a8f3467d7..e0b95bdd5 100644 --- a/hfsprogs/PKGBUILD +++ b/hfsprogs/PKGBUILD @@ -45,7 +45,7 @@ package() { install -m 644 newfs_hfs.tproj/hfsbootdata.img "$pkgdir/usr/share/hfsprogs/hfsbootdata" install -D -m755 newfs_hfs.tproj/newfs_hfs "$pkgdir/sbin/mkfs.hfsplus" install -D -m755 fsck_hfs.tproj/fsck_hfs "$pkgdir/sbin/fsck.hfsplus" - install -D -m644 $startdir/src/license "$pkgdir/usr/share/licenses/hfsprogs/APSL" + install -D -m644 ${srcdir}/license "$pkgdir/usr/share/licenses/hfsprogs/APSL" install -d -m 755 "$pkgdir/usr/share/man/man8/" install -m 644 newfs_hfs.tproj/newfs_hfs.8 "$pkgdir/usr/share/man/man8/mkfs.hfsplus.8" install -m 644 fsck_hfs.tproj/fsck_hfs.8 "$pkgdir/usr/share/man/man8/fsck.hfsplus.8" diff --git a/hsqldb-java/PKGBUILD b/hsqldb-java/PKGBUILD index d7d0bad9d..2bffc952a 100644 --- a/hsqldb-java/PKGBUILD +++ b/hsqldb-java/PKGBUILD @@ -22,13 +22,13 @@ build() { [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - cd ${startdir}/src/hsqldb/build + cd ${srcdir}/hsqldb/build ant jar || return 1 - mkdir -p ${startdir}/pkg/usr/share/java - install -m644 ${startdir}/src/hsqldb/lib/hsqldb.jar ${startdir}/pkg/usr/share/java/ + mkdir -p ${pkgdir}/usr/share/java + install -m644 ${srcdir}/hsqldb/lib/hsqldb.jar ${pkgdir}/usr/share/java/ - mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname} - install -m644 ${startdir}/src/hsqldb/doc/hsqldb_lic.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/ + mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 ${srcdir}/hsqldb/doc/hsqldb_lic.txt ${pkgdir}/usr/share/licenses/${pkgname}/ } diff --git a/id3lib/PKGBUILD b/id3lib/PKGBUILD index 07b6476d4..0db62ef82 100644 --- a/id3lib/PKGBUILD +++ b/id3lib/PKGBUILD @@ -24,12 +24,12 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '196c65adee1ba511ddacef2de0dfd102'\ '78e90e15ddd1122b66da352b6c3b00ff' 'fdbffd2d9d289ed0d730950c78d4ebc4') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - patch -Np1 -i ${startdir}/src/patch_id3lib_3.8.3_UTF16_writing_bug.diff || return 1 - patch -Np0 -i ${startdir}/src/id3lib-3.8.3-CVE-2007-4460.patch || return 1 - patch -Np1 -i ${startdir}/src/id3lib-3.8.3-gcc-4.3.patch || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/patch_id3lib_3.8.3_UTF16_writing_bug.diff || return 1 + patch -Np0 -i ${srcdir}/id3lib-3.8.3-CVE-2007-4460.patch || return 1 + patch -Np1 -i ${srcdir}/id3lib-3.8.3-gcc-4.3.patch || return 1 ./configure --prefix=/usr sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile || return 1 make || return 1 - make DESTDIR=${startdir}/pkg install + make DESTDIR=${pkgdir} install } diff --git a/ispell/PKGBUILD b/ispell/PKGBUILD index 93aad34da..2c996505c 100644 --- a/ispell/PKGBUILD +++ b/ispell/PKGBUILD @@ -14,7 +14,7 @@ source=(http://fmg-www.cs.ucla.edu/geoff/tars/${pkgname}-${pkgver}.tar.gz licens md5sums=('12087d7555fc2b746425cd167af480fe' 'bf51b6181b9914dedc266ba970bb7319' '0a2842aa10930426b58a962ca517a51a') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} patch -Np0 -i ${startdir}/getline.patch || return 1 sed -i 's/#undef USG/#define USG/' local.h.linux @@ -24,26 +24,26 @@ build() { make TMPDIR=/tmp all || return 1 # Installing binary tools - install -D -m755 buildhash ${startdir}/pkg/usr/bin/buildhash - install -D -m755 findaffix ${startdir}/pkg/usr/bin/findaffix - install -D -m755 icombine ${startdir}/pkg/usr/bin/icombine - install -D -m755 ijoin ${startdir}/pkg/usr/bin/ijoin - install -D -m755 ispell ${startdir}/pkg/usr/bin/ispell - install -D -m755 iwhich ${startdir}/pkg/usr/bin/iwhich - install -D -m755 munchlist ${startdir}/pkg/usr/bin/munchlist - install -D -m755 tryaffix ${startdir}/pkg/usr/bin/tryaffix + install -D -m755 buildhash ${pkgdir}/usr/bin/buildhash + install -D -m755 findaffix ${pkgdir}/usr/bin/findaffix + install -D -m755 icombine ${pkgdir}/usr/bin/icombine + install -D -m755 ijoin ${pkgdir}/usr/bin/ijoin + install -D -m755 ispell ${pkgdir}/usr/bin/ispell + install -D -m755 iwhich ${pkgdir}/usr/bin/iwhich + install -D -m755 munchlist ${pkgdir}/usr/bin/munchlist + install -D -m755 tryaffix ${pkgdir}/usr/bin/tryaffix # Installing man pages - install -D -m644 ispell.1 ${startdir}/pkg/usr/share/man/man1/ispell.1 - install -D -m644 ispell.5 ${startdir}/pkg/usr/share/man/man5/ispell.5 + install -D -m644 ispell.1 ${pkgdir}/usr/share/man/man1/ispell.1 + install -D -m644 ispell.5 ${pkgdir}/usr/share/man/man5/ispell.5 # Installing dictionnaries - install -d ${startdir}/pkg/usr/bin ${startdir}/pkg/usr/lib/ispell - install -m644 languages/american/americanmed.hash ${startdir}/pkg/usr/lib/ispell/americanmed.hash - install -m644 languages/english/english.aff ${startdir}/pkg/usr/lib/ispell/english.aff - ln -s americanmed.hash ${startdir}/pkg/usr/lib/ispell/american.hash - ln -s americanmed.hash ${startdir}/pkg/usr/lib/ispell/english.hash + install -d ${pkgdir}/usr/bin ${pkgdir}/usr/lib/ispell + install -m644 languages/american/americanmed.hash ${pkgdir}/usr/lib/ispell/americanmed.hash + install -m644 languages/english/english.aff ${pkgdir}/usr/lib/ispell/english.aff + ln -s americanmed.hash ${pkgdir}/usr/lib/ispell/american.hash + ln -s americanmed.hash ${pkgdir}/usr/lib/ispell/english.hash # Installing license - install -D -m644 ${startdir}/src/license.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt } diff --git a/libart-lgpl/PKGBUILD b/libart-lgpl/PKGBUILD index c7cdbfeac..cf059122d 100644 --- a/libart-lgpl/PKGBUILD +++ b/libart-lgpl/PKGBUILD @@ -13,8 +13,8 @@ options=('!libtool') sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa') build() { - cd ${startdir}/src/libart_lgpl-${pkgver} + cd ${srcdir}/libart_lgpl-${pkgver} ./configure --prefix=/usr || return 1 make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + make DESTDIR=${pkgdir} install || return 1 } diff --git a/libksba/PKGBUILD b/libksba/PKGBUILD index 0f82425b1..d547d5860 100644 --- a/libksba/PKGBUILD +++ b/libksba/PKGBUILD @@ -16,10 +16,10 @@ options=(!libtool) install=libksba.install build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install } md5sums=('cd86fad9c9d360b2cf80449f8a4a4075') diff --git a/libmad/PKGBUILD b/libmad/PKGBUILD index 97f3b6e87..31be1f87a 100644 --- a/libmad/PKGBUILD +++ b/libmad/PKGBUILD @@ -34,5 +34,5 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install } diff --git a/log4cxx/PKGBUILD b/log4cxx/PKGBUILD index b2ad52320..5d7e8383a 100644 --- a/log4cxx/PKGBUILD +++ b/log4cxx/PKGBUILD @@ -19,7 +19,7 @@ md5sums=('b30ffb8da3665178e68940ff7a61084c' 'dfa17719a57b19f12cbef94419a2aac8') build() { - cd $startdir/src/apache-$pkgname-$pkgver + cd ${srcdir}/apache-$pkgname-$pkgver patch -p1 < $startdir/log4cxx-0.10.0-missing_includes.patch @@ -28,7 +28,7 @@ build() { } package() { - cd $startdir/src/apache-$pkgname-$pkgver + cd ${srcdir}/apache-$pkgname-$pkgver - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install } diff --git a/lynx/PKGBUILD b/lynx/PKGBUILD index 5593fc3fa..51d020b3d 100644 --- a/lynx/PKGBUILD +++ b/lynx/PKGBUILD @@ -15,10 +15,10 @@ url="http://lynx.isc.org" backup=('etc/lynx.cfg') build() { - cd $startdir/src/${pkgname}2-8-7 + cd ${srcdir}/${pkgname}2-8-7 ./configure --prefix=/usr --sysconfdir=/etc --with-ssl --enable-nls \ --mandir=/usr/share/man make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install } md5sums=('124253e635f7c76bdffc47b9d036c812') diff --git a/madwifi-utils/PKGBUILD b/madwifi-utils/PKGBUILD index 08d85fa03..f62910706 100644 --- a/madwifi-utils/PKGBUILD +++ b/madwifi-utils/PKGBUILD @@ -32,10 +32,10 @@ build() { [ "${CARCH}" == "i686" ] && export ARCH=i386 export KERNELPATH=/lib/modules/${_kernver}/build - #cd $startdir/src/madwifi-$pkgver - cd $startdir/src/madwifi-$_ver + #cd ${srcdir}/madwifi-$pkgver + cd ${srcdir}/madwifi-$_ver make tools|| return 1 - make DESTDIR=$startdir/pkg \ + make DESTDIR=${pkgdir} \ BINDIR=/usr/bin \ MANDIR=/usr/share/man \ install-tools diff --git a/nss-mdns/PKGBUILD b/nss-mdns/PKGBUILD index 6c759c234..cfab1641c 100644 --- a/nss-mdns/PKGBUILD +++ b/nss-mdns/PKGBUILD @@ -26,7 +26,7 @@ build() { --enable-avahi make || return 1 make DESTDIR=${pkgdir} install - mkdir -p ${startdir}/pkg/etc - install -m644 ../mdns.allow ${startdir}/pkg/etc/mdns.allow + mkdir -p ${pkgdir}/etc + install -m644 ../mdns.allow ${pkgdir}/etc/mdns.allow } diff --git a/ocaml/PKGBUILD b/ocaml/PKGBUILD index 98b8894ac..9f7819cd1 100644 --- a/ocaml/PKGBUILD +++ b/ocaml/PKGBUILD @@ -33,7 +33,7 @@ package() { make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install # Save >10MB with this one, makepkg only strips debug symbols. -#find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; +#find ${pkgdir}/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; # install license install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/packagekit/PKGBUILD b/packagekit/PKGBUILD index 8e9e070bf..ef43439d9 100644 --- a/packagekit/PKGBUILD +++ b/packagekit/PKGBUILD @@ -1,7 +1,7 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer: Giuseppe Calà +# maintainer: Giuseppe Calà pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python') diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD index 3081c629b..18958e73e 100644 --- a/pinentry/PKGBUILD +++ b/pinentry/PKGBUILD @@ -14,7 +14,7 @@ source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('2ae681cbca0d9fb774b2c90b11ebf56c') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver [ "$QTDIR" = "" ] # && source /etc/profile.d/qt3.sh for file in qt4/*.moc; do /usr/bin/moc ${file/.moc/.h} > ${file} @@ -30,7 +30,7 @@ build() { } package() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install rm ${pkgdir}/usr/share/info/dir rm ${pkgdir}/usr/bin/pinentry diff --git a/portaudio-svn/PKGBUILD b/portaudio-svn/PKGBUILD index 23a8e3e52..f40de6e33 100644 --- a/portaudio-svn/PKGBUILD +++ b/portaudio-svn/PKGBUILD @@ -39,6 +39,6 @@ build() { package() { cd $_svnmod-build - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" } diff --git a/rarian/PKGBUILD b/rarian/PKGBUILD index b83caff46..23720745b 100644 --- a/rarian/PKGBUILD +++ b/rarian/PKGBUILD @@ -20,10 +20,10 @@ md5sums=('75091185e13da67a0ff4279de1757b94' '457e9827197009cfa360911fe49a5ad7') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/user-segfault.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static || return 1 make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + make DESTDIR=${pkgdir} install || return 1 } diff --git a/re2c/PKGBUILD b/re2c/PKGBUILD index cdc3ed5d8..2ebfde744 100644 --- a/re2c/PKGBUILD +++ b/re2c/PKGBUILD @@ -14,10 +14,10 @@ source=(http://downloads.sourceforge.net/sourceforge/re2c/re2c-${pkgver}.tar.gz) md5sums=('4a97d8f77ed6d2c76c8bd840a43f5633') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install } diff --git a/sbcl/PKGBUILD b/sbcl/PKGBUILD index 525817eaf..b46dd5fcb 100644 --- a/sbcl/PKGBUILD +++ b/sbcl/PKGBUILD @@ -46,8 +46,8 @@ package() { INSTALL_ROOT="$pkgdir/usr" sh install.sh - src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/chakra-fixes.lisp - mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core + src/runtime/sbcl --core output/sbcl.core --script ${srcdir}/chakra-fixes.lisp + mv sbcl-new.core ${pkgdir}/usr/lib/sbcl/sbcl.core # sources mkdir -p "$pkgdir/usr/share/sbcl-source" diff --git a/speex/PKGBUILD b/speex/PKGBUILD index 98e07e289..fb40bf4a7 100644 --- a/speex/PKGBUILD +++ b/speex/PKGBUILD @@ -23,7 +23,7 @@ build() { package() { cd $srcdir/speex-$pkgver - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } diff --git a/strigi-git/PKGBUILD b/strigi-git/PKGBUILD index 817b4294f..43a6cce79 100644 --- a/strigi-git/PKGBUILD +++ b/strigi-git/PKGBUILD @@ -55,7 +55,7 @@ build() { fi mkdir $srcdir/build cd $srcdir/build - cmake $startdir/src/$_gitname -DCMAKE_BUILD_TYPE=debugfull \ + cmake ${srcdir}/$_gitname -DCMAKE_BUILD_TYPE=debugfull \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_INOTIFY=ON \ -DENABLE_LOG4CXX=OFF \ diff --git a/tls/PKGBUILD b/tls/PKGBUILD index 28786fe4f..93bcab38b 100644 --- a/tls/PKGBUILD +++ b/tls/PKGBUILD @@ -15,15 +15,15 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname$pkgver-src.tar.gz") md5sums=('eb326ff9e6fc3b9885aa5c72fb8df3bf') build() { - cd $startdir/src/tls$pkgver + cd ${srcdir}/tls$pkgver ./configure --prefix=/usr --with-ssl-dir=/usr make } package() { - cd $startdir/src/tls$pkgver + cd ${srcdir}/tls$pkgver - make DESTDIR=$startdir/pkg install + make DESTDIR=${pkgdir} install ln -s tls1.6/libtls1.6.so $pkgdir/usr/lib/libtls1.6.so } diff --git a/tsocks/PKGBUILD b/tsocks/PKGBUILD index d78a28e46..8739d7c2e 100644 --- a/tsocks/PKGBUILD +++ b/tsocks/PKGBUILD @@ -19,8 +19,8 @@ source=(http://downloads.sourceforge.net/tsocks/tsocks-$pkgver.tar.gz) md5sums=('51caefd77e5d440d0bbd6443db4fc0f8') build() { - cd $startdir/src/tsocks-1.8 + cd ${srcdir}/tsocks-1.8 ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib || return 1 make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + make DESTDIR=${pkgdir} install || return 1 } diff --git a/umfpack/PKGBUILD b/umfpack/PKGBUILD index 6d2c0adfc..48ef76213 100644 --- a/umfpack/PKGBUILD +++ b/umfpack/PKGBUILD @@ -37,22 +37,22 @@ md5sums=('19f5d8b4231ec9114718641ce51cce6e' build() { cd "$srcdir/UMFPACK" cp -rf "$srcdir/UFconfig/xerbla" . - cp -L ../UFconfig.mk $startdir/src/UFconfig + cp -L ../UFconfig.mk ${srcdir}/UFconfig [ $CARCH == "x86_64" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk make library || return 1 install -d "$pkgdir/usr/lib" "$pkgdir/usr/include" install -D -m644 Lib/libumfpack.a "$pkgdir/usr/lib/libumfpack.a" - cp $startdir/src/UMFPACK/Include/*.h $startdir/pkg/usr/include + cp ${srcdir}/UMFPACK/Include/*.h ${pkgdir}/usr/include install -D -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/libamd.a" - cp $startdir/src/AMD/Include/*.h $startdir/pkg/usr/include + cp ${srcdir}/AMD/Include/*.h ${pkgdir}/usr/include install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include" || return 1 # Fix permissions - cd $startdir/pkg/usr/include + cd ${pkgdir}/usr/include chmod oug+r * - cd $startdir/pkg/usr/lib + cd ${pkgdir}/usr/lib chmod oug+r * } diff --git a/xcalib/PKGBUILD b/xcalib/PKGBUILD index 7578559ef..512163567 100644 --- a/xcalib/PKGBUILD +++ b/xcalib/PKGBUILD @@ -18,12 +18,12 @@ md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7' 'fd3aa535f50234ee7d46494913abc1a7') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver patch -p0 < ../makefile-ldflags.patch make || return 1 - install -D -m755 xcalib $startdir/pkg/usr/bin/xcalib + install -D -m755 xcalib ${pkgdir}/usr/bin/xcalib - mkdir -p $startdir/pkg/usr/share/xcalib - cp README *.icc *.icm $startdir/pkg/usr/share/xcalib + mkdir -p ${pkgdir}/usr/share/xcalib + cp README *.icc *.icm ${pkgdir}/usr/share/xcalib } \ No newline at end of file diff --git a/xplanet/PKGBUILD b/xplanet/PKGBUILD index 1002de26d..030ed7807 100644 --- a/xplanet/PKGBUILD +++ b/xplanet/PKGBUILD @@ -15,14 +15,14 @@ source=("http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplane md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692') build() { - cd "$startdir/src/$pkgname-$pkgver" + cd "${srcdir}/$pkgname-$pkgver" ./configure --prefix=/usr --with-freetype make } package() { - cd "$startdir/src/$pkgname-$pkgver" + cd "${srcdir}/$pkgname-$pkgver" - make prefix=$startdir/pkg/usr install + make prefix=${pkgdir}/usr install }