diff options
39 files changed, 146 insertions, 26 deletions
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD index f08d81db30..7768dbe68e 100644 --- a/main/apr-util/APKBUILD +++ b/main/apr-util/APKBUILD @@ -15,8 +15,15 @@ depends_dev="expat-dev apr-dev openldap-dev sqlite-dev postgresql-dev db-dev" source="http://www.apache.org/dist/apr/$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 \ @@ -35,7 +42,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/apr-util*/*.la \ "$pkgdir"/usr/lib/*.exp \ diff --git a/main/atkmm/APKBUILD b/main/atkmm/APKBUILD index d2d64639c0..7b19a37be0 100644 --- a/main/atkmm/APKBUILD +++ b/main/atkmm/APKBUILD @@ -13,6 +13,11 @@ source="http://ftp.gnome.org/pub/GNOME/sources/atkmm/${pkgver%.*}/atkmm-$pkgver. replaces="gtkmm" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD index 136f201aed..bd8db1e346 100644 --- a/main/bdftopcf/APKBUILD +++ b/main/bdftopcf/APKBUILD @@ -13,6 +13,12 @@ subpackages="$pkgname-doc" source="http://xorg.freedesktop.org//releases/individual/app/bdftopcf-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/cairomm/APKBUILD b/main/cairomm/APKBUILD index 5ff5bca0eb..4b28dcc083 100644 --- a/main/cairomm/APKBUILD +++ b/main/cairomm/APKBUILD @@ -13,6 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD index 85fff62b24..f58958d574 100644 --- a/main/daq/APKBUILD +++ b/main/daq/APKBUILD @@ -17,6 +17,7 @@ _builddir="$srcdir"/daq-$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/dovecot/APKBUILD b/main/dovecot/APKBUILD index 3b4bdfdd79..fd20df44ce 100644 --- a/main/dovecot/APKBUILD +++ b/main/dovecot/APKBUILD @@ -28,6 +28,7 @@ source="http://www.dovecot.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz prepare() { cd "$srcdir"/$pkgname-$pkgver + update_config_sub || return 1 for i in $patches; do msg $i patch -p1 -i "$srcdir"/$i || return 1 diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD index 772197895b..c5addbb193 100644 --- a/main/epdfview/APKBUILD +++ b/main/epdfview/APKBUILD @@ -19,6 +19,7 @@ source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) diff --git a/main/evince/APKBUILD b/main/evince/APKBUILD index 2f231f67ec..a6eb66d545 100644 --- a/main/evince/APKBUILD +++ b/main/evince/APKBUILD @@ -34,6 +34,7 @@ _builddir="${srcdir}/${pkgname}-${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/fprobe/APKBUILD b/main/fprobe/APKBUILD index 824c4e1cbc..ca6d465d28 100644 --- a/main/fprobe/APKBUILD +++ b/main/fprobe/APKBUILD @@ -21,6 +21,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd $_builddir + update_config_sub || return 1 for i in ../*.patch do msg "Applying $i" diff --git a/main/glibmm/APKBUILD b/main/glibmm/APKBUILD index e09c93717a..8e77df87c8 100644 --- a/main/glibmm/APKBUILD +++ b/main/glibmm/APKBUILD @@ -12,8 +12,14 @@ subpackages="$pkgname-dev $pkgname-doc" depends_dev="libsigc++-dev" source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,7 +29,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la } diff --git a/main/gnome-themes/APKBUILD b/main/gnome-themes/APKBUILD index da9ce45897..a740bab9d9 100644 --- a/main/gnome-themes/APKBUILD +++ b/main/gnome-themes/APKBUILD @@ -18,6 +18,7 @@ _builddir="${srcdir}/${pkgname}-${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/goffice0.8/APKBUILD b/main/goffice0.8/APKBUILD index cde30efe60..f1500ca57e 100644 --- a/main/goffice0.8/APKBUILD +++ b/main/goffice0.8/APKBUILD @@ -20,6 +20,7 @@ source="http://ftp.gnome.org/pub/gnome/sources/$_realname/$_maj.$_min/$_realname prepare() { cd "$srcdir"/$_realname-$pkgver + 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/gtkmm/APKBUILD b/main/gtkmm/APKBUILD index c2422dc465..2a8435a69c 100644 --- a/main/gtkmm/APKBUILD +++ b/main/gtkmm/APKBUILD @@ -12,8 +12,14 @@ depends_dev="atkmm-dev gtk+-dev glibmm-dev pangomm-dev" subpackages="$pkgname-dev" source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/gtkmm-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,7 +29,7 @@ build() { } package() { - cd "$srcdir"/gtkmm-$pkgver + cd "$_builddir" make install DESTDIR="$pkgdir" || return 1 rm "$pkgdir"/usr/lib/*.la } diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD index 7411c7732c..4d38060a43 100644 --- a/main/ipset/APKBUILD +++ b/main/ipset/APKBUILD @@ -17,6 +17,7 @@ _builddir=$srcdir/ipset-$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/libass/APKBUILD b/main/libass/APKBUILD index dfe103d364..50a04b370e 100644 --- a/main/libass/APKBUILD +++ b/main/libass/APKBUILD @@ -16,6 +16,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 # apply patches here } diff --git a/main/libee/APKBUILD b/main/libee/APKBUILD index 90eeac8ad1..c91f223410 100644 --- a/main/libee/APKBUILD +++ b/main/libee/APKBUILD @@ -14,6 +14,7 @@ source="http://www.libee.org/download/files/download/$pkgname-$pkgver.tar.gz" _builddir="$srcdir/$pkgname-$pkgver" prepare() { cd "$_builddir" + update_config_sub || return 1 ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/main/libgnome/APKBUILD b/main/libgnome/APKBUILD index ada696e2e7..16b26fcf23 100644 --- a/main/libgnome/APKBUILD +++ b/main/libgnome/APKBUILD @@ -19,6 +19,7 @@ _builddir="${srcdir}/${pkgname}-${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/libguess/APKBUILD b/main/libguess/APKBUILD index 997e53c079..6f323aead7 100644 --- a/main/libguess/APKBUILD +++ b/main/libguess/APKBUILD @@ -18,6 +18,7 @@ _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/libnetfilter_cthelper/APKBUILD b/main/libnetfilter_cthelper/APKBUILD index 50c4533dfb..d05fee6784 100644 --- a/main/libnetfilter_cthelper/APKBUILD +++ b/main/libnetfilter_cthelper/APKBUILD @@ -16,6 +16,7 @@ _builddir="$srcdir"/libnetfilter_cthelper-$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/libnetfilter_cttimeout/APKBUILD b/main/libnetfilter_cttimeout/APKBUILD index f90e923e99..2fa956720b 100644 --- a/main/libnetfilter_cttimeout/APKBUILD +++ b/main/libnetfilter_cttimeout/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/libnetfilter_cttimeout-$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/libnfsidmap/APKBUILD b/main/libnfsidmap/APKBUILD index 1ed782826c..c23c2e4cd3 100644 --- a/main/libnfsidmap/APKBUILD +++ b/main/libnfsidmap/APKBUILD @@ -17,6 +17,7 @@ _builddir="$srcdir"/libnfsidmap-$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/libnih/APKBUILD b/main/libnih/APKBUILD index 7875ed96a0..855b855813 100644 --- a/main/libnih/APKBUILD +++ b/main/libnih/APKBUILD @@ -18,6 +18,7 @@ _builddir="${srcdir}/${pkgname}-${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/librpcsecgss/APKBUILD b/main/librpcsecgss/APKBUILD index 57b21a8eaf..4d0d1c253e 100644 --- a/main/librpcsecgss/APKBUILD +++ b/main/librpcsecgss/APKBUILD @@ -17,6 +17,7 @@ _builddir="$srcdir"/librpcsecgss-$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/libsndfile/APKBUILD b/main/libsndfile/APKBUILD index 673d5d0165..dff2d13b5d 100644 --- a/main/libsndfile/APKBUILD +++ b/main/libsndfile/APKBUILD @@ -12,8 +12,15 @@ depends_dev="flac-dev libvorbis-dev libogg-dev" makedepends="alsa-lib-dev $depends_dev" source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build () { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ac_cv_sys_largefile_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \ ./configure \ --build=$CBUILD \ @@ -26,7 +33,7 @@ build () { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } diff --git a/main/libtorrent/APKBUILD b/main/libtorrent/APKBUILD index d7d0dad963..b938de68e0 100644 --- a/main/libtorrent/APKBUILD +++ b/main/libtorrent/APKBUILD @@ -12,8 +12,15 @@ subpackages="$pkgname-dev" options='libtool' source="http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ @@ -25,7 +32,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } diff --git a/main/libvdpau/APKBUILD b/main/libvdpau/APKBUILD index 02141a77b1..b39f218e17 100644 --- a/main/libvdpau/APKBUILD +++ b/main/libvdpau/APKBUILD @@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 # apply patches here } diff --git a/main/libwnck/APKBUILD b/main/libwnck/APKBUILD index 9b0699a3b7..ccefcadba0 100644 --- a/main/libwnck/APKBUILD +++ b/main/libwnck/APKBUILD @@ -16,6 +16,12 @@ depends_dev="glib-dev gtk+-dev libx11-dev pango-dev cairo-dev startup-notification-dev libxres-dev" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/libxfcegui4/APKBUILD b/main/libxfcegui4/APKBUILD index 166d19d318..5a10a1d595 100644 --- a/main/libxfcegui4/APKBUILD +++ b/main/libxfcegui4/APKBUILD @@ -8,13 +8,20 @@ arch="all" license="GPL2" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends= +depends_dev="gtk+-dev libxfce4util-dev xfconf-dev startup-notification-dev" makedepends="gtk+-dev xfconf-dev libxfce4util-dev startup-notification-dev libglade-dev" source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" -depends_dev="gtk+-dev libxfce4util-dev xfconf-dev startup-notification-dev" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +35,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } diff --git a/main/loudmouth/APKBUILD b/main/loudmouth/APKBUILD index 973c32efaf..e4e38b8c05 100644 --- a/main/loudmouth/APKBUILD +++ b/main/loudmouth/APKBUILD @@ -23,6 +23,7 @@ _builddir="$srcdir"/$pkgname-$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/mkfontscale/APKBUILD b/main/mkfontscale/APKBUILD index 553fb772a2..12da188635 100644 --- a/main/mkfontscale/APKBUILD +++ b/main/mkfontscale/APKBUILD @@ -13,8 +13,15 @@ install= triggers="$pkgname.trigger=/usr/share/fonts/*" source="http://xorg.freedesktop.org/releases/individual/app/$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 \ @@ -24,7 +31,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } md5sums="96ca346f185c0ab48e42bf5bb0375da5 mkfontscale-1.0.7.tar.bz2" diff --git a/main/mp3splt/APKBUILD b/main/mp3splt/APKBUILD index 37499fdc37..c038849e80 100644 --- a/main/mp3splt/APKBUILD +++ b/main/mp3splt/APKBUILD @@ -17,6 +17,7 @@ _builddir="$srcdir"/mp3splt-$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/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD index 6f4a7cd7f6..24fa3ecbf0 100644 --- a/main/nagios-plugins/APKBUILD +++ b/main/nagios-plugins/APKBUILD @@ -14,7 +14,8 @@ pkggroups="nagios" subpackages="$pkgname-contrib" prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" + update_config_sub || return 1 # fix eglibc-2.16 build issue sed -i -e '/gets is a/d' \ gl/stdio.in.h || return 1 diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD index 8f8e0dcbf5..756878f32c 100644 --- a/main/nagios/APKBUILD +++ b/main/nagios/APKBUILD @@ -20,6 +20,11 @@ pkggroups="nagios" _builddir="$srcdir/$pkgname" +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/ngrep/APKBUILD b/main/ngrep/APKBUILD index 31666553be..487c58704a 100644 --- a/main/ngrep/APKBUILD +++ b/main/ngrep/APKBUILD @@ -13,7 +13,14 @@ makedepends="$depends_dev" install="" subpackages="" source="http://downloads.sourceforge.net/sourceforge/ngrep/$pkgname-$pkgver.tar.bz2" + _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD index f1b54fcc3a..9bea3e4147 100644 --- a/main/nmap/APKBUILD +++ b/main/nmap/APKBUILD @@ -15,6 +15,11 @@ source="http://nmap.org/dist/$pkgname-$pkgver.tgz" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/openbox/APKBUILD b/main/openbox/APKBUILD index 533adc47ca..b786c7eb95 100644 --- a/main/openbox/APKBUILD +++ b/main/openbox/APKBUILD @@ -19,6 +19,7 @@ _builddir="$srcdir"/openbox-$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/pangomm/APKBUILD b/main/pangomm/APKBUILD index 6aa9441c1f..b33df55a9f 100644 --- a/main/pangomm/APKBUILD +++ b/main/pangomm/APKBUILD @@ -13,6 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/GNOME/sources/pangomm/${pkgver%.*}/pangomm-$pkgver.tar.xz" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$srcdir/$pkgname-$pkgver" ./configure \ diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD index 5ce8302521..58e6611412 100644 --- a/main/pth/APKBUILD +++ b/main/pth/APKBUILD @@ -14,14 +14,20 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz pth-2.0.6-sigstack.patch " -build () { - cd "$srcdir"/$pkgname-$pkgver +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 for i in ../*.patch; do msg "Applying $i..." patch -p1 < $i || return 1 done +} +build() { + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,7 +41,7 @@ build () { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make -j1 DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/*.la } diff --git a/main/py-gtk/APKBUILD b/main/py-gtk/APKBUILD index 7e9cf6c856..52bbfef03f 100644 --- a/main/py-gtk/APKBUILD +++ b/main/py-gtk/APKBUILD @@ -18,13 +18,14 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-demo" _builddir="$srcdir"/pygtk-$pkgver prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + 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;; + esac + done # disable pyc echo '#!/bin/sh' > py-compile libtoolize --force && aclocal -I m4 && autoconf \ |