Simplify templates by not needing $patch_files in some cases.

If exists a patch called $pkgname-fix-{build,install}.diff in the
templates directory, they will be applied automatically. If patches
are named differently $patch_files must be used yet.

--HG--
extra : convert_revision : 21f6edfab580c569b3737280f54a6332c44baa49
This commit is contained in:
Juan RP 2008-10-27 04:08:55 +01:00
parent c06defc719
commit 5ef5ca8d35
12 changed files with 8 additions and 11 deletions

View file

@ -1,7 +1,6 @@
# Template build file for 'bzip2'.
pkgname=bzip2
version=1.0.5
patch_files="$pkgname-fix-install.diff"
distfiles="http://www.bzip.org/1.0.5/$pkgname-$version@.tar.gz"
build_style=gnu_makefile
make_build_target="-f Makefile-libbz2_so"

View file

@ -1,7 +1,6 @@
# Template file for 'cpio'
pkgname=cpio
version=2.9
patch_files="$pkgname-fix-build.diff"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz"
build_style=gnu_configure
short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support"

View file

@ -2,7 +2,6 @@
pkgname=firefox
version=3.0.3
wrksrc=mozilla
patch_files="$pkgname-fix-build.diff"
distfiles="
http://sunsite.rediris.es/pub/mozilla.org/firefox/releases/3.0.3/source/$pkgname-$version-source@.tar.bz2"
build_style=gnu_configure

View file

@ -1,7 +1,6 @@
# Template file for 'gdbm'
pkgname=gdbm
version=1.8.3
patch_files="$pkgname-fix-install.diff"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz"
build_style=gnu_configure
short_desc="GNU database routines"

View file

@ -1,7 +1,6 @@
# Template file for 'gzip'
pkgname=gzip
version=1.3.12
patch_files="$pkgname-fix-build.diff"
distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version@.tar.gz"
build_style=gnu_configure
short_desc="GNU compression utility (replacement for compress)"

View file

@ -1,7 +1,6 @@
# Template build file for 'mono'.
pkgname=mono
version=2.0
patch_files="$pkgname-fix-build.diff"
distfiles="http://ftp.novell.com/pub/mono/sources/mono/$pkgname-$version@.tar.bz2"
tar_override_cmd="$XBPS_MASTERDIR/bin/gtar"
build_style=gnu_configure

View file

@ -1,7 +1,6 @@
# Template file for 'openssl'
pkgname=openssl
version=0.9.8i
patch_files="$pkgname-fix-install.diff"
distfiles="http://www.openssl.org/source/$pkgname-$version@.tar.gz"
build_style=configure
configure_script="./Configure"

View file

@ -1,7 +1,6 @@
# Template file for 'procps'
pkgname=procps
version=3.2.7
patch_files="$pkgname-fix-install.diff"
distfiles="http://procps.sourceforge.net/$pkgname-$version@.tar.gz"
build_style=gnu_makefile
make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"

View file

@ -1,7 +1,6 @@
# Template file for 'sysklogd'
pkgname=sysklogd
version=1.5
patch_files="$pkgname-fix-install.diff"
distfiles="
http://www.infodrom.org/projects/sysklogd/download/$pkgname-$version@.tar.gz"
build_style=gnu_makefile

View file

@ -1,7 +1,6 @@
# Template file for 'util-linux'
pkgname=util-linux
version=2.12r
patch_files="$pkgname-fix-build.diff"
distfiles="http://www.kernel.org/pub/linux/utils/util-linux/$pkgname-$version@.tar.bz2"
build_style=gnu_configure
CFLAGS="-I/usr/include"

View file

@ -1,7 +1,6 @@
# Template build file for 'zlib'
pkgname=zlib
version=1.2.3
patch_files="$pkgname-fix-build.diff"
distfiles="http://www.zlib.net/$pkgname-$version@.tar.bz2"
build_style=configure
CFLAGS="-fPIC -DPIC"

View file

@ -611,6 +611,14 @@ apply_tmpl_patches()
local patch=
local i=
# Apply some build/install patches automatically.
if [ -f $XBPS_TEMPLATESDIR/$pkgname-fix-build.diff ]; then
patch_files="$pkgname-fix-build.diff $patch_files"
fi
if [ -f $XBPS_TEMPLATESDIR/$pkgname-fix-install.diff ]; then
patch_files="$pkgname-fix-install.diff $patch_files"
fi
#
# If package needs some patches applied before building,
# apply them now.