Merge branch 'master' of git://repo.or.cz/xbps

--HG--
extra : convert_revision : 3eb808e66e3038ed30db60786fc18d29177e5892

srcpkgs/dialog/template

@@ -0,0 +1,22 @@
+# Template file for 'dialog'
+pkgname=dialog
+_distver=1.1
+_date=20080819
+version=${_distver}.${_date}
+wrksrc=${pkgname}-${_distver}-${_date}
+distfiles="ftp://invisible-island.net/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
+build_style=gnu_configure
+configure_args="--with-ncursesw --enable-nls"
+short_desc="A tool to display dialog boxes from shell scripts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9
+long_desc="
+ Dialog is a program that will let you to present a variety of questions
+ or display messages using dialog boxes from a shell script. Currently,
+ these types of dialog boxes are implemented:
+ yes/no box, menu box, input box, message box, text box, info box,
+ guage box, checklist box, and radiolist box."
+
+Add_dependency run glibc
+Add_dependency run ncursesw
+Add_dependency build ncursesw-devel

srcpkgs/flac/depends

@@ -0,0 +1,2 @@
+abi_depends=">=1.2.1"
+api_depends="${abi_depends}"

srcpkgs/flac/libflac-devel.template

@@ -0,0 +1,21 @@
+# Template file for 'libflac-devel'.
+#
+short_desc="${short_desc} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libstdc++-devel
+Add_dependency run libogg-devel
+Add_dependency run libflac
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+}

srcpkgs/flac/libflac.template

@@ -0,0 +1,15 @@
+# Template file for 'libflac'.
+#
+short_desc="${short_desc} - shared libraries"
+long_desc="${long_desc}
+
+ This package contains the FLAC shared libraries."
+
+Add_dependency run libstdc++
+Add_dependency run libogg
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so.* ${DESTDIR}/usr/lib
+}

srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch

@@ -0,0 +1,10 @@
+--- examples/cpp/encode/file/main.cpp	2007-09-13 09:58:03.000000000 -0600
++++ examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
+@@ -30,6 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+ 

srcpkgs/flac/template

@@ -0,0 +1,30 @@
+# Template file for 'flac'
+pkgname=flac
+version=1.2.1
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin"
+short_desc="Free Lossless Audio Codec"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
+long_desc="
+ FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is
+ similar to MP3, but lossless. The FLAC project consists of:
+  * the stream format
+  * libFLAC, which implements reference encoders and decoders
+  * flac, a command-line wrapper around libFLAC to encode and decode .flac
+    files
+  * input plugins for various music players (Winamp, XMMS, and more in the
+    works)
+
+\"Free\" means that the specification of the stream format is in the public
+domain (the FLAC project reserves the right to set the FLAC specification
+and certify compliance), and that neither the FLAC format nor any of the
+implemented encoding/decoding methods are covered by any patent. It also
+means that the source for libFLAC is available under the LGPL and the
+sources for flac and the plugins are available under the GPL."
+ 
+subpackages="libflac libflac-devel"
+Add_dependency run libflac
+Add_dependency build nasm
+Add_dependency build libogg-devel

srcpkgs/libasyncns-devel

@@ -0,0 +1 @@
+libasyncns

srcpkgs/libasyncns/depends

@@ -0,0 +1,2 @@
+abi_depends=">=0.8"
+api_depends="${abi_depends}"

srcpkgs/libasyncns/libasyncns-devel.template

@@ -0,0 +1,19 @@
+# Template file for 'libasyncns-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc-devel
+Add_dependency run libasyncns
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}

srcpkgs/libasyncns/template

@@ -0,0 +1,20 @@
+# Template file for 'libasyncns'
+pkgname=libasyncns
+version=0.8
+distfiles="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="C library for executing name service queries asynchronously"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=4f1a66e746cbe54ff3c2fbada5843df4fbbbe7481d80be003e8d11161935ab74
+long_desc="
+ libasyncns is a C library for Linux/Unix for executing name service queries
+ asynchronously. It is an asynchronous wrapper around getaddrinfo(3),
+ getnameinfo(3), res_query(3) and res_search(3) from libc and libresolv.
+
+ In contrast to GNU's asynchronous name resolving API getaddrinfo_a(),
+ libasyncns does not make use of UNIX signals for reporting completion of
+ name queries. Instead, the API exports a standard UNIX file descriptor which
+ may be integerated cleanly into custom main loops."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc

srcpkgs/libdrm/template

@@ -1,13 +1,13 @@
 # Template build file for 'libdrm'.
 pkgname=libdrm
-version=2.4.16
+version=2.4.17
 distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-udev --enable-nouveau-experimental-api
  --enable-radeon-experimental-api --enable-intel"
 short_desc="Userspace interface to kernel DRM services"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=ca8e95d1c93c302b25cd2899040ea8eb0987f7d1d02eb658274243d9ada933ca
+checksum=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
 long_desc="
  This package provides a library which offers a userspace interface
  to kernel DRM (Direct Rendering Manager) services for access to

srcpkgs/libflac

@@ -0,0 +1 @@
+flac

srcpkgs/libflac-devel

@@ -0,0 +1 @@
+flac

srcpkgs/libogg/libogg-devel.template

@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run glibc-devel
 Add_dependency run libogg
 
 do_install()

srcpkgs/libogg/template

@@ -1,11 +1,11 @@
 # Template file for 'libogg'.
 pkgname=libogg
-version=1.1.3
+version=1.1.4
 distfiles="http://downloads.xiph.org/releases/ogg/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="The Ogg bitstream file format library"
 maintainer="pancake <pancake@nopcode.org>"
-checksum=bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
+checksum=9354c183fd88417c2860778b60b7896c9487d8f6e58b9fec3fdbf971142ce103
 long_desc="
  Libogg is a library for manipulating Ogg bitstream file formats.
  Libogg supports both making Ogg bitstreams and getting packets from

srcpkgs/libsamplerate-devel

@@ -0,0 +1 @@
+libsamplerate

srcpkgs/libsamplerate/depends

@@ -0,0 +1,2 @@
+abi_depends=">=0.1.7"
+api_depends="${abi_depends}"

srcpkgs/libsamplerate/libsamplerate-devel.template

@@ -0,0 +1,19 @@
+# Template file for 'libsamplerate-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glibc-devel
+Add_dependency run libsoundfile-devel
+Add_dependency run libsamplerate
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+}

srcpkgs/libsamplerate/template

@@ -0,0 +1,22 @@
+# Template file for 'libsamplerate'
+pkgname=libsamplerate
+version=0.1.7
+distfiles="http://www.mega-nerd.com/SRC/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="Sample Rate Converter for audio"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c
+long_desc="
+ One example of where such a thing would be useful is converting audio from
+ the CD sample rate of 44.1kHz to the 48kHz sample rate used by DAT players.
+
+ SRC is capable of arbitrary and time varying conversions; from downsampling
+ by a factor of 256 to upsampling by the same factor. Arbitrary in this case
+ means that the ratio of input and output sample rates can be an irrational
+ number. The conversion ratio can also vary with time for speeding up and
+ slowing down effects."
+
+subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libsndfile
+Add_dependency build libsndfile-devel

srcpkgs/libsndfile-devel

@@ -0,0 +1 @@
+libsndfile

srcpkgs/libsndfile-progs

@@ -0,0 +1 @@
+libsndfile

srcpkgs/libsndfile/depends

@@ -0,0 +1,2 @@
+abi_depends=">=1.0.20"
+api_depends="${abi_depends}"

srcpkgs/libsndfile/libsndfile-devel.template

@@ -0,0 +1,21 @@
+# Template file for 'libsndfile-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run alsa-lib-devel
+Add_dependency run libvorbis-devel
+Add_dependency run libflac-devel
+Add_dependency run libsndfile
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}

srcpkgs/libsndfile/libsndfile-progs.template

@@ -0,0 +1,18 @@
+# Template file for 'libsndfile-progs'.
+#
+short_desc="${sourcepkg} - bundled cmdline apps"
+long_desc="${long_desc}
+
+ This package contains the command line applications that use
+ libsndfile."
+
+Add_dependency run alsa-lib
+Add_dependency run sqlite
+Add_dependency run libsndfile
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/share/man ${DESTDIR}/usr/share
+}

srcpkgs/libsndfile/template

@@ -0,0 +1,22 @@
+# Template file for 'libsndfile'
+pkgname=libsndfile
+version=1.0.21
+distfiles="http://www.mega-nerd.com/$pkgname/files/$pkgname-$version.tar.gz"
+build_style=gnu_configure
+short_desc="C library for reading and writing files containing sampled sound"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=7e9083a2551ff347276d82cdb61f2b4f9cd137c0b76433800e991583ded8ea67
+long_desc="
+ Libsndfile is a C library for reading and writing files containing
+ sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
+ through one standard library interface."
+
+subpackages="$pkgname-progs $pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libogg
+Add_dependency run libvorbis
+Add_dependency run libflac
+Add_dependency build alsa-lib-devel
+Add_dependency build libvorbis-devel	">=1.2.3"
+Add_dependency build libflac-devel
+Add_dependency build sqlite-devel

srcpkgs/libvorbis/libvorbis-devel.template

@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run glibc-devel
+Add_dependency run libogg-devel
 Add_dependency run libvorbis
 
 do_install()

srcpkgs/libvorbis/template

@@ -1,11 +1,11 @@
 # Template file for 'libvorbis'.
 pkgname=libvorbis
-version=1.2.1rc1
+version=1.2.3
-distfiles="http://people.xiph.org/~giles/2008/$pkgname-$version.tar.gz"
+distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
 build_style=gnu_configure
 short_desc="The Vorbis General Audio Compression Codec"
 maintainer="pancake <pancake@nopcode.org>"
-checksum=afea086a9807f05c00a97007d2d1c0dbc361541b268b9fc01180665bb61bd7d7
+checksum=c679d1e5e45a3ec8aceb5e71de8e3712630b7a6dec6952886c17435a65955947
 long_desc="
  Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
  general-purpose compressed audio format for audio and music at fixed
@@ -16,5 +16,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 Add_dependency build pkg-config
-Add_dependency full glibc
+Add_dependency build libogg-devel
-Add_dependency full libogg
+Add_dependency run glibc
+Add_dependency run libogg

srcpkgs/xbps-mklive/files/xbps-mklive.sh

@@ -154,14 +154,23 @@ if [ ! -f "$ISOLINUX_DIR/vesamenu.c32" ]; then
 	cp -f $SYSLINUX_DATADIR/vesamenu.c32 "$ISOLINUX_DIR"
 fi
 
-for _pkg_ in ${PACKAGE_LIST}; do
+xbps_relver=$(xbps-bin.static -V)
-	info_msg "Installing ${_pkg_} package..."
+xbps-uhelper.static cmpver ${xbps_relver} 20091222
-	xbps-bin.static -r $TEMP_ROOTFS -f install ${_pkg_}
+if [ $? -eq 255 ]; then
+	yesflag="-f"
+	for _pkg_ in ${PACKAGE_LIST}; do
+		info_msg "Installing ${_pkg_} package..."
+		xbps-bin.static -r $TEMP_ROOTFS ${yesflag} install ${_pkg_}
+		[ $? -ne 0 ] && error_out $?
+	done
+else
+	yesflag="-y"
+	xbps-bin.static -r $TEMP_ROOTFS ${yesflag} install ${PACKAGE_LIST}
 	[ $? -ne 0 ] && error_out $?
-done
+fi
-xbps-bin.static -r $TEMP_ROOTFS autoupdate || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS ${yesflag} autoupdate || error_out $?
-xbps-bin.static -r $TEMP_ROOTFS autoremove || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS ${yesflag} autoremove || error_out $?
-xbps-bin.static -r $TEMP_ROOTFS purge all || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS ${yesflag} purge all || error_out $?
 xbps-bin.static -r $TEMP_ROOTFS list > $BUILD_TMPDIR/packages.txt
 
 info_msg "Creating /etc/motd..."

srcpkgs/xbps-mklive/template

@@ -1,6 +1,6 @@
 # Template file for 'xbps-mklive'
 pkgname=xbps-mklive
-version=0.1.4
+version=0.1.5
 build_style=custom-install
 short_desc="XBPS Live image maker"
 maintainer="Juan RP <xtraeme@gmail.com>"