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

2020-05-16 Thread Felix Yan via arch-commits 
Date: Saturday, May 16, 2020 @ 12:36:01
  Author: felixonmars
Revision: 384572

upgpkg: nawk 20180827-2: reproducibility rebuild

Modified:
  nawk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 12:35:58 UTC (rev 384571)
+++ PKGBUILD2020-05-16 12:36:01 UTC (rev 384572)
@@ -2,7 +2,7 @@
 
 pkgname=nawk
 pkgver=20180827
-pkgrel=1
+pkgrel=2
 pkgdesc="The one, true implementation of AWK"
 url="https://github.com/onetrueawk/awk;
 license=('custom')

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

2018-09-27 Thread Dave Reisner via arch-commits 
Date: Thursday, September 27, 2018 @ 10:28:54
  Author: dreisner
Revision: 335470

upgpkg: nawk 20180827-1

Modified:
  nawk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-09-27 10:16:33 UTC (rev 335469)
+++ PKGBUILD2018-09-27 10:28:54 UTC (rev 335470)
@@ -1,7 +1,7 @@
 # Maintainer: Dave Reisner 
 
 pkgname=nawk
-pkgver=20180824
+pkgver=20180827
 pkgrel=1
 pkgdesc="The one, true implementation of AWK"
 url="https://github.com/onetrueawk/awk;
@@ -10,7 +10,7 @@
 options=('!makeflags')
 depends=('glibc')
 makedepends=('git')
-source=(git+https://github.com/onetrueawk/awk
+source=(git+https://github.com/onetrueawk/awk#tag=$pkgver
 'manpage-naming.patch')
 md5sums=('SKIP'
  '5413692140f8366f8ae6bcecc9a40f2f')
@@ -18,7 +18,7 @@
 pkgver() {
   cd awk
 
-  git --no-pager log --pretty='format:%ad' --date=format:%Y%m%d HEAD~..
+  git describe --tags
 }
 
 prepare() {

[arch-commits] Commit in nawk/trunk (PKGBUILD manpage-naming.patch)

2018-08-25 Thread Dave Reisner via arch-commits 
Date: Saturday, August 25, 2018 @ 10:41:13
  Author: dreisner
Revision: 333001

upgpkg: nawk 20180824-1

- pull latest from github sources
- fix license, it's a custom lucent deal
- ensure binary has full RELRO
- include testsuite in packaging

Modified:
  nawk/trunk/PKGBUILD
  nawk/trunk/manpage-naming.patch

--+
 PKGBUILD |   45 +++--
 manpage-naming.patch |   35 +++
 2 files changed, 46 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-25 08:35:48 UTC (rev 333000)
+++ PKGBUILD2018-08-25 10:41:13 UTC (rev 333001)
@@ -2,37 +2,54 @@
 # Maintainer: Dave Reisner 
 
 pkgname=nawk
-pkgver=20121220
-pkgrel=3
+pkgver=20180824
+pkgrel=1
 pkgdesc="The one, true implementation of AWK"
-url="https://www.cs.princeton.edu/~bwk/btl.mirror/;
-license=('MIT')
+url="https://github.com/onetrueawk/awk;
+license=('custom')
 arch=('x86_64')
 options=('!makeflags')
 depends=('glibc')
-source=("$pkgname-$pkgver.tar.gz::https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
+makedepends=('git')
+source=(git+https://github.com/onetrueawk/awk
 'manpage-naming.patch')
-md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
- '8486d387a51fe3b3c9875c4151ad92b4')
+md5sums=('SKIP'
+ '5413692140f8366f8ae6bcecc9a40f2f')
 
+pkgver() {
+  cd awk
+
+  git --no-pager log --pretty='format:%ad' --date=format:%Y%m%d HEAD~..
+}
+
 prepare() {
+  cd awk
+
   # awk -> nawk
   patch -Np1 <"$srcdir"/manpage-naming.patch
 
-  # create license
-  sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE
+  bsdtar xf awktest.tar
+}
 
-  # fix build
-  sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
+check() {
+  cd awk
+
+  ./REGRESS
 }
 
 build() {
-  make "CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" \
-"LDFLAGS=$LDFLAGS" \
-"CFLAGS=$CFLAGS"
+  cd awk
+
+  # the final linking step doesn't honor LDFLAGS, so let's just throw it all
+  # together into CFLAGS.
+  make \
+"CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" \
+"CFLAGS=$CFLAGS $LDFLAGS"
 }
 
 package() {
+  cd awk
+
   install -Dm755 a.out "$pkgdir/usr/bin/nawk"
   install -Dm644 awk.1 "$pkgdir/usr/share/man/man1/nawk.1"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/nawk/LICENSE"

Modified: manpage-naming.patch
===
--- manpage-naming.patch2018-08-25 08:35:48 UTC (rev 333000)
+++ manpage-naming.patch2018-08-25 10:41:13 UTC (rev 333001)
@@ -1,14 +1,14 @@
-diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1
 ./nawk-20100523.orig/awk.1 2007-03-31 16:56:19.0 -0400
-+++ nawk-20100523/awk.12010-09-20 21:49:16.840069318 -0400
-@@ -7,13 +7,11 @@
+diff --git a/awk.1 b/awk.1
+index 5830143..339271e 100644
+--- a/awk.1
 b/awk.1
+@@ -7,12 +7,12 @@
  .fi
  .ft 1
  ..
--awk
 -.TH AWK 1
--.CT 1 files prog_other
 +.TH NAWK 1
+ .CT 1 files prog_other
  .SH NAME
 -awk \- pattern-directed scanning and processing language
 +nawk \- pattern-directed scanning and processing language
@@ -18,7 +18,7 @@
  [
  .BI \-F
  .I fs
-@@ -32,7 +30,7 @@
+@@ -31,7 +31,7 @@ awk \- pattern-directed scanning and processing language
  .I file ...
  ]
  .SH DESCRIPTION
@@ -27,20 +27,15 @@
  scans each input
  .I file
  for lines that match any of a set of patterns specified literally in
-@@ -198,7 +196,6 @@
- .BR atan2 
- are built in.
- Other built-in functions:
--.TF length
- .TP
- .B length
- the length of its argument
-@@ -407,7 +404,6 @@
+@@ -426,7 +426,7 @@ and
  do not combine with other patterns.
+ They may appear multiple times in a program and execute
+ in the order they are read by
+-.IR awk .
++.IR nawk .
  .PP
  Variable names with special meanings:
--.TF FILENAME
- .TP
- .B CONVFMT
- conversion format used when converting numbers
+ .TF FILENAME
+-- 
+2.18.0

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

2016-09-10 Thread Dave Reisner 
Date: Sunday, September 11, 2016 @ 01:31:34
  Author: dreisner
Revision: 276162

upgpkg: nawk 20121220-3

- change upstream URL to working location
- fetch source over https

Modified:
  nawk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2016-09-10 18:48:09 UTC (rev 276161)
+++ PKGBUILD2016-09-11 01:31:34 UTC (rev 276162)
@@ -3,14 +3,14 @@
 
 pkgname=nawk
 pkgver=20121220
-pkgrel=2
+pkgrel=3
 pkgdesc="The one, true implementation of AWK"
-url="http://cm.bell-labs.com/who/bwk/;
+url="https://www.cs.princeton.edu/~bwk/btl.mirror/;
 license=('MIT')
 arch=('i686' 'x86_64')
 options=('!makeflags')
 depends=('glibc')
-source=("$pkgname-$pkgver.tar.gz::http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
+source=("$pkgname-$pkgver.tar.gz::https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
 'manpage-naming.patch')
 md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
  '8486d387a51fe3b3c9875c4151ad92b4')

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

2014-06-30 Thread Dave Reisner 
Date: Monday, June 30, 2014 @ 19:58:47
  Author: dreisner
Revision: 215855

upgpkg: nawk 20121220-2

- modernize PKGBUILD
- rebuild for .MTREE

Modified:
  nawk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-06-30 17:47:06 UTC (rev 215854)
+++ PKGBUILD2014-06-30 17:58:47 UTC (rev 215855)
@@ -3,7 +3,7 @@
 
 pkgname=nawk
 pkgver=20121220
-pkgrel=1
+pkgrel=2
 pkgdesc=The one, true implementation of AWK
 url=http://cm.bell-labs.com/who/bwk/;
 license=('MIT')
@@ -15,9 +15,9 @@
 md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
  '8486d387a51fe3b3c9875c4151ad92b4')
 
-build() {
+prepare() {
   # awk - nawk
-  patch -Np1  manpage-naming.patch
+  patch -Np1 $srcdir/manpage-naming.patch
 
   # create license
   sed -n '/Copyright/,/THIS SOFTWARE\./p' README  LICENSE
@@ -24,8 +24,12 @@
 
   # fix build
   sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
+}
 
-  make CPPFLAGS=-DHAS_ISBLANK LDFLAGS=$LDFLAGS CFLAGS=$CFLAGS
+build() {
+  make CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS \
+LDFLAGS=$LDFLAGS \
+CFLAGS=$CFLAGS
 }
 
 package() {

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

2012-12-21 Thread Dave Reisner 
Date: Friday, December 21, 2012 @ 21:28:31
  Author: dreisner
Revision: 173725

upgpkg: nawk 20121220-1

Modified:
  nawk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-12-21 23:33:14 UTC (rev 173724)
+++ PKGBUILD2012-12-22 02:28:31 UTC (rev 173725)
@@ -2,23 +2,29 @@
 # Maintainer: Dave Reisner dreis...@archlinux.org
 
 pkgname=nawk
-pkgver=20110810
-pkgrel=3
+pkgver=20121220
+pkgrel=1
 pkgdesc=The one, true implementation of AWK
 url=http://cm.bell-labs.com/who/bwk/;
 license=('MIT')
 arch=('i686' 'x86_64')
 options=('!makeflags')
 depends=('glibc')
-source=(http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
+source=($pkgname-$pkgver.tar.gz::http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
 'manpage-naming.patch')
-md5sums=('a7062ecade93dc4cb39190e48db9a51d'
+md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
  '8486d387a51fe3b3c9875c4151ad92b4')
 
 build() {
+  # awk - nawk
   patch -Np1  manpage-naming.patch
+
+  # create license
   sed -n '/Copyright/,/THIS SOFTWARE\./p' README  LICENSE
 
+  # fix build
+  sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
+
   make CPPFLAGS=-DHAS_ISBLANK LDFLAGS=$LDFLAGS CFLAGS=$CFLAGS
 }

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

2011-11-13 Thread Dave Reisner 
Date: Sunday, November 13, 2011 @ 09:58:31
  Author: dreisner
Revision: 142711

upgpkg: nawk 20110810-3

- don't provide awk -- we're not symlinking /bin/awk
- fix desc

Modified:
  nawk/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-11-13 11:56:55 UTC (rev 142710)
+++ PKGBUILD2011-11-13 14:58:31 UTC (rev 142711)
@@ -3,14 +3,13 @@
 
 pkgname=nawk
 pkgver=20110810
-pkgrel=2
-pkgdesc=The one, true implementation of the AWK
+pkgrel=3
+pkgdesc=The one, true implementation of AWK
 url=http://cm.bell-labs.com/who/bwk/;
 license=('MIT')
 arch=('i686' 'x86_64')
 options=('!makeflags')
 depends=('glibc')
-provides=('awk')
 source=(http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
 'manpage-naming.patch')
 md5sums=('a7062ecade93dc4cb39190e48db9a51d'

[arch-commits] Commit in nawk/trunk (PKGBUILD manpage-naming.patch)

2011-11-12 Thread Dave Reisner 
Date: Saturday, November 12, 2011 @ 21:24:17
  Author: dreisner
Revision: 142697

upgpkg: nawk 20110810-2

- add our own build flags
- patch manpage to refer to nawk instead of awk

Added:
  nawk/trunk/manpage-naming.patch
Modified:
  nawk/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 manpage-naming.patch |   46 ++
 2 files changed, 54 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-13 02:03:02 UTC (rev 142696)
+++ PKGBUILD2011-11-13 02:24:17 UTC (rev 142697)
@@ -3,7 +3,7 @@
 
 pkgname=nawk
 pkgver=20110810
-pkgrel=1
+pkgrel=2
 pkgdesc=The one, true implementation of the AWK
 url=http://cm.bell-labs.com/who/bwk/;
 license=('MIT')
@@ -11,12 +11,16 @@
 options=('!makeflags')
 depends=('glibc')
 provides=('awk')
-source=(http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;)
-md5sums=('a7062ecade93dc4cb39190e48db9a51d')
+source=(http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz;
+'manpage-naming.patch')
+md5sums=('a7062ecade93dc4cb39190e48db9a51d'
+ '8486d387a51fe3b3c9875c4151ad92b4')
 
 build() {
-  CPPFLAGS=-DHAS_ISBLANK make
+  patch -Np1  manpage-naming.patch
   sed -n '/Copyright/,/THIS SOFTWARE\./p' README  LICENSE
+
+  make CPPFLAGS=-DHAS_ISBLANK LDFLAGS=$LDFLAGS CFLAGS=$CFLAGS
 }
 
 package() {

Added: manpage-naming.patch
===
--- manpage-naming.patch(rev 0)
+++ manpage-naming.patch2011-11-13 02:24:17 UTC (rev 142697)
@@ -0,0 +1,46 @@
+diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1
+--- ./nawk-20100523.orig/awk.1 2007-03-31 16:56:19.0 -0400
 nawk-20100523/awk.12010-09-20 21:49:16.840069318 -0400
+@@ -7,13 +7,11 @@
+ .fi
+ .ft 1
+ ..
+-awk
+-.TH AWK 1
+-.CT 1 files prog_other
++.TH NAWK 1
+ .SH NAME
+-awk \- pattern-directed scanning and processing language
++nawk \- pattern-directed scanning and processing language
+ .SH SYNOPSIS
+-.B awk
++.B nawk
+ [
+ .BI \-F
+ .I fs
+@@ -32,7 +30,7 @@
+ .I file ...
+ ]
+ .SH DESCRIPTION
+-.I Awk
++.I Nawk
+ scans each input
+ .I file
+ for lines that match any of a set of patterns specified literally in
+@@ -198,7 +196,6 @@
+ .BR atan2 
+ are built in.
+ Other built-in functions:
+-.TF length
+ .TP
+ .B length
+ the length of its argument
+@@ -407,7 +404,6 @@
+ do not combine with other patterns.
+ .PP
+ Variable names with special meanings:
+-.TF FILENAME
+ .TP
+ .B CONVFMT
+ conversion format used when converting numbers
+