[arch-commits] Commit in nawk/repos/extra-x86_64 (4 files)

[Dave Reisner]

    Date: Saturday, August 25, 2018 @ 10:47:38
  Author: dreisner
Revision: 333002

archrelease: copy trunk to extra-x86_64

Added:
  nawk/repos/extra-x86_64/PKGBUILD
    (from rev 333001, nawk/trunk/PKGBUILD)
  nawk/repos/extra-x86_64/manpage-naming.patch
    (from rev 333001, nawk/trunk/manpage-naming.patch)
Deleted:
  nawk/repos/extra-x86_64/PKGBUILD
  nawk/repos/extra-x86_64/manpage-naming.patch

----------------------+
 PKGBUILD             |   95 ++++++++++++++++++++++++++++---------------------
 manpage-naming.patch |   87 +++++++++++++++++++++-----------------------
 2 files changed, 97 insertions(+), 85 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-25 10:41:13 UTC (rev 333001)
+++ PKGBUILD	2018-08-25 10:47:38 UTC (rev 333002)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=nawk
-pkgver=20121220
-pkgrel=3
-pkgdesc="The one, true implementation of AWK"
-url="https://www.cs.princeton.edu/~bwk/btl.mirror/"
-license=('MIT')
-arch=('i686' 'x86_64')
-options=('!makeflags')
-depends=('glibc')
-source=("$pkgname-$pkgver.tar.gz::https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"
-        'manpage-naming.patch')
-md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
-         '8486d387a51fe3b3c9875c4151ad92b4')
-
-prepare() {
-  # awk -> nawk
-  patch -Np1 <"$srcdir"/manpage-naming.patch
-
-  # create license
-  sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE
-
-  # fix build
-  sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
-}
-
-build() {
-  make "CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" \
-    "LDFLAGS=$LDFLAGS" \
-    "CFLAGS=$CFLAGS"
-}
-
-package() {
-  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"
-}

Copied: nawk/repos/extra-x86_64/PKGBUILD (from rev 333001, nawk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-25 10:47:38 UTC (rev 333002)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=nawk
+pkgver=20180824
+pkgrel=1
+pkgdesc="The one, true implementation of AWK"
+url="https://github.com/onetrueawk/awk"
+license=('custom')
+arch=('x86_64')
+options=('!makeflags')
+depends=('glibc')
+makedepends=('git')
+source=(git+https://github.com/onetrueawk/awk
+        'manpage-naming.patch')
+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
+
+  bsdtar xf awktest.tar
+}
+
+check() {
+  cd awk
+
+  ./REGRESS
+}
+
+build() {
+  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"
+}

Deleted: manpage-naming.patch
===================================================================
--- manpage-naming.patch	2018-08-25 10:41:13 UTC (rev 333001)
+++ manpage-naming.patch	2018-08-25 10:47:38 UTC (rev 333002)
@@ -1,46 +0,0 @@
-diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1
---- ./nawk-20100523.orig/awk.1	2007-03-31 16:56:19.000000000 -0400
-+++ nawk-20100523/awk.1	2010-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
-

Copied: nawk/repos/extra-x86_64/manpage-naming.patch (from rev 333001, nawk/trunk/manpage-naming.patch)
===================================================================
--- manpage-naming.patch	                        (rev 0)
+++ manpage-naming.patch	2018-08-25 10:47:38 UTC (rev 333002)
@@ -0,0 +1,41 @@
+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
+ ..
+-.TH AWK 1
++.TH NAWK 1
+ .CT 1 files prog_other
+ .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
+@@ -31,7 +31,7 @@ awk \- pattern-directed scanning and processing language
+ .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
+@@ -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
+-- 
+2.18.0
+