diff options
58 files changed, 128 insertions, 21 deletions
diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD index 7ada8567116..73e3d996c85 100644 --- a/main/audacious-plugins/APKBUILD +++ b/main/audacious-plugins/APKBUILD @@ -55,6 +55,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in diff --git a/main/audacious/APKBUILD b/main/audacious/APKBUILD index 9c384c416ee..26fdea5da2a 100644 --- a/main/audacious/APKBUILD +++ b/main/audacious/APKBUILD @@ -18,7 +18,7 @@ source="http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2 _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/audacity/APKBUILD b/main/audacity/APKBUILD index fa4db601347..5d957f71b6b 100644 --- a/main/audacity/APKBUILD +++ b/main/audacity/APKBUILD @@ -20,6 +20,7 @@ _builddir="$srcdir"/audacity-src-$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/cegui06/APKBUILD b/main/cegui06/APKBUILD index d22764af968..7ad0456f797 100644 --- a/main/cegui06/APKBUILD +++ b/main/cegui06/APKBUILD @@ -22,6 +22,7 @@ _builddir="$srcdir"/CEGUI-0.6.2 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/darkice/APKBUILD b/main/darkice/APKBUILD index 5edd7f17a76..bb4e7862c16 100644 --- a/main/darkice/APKBUILD +++ b/main/darkice/APKBUILD @@ -15,7 +15,14 @@ subpackages="$pkgname-doc" source="http://darkice.googlecode.com/files/$pkgname-$pkgver.tar.gz darkice.initd darkice.confd" + _builddir=$srcdir/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/farstream/APKBUILD b/main/farstream/APKBUILD index ca2be9549b6..5dc1da3856c 100644 --- a/main/farstream/APKBUILD +++ b/main/farstream/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/farstream-$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/farstream0.1/APKBUILD b/main/farstream0.1/APKBUILD index 8e73e5c42f0..c9e7cc324e8 100644 --- a/main/farstream0.1/APKBUILD +++ b/main/farstream0.1/APKBUILD @@ -21,6 +21,7 @@ _builddir="$srcdir"/farstream-$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/freeradius/APKBUILD b/main/freeradius/APKBUILD index 0797e088c94..f4a83ef1f95 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -27,6 +27,7 @@ _builddir="$srcdir"/$pkgname-server-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 # we dont have libnsl sed -i 's/nsl, //g' configure.in || return 1 diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD index 9d02ec55471..41a684c31d2 100644 --- a/main/gnokii/APKBUILD +++ b/main/gnokii/APKBUILD @@ -21,6 +21,7 @@ source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2 _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/gnome-bluetooth/APKBUILD b/main/gnome-bluetooth/APKBUILD index 4666c4eb054..a0816b29eab 100644 --- a/main/gnome-bluetooth/APKBUILD +++ b/main/gnome-bluetooth/APKBUILD @@ -20,6 +20,7 @@ source="http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/${pkgver%.*}/gnom _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/gnome-control-center/APKBUILD b/main/gnome-control-center/APKBUILD index 7977e90d4b7..7ae9db6bca3 100644 --- a/main/gnome-control-center/APKBUILD +++ b/main/gnome-control-center/APKBUILD @@ -42,6 +42,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/gnome-disk-utility/APKBUILD b/main/gnome-disk-utility/APKBUILD index 4d6ed675343..51f6d6a12e5 100644 --- a/main/gnome-disk-utility/APKBUILD +++ b/main/gnome-disk-utility/APKBUILD @@ -19,6 +19,7 @@ source="http://ftp.gnome.org/pub/GNOME/sources/gnome-disk-utility/${pkgver%.*}/g _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 patch -Np1 -i "$srcdir/fix-freeze.patch" patch -Np1 -i "$srcdir/exp2.patch" } diff --git a/main/gnome-panel/APKBUILD b/main/gnome-panel/APKBUILD index e2ea9679427..78d2cf104cc 100644 --- a/main/gnome-panel/APKBUILD +++ b/main/gnome-panel/APKBUILD @@ -32,6 +32,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/gnome-power-manager/APKBUILD b/main/gnome-power-manager/APKBUILD index 16550a3adf6..3120b6ab72a 100644 --- a/main/gnome-power-manager/APKBUILD +++ b/main/gnome-power-manager/APKBUILD @@ -41,6 +41,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/gnome-system-monitor/APKBUILD b/main/gnome-system-monitor/APKBUILD index ad83de9e003..e38d81eb257 100644 --- a/main/gnome-system-monitor/APKBUILD +++ b/main/gnome-system-monitor/APKBUILD @@ -54,6 +54,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/gparted/APKBUILD b/main/gparted/APKBUILD index 17b01853f02..3b60a671e9f 100644 --- a/main/gparted/APKBUILD +++ b/main/gparted/APKBUILD @@ -16,6 +16,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 } build() { diff --git a/main/gst-ffmpeg/APKBUILD b/main/gst-ffmpeg/APKBUILD index 23a65991716..fb3eb92fe87 100644 --- a/main/gst-ffmpeg/APKBUILD +++ b/main/gst-ffmpeg/APKBUILD @@ -12,6 +12,7 @@ source="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-$pkgver.tar.b _builddir="$srcdir"/gst-ffmpeg-$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/gst-plugins-bad/APKBUILD b/main/gst-plugins-bad/APKBUILD index 9f5f0457eca..0a0359e2622 100644 --- a/main/gst-plugins-bad/APKBUILD +++ b/main/gst-plugins-bad/APKBUILD @@ -17,8 +17,15 @@ makedepends="gst-plugins-base-dev gstreamer-dev xvidcore-dev bzip2-dev #'libdca>=0.0.5' 'exempi>=2.1.0' 'jack-audio-connection-kit>=0.116.2' 'musicbrainz>=2.1.5' 'libcdaudio>=0.99.12' 'libmpcdec>=1.2.6' 'mjpegtools>=1.9.0' 'libdvdnav>=4.1.3' 'liblrdf>=0.4.0' 'libofa>=0.9.3') source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$pkgver.tar.bz2" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/gst-plugins-bad-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,7 +41,7 @@ build() { } package() { - cd "$srcdir"/gst-plugins-bad-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } diff --git a/main/gst-plugins-bad1/APKBUILD b/main/gst-plugins-bad1/APKBUILD index b8b2d5af950..f64a0117f6f 100644 --- a/main/gst-plugins-bad1/APKBUILD +++ b/main/gst-plugins-bad1/APKBUILD @@ -39,6 +39,12 @@ source="http://gstreamer.freedesktop.org//src/gst-plugins-bad/gst-plugins-bad-$p ldpath="/usr/lib/gstreamer-1.0" _builddir="$srcdir"/gst-plugins-bad-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/gst-plugins-base1/APKBUILD b/main/gst-plugins-base1/APKBUILD index 978b94a0f8c..6d2ff818eb6 100644 --- a/main/gst-plugins-base1/APKBUILD +++ b/main/gst-plugins-base1/APKBUILD @@ -32,6 +32,7 @@ _builddir="$srcdir"/gst-plugins-base-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 } build() { diff --git a/main/gst-plugins-good/APKBUILD b/main/gst-plugins-good/APKBUILD index 7c92902db7c..3e1b977663c 100644 --- a/main/gst-plugins-good/APKBUILD +++ b/main/gst-plugins-good/APKBUILD @@ -23,6 +23,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/gst-plugins-ugly/APKBUILD b/main/gst-plugins-ugly/APKBUILD index f97ca6d810b..1bd90823e6c 100644 --- a/main/gst-plugins-ugly/APKBUILD +++ b/main/gst-plugins-ugly/APKBUILD @@ -17,6 +17,7 @@ subpackages="$pkgname-lang" _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/gst-plugins-ugly1/APKBUILD b/main/gst-plugins-ugly1/APKBUILD index 362974e4565..89e5c383fb5 100644 --- a/main/gst-plugins-ugly1/APKBUILD +++ b/main/gst-plugins-ugly1/APKBUILD @@ -28,6 +28,11 @@ ldpath="/usr/lib/gstreamer-1.0" _builddir="$srcdir"/gst-plugins-ugly-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/gtkglext/APKBUILD b/main/gtkglext/APKBUILD index b6d97477330..98863868a2a 100644 --- a/main/gtkglext/APKBUILD +++ b/main/gtkglext/APKBUILD @@ -20,6 +20,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/icecast/APKBUILD b/main/icecast/APKBUILD index e562a03e1fa..7ffae0b098a 100644 --- a/main/icecast/APKBUILD +++ b/main/icecast/APKBUILD @@ -20,6 +20,7 @@ source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz prepare() { cd "$srcdir"/$pkgname-$pkgver + update_config_sub || return 1 patch -p1 -i "$srcdir"/conf-change-owner.patch } diff --git a/main/libdv/APKBUILD b/main/libdv/APKBUILD index dd5b90ee4a7..c5a8dac08b6 100644 --- a/main/libdv/APKBUILD +++ b/main/libdv/APKBUILD @@ -23,6 +23,7 @@ _builddir="$srcdir"/libdv-$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/libgweather/APKBUILD b/main/libgweather/APKBUILD index c2a37cb3049..80df9b2e64b 100644 --- a/main/libgweather/APKBUILD +++ b/main/libgweather/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/libnice/APKBUILD b/main/libnice/APKBUILD index 9905aaea535..98549feb3e8 100644 --- a/main/libnice/APKBUILD +++ b/main/libnice/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/libnice-$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/libshout/APKBUILD b/main/libshout/APKBUILD index 3eacdcde44b..8e755b89699 100644 --- a/main/libshout/APKBUILD +++ b/main/libshout/APKBUILD @@ -17,6 +17,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/libva-intel-driver/APKBUILD b/main/libva-intel-driver/APKBUILD index 5c8d43b1f0c..ff8cdbc2161 100644 --- a/main/libva-intel-driver/APKBUILD +++ b/main/libva-intel-driver/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/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD index 50b223c191c..efabe718c36 100644 --- a/main/mesa-demos/APKBUILD +++ b/main/mesa-demos/APKBUILD @@ -19,6 +19,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/mp3splt-gtk/APKBUILD b/main/mp3splt-gtk/APKBUILD index de3c7af7bec..87ebbad849e 100644 --- a/main/mp3splt-gtk/APKBUILD +++ b/main/mp3splt-gtk/APKBUILD @@ -19,6 +19,7 @@ _builddir="$srcdir"/mp3splt-gtk-$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/mpd/APKBUILD b/main/mpd/APKBUILD index 1e0d759d8c3..40def3d346c 100644 --- a/main/mpd/APKBUILD +++ b/main/mpd/APKBUILD @@ -20,8 +20,15 @@ source="http://www.musicpd.org/download/mpd/${pkgver%.*}/mpd-$pkgver.tar.xz mpd.confd " +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,7 +43,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install #provide a config that works by default diff --git a/main/obexd/APKBUILD b/main/obexd/APKBUILD index 53af098f7d0..ab25b29b966 100644 --- a/main/obexd/APKBUILD +++ b/main/obexd/APKBUILD @@ -15,6 +15,7 @@ source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2 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;; @@ -22,8 +23,7 @@ prepare() { done } -build () -{ +build() { cd "$srcdir"/$pkgname-$pkgver ./configure \ --build=$CBUILD \ diff --git a/main/openobex/APKBUILD b/main/openobex/APKBUILD index d784c4ccb56..bfdd3cc345e 100644 --- a/main/openobex/APKBUILD +++ b/main/openobex/APKBUILD @@ -13,6 +13,12 @@ subpackages="$pkgname-dev libopenobex" source="http://downloads.sourceforge.net/project/openobex/openobex/$pkgver/openobex-$pkgver-Source.tar.gz" _builddir="$srcdir"/openobex-$pkgver-Source + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/pam-pgsql/APKBUILD b/main/pam-pgsql/APKBUILD index e13322dfe7f..5af75ae7c5c 100644 --- a/main/pam-pgsql/APKBUILD +++ b/main/pam-pgsql/APKBUILD @@ -19,6 +19,7 @@ _builddir="$srcdir"/pam-pgsql-$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/parole/APKBUILD b/main/parole/APKBUILD index 16b12936522..9151b8c6818 100644 --- a/main/parole/APKBUILD +++ b/main/parole/APKBUILD @@ -20,6 +20,7 @@ source="http://archive.xfce.org/src/apps/parole/$_branch/parole-$pkgver.tar.bz2" prepare() { cd "$srcdir"/$pkgname-$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/perdition/APKBUILD b/main/perdition/APKBUILD index 59e4ab87990..9850ff0d938 100644 --- a/main/perdition/APKBUILD +++ b/main/perdition/APKBUILD @@ -20,6 +20,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/pidgin-otr/APKBUILD b/main/pidgin-otr/APKBUILD index 944be373d2d..48db611fe29 100644 --- a/main/pidgin-otr/APKBUILD +++ b/main/pidgin-otr/APKBUILD @@ -16,6 +16,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/pidgin/APKBUILD b/main/pidgin/APKBUILD index 2a52a42afbe..1716dd3b055 100644 --- a/main/pidgin/APKBUILD +++ b/main/pidgin/APKBUILD @@ -20,6 +20,7 @@ source="http://downloads.sourceforge.net/pidgin/pidgin-$pkgver.tar.bz2 _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/poppler-qt4/APKBUILD b/main/poppler-qt4/APKBUILD index 78741975527..bd3c9376478 100644 --- a/main/poppler-qt4/APKBUILD +++ b/main/poppler-qt4/APKBUILD @@ -29,12 +29,15 @@ replaces="poppler-glib" depends_dev="$makedepends" source="http://poppler.freedesktop.org/poppler-$pkgver.tar.gz" +_builddir="$srcdir/$_realname-$pkgver" + prepare() { - return 0 + cd "$_builddir" + update_config_sub || return 1 } build() { - cd "$srcdir"/$_realname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -54,7 +57,7 @@ build() { } package() { - cd "$srcdir"/$_realname-$pkgver + cd "$_builddir" install -D -m644 poppler-qt4.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt4.pc cd qt4 make DESTDIR="$pkgdir" install || return 1 diff --git a/main/py-gst/APKBUILD b/main/py-gst/APKBUILD index 9a6d6dcfe99..db1dd5ac416 100644 --- a/main/py-gst/APKBUILD +++ b/main/py-gst/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/recordmydesktop/APKBUILD b/main/recordmydesktop/APKBUILD index 12cc3fe5153..4176253195b 100644 --- a/main/recordmydesktop/APKBUILD +++ b/main/recordmydesktop/APKBUILD @@ -20,6 +20,7 @@ source="http://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver _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/rest/APKBUILD b/main/rest/APKBUILD index 5fcfcfd6120..5c9d1e57697 100644 --- a/main/rest/APKBUILD +++ b/main/rest/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/rest-$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/sdl_image/APKBUILD b/main/sdl_image/APKBUILD index 8533a56a38c..10790c60a04 100644 --- a/main/sdl_image/APKBUILD +++ b/main/sdl_image/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/SDL_image-$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/sdl_mixer/APKBUILD b/main/sdl_mixer/APKBUILD index 7254cdd751b..7f63143fd13 100644 --- a/main/sdl_mixer/APKBUILD +++ b/main/sdl_mixer/APKBUILD @@ -17,6 +17,7 @@ _builddir="$srcdir"/SDL_mixer-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \ -e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \ -e "/DEFAULT_PATH2/s/\/usr\/local\/lib\/timidity/\/usr\/lib\/timidity/" \ diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD index 53ec5793d3d..415e0e4b2a6 100644 --- a/main/sox/APKBUILD +++ b/main/sox/APKBUILD @@ -17,6 +17,7 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t prepare() { cd "$srcdir"/$pkgname-$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/swfdec/APKBUILD b/main/swfdec/APKBUILD index 1d5e6db4c50..0b1d88c8fb1 100644 --- a/main/swfdec/APKBUILD +++ b/main/swfdec/APKBUILD @@ -14,9 +14,15 @@ depends_dev="glib-dev liboil-dev cairo-dev pango-dev gtk+-dev libsoup-dev gstreamer-dev gst-plugins-base-dev alsa-lib-dev" source="http://$pkgname.freedesktop.org/download/$pkgname/0.8/$pkgname-$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 \ @@ -31,7 +37,7 @@ build () } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } diff --git a/main/udisks/APKBUILD b/main/udisks/APKBUILD index ab01329b568..7af031018ba 100644 --- a/main/udisks/APKBUILD +++ b/main/udisks/APKBUILD @@ -21,6 +21,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) patch -p1 -i "$srcdir"/$i || return 1;; diff --git a/main/vanessa_adt/APKBUILD b/main/vanessa_adt/APKBUILD index 3e841400364..0d6513b4443 100644 --- a/main/vanessa_adt/APKBUILD +++ b/main/vanessa_adt/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 return 0 } diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD index 227e8ed644f..042326f31ae 100644 --- a/main/vanessa_socket/APKBUILD +++ b/main/vanessa_socket/APKBUILD @@ -18,6 +18,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 return 0 } diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD index c1dcc559923..760a013f991 100644 --- a/main/webkitgtk/APKBUILD +++ b/main/webkitgtk/APKBUILD @@ -55,6 +55,7 @@ _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/wxgtk/APKBUILD b/main/wxgtk/APKBUILD index e295ae93f4a..30bbc4076b2 100644 --- a/main/wxgtk/APKBUILD +++ b/main/wxgtk/APKBUILD @@ -19,6 +19,7 @@ _builddir="$srcdir"/wxPython-src-$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/xfburn/APKBUILD b/main/xfburn/APKBUILD index e991f7ceaf6..44a080b9828 100644 --- a/main/xfburn/APKBUILD +++ b/main/xfburn/APKBUILD @@ -17,6 +17,7 @@ source="http://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/xfburn-$pkgver.tar. _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/xfce4-mixer/APKBUILD b/main/xfce4-mixer/APKBUILD index 6946da1e0b6..c5dfcca34a8 100644 --- a/main/xfce4-mixer/APKBUILD +++ b/main/xfce4-mixer/APKBUILD @@ -14,8 +14,15 @@ subpackages="$pkgname-lang" source="http://archive.xfce.org/src/apps/xfce4-mixer/${pkgver%.*}/xfce4-mixer-$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 \ @@ -30,7 +37,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" -name '*.la' -delete } diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD index e18a6531b6e..dc312db636b 100644 --- a/main/xfce4-screenshooter/APKBUILD +++ b/main/xfce4-screenshooter/APKBUILD @@ -17,6 +17,7 @@ source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4- _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/xscreensaver/APKBUILD b/main/xscreensaver/APKBUILD index 731051eaadb..5bf97e891da 100644 --- a/main/xscreensaver/APKBUILD +++ b/main/xscreensaver/APKBUILD @@ -21,6 +21,7 @@ _confdir=/usr/share/xscreensaver/config 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/zsnes/APKBUILD b/main/zsnes/APKBUILD index 6240d9c4d8b..6c4303e02c7 100644 --- a/main/zsnes/APKBUILD +++ b/main/zsnes/APKBUILD @@ -16,16 +16,23 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}151src.t zsnes-libpng15.patch zsnes_icon.png" -build() { - cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.} +_builddir="$srcdir/${pkgname}_${pkgver%.*}_${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;; esac done - cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src - aclocal && autoconf || return 1 + cd "$_builddir"/src + aclocal && autoconf || return 1 +} + +build() { + cd "$_builddir"/src export GCC_SPECS=hardenednopie.specs LDFLAGS="$LDFLAGS -fno-PIE" ./configure \ @@ -42,7 +49,7 @@ build() { } package() { - cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src + cd "$_builddir"/src make DESTDIR="$pkgdir" install install -Dm644 "$srcdir"/zsnes.desktop \ "$pkgdir"/usr/share/applications/zsnes.desktop |