From: "Jason St. John" <[email protected]>

Update doc/PKGBUILD-example.txt with several changes from the official Arch
Linux package for patch-2.7.1-2, including other changes shown below:

-- moves the patch command into its own prepare() function
-- replaces spaces with tabs in functions
-- adds check() function
-- added "-k" switch in check() function
-- replaces 'make prefix=' with 'make DESTDIR='
-- improves quoting of the "cd" command in functions

Signed-off-by: Jason St. John <[email protected]>
---
 doc/PKGBUILD-example.txt | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt
index 00dd8b1..f2eb8c9 100644
--- a/doc/PKGBUILD-example.txt
+++ b/doc/PKGBUILD-example.txt
@@ -1,24 +1,44 @@
 # Maintainer: Joe User <[email protected]>

 pkgname=patch
-pkgver=2.5.4
-pkgrel=3
+pkgver=2.7.1
+pkgrel=2
 pkgdesc="A utility to apply patch files to original sources"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/patch/patch.html";
 license=('GPL')
 groups=('base-devel')
-depends=('glibc' 'ed')
-source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz";)
-md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
+depends=('glibc')
+makedepends=('ed')
+optdepends=('ed: for "patch -e" functionality')
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+        "patch-2.7.1-initialize-data-structures-early-enough.patch")
+md5sums=('e9ae5393426d3ad783a300a338c09b72'
+         'SKIP'
+         'dc6367a7cd49933d4006c246789e98da')
+
+prepare() {
+       cd "$srcdir/$pkgname-$pkgver"
+
+       # Fix segfault on non-numeric strip-count
+       # (also segfaults on nonexistent directory passed to -d)
+       # http://savannah.gnu.org/bugs/?37500
+       patch -Np1 -i \
+               
"$srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch"
+}

 build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
+       cd "$srcdir/$pkgname-$pkgver"
+       ./configure --prefix=/usr
+       make
+}
+
+check() {
+       cd "$srcdir/$pkgname-$pkgver"
+       make -k check
 }

 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make prefix="$pkgdir"/usr install
+       cd "$srcdir/$pkgname-$pkgver"
+       make DESTDIR="$pkgdir/" install
 }
--
1.8.3


Reply via email to