diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | main/fluxbox/APKBUILD | 4 | ||||
| -rw-r--r-- | main/gmp5/APKBUILD | 4 | ||||
| -rw-r--r-- | main/gtk+/APKBUILD | 2 | ||||
| -rw-r--r-- | main/mpfr3/APKBUILD | 2 | ||||
| -rw-r--r-- | main/pango/APKBUILD | 2 | ||||
| -rw-r--r-- | main/screen/APKBUILD | 4 | ||||
| -rw-r--r-- | main/terminal/APKBUILD | 4 | ||||
| -rwxr-xr-x | rebuild-alpine.sh | 13 | ||||
| -rw-r--r-- | testing/lua-rex/APKBUILD (renamed from testing/lua-rexlib/APKBUILD) | 0 | ||||
| -rw-r--r-- | testing/multipath-tools/APKBUILD | 4 |
11 files changed, 34 insertions, 19 deletions
@@ -16,28 +16,28 @@ non-free-pkgs := $(shell ./aport.lua deplist $(rootdir) non-free) unstable-pkgs := $(shell ./aport.lua deplist $(rootdir) unstable) -main: +main: for p in $(main-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ abuild -r; \ done -testing: +testing: for p in $(testing-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ abuild -r; \ done -non-free: +non-free: for p in $(non-free-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ abuild -r; \ done -unstable: +unstable: for p in $(unstable-pkgs) ; \ do \ cd $(rootdir)/$@/$$p; \ @@ -51,6 +51,12 @@ clean: abuild cleanpkg; \ done +cleanold: + for p in $(all-pkgs) ; do \ + cd $(rootdir)/$$p; \ + abuild cleanoldpkg; \ + done + fetch: for p in $(all-pkgs) ; do \ cd $(rootdir)/$$p; \ diff --git a/main/fluxbox/APKBUILD b/main/fluxbox/APKBUILD index dce038f72..caa80f4db 100644 --- a/main/fluxbox/APKBUILD +++ b/main/fluxbox/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fluxbox pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight and highly-configurable window manager" url="http://www.fluxbox.org" license="MIT" subpackages="$pkgname-doc" depends= makedepends="pkgconfig libxinerama-dev libxpm-dev libxrandr imlib2-dev - libxrender-dev libxrandr-dev libxinerama-dev" + libxrender-dev libxrandr-dev libxinerama-dev freetype-dev" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" build () { diff --git a/main/gmp5/APKBUILD b/main/gmp5/APKBUILD index e07bff62c..1bbf41f4c 100644 --- a/main/gmp5/APKBUILD +++ b/main/gmp5/APKBUILD @@ -9,7 +9,7 @@ url="http://gmplib.org/" license="LGPL3" makedepends="m4 texinfo" depends= -subpackages="$pkgname-doc gmp-dev:dev" +subpackages="$pkgname-doc gmp-dev" source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2 gmp-4.1.4-noexecstack.patch " @@ -17,7 +17,7 @@ source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2 _builddir="$srcdir"/$_name-$pkgver build() { cd "$_builddir" - patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1 + patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1 ABI="32" ./configure --prefix=/usr \ --build=${CHOST} \ diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD index d42980c0a..a8fa2fae6 100644 --- a/main/gtk+/APKBUILD +++ b/main/gtk+/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk+ pkgver=2.20.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (v2)" url="http://www.gtk.org/" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" diff --git a/main/mpfr3/APKBUILD b/main/mpfr3/APKBUILD index 31d912402..d7c4aa6a3 100644 --- a/main/mpfr3/APKBUILD +++ b/main/mpfr3/APKBUILD @@ -8,7 +8,7 @@ license="GPL LGPL" depends= makedepends="gmp-dev texinfo" source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2" -subpackages="$pkgname-doc mpfr-dev:dev" +subpackages="$pkgname-doc mpfr-dev" _builddir="$srcdir"/mpfr-$pkgver build() { diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD index 21e266719..762a4c6d5 100644 --- a/main/pango/APKBUILD +++ b/main/pango/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pango pkgver=1.28.1 -pkgrel=0 +pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.pango.org/" license="LGPL" diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD index 6b08e5fad..c5ab5f9f1 100644 --- a/main/screen/APKBUILD +++ b/main/screen/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: pkgname=screen pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager that multiplexes a physical terminal" url="http://ftp.gnu.org/gnu/screen/" license="GPL" depends= -makedepends="" +makedepends="ncurses-dev" install= subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/screen/$pkgname-$pkgver.tar.gz diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD index 620d3535d..147c03dae 100644 --- a/main/terminal/APKBUILD +++ b/main/terminal/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=terminal pkgver=0.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" url="http://www.xfce.org/projects/terminal/" license="GPL-2" subpackages="$pkgname-doc" depends="startup-notification hicolor-icon-theme" makedepends="pkgconfig exo-dev vte-dev dbus-glib-dev gettext-dev libiconv-dev - intltool" + intltool ncurses-dev" install= source="http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2 " diff --git a/rebuild-alpine.sh b/rebuild-alpine.sh index 20756bd9a..b5d72f92b 100755 --- a/rebuild-alpine.sh +++ b/rebuild-alpine.sh @@ -26,9 +26,14 @@ build () { pkgno=$(expr "$pkgno" + 1) echo "Building $p ($pkgno of $pktcnt in $1 - $failed failed)" cd $rootdir/$1/$p + if [ -n "$debug" ] ; then + apk info | sort > $rootdir/packages.$1.$pkgno.$p.before + fi abuild -rm > $rootdir/$1_$p.txt 2>&1 if [ "$?" = "0" ] ; then - rm $rootdir/$1_$p.txt + if [ -z "$debug" ] ; then + rm $rootdir/$1_$p.txt + fi else echo "Package $1/$p failed to build (output in $rootdir/$1_$p.txt)" if [ -n "$mail" ] ; then @@ -46,6 +51,9 @@ build () { fi failed=$(expr "$failed" + 1) fi + if [ -n "$debug" ] ; then + apk info | sort > $rootdir/packages.$1.$pkgno.$p.after + fi done cd $rootdir } @@ -54,10 +62,11 @@ touch START_OF_BUILD.txt unset clean unset mail -while getopts "cm" opt; do +while getopts "cmd" opt; do case $opt in 'c') clean="--clean";; 'm') mail="--mail";; + 'd') debug="--debug";; esac done diff --git a/testing/lua-rexlib/APKBUILD b/testing/lua-rex/APKBUILD index 4f7bce089..4f7bce089 100644 --- a/testing/lua-rexlib/APKBUILD +++ b/testing/lua-rex/APKBUILD diff --git a/testing/multipath-tools/APKBUILD b/testing/multipath-tools/APKBUILD index 471d9de2c..bb6227f93 100644 --- a/testing/multipath-tools/APKBUILD +++ b/testing/multipath-tools/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname="multipath-tools" pkgver=0.4.8 -pkgrel=2 +pkgrel=3 pkgdesc="Device Mapper Multipathing Driver" url="http://christophe.varoqui.free.fr/" license="GPL" depends= -makedepends="lvm2-dev libaio-dev readline-dev" +makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev" install= subpackages="$pkgname-doc" source="http://christophe.varoqui.free.fr/$pkgname/$pkgname-$pkgver.tar.bz2 |