Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wertyi48 2013-07-04 13:09:10 -03:00
commit d43c029f99
3 changed files with 33 additions and 24 deletions

View file

@ -1,7 +1,7 @@
# Template file for 'libpwquality' # Template file for 'libpwquality'
pkgname=libpwquality pkgname=libpwquality
version=1.2.0 version=1.2.2
revision=3 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-static --enable-pam --disable-python-bindings configure_args="--disable-static --enable-pam --disable-python-bindings
--with-securedir=/usr/lib/security" --with-securedir=/usr/lib/security"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://fedorahosted.org/libpwquality/" homepage="https://fedorahosted.org/libpwquality/"
license="GPL-2" license="GPL-2"
distfiles="https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$version.tar.bz2" distfiles="https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$version.tar.bz2"
checksum=32cfbe302ade7e7271ed44bcae8aae3b6b55ca56ff642c4ece1752ffaa8003ee checksum=9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends="libtool automake gettext-devel" hostmakedepends="libtool automake gettext-devel"
@ -22,17 +22,17 @@ fi
libpwquality-devel_package() { libpwquality-devel_package() {
depends="${sourcepkg}-${version}_${revision}" depends="${sourcepkg}-${version}_${revision}"
short_desc="${short_desc} -- development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
} }
} }
libpwquality_package() { libpwquality_package() {
conf_files="/etc/security/pwquality.conf" conf_files="/etc/security/pwquality.conf"
pkg_install() { pkg_install() {
vmove etc vmove all
vmove usr
} }
} }

View file

@ -1,33 +1,42 @@
# Template file for 'rust' # Template file for 'rust'
pkgname=rust pkgname=rust
version=0.6 version=0.7
revision=1 revision=1
makedepends="which pkg-config perl curl python chrpath" build_style=configure
configure_args="--prefix=/usr --disable-docs"
hostmakedepends="which pkg-config perl curl python chrpath"
short_desc="A safe, concurrent, practical language" short_desc="A safe, concurrent, practical language"
maintainer="pancake <pancake@nopcode.org>" maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.rust-lang.org/" homepage="http://www.rust-lang.org/"
license="MIT, Apache-2.0" license="MIT, Apache-2.0"
distfiles="http://static.rust-lang.org/dist/rust-${version}.tar.gz" distfiles="http://static.rust-lang.org/dist/rust-${version}.tar.gz"
checksum=e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5 checksum=0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0
disable_debug=yes if [ "$XBPS_MACHINE" = "x86_64" ]; then
configure_args+=" --build-triple=$(gcc -dumpmachine)"
fi
do_configure() { if [ "$CROSS_BUILD" ]; then
./configure --prefix=${DESTDIR}/usr --disable-docs msg_error "$pkgver cannot be cross compiled currently.\n"
} fi
do_build() { post_install() {
make ${makejobs}
}
do_install() {
make install
vinstall COPYRIGHT 644 usr/share/licenses/rust LICENSE vinstall COPYRIGHT 644 usr/share/licenses/rust LICENSE
# Set proper rpath on binaries. vmkdir usr/share/vim/vimfiles
for f in rust rustdoc rustc rusti rustpkg; do cp -a src/etc/vim ${DESTDIR}/usr/share/vim/vimfiles
chrpath -r /usr/lib/rustc/${XBPS_MACHINE}-unknown-linux-gnu/lib ${DESTDIR}/usr/bin/${f} find ${DESTDIR}/usr/share/vim -type f -exec chmod 644 {} +
done find ${DESTDIR}/usr/share/vim -type d -exec chmod 755 {} +
vinstall src/etc/zsh/_rust 644 usr/share/zsh/site-functions
vinstall src/etc/kate/rust.xml 644 usr/share/apps/katepart/syntax
vinstall src/etc/gedit/share/mime/packages/rust.xml 644 usr/share/mime/packages
vinstall src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \
644 usr/share/gtksourceview-3.0/language-specs
# https://github.com/mozilla/rust/issues/5219
cd ${DESTDIR}/usr
chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
} }
rust_package() { rust_package() {

View file

@ -1,7 +1,7 @@
# Template file for 'xbps-git' # Template file for 'xbps-git'
pkgname=xbps-git pkgname=xbps-git
version=20130704 version=20130704
revision=1 revision=3
build_style=configure build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests" configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests"
short_desc="The XBPS package system (development branch)" short_desc="The XBPS package system (development branch)"