diff options
41 files changed, 202 insertions, 40 deletions
diff --git a/main/encodings/APKBUILD b/main/encodings/APKBUILD index 3ad7a361fa..c031a5c664 100644 --- a/main/encodings/APKBUILD +++ b/main/encodings/APKBUILD @@ -11,8 +11,15 @@ makedepends="pkgconfig mkfontscale" install= source="http://xorg.freedesktop.org/releases/individual/font/encodings-$pkgver.tar.bz2" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir"/encodings-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,7 +30,7 @@ build() { } package() { - cd "$srcdir"/encodings-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } md5sums="29637480e7ce12546668631067c19ced encodings-1.0.3.tar.bz2" diff --git a/main/font-bh-ttf/APKBUILD b/main/font-bh-ttf/APKBUILD index fa29ff8555..eaa179d079 100644 --- a/main/font-bh-ttf/APKBUILD +++ b/main/font-bh-ttf/APKBUILD @@ -11,8 +11,15 @@ makedepends="pkgconfig font-util-dev bdftopcf" install= source="http://xorg.freedesktop.org/releases/individual/font/$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 -j1 DESTDIR="$pkgdir" \ MKFONTDIR=: \ MKFONTSCALE=: \ diff --git a/main/font-bitstream-speedo/APKBUILD b/main/font-bitstream-speedo/APKBUILD index 557a074eec..75dbd22423 100644 --- a/main/font-bitstream-speedo/APKBUILD +++ b/main/font-bitstream-speedo/APKBUILD @@ -11,8 +11,15 @@ makedepends="pkgconfig font-util-dev bdftopcf" install= source="http://xorg.freedesktop.org/releases/individual/font/$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 -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1 } diff --git a/main/font-misc-ethiopic/APKBUILD b/main/font-misc-ethiopic/APKBUILD index 05e76360ac..68ea3630a7 100644 --- a/main/font-misc-ethiopic/APKBUILD +++ b/main/font-misc-ethiopic/APKBUILD @@ -12,6 +12,12 @@ install= source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/font-misc-meltho/APKBUILD b/main/font-misc-meltho/APKBUILD index 8cd7789551..d49f22fb00 100644 --- a/main/font-misc-meltho/APKBUILD +++ b/main/font-misc-meltho/APKBUILD @@ -12,6 +12,12 @@ install= source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/glib-networking/APKBUILD b/main/glib-networking/APKBUILD index 1a547ebca0..3f141916ec 100644 --- a/main/glib-networking/APKBUILD +++ b/main/glib-networking/APKBUILD @@ -22,6 +22,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-desktop/APKBUILD b/main/gnome-desktop/APKBUILD index c76d464408..702068fc1e 100644 --- a/main/gnome-desktop/APKBUILD +++ b/main/gnome-desktop/APKBUILD @@ -15,9 +15,11 @@ subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" _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-keyring/APKBUILD b/main/gnome-keyring/APKBUILD index 74c604f1b5..20a9c88e0e 100644 --- a/main/gnome-keyring/APKBUILD +++ b/main/gnome-keyring/APKBUILD @@ -32,9 +32,11 @@ source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname} egg-asn1x.patch" _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-menus/APKBUILD b/main/gnome-menus/APKBUILD index 6827135105..72666df003 100644 --- a/main/gnome-menus/APKBUILD +++ b/main/gnome-menus/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/librsvg/APKBUILD b/main/librsvg/APKBUILD index f368eeb9c0..76f74ec2db 100644 --- a/main/librsvg/APKBUILD +++ b/main/librsvg/APKBUILD @@ -16,6 +16,12 @@ source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$p depends_dev="glib-dev gtk+-dev cairo-dev libcroco-dev libgsf-dev" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/libxfce4ui/APKBUILD b/main/libxfce4ui/APKBUILD index 177ec130b0..3ee304dd57 100644 --- a/main/libxfce4ui/APKBUILD +++ b/main/libxfce4ui/APKBUILD @@ -14,8 +14,15 @@ makedepends="gtk+-dev xfconf-dev libxfce4util-dev startup-notification-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 \ @@ -32,7 +39,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la \ "$pkgdir"/usr/lib/glade3/modules/*.la \ diff --git a/main/mkfontdir/APKBUILD b/main/mkfontdir/APKBUILD index bdee1b75b5..28d15da7e7 100644 --- a/main/mkfontdir/APKBUILD +++ b/main/mkfontdir/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="9365ac66d19186eaf030482d312fca06 mkfontdir-1.0.5.tar.bz2" diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD index 24fa3ecbf0..c010f6dab9 100644 --- a/main/nagios-plugins/APKBUILD +++ b/main/nagios-plugins/APKBUILD @@ -45,6 +45,9 @@ 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 + return 0 } contrib() { diff --git a/main/netcf/APKBUILD b/main/netcf/APKBUILD index 797a3040c1..433eff5bb1 100644 --- a/main/netcf/APKBUILD +++ b/main/netcf/APKBUILD @@ -18,6 +18,7 @@ replaces="libnetcf" _builddir="$srcdir/netcf-$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/orage/APKBUILD b/main/orage/APKBUILD index 2ee5d67d9b..66b078aaf4 100644 --- a/main/orage/APKBUILD +++ b/main/orage/APKBUILD @@ -13,12 +13,15 @@ makedepends="pkgconfig xfce4-panel-dev libnotify-dev intltool gettext-dev install= source="http://archive.xfce.org/src/apps/orage/${pkgver%.*}/orage-$pkgver.tar.bz2" +_builddir="$srcdir/$pkgname-$pkgver" + prepare() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" + update_config_sub || return 1 } build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,7 +35,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } diff --git a/main/py-gnome/APKBUILD b/main/py-gnome/APKBUILD index 43a6d73b0d..937780efed 100644 --- a/main/py-gnome/APKBUILD +++ b/main/py-gnome/APKBUILD @@ -21,6 +21,7 @@ _builddir="$srcdir"/$_realname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 } build() { diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD index bde9118fab..cd87acfdc6 100644 --- a/main/rrdtool/APKBUILD +++ b/main/rrdtool/APKBUILD @@ -18,8 +18,10 @@ source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz " _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/rtorrent/APKBUILD b/main/rtorrent/APKBUILD index 24399d2fca..9937e9d43e 100644 --- a/main/rtorrent/APKBUILD +++ b/main/rtorrent/APKBUILD @@ -11,8 +11,15 @@ makedepends='libsigc++-dev libtorrent-dev curl-dev xmlrpc-c-dev ncurses-dev' subpackages="$pkgname-doc" 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" export LDFLAGS="$LDFLAGS -lpthread" ./configure \ @@ -27,7 +34,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install install -D doc/rtorrent.rc "$pkgdir"/usr/share/doc/rtorrent/rtorrent.r } diff --git a/main/sshguard/APKBUILD b/main/sshguard/APKBUILD index 79d5e4d521..d47c6af107 100644 --- a/main/sshguard/APKBUILD +++ b/main/sshguard/APKBUILD @@ -21,6 +21,7 @@ _builddir="$srcdir"/sshguard-$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/sylpheed/APKBUILD b/main/sylpheed/APKBUILD index fdc49c1032..bd44cb5d53 100644 --- a/main/sylpheed/APKBUILD +++ b/main/sylpheed/APKBUILD @@ -15,6 +15,7 @@ source="http://$pkgname.sraoss.jp/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.bz prepare() { cd "$srcdir/sylpheed-$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/tcpdump/APKBUILD b/main/tcpdump/APKBUILD index 20b7739861..dad417d5bc 100644 --- a/main/tcpdump/APKBUILD +++ b/main/tcpdump/APKBUILD @@ -12,6 +12,12 @@ subpackages="$pkgname-doc" source="http://www.$pkgname.org/release/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build () { cd "$_builddir" ./configure \ diff --git a/main/tcpflow/APKBUILD b/main/tcpflow/APKBUILD index 2addf08f2b..27e1eb1aa1 100644 --- a/main/tcpflow/APKBUILD +++ b/main/tcpflow/APKBUILD @@ -14,6 +14,12 @@ subpackages="$pkgname-doc" source="https://github.com/downloads/simsong/tcpflow/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/ucarp/APKBUILD b/main/ucarp/APKBUILD index e7639dd42c..5ebccd71aa 100644 --- a/main/ucarp/APKBUILD +++ b/main/ucarp/APKBUILD @@ -18,8 +18,15 @@ source="http://download.pureftpd.org/pub/ucarp/$pkgname-$pkgver.tar.gz vip-down-default.sh " +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure \ --build=$CBUILD \ @@ -34,7 +41,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index 2f970c7c25..e14a380d6e 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD @@ -23,6 +23,7 @@ _builddir="$srcdir"/$pkgname-$_realver 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/vde2/APKBUILD b/main/vde2/APKBUILD index e0ec787878..fe6509124d 100644 --- a/main/vde2/APKBUILD +++ b/main/vde2/APKBUILD @@ -17,6 +17,11 @@ source="http://downloads.sourceforge.net/project/vde/vde2/$pkgver/vde2-$pkgver.t _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build() { cd "$_builddir" ./configure \ diff --git a/main/wv/APKBUILD b/main/wv/APKBUILD index 3ddad0cf2b..c677edfeb9 100644 --- a/main/wv/APKBUILD +++ b/main/wv/APKBUILD @@ -13,6 +13,7 @@ source="http://www.abisource.com/downloads/wv/$pkgver/wv-$pkgver.tar.gz" prepare() { cd "$srcdir"/$pkgname-$pkgver + update_config_sub || return 1 # patch -p1 -i "$srcdir"/fix-soname.patch } diff --git a/main/xfce-utils/APKBUILD b/main/xfce-utils/APKBUILD index b58a54f35e..e15154ecd2 100644 --- a/main/xfce-utils/APKBUILD +++ b/main/xfce-utils/APKBUILD @@ -12,8 +12,15 @@ makedepends="libxfce4ui-dev" install= source="http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" -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 \ @@ -27,7 +34,7 @@ build () { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } md5sums="03b5fba5f63f4f1a31cc7d3728f3c87e xfce-utils-4.8.3.tar.bz2" diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD index 733d13214f..fd824c90e7 100644 --- a/main/xfce4-battery-plugin/APKBUILD +++ b/main/xfce4-battery-plugin/APKBUILD @@ -12,8 +12,11 @@ subpackages="$pkgname-lang" source="http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 " +_builddir="$srcdir/$pkgname-$pkgver" + prepare() { - cd "$srcdir"/$pkgname-$pkgver + 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,7 +25,7 @@ prepare() { } build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,7 +39,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/xfce4/panel/plugins/*.la } diff --git a/main/xfce4-clipman-plugin/APKBUILD b/main/xfce4-clipman-plugin/APKBUILD index 0f7608c09d..a3dc7950bc 100644 --- a/main/xfce4-clipman-plugin/APKBUILD +++ b/main/xfce4-clipman-plugin/APKBUILD @@ -13,9 +13,11 @@ subpackages="$pkgname-doc $pkgname-lang" source="http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.2/xfce4-clipman-plugin-$pkgver.tar.bz2" _builddir="$srcdir"/xfce4-clipman-plugin-$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/xfce4-cpugraph-plugin/APKBUILD b/main/xfce4-cpugraph-plugin/APKBUILD index cc8b6e25a4..3df3812f1a 100644 --- a/main/xfce4-cpugraph-plugin/APKBUILD +++ b/main/xfce4-cpugraph-plugin/APKBUILD @@ -14,9 +14,11 @@ subpackages="$pkgname-lang" source="http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/${pkgver%.*}/xfce4-cpugraph-plugin-$pkgver.tar.bz2" _builddir="$srcdir"/xfce4-cpugraph-plugin-$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/xfce4-notes-plugin/APKBUILD b/main/xfce4-notes-plugin/APKBUILD index 98791512b7..fba2bfba05 100644 --- a/main/xfce4-notes-plugin/APKBUILD +++ b/main/xfce4-notes-plugin/APKBUILD @@ -17,7 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # apply patches here + update_config_sub || return 1 } build() { diff --git a/main/xfce4-notifyd/APKBUILD b/main/xfce4-notifyd/APKBUILD index f3576ae316..e6cbfdda33 100644 --- a/main/xfce4-notifyd/APKBUILD +++ b/main/xfce4-notifyd/APKBUILD @@ -14,6 +14,12 @@ subpackages="$pkgname-lang" source="http://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notifyd-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + update_config_sub || return 1 +} + build () { cd "$_builddir" ./configure \ diff --git a/main/xfce4-power-manager/APKBUILD b/main/xfce4-power-manager/APKBUILD index 2ec1b9595e..b0cdea2f5c 100644 --- a/main/xfce4-power-manager/APKBUILD +++ b/main/xfce4-power-manager/APKBUILD @@ -16,9 +16,11 @@ subpackages="$pkgname-doc $pkgname-lang" source="http://archive.xfce.org/src/apps/xfce4-power-manager/${pkgver%.*}/xfce4-power-manager-$pkgver.tar.bz2" _builddir="$srcdir"/xfce4-power-manager-$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/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD index 0e5143c15e..fbdd1cd12d 100644 --- a/main/xfce4-taskmanager/APKBUILD +++ b/main/xfce4-taskmanager/APKBUILD @@ -10,9 +10,16 @@ depends= makedepends="pkgconfig intltool libxfcegui4-dev" source="http://archive.xfce.org/src/apps/${pkgname}/1.0/${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 \ @@ -26,7 +33,7 @@ build () } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install } diff --git a/main/xfce4-wavelan-plugin/APKBUILD b/main/xfce4-wavelan-plugin/APKBUILD index e270b0885a..0dab596891 100644 --- a/main/xfce4-wavelan-plugin/APKBUILD +++ b/main/xfce4-wavelan-plugin/APKBUILD @@ -13,8 +13,10 @@ source="http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgn " _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/xgamma/APKBUILD b/main/xgamma/APKBUILD index 758f174a20..c49ccb88d8 100644 --- a/main/xgamma/APKBUILD +++ b/main/xgamma/APKBUILD @@ -11,8 +11,15 @@ depends= makedepends="pkgconfig libx11-dev libxxf86vm-dev" 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 \ @@ -23,7 +30,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } md5sums="e8a88bf1a18f35b724619849dca97f4f xgamma-1.0.3.tar.bz2" diff --git a/main/xkbcomp/APKBUILD b/main/xkbcomp/APKBUILD index 3629142a2d..ca5ea9a40b 100644 --- a/main/xkbcomp/APKBUILD +++ b/main/xkbcomp/APKBUILD @@ -12,8 +12,15 @@ makedepends="pkgconfig libx11-dev libxkbfile-dev" subpackages="$pkgname-doc" 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 \ @@ -26,7 +33,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install } diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD index 84a51293ef..b6538dafeb 100644 --- a/main/xkeyboard-config/APKBUILD +++ b/main/xkeyboard-config/APKBUILD @@ -12,8 +12,11 @@ makedepends="xkbcomp intltool libx11-dev" source="http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2 " +_builddir="$srcdir/$pkgname-$pkgver" + prepare() { - cd "$srcdir"/$pkgname-$pkgver + 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;; @@ -21,8 +24,8 @@ prepare() { done } -build () { - cd "$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" ./configure \ --build=$CBUILD \ @@ -36,7 +39,7 @@ build () { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm -f "$pkgdir"/usr/share/X11/xkb/compiled || return 1 install -m755 -d "$pkgdir"/var/lib/xkb diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 78d0b999a5..dcfdd830ab 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -34,13 +34,15 @@ install_if="linux-$_flavor=$_kernelver $_realname" subpackages= source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.xz" -# override kernel's prepare() +_builddir="$srcdir/$_realname-$_realver" + prepare() { - : + cd "$_builddir" + update_config_sub || return 1 } build() { - cd "$srcdir/$_realname-$_realver" + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -54,7 +56,7 @@ build() { } package() { - cd "$srcdir/$_realname-$_realver"/extensions + cd "$_builddir/extensions" make DESTDIR="$pkgdir" modules_install } diff --git a/main/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD index 91c4c96a76..90c30904f2 100644 --- a/main/xtables-addons/APKBUILD +++ b/main/xtables-addons/APKBUILD @@ -12,8 +12,15 @@ install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$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 \ @@ -27,7 +34,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make builddir= DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD index 72cd936b5a..0cfa65428a 100644 --- a/main/zabbix/APKBUILD +++ b/main/zabbix/APKBUILD @@ -33,6 +33,7 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 for i in $source; do case $i in *.patch) |