[arch-commits] Commit in make/trunk (PKGBUILD)

2020-04-08 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, April 8, 2020 @ 13:39:15
  Author: foutrelis
Revision: 379827

upgpkg: make 4.3-3: re-enable guile

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-08 13:36:23 UTC (rev 379826)
+++ PKGBUILD2020-04-08 13:39:15 UTC (rev 379827)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('x86_64')
 url="https://www.gnu.org/software/make;
@@ -18,7 +18,7 @@
 
 build() {
cd "${pkgname}-${pkgver}"
-   ./configure --prefix=/usr --without-guile
+   ./configure --prefix=/usr
make
 }

[arch-commits] Commit in make/trunk (PKGBUILD)

2020-04-08 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, April 8, 2020 @ 12:59:43
  Author: foutrelis
Revision: 379823

upgpkg: make 4.3-2: temporarily build without guile (for libffi)

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-08 12:33:16 UTC (rev 379822)
+++ PKGBUILD2020-04-08 12:59:43 UTC (rev 379823)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('x86_64')
 url="https://www.gnu.org/software/make;
@@ -18,7 +18,7 @@
 
 build() {
cd "${pkgname}-${pkgver}"
-   ./configure --prefix=/usr
+   ./configure --prefix=/usr --without-guile
make
 }

[arch-commits] Commit in make/trunk (PKGBUILD)

2019-11-19 Thread Lukas Fleischer via arch-commits 
Date: Tuesday, November 19, 2019 @ 16:09:57
  Author: lfleischer
Revision: 369439

Fix unquoted variables

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |   35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-19 16:08:15 UTC (rev 369438)
+++ PKGBUILD2019-11-19 16:09:57 UTC (rev 369439)
@@ -1,4 +1,5 @@
-# Maintainer: Allan McRae 
+# Maintainer: Lukas Fleischer 
+# Contributor: Allan McRae 
 # Contributor: judd 
 
 pkgname=make
@@ -10,7 +11,7 @@
 license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'guile')
-source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 guile-2.2.patch
 make-4.2.1-glob1.patch
 make-4.2.1-glob2.patch
@@ -24,31 +25,31 @@
 validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/guile-2.2.patch
+   cd "${pkgname}-${pkgver}"
+   patch -p1 -i "${srcdir}"/guile-2.2.patch
 
-  
#https://git.savannah.gnu.org/cgit/make.git/patch/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
-  patch -p1 -i ${srcdir}/make-4.2.1-glob1.patch
-  
#https://git.savannah.gnu.org/cgit/make.git/patch/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
-  patch -p1 -i ${srcdir}/make-4.2.1-glob2.patch
+   
#https://git.savannah.gnu.org/cgit/make.git/patch/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
+   patch -p1 -i "${srcdir}"/make-4.2.1-glob1.patch
+   
#https://git.savannah.gnu.org/cgit/make.git/patch/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
+   patch -p1 -i "${srcdir}"/make-4.2.1-glob2.patch
 
-  patch -p1 -i ${srcdir}/make-4.2.1-test-driver.patch
+   patch -p1 -i "${srcdir}"/make-4.2.1-test-driver.patch
 
-  autoreconf -fi
+   autoreconf -fi
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
+   cd "${pkgname}-${pkgver}"
+   ./configure --prefix=/usr
+   make
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
-  make -k check
+   cd "${pkgname}-${pkgver}"
+   make -k check
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+   cd "${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
 }

[arch-commits] Commit in make/trunk (PKGBUILD)

2019-11-13 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, November 13, 2019 @ 17:57:10
  Author: foutrelis
Revision: 368428

[core] mass rebuild

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 17:55:58 UTC (rev 368427)
+++ PKGBUILD2019-11-13 17:57:10 UTC (rev 368428)
@@ -3,7 +3,7 @@
 
 pkgname=make
 pkgver=4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('x86_64')
 url="https://www.gnu.org/software/make;

[arch-commits] Commit in make/trunk (PKGBUILD)

2019-03-03 Thread Lukas Fleischer via arch-commits 
Date: Sunday, March 3, 2019 @ 11:32:56
  Author: lfleischer
Revision: 347014

make: use HTTPs

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-03 11:32:37 UTC (rev 347013)
+++ PKGBUILD2019-03-03 11:32:56 UTC (rev 347014)
@@ -6,11 +6,11 @@
 pkgrel=3
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('x86_64')
-url="http://www.gnu.org/software/make;
+url="https://www.gnu.org/software/make;
 license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'guile')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 guile-2.2.patch
 make-4.2.1-glob1.patch
 make-4.2.1-glob2.patch

[arch-commits] Commit in make/trunk (PKGBUILD guile-2.2.patch)

2017-03-29 Thread Bartłomiej Piotrowski 
Date: Wednesday, March 29, 2017 @ 08:53:50
  Author: bpiotrowski
Revision: 291778

upgpkg: make 4.2.1-2

rebuild against guile 2.2

Added:
  make/trunk/guile-2.2.patch
Modified:
  make/trunk/PKGBUILD

-+
 PKGBUILD|   13 ++---
 guile-2.2.patch |   15 +++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-29 08:19:49 UTC (rev 291777)
+++ PKGBUILD2017-03-29 08:53:50 UTC (rev 291778)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make;
@@ -11,11 +11,18 @@
 license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'guile')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+guile-2.2.patch)
 md5sums=('15b012617e7c44c0ed482721629577ac'
- 'SKIP')
+ 'SKIP'
+ '89bbbe3f806f208608e117665feb562b')
 validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/guile-2.2.patch
+  autoreconf -fi
+}
 
 build() {
   cd ${pkgname}-${pkgver}

Added: guile-2.2.patch
===
--- guile-2.2.patch (rev 0)
+++ guile-2.2.patch 2017-03-29 08:53:50 UTC (rev 291778)
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index 64ec870..eb1139f 100644
+--- a/configure.ac
 b/configure.ac
+@@ -168,8 +168,8 @@ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
+ # comes with it's own PC file so we have to specify them as individual
+ # packages.  Ugh.
+ AS_IF([test "x$with_guile" != xno],
+-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
+-  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
++[ PKG_CHECK_MODULES([GUILE], [guile-2.2], [have_guile=yes],
++  [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
+ [have_guile=no])])
+ ])
+

[arch-commits] Commit in make/trunk (PKGBUILD)

2016-06-11 Thread Andreas Radke 
Date: Saturday, June 11, 2016 @ 14:16:39
  Author: andyrtr
Revision: 269339

upgpkg: make 4.2.1-1

upstream update 4.2.1

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-11 11:31:10 UTC (rev 269338)
+++ PKGBUILD2016-06-11 12:16:39 UTC (rev 269339)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=make
-pkgver=4.2
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 groups=('base-devel')
 depends=('glibc' 'guile')
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('85ad14d08766201ffe71efa866f4fb91'
+md5sums=('15b012617e7c44c0ed482721629577ac'
  'SKIP')
 validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith

[arch-commits] Commit in make/trunk (PKGBUILD make.install)

2016-04-30 Thread Allan McRae 
Date: Sunday, May 1, 2016 @ 05:41:22
  Author: allan
Revision: 266710

upgpkg: make 4.1-4

remove install file

Modified:
  make/trunk/PKGBUILD
Deleted:
  make/trunk/make.install

--+
 PKGBUILD |5 ++---
 make.install |   20 
 2 files changed, 2 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-01 02:57:25 UTC (rev 266709)
+++ PKGBUILD2016-05-01 03:41:22 UTC (rev 266710)
@@ -4,14 +4,13 @@
 
 pkgname=make
 pkgver=4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make;
 license=('GPL3')
 groups=('base-devel')
-depends=('glibc' 'sh' 'guile')
-install=$pkgname.install
+depends=('glibc' 'guile')
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 make-4.1-NULL-ttyname.patch)
 md5sums=('57a7a224a822f94789a587ccbcedff69'

Deleted: make.install
===
--- make.install2016-05-01 02:57:25 UTC (rev 266709)
+++ make.install2016-05-01 03:41:22 UTC (rev 266710)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(make.info make.info-1 make.info-2)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}

[arch-commits] Commit in make/trunk (PKGBUILD)

2016-02-19 Thread Allan McRae 
Date: Saturday, February 20, 2016 @ 08:10:20
  Author: allan
Revision: 260035

upgpkg: make 4.1-3

patches don't apply when commented out...

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-20 03:20:53 UTC (rev 260034)
+++ PKGBUILD2016-02-20 07:10:20 UTC (rev 260035)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make;
@@ -24,7 +24,7 @@
   cd ${pkgname}-${pkgver}
 
   # upstream commit 292da6f6
-  #patch -p1 -i ${srcdir}/make-4.1-NULL-ttyname.patch
+  patch -p1 -i ${srcdir}/make-4.1-NULL-ttyname.patch
 }
 
 build() {

[arch-commits] Commit in make/trunk (PKGBUILD make-4.1-NULL-ttyname.patch)

2016-02-19 Thread Allan McRae 
Date: Saturday, February 20, 2016 @ 04:17:53
  Author: allan
Revision: 260033

upgpkg: make 4.1-2

crash fix from upstream

Added:
  make/trunk/make-4.1-NULL-ttyname.patch
Modified:
  make/trunk/PKGBUILD

-+
 PKGBUILD|   25 -
 make-4.1-NULL-ttyname.patch |   59 ++
 2 files changed, 77 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-20 02:13:35 UTC (rev 260032)
+++ PKGBUILD2016-02-20 03:17:53 UTC (rev 260033)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/make;
@@ -12,24 +12,35 @@
 groups=('base-devel')
 depends=('glibc' 'sh' 'guile')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+make-4.1-NULL-ttyname.patch)
 md5sums=('57a7a224a822f94789a587ccbcedff69'
- 'SKIP')
+ 'SKIP'
+ '91cfbd6ca26b0f59b800d1a81154c080')
 validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith
 
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # upstream commit 292da6f6
+  #patch -p1 -i ${srcdir}/make-4.1-NULL-ttyname.patch
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
+  cd ${pkgname}-${pkgver}
+  # features/archives ... FAILED (3/10 
passed)
+  # caused by binutils configured with --enable-deterministic-archives
+  make -k check || true
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }

Added: make-4.1-NULL-ttyname.patch
===
--- make-4.1-NULL-ttyname.patch (rev 0)
+++ make-4.1-NULL-ttyname.patch 2016-02-20 03:17:53 UTC (rev 260033)
@@ -0,0 +1,59 @@
+From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001
+From: Paul Smith 
+Date: Mon, 20 Oct 2014 01:54:56 -0400
+Subject: [PATCH] * main.c (main): [SV 43434] Handle NULL returns from
+ ttyname().
+
+---
+ main.c| 15 ++-
+ makeint.h |  3 ++-
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/main.c b/main.c
+index b2d169c..0cdb8a8 100644
+--- a/main.c
 b/main.c
+@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp)
+ #ifdef HAVE_ISATTY
+ if (isatty (fileno (stdout)))
+   if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
+-define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
+-   o_default, 0)->export = v_export;
+-
++{
++  const char *tty = TTYNAME (fileno (stdout));
++  define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
++ o_default, 0)->export = v_export;
++}
+ if (isatty (fileno (stderr)))
+   if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
+-define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
+-   o_default, 0)->export = v_export;
++{
++  const char *tty = TTYNAME (fileno (stderr));
++  define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
++ o_default, 0)->export = v_export;
++}
+ #endif
+ 
+   /* Reset in case the switches changed our minds.  */
+diff --git a/makeint.h b/makeint.h
+index 6223936..2009f41 100644
+--- a/makeint.h
 b/makeint.h
+@@ -436,10 +436,11 @@ extern struct rlimit stack_limit;
+ /* The number of bytes needed to represent the largest integer as a string.  
*/
+ #define INTSTR_LENGTH CSTRLEN ("18446744073709551616")
+ 
++#define DEFAULT_TTYNAME "true"
+ #ifdef HAVE_TTYNAME
+ # define TTYNAME(_f) ttyname (_f)
+ #else
+-# define TTYNAME(_f) "true"
++# define TTYNAME(_f) DEFAULT_TTYNAME
+ #endif
+ 
+ 
+-- 
+2.7.1
+

[arch-commits] Commit in make/trunk (PKGBUILD make-4.0-char-cast.patch)

2014-10-05 Thread Allan McRae 
Date: Monday, October 6, 2014 @ 03:39:20
  Author: allan
Revision: 223897

upgpkg: make 4.1-1

upstream update, remove old patch

Modified:
  make/trunk/PKGBUILD
Deleted:
  make/trunk/make-4.0-char-cast.patch

--+
 PKGBUILD |   19 ++-
 make-4.0-char-cast.patch |   43 ---
 2 files changed, 6 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-05 21:41:26 UTC (rev 223896)
+++ PKGBUILD2014-10-06 01:39:20 UTC (rev 223897)
@@ -3,8 +3,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=make
-pkgver=4.0
-pkgrel=2
+pkgver=4.1
+pkgrel=1
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -12,19 +12,12 @@
 groups=('base-devel')
 depends=('glibc' 'sh' 'guile')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-make-4.0-char-cast.patch)
-md5sums=('571d470a7647b455e3af3f92d79f1c18'
- 'SKIP'
- '1840aae18e1c0d1c52563020ef3ff5f3')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('57a7a224a822f94789a587ccbcedff69'
+ 'SKIP')
+validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4')   # Paul Smith
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
 
-  # http://git.savannah.gnu.org/cgit/make.git/commit/?id=9d58570c
-  patch -p1 -i ${srcdir}/make-4.0-char-cast.patch
-}
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr

Deleted: make-4.0-char-cast.patch
===
--- make-4.0-char-cast.patch2014-10-05 21:41:26 UTC (rev 223896)
+++ make-4.0-char-cast.patch2014-10-06 01:39:20 UTC (rev 223897)
@@ -1,43 +0,0 @@
-From 9d58570c77240fed53d1f88217877f8e778f4bb2 Mon Sep 17 00:00:00 2001
-From: Paul Smith psm...@gnu.org
-Date: Sat, 26 Oct 2013 04:10:17 +
-Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char.
-
-* tests/scripts/misc/utf8: Test variable names with characters 127.
-Fix suggested by Robert Bogomip bob.b...@milohedge.com

-diff --git a/makeint.h b/makeint.h
-index 77f51e0..c591427 100644
 a/makeint.h
-+++ b/makeint.h
-@@ -415,7 +415,7 @@ extern int unixy_shell;
- # define MAP_VMSCOMMA   0x
- #endif
- 
--#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m))
-+#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
- 
- #if defined(HAVE_SYS_RESOURCE_H)  defined(HAVE_GETRLIMIT)  
defined(HAVE_SETRLIMIT)
- # define SET_STACK_SIZE
-diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8
-new file mode 100644
-index 000..2adcd07
 a/dev/null
-+++ b/tests/scripts/misc/utf8
-@@ -0,0 +1,14 @@
-+#
-*-perl-*-
-+$description = Test utf8 handling.;
-+
-+$details = ;
-+
-+# Variable names containing UTF8 characters
-+run_make_test(
-+\xe2\x96\xaa := hello
-+\$(info \$(\xe2\x96\xaa))
-+all:
-+,
-+  '', hello\n#MAKE#: Nothing to be done for 'all'.);
-+
-+1;
---
-cgit v0.9.0.2

[arch-commits] Commit in make/trunk (PKGBUILD make-4.0-char-cast.patch)

2013-12-12 Thread Allan McRae 
Date: Thursday, December 12, 2013 @ 16:38:21
  Author: allan
Revision: 201469

upgpkg: make 4.0-2

fix overflow bug

Added:
  make/trunk/make-4.0-char-cast.patch
Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 make-4.0-char-cast.patch |   43 +++
 2 files changed, 55 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-12 15:37:16 UTC (rev 201468)
+++ PKGBUILD2013-12-12 15:38:21 UTC (rev 201469)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -12,10 +12,19 @@
 groups=('base-devel')
 depends=('glibc' 'sh' 'guile')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+make-4.0-char-cast.patch)
 md5sums=('571d470a7647b455e3af3f92d79f1c18'
- 'SKIP')
+ 'SKIP'
+ '1840aae18e1c0d1c52563020ef3ff5f3')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # http://git.savannah.gnu.org/cgit/make.git/commit/?id=9d58570c
+  patch -p1 -i ${srcdir}/make-4.0-char-cast.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: make-4.0-char-cast.patch
===
--- make-4.0-char-cast.patch(rev 0)
+++ make-4.0-char-cast.patch2013-12-12 15:38:21 UTC (rev 201469)
@@ -0,0 +1,43 @@
+From 9d58570c77240fed53d1f88217877f8e778f4bb2 Mon Sep 17 00:00:00 2001
+From: Paul Smith psm...@gnu.org
+Date: Sat, 26 Oct 2013 04:10:17 +
+Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char.
+
+* tests/scripts/misc/utf8: Test variable names with characters 127.
+Fix suggested by Robert Bogomip bob.b...@milohedge.com
+---
+diff --git a/makeint.h b/makeint.h
+index 77f51e0..c591427 100644
+--- a/makeint.h
 b/makeint.h
+@@ -415,7 +415,7 @@ extern int unixy_shell;
+ # define MAP_VMSCOMMA   0x
+ #endif
+ 
+-#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m))
++#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
+ 
+ #if defined(HAVE_SYS_RESOURCE_H)  defined(HAVE_GETRLIMIT)  
defined(HAVE_SETRLIMIT)
+ # define SET_STACK_SIZE
+diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8
+new file mode 100644
+index 000..2adcd07
+--- a/dev/null
 b/tests/scripts/misc/utf8
+@@ -0,0 +1,14 @@
++#
-*-perl-*-
++$description = Test utf8 handling.;
++
++$details = ;
++
++# Variable names containing UTF8 characters
++run_make_test(
++\xe2\x96\xaa := hello
++\$(info \$(\xe2\x96\xaa))
++all:
++,
++  '', hello\n#MAKE#: Nothing to be done for 'all'.);
++
++1;
+--
+cgit v0.9.0.2

[arch-commits] Commit in make/trunk (PKGBUILD)

2013-10-09 Thread Allan McRae 
Date: Wednesday, October 9, 2013 @ 12:42:38
  Author: allan
Revision: 196239

upgpkg: make 4.0-1

upstream update, add guile dependency

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |   43 ++-
 1 file changed, 6 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-09 10:06:27 UTC (rev 196238)
+++ PKGBUILD2013-10-09 10:42:38 UTC (rev 196239)
@@ -3,52 +3,21 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=make
-pkgver=3.82
-pkgrel=6
+pkgver=4.0
+pkgrel=1
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
 license=('GPL3')
 groups=('base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'sh' 'guile')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-make-3.82-bug30612.patch
-make-3.82-bug30723.patch
-make-3.82-sort-blank.patch
-make-3.82-makeflags.patch
-make-3.82-expensive_glob.patch
-make-3.82-dont-prune-intermediate.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
- 'SKIP'
- '8714ba22911a58ab3eb42ac3f4c6c3bd'
- '662e6450e19a5acdaa5c9fcb8ad78dea'
- '7d01a99f389d8f08dec93ed479071ee4'
- 'bc12ad4d0c6e6c0e72d9fb61054f446b'
- 'e58d4211c5b29d7d927a304d082849e7'
- '45ac9e987f4bf16c0d7e1685db943917')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('571d470a7647b455e3af3f92d79f1c18'
+ 'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # http://savannah.gnu.org/bugs/?30612
-  patch -Np1 -i $srcdir/make-3.82-bug30612.patch
-  
-  # http://savannah.gnu.org/bugs/?30723
-  patch -Np1 -i $srcdir/make-3.82-bug30723.patch
-  
-  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
-  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-  
-  # https://savannah.gnu.org/bugs/?33873
-  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-  
-  # http://lists.gnu.org/archive/html/bug-make/2011-04/msg2.html
-  patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
- 
-  # https://savannah.gnu.org/bugs/?30653
-  patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
-
   ./configure --prefix=/usr
   make
 }

[arch-commits] Commit in make/trunk (PKGBUILD make-3.82-bug30612.patch)

2013-07-01 Thread Allan McRae 
Date: Monday, July 1, 2013 @ 07:59:48
  Author: allan
Revision: 189235

upgpkg: make 3.82-6

update patch with additional upstream fix

Modified:
  make/trunk/PKGBUILD
  make/trunk/make-3.82-bug30612.patch

--+
 PKGBUILD |7 +++
 make-3.82-bug30612.patch |   27 ++-
 2 files changed, 29 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-01 01:03:08 UTC (rev 189234)
+++ PKGBUILD2013-07-01 05:59:48 UTC (rev 189235)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=5
+pkgrel=6
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -20,15 +20,14 @@
 make-3.82-expensive_glob.patch
 make-3.82-dont-prune-intermediate.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
- 'c78daf24f4ec5900c8f81e89a6e1cd5a'
- 'c8f496b22191f9fb9420ab14c1a19a47'
+ 'SKIP'
+ '8714ba22911a58ab3eb42ac3f4c6c3bd'
  '662e6450e19a5acdaa5c9fcb8ad78dea'
  '7d01a99f389d8f08dec93ed479071ee4'
  'bc12ad4d0c6e6c0e72d9fb61054f446b'
  'e58d4211c5b29d7d927a304d082849e7'
  '45ac9e987f4bf16c0d7e1685db943917')
 
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   

Modified: make-3.82-bug30612.patch
===
--- make-3.82-bug30612.patch2013-07-01 01:03:08 UTC (rev 189234)
+++ make-3.82-bug30612.patch2013-07-01 05:59:48 UTC (rev 189235)
@@ -1,4 +1,3 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
 --- make-3.82-orig/main.c  2010-07-19 17:10:53.0 +1000
 +++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
 @@ -1,3 +1,4 @@
@@ -64,3 +63,29 @@
  
  /* Find and set the new end.  Massage names if necessary.  */
  while (1)
+diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c
+index c87d4a7..b012094 100644
+--- make-3.82-orig/read.c
 make-3.82-fix30612/read.c
+@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int 
stopchar,
+   nlen -= (n + 1) - tp;
+   tp = n + 1;
+ 
+-  /* If we have just lib(, part of something like
+- lib( a b), go to the next item.  */
+-  if (! nlen)
+-continue;
+-
+   /* We can stop looking now.  */
+   break;
+ }
+ }
+   while (*e != '\0');
++
++  /* If we have just lib(, part of something like lib( a b),
++ go to the next item.  */
++  if (! nlen)
++continue;
+ }
+ }
+

[arch-commits] Commit in make/trunk (PKGBUILD make-3.82-makeflags.patch)

2011-09-12 Thread Allan McRae 
Date: Monday, September 12, 2011 @ 23:02:58
  Author: allan
Revision: 137948

upgpkg: make 3.82-4

fix issue with ignoring MAKEFLAGS

Added:
  make/trunk/make-3.82-makeflags.patch
Modified:
  make/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +---
 make-3.82-makeflags.patch |   36 
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-12 23:26:47 UTC (rev 137947)
+++ PKGBUILD2011-09-13 03:02:58 UTC (rev 137948)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=3
+pkgrel=4
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -15,11 +15,13 @@
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 bug30612.patch
 bug30723.patch
-make-3.82-sort-blank.patch)
+make-3.82-sort-blank.patch
+make-3.82-makeflags.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
  'c8f496b22191f9fb9420ab14c1a19a47'
  '662e6450e19a5acdaa5c9fcb8ad78dea'
- '7d01a99f389d8f08dec93ed479071ee4')
+ '7d01a99f389d8f08dec93ed479071ee4'
+ 'bc12ad4d0c6e6c0e72d9fb61054f446b')
 
 
 build() {
@@ -34,6 +36,10 @@
   # https://bugs.archlinux.org/task/22733 (fix from Fedora)
   patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
   
+  # https://savannah.gnu.org/support/index.php?107487
+  # https://savannah.gnu.org/bugs/?33873
+  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
+  
   ./configure --prefix=/usr
   make
 }

Added: make-3.82-makeflags.patch
===
--- make-3.82-makeflags.patch   (rev 0)
+++ make-3.82-makeflags.patch   2011-09-13 03:02:58 UTC (rev 137948)
@@ -0,0 +1,36 @@
+Index: main.c
+===
+RCS file: /sources/make/make/main.c,v
+retrieving revision 1.246
+diff -u -r1.246 main.c
+--- main.c 29 Aug 2010 23:05:27 -  1.246
 main.c 27 Jul 2011 22:03:12 -
+@@ -2091,10 +2095,16 @@
+ 
+   /* Reset makeflags in case they were changed.  */
+   {
++if (master_job_slots)
++  {
++assert (job_slots == default_job_slots);
++job_slots = master_job_slots;
++  }
+ const char *pv = define_makeflags (1, 1);
+ char *p = alloca (sizeof (MAKEFLAGS=) + strlen (pv) + 1);
+ sprintf (p, MAKEFLAGS=%s, pv);
+ putenv (allocated_variable_expand (p));
++job_slots = default_job_slots;
+   }
+ 
+ if (ISDB (DB_BASIC))
+@@ -2825,9 +2852,11 @@
+   (*(unsigned int *) cs-value_ptr ==
+  *(unsigned int *) cs-noarg_value))
+   ADD_FLAG (, 0); /* Optional value omitted; see below.  */
++#if 0
+ else if (cs-c == 'j')
+   /* Special case for `-j'.  */
+   ADD_FLAG (1, 1);
++#endif
+ else
+   {
+ char *buf = alloca (30);

[arch-commits] Commit in make/trunk (PKGBUILD make-3.82-sort-blank.patch)

2011-02-18 Thread Allan McRae 
Date: Friday, February 18, 2011 @ 17:21:30
  Author: allan
Revision: 110342

upgpkg: make 3.82-3
fix andriod build crash - FS#22733

Added:
  make/trunk/make-3.82-sort-blank.patch
Modified:
  make/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 make-3.82-sort-blank.patch |   17 +
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 21:14:40 UTC (rev 110341)
+++ PKGBUILD2011-02-18 22:21:30 UTC (rev 110342)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=2
+pkgrel=3
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -14,10 +14,12 @@
 install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 bug30612.patch
-bug30723.patch)
+bug30723.patch
+make-3.82-sort-blank.patch)
 md5sums=('1a11100f3c63fcf5753818e59d63088f'
  'c8f496b22191f9fb9420ab14c1a19a47'
- '662e6450e19a5acdaa5c9fcb8ad78dea')
+ '662e6450e19a5acdaa5c9fcb8ad78dea'
+ '7d01a99f389d8f08dec93ed479071ee4')
 
 
 build() {
@@ -29,6 +31,9 @@
   # http://savannah.gnu.org/bugs/?30723
   patch -Np1 -i $srcdir/bug30723.patch
   
+  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
+  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
+  
   ./configure --prefix=/usr
   make
   make check

Added: make-3.82-sort-blank.patch
===
--- make-3.82-sort-blank.patch  (rev 0)
+++ make-3.82-sort-blank.patch  2011-02-18 22:21:30 UTC (rev 110342)
@@ -0,0 +1,17 @@
+diff -urp make-3.82/function.c make-3.82-pm/function.c
+--- make-3.82/function.c   2010-07-13 03:20:39.0 +0200
 make-3.82-pm/function.c2010-10-27 01:43:27.0 +0200
+@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
+ {
+   char c = *(t++);
+ 
+-  if (! isspace ((unsigned char)c))
++  if (! isblank ((unsigned char)c))
+ continue;
+ 
+   ++wordi;
+ 
+-  while (isspace ((unsigned char)*t))
++  while (isblank ((unsigned char)*t))
+ ++t;
+ }

[arch-commits] Commit in make/trunk (PKGBUILD make.install)

2011-02-01 Thread Allan McRae 
Date: Tuesday, February 1, 2011 @ 23:46:28
  Author: allan
Revision: 108663

fix license (FS#22421), fix install script

Modified:
  make/trunk/PKGBUILD
  make/trunk/make.install

--+
 PKGBUILD |2 +-
 make.install |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-02 04:33:53 UTC (rev 108662)
+++ PKGBUILD2011-02-02 04:46:28 UTC (rev 108663)
@@ -8,7 +8,7 @@
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
-license=('GPL')
+license=('GPL3')
 groups=('base-devel')
 depends=('glibc' 'sh')
 install=$pkgname.install

Modified: make.install
===
--- make.install2011-02-02 04:33:53 UTC (rev 108662)
+++ make.install2011-02-02 04:46:28 UTC (rev 108663)
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(make.info make.info-1 make.info-2)
 
 post_install() {

[arch-commits] Commit in make/trunk (PKGBUILD bug30612.patch bug30723.patch)

2010-09-23 Thread Allan McRae 
Date: Thursday, September 23, 2010 @ 09:39:14
  Author: allan
Revision: 91160

upgpkg: make 3.82-2
add upstream bug fixes

Added:
  make/trunk/bug30612.patch
  make/trunk/bug30723.patch
Modified:
  make/trunk/PKGBUILD

+
 PKGBUILD   |   18 ---
 bug30612.patch |   66 +++
 bug30723.patch |   12 ++
 3 files changed, 93 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-23 13:25:06 UTC (rev 91159)
+++ PKGBUILD2010-09-23 13:39:14 UTC (rev 91160)
@@ -4,7 +4,7 @@
 
 pkgname=make
 pkgver=3.82
-pkgrel=1
+pkgrel=2
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -12,11 +12,23 @@
 groups=('base-devel')
 depends=('glibc' 'sh')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1a11100f3c63fcf5753818e59d63088f')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+bug30612.patch
+bug30723.patch)
+md5sums=('1a11100f3c63fcf5753818e59d63088f'
+ 'c8f496b22191f9fb9420ab14c1a19a47'
+ '662e6450e19a5acdaa5c9fcb8ad78dea')
 
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # http://savannah.gnu.org/bugs/?30612
+  patch -Np1 -i $srcdir/bug30612.patch
+  
+  # http://savannah.gnu.org/bugs/?30723
+  patch -Np1 -i $srcdir/bug30723.patch
+  
   ./configure --prefix=/usr
   make
   make check

Added: bug30612.patch
===
--- bug30612.patch  (rev 0)
+++ bug30612.patch  2010-09-23 13:39:14 UTC (rev 91160)
@@ -0,0 +1,66 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
+--- make-3.82-orig/main.c  2010-07-19 17:10:53.0 +1000
 make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000
+@@ -1,3 +1,4 @@
++
+ /* Argument parsing and main program of GNU Make.
+ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+@@ -1138,7 +1139,7 @@
+  a macro and some compilers (MSVC) don't like conditionals in macros.  */
+   {
+ const char *features = target-specific order-only second-expansion
+-else-if shortest-stem undefine
++else-if shortest-stem undefine oneshell
+ #ifndef NO_ARCHIVES
+ archives
+ #endif
+diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
+--- make-3.82-orig/read.c  2010-07-13 11:20:42.0 +1000
 make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000
+@@ -3028,7 +3028,7 @@
+ {
+   /* This looks like the first element in an open archive group.
+  A valid group MUST have ')' as the last character.  */
+-  const char *e = p + nlen;
++  const char *e = p;
+   do
+ {
+   e = next_token (e);
+@@ -3084,19 +3084,19 @@
+  Go to the next item in the string.  */
+   if (flags  PARSEFS_NOGLOB)
+ {
+-  NEWELT (concat (2, prefix, tp));
++  NEWELT (concat (2, prefix, tmpbuf));
+   continue;
+ }
+ 
+   /* If we get here we know we're doing glob expansion.
+  TP is a string in tmpbuf.  NLEN is no longer used.
+  We may need to do more work: after this NAME will be set.  */
+-  name = tp;
++  name = tmpbuf;
+ 
+   /* Expand tilde if applicable.  */
+-  if (tp[0] == '~')
++  if (tmpbuf[0] == '~')
+   {
+-tildep = tilde_expand (tp);
++tildep = tilde_expand (tmpbuf);
+ if (tildep != 0)
+ name = tildep;
+   }
+@@ -3152,7 +3152,11 @@
+ else
+   {
+ /* We got a chain of items.  Attach them.  */
+-(*newp)-next = found;
++if (*newp)
++  (*newp)-next = found;
++else
++  *newp = found;
++
+ 
+ /* Find and set the new end.  Massage names if necessary.  */
+ while (1)

Added: bug30723.patch
===
--- bug30723.patch  (rev 0)
+++ bug30723.patch  2010-09-23 13:39:14 UTC (rev 91160)
@@ -0,0 +1,12 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
+--- make-3.82-orig/main.c  2010-07-19 17:10:53.0 +1000
 make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000
+@@ -2093,7 +2093,7 @@
+ const char *pv = define_makeflags (1, 1);
+ char *p = alloca (sizeof (MAKEFLAGS=) + strlen (pv) + 1);
+ sprintf (p, MAKEFLAGS=%s, pv);
+-putenv (p);
++putenv (allocated_variable_expand (p));
+

[arch-commits] Commit in make/trunk (PKGBUILD)

2010-08-12 Thread Allan McRae 
Date: Thursday, August 12, 2010 @ 08:51:56
  Author: allan
Revision: 87338

upgpkg: make 3.82-1
upstream update

Modified:
  make/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-12 12:34:14 UTC (rev 87337)
+++ PKGBUILD2010-08-12 12:51:56 UTC (rev 87338)
@@ -3,8 +3,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=make
-pkgver=3.81
-pkgrel=5
+pkgver=3.82
+pkgrel=1
 pkgdesc=GNU make utility to maintain groups of programs
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
@@ -12,14 +12,14 @@
 groups=('base-devel')
 depends=('glibc' 'sh')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a4e9494ac6dc3f6b0c5ff75c5d52abba')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('1a11100f3c63fcf5753818e59d63088f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
---mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr
   make
+  make check
 }
 
 package() {

[arch-commits] Commit in make/trunk (PKGBUILD make.install)

2010-04-17 Thread Allan McRae 
Date: Saturday, April 17, 2010 @ 23:42:45
  Author: allan
Revision: 77792

upgpkg: make 3.81-5
compress info pages

Modified:
  make/trunk/PKGBUILD
  make/trunk/make.install

--+
 PKGBUILD |   16 +---
 make.install |6 ++
 2 files changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-18 01:10:20 UTC (rev 77791)
+++ PKGBUILD2010-04-18 03:42:45 UTC (rev 77792)
@@ -1,17 +1,17 @@
 # $Id$
-# Maintainer: Andreas Radke andyrtr at archlinux.org
+# Maintainer: Allan McRae al...@archlinux.org
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=make
 pkgver=3.81
-pkgrel=4
+pkgrel=5
 pkgdesc=GNU make utility to maintain groups of programs
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/make;
 license=('GPL')
 groups=('base-devel')
+depends=('glibc' 'sh')
 install=$pkgname.install
-depends=('glibc' 'bash')
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('a4e9494ac6dc3f6b0c5ff75c5d52abba')
 
@@ -19,8 +19,10 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 --mandir=/usr/share/man --infodir=/usr/share/info
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
 
-  rm -f ${pkgdir}/usr/share/info/dir
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }

Modified: make.install
===
--- make.install2010-04-18 01:10:20 UTC (rev 77791)
+++ make.install2010-04-18 03:42:45 UTC (rev 77792)
@@ -4,7 +4,7 @@
 post_install() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${fileli...@]}; do
-install-info $infodir/$file $infodir/dir 2 /dev/null
+install-info $infodir/$file.gz $infodir/dir 2 /dev/null
   done
 }
 
@@ -15,8 +15,6 @@
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${fileli...@]}; do
-install-info --delete $infodir/$file $infodir/dir 2 /dev/null
+install-info --delete $infodir/$file.gz $infodir/dir 2 /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et: