diff options
-rw-r--r-- | main/acct/APKBUILD | 2 | ||||
-rw-r--r-- | main/at-spi2-atk/APKBUILD | 1 | ||||
-rw-r--r-- | main/at-spi2-core/APKBUILD | 1 | ||||
-rw-r--r-- | main/confuse/APKBUILD | 13 | ||||
-rw-r--r-- | main/coreutils/APKBUILD | 4 | ||||
-rw-r--r-- | main/file/APKBUILD | 9 | ||||
-rw-r--r-- | main/giflib/APKBUILD | 1 | ||||
-rw-r--r-- | main/imlib2/APKBUILD | 1 | ||||
-rw-r--r-- | main/jwm/APKBUILD | 4 | ||||
-rw-r--r-- | main/libid3tag/APKBUILD | 15 | ||||
-rw-r--r-- | main/libsecret/APKBUILD | 1 | ||||
-rw-r--r-- | main/libunique3/APKBUILD | 1 | ||||
-rw-r--r-- | main/recordproto/APKBUILD | 11 | ||||
-rw-r--r-- | main/xineramaproto/APKBUILD | 11 | ||||
-rw-r--r-- | main/xvidcore/APKBUILD | 5 |
15 files changed, 65 insertions, 15 deletions
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD index d0a7142f9b..1f8f8045cf 100644 --- a/main/acct/APKBUILD +++ b/main/acct/APKBUILD @@ -13,9 +13,9 @@ install= subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/acct/${pkgname}-${pkgver}.tar.gz" - prepare() { cd "$srcdir/$pkgname-$pkgver" + update_config_sub || return 1 # fix eglibc-2.16+ build issue sed -i -e '/gets is a/d' \ lib/stdio.in.h || return 1 diff --git a/main/at-spi2-atk/APKBUILD b/main/at-spi2-atk/APKBUILD index d315ddf224..bd34fb0caa 100644 --- a/main/at-spi2-atk/APKBUILD +++ b/main/at-spi2-atk/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/at-spi2-atk-$pkgver prepare() { local i cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD index b28205db91..1e92693f39 100644 --- a/main/at-spi2-core/APKBUILD +++ b/main/at-spi2-core/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/at-spi2-core-$pkgver prepare() { local i cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD index f25ae900c6..f37b4bc10b 100644 --- a/main/confuse/APKBUILD +++ b/main/confuse/APKBUILD @@ -11,11 +11,16 @@ makedepends="flex bison pkgconfig" subpackages="$pkgname-dev" source="http://savannah.nongnu.org/download/confuse/confuse-$pkgver.tar.gz" -build() { - cd "$srcdir"/$pkgname-$pkgver - # drop -Werror +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 sed -i -e 's/-Werror//' */Makefile.* || die +} +build() { + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +32,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD index 4e7321811c..4be6e2b0a5 100644 --- a/main/coreutils/APKBUILD +++ b/main/coreutils/APKBUILD @@ -33,6 +33,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/charset.alias + rmdir -p "$pkgdir"/usr/lib 2>/dev/null + install -d "$pkgdir"/bin "$pkgdir"/usr/sbin cd "$pkgdir"/usr/bin/ diff --git a/main/file/APKBUILD b/main/file/APKBUILD index 27d4c1367a..92cd07968d 100644 --- a/main/file/APKBUILD +++ b/main/file/APKBUILD @@ -10,8 +10,15 @@ depends= source="ftp://ftp.astron.com/pub/file/file-$pkgver.tar.gz" subpackages="$pkgname-dev $pkgname-doc" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD index 32f5c72161..2c0d18c0cc 100644 --- a/main/giflib/APKBUILD +++ b/main/giflib/APKBUILD @@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD index f9263f99bf..50428055fd 100644 --- a/main/imlib2/APKBUILD +++ b/main/imlib2/APKBUILD @@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 } build() { diff --git a/main/jwm/APKBUILD b/main/jwm/APKBUILD index cf86742862..63640cc6db 100644 --- a/main/jwm/APKBUILD +++ b/main/jwm/APKBUILD @@ -19,6 +19,10 @@ source="http://joewing.net/programs/jwm/snapshots/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} build() { cd "$_builddir" diff --git a/main/libid3tag/APKBUILD b/main/libid3tag/APKBUILD index 2526477bf4..81cd7f5576 100644 --- a/main/libid3tag/APKBUILD +++ b/main/libid3tag/APKBUILD @@ -13,9 +13,15 @@ install= subpackages="$pkgname-dev" source="ftp://ftp.mars.org/pub/mpeg/libid3tag-$pkgver.tar.gz" -build() { - cd "$srcdir/$pkgname-$pkgver" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} +build() { + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,10 +34,9 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 - rm "$pkgdir"/usr/lib/*.la - + rm "$pkgdir"/usr/lib/*.la } md5sums="e5808ad997ba32c498803822078748c3 libid3tag-0.15.1b.tar.gz" diff --git a/main/libsecret/APKBUILD b/main/libsecret/APKBUILD index a036d55583..94e5d21221 100644 --- a/main/libsecret/APKBUILD +++ b/main/libsecret/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/libsecret-$pkgver prepare() { local i cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; diff --git a/main/libunique3/APKBUILD b/main/libunique3/APKBUILD index f545c71e2c..8749f2d961 100644 --- a/main/libunique3/APKBUILD +++ b/main/libunique3/APKBUILD @@ -15,6 +15,7 @@ source="http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique- _builddir="$srcdir"/libunique-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return;; diff --git a/main/recordproto/APKBUILD b/main/recordproto/APKBUILD index 599ea48d2e..c8eb228233 100644 --- a/main/recordproto/APKBUILD +++ b/main/recordproto/APKBUILD @@ -10,8 +10,15 @@ depends="" makedepends="" source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,7 +28,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/main/xineramaproto/APKBUILD b/main/xineramaproto/APKBUILD index d7574b6a88..3aba0f5128 100644 --- a/main/xineramaproto/APKBUILD +++ b/main/xineramaproto/APKBUILD @@ -10,8 +10,15 @@ depends="" makedepends="" source="http://xorg.freedesktop.org//releases/individual/proto/$pkgname-$pkgver.tar.bz2" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,7 +28,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } md5sums="9959fe0bfb22a0e7260433b8d199590a xineramaproto-1.2.1.tar.bz2" diff --git a/main/xvidcore/APKBUILD b/main/xvidcore/APKBUILD index bcfcfae1c3..a01a9957af 100644 --- a/main/xvidcore/APKBUILD +++ b/main/xvidcore/APKBUILD @@ -11,6 +11,11 @@ depends= makedepends="nasm" source="http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2" +prepare() { + cd "$srcdir"/$pkgname + update_config_sub || return 1 +} + build() { cd "$srcdir"/$pkgname/build/generic ./configure \ |