summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD59
-rw-r--r--manpage-naming.patch43
3 files changed, 33 insertions, 82 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3b253c877d80..afb2832f431d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Sep 10 11:38:02 UTC 2019
pkgbase = nawk-git
pkgdesc = The version of awk described in "The AWK Programming Language".
- pkgver = 20190910.r97.34a6f41
+ pkgver = 20231001.r288.d8e4368
pkgrel = 1
url = https://github.com/onetrueawk/awk
arch = i686
@@ -14,13 +12,8 @@ pkgbase = nawk-git
conflicts = nawk
options = !makeflags
source = nawk-git::git+https://github.com/onetrueawk/awk
- source = manpage-naming.patch
+ source = nawk-git-bsd::git+https://github.com/onetrueawk/awk#branch=bsd-features
+ md5sums = SKIP
md5sums = SKIP
- md5sums = f79cfc163176b6b06891f4dbeadc218f
- sha1sums = SKIP
- sha1sums = a729df9321d409402c023937260e5627fa72f811
- sha256sums = SKIP
- sha256sums = 5f0e0e737626b5060559a1a97dfc191875d6b2f784aa4fe2256add03d38f968b
pkgname = nawk-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a8a781791857..effb597159d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,57 @@
# Maintainer: aksr <aksr at t-com dot me>
pkgname=nawk-git
-pkgver=20190910.r97.34a6f41
+pkgver=20231001.r288.d8e4368
pkgrel=1
-epoch=
pkgdesc='The version of awk described in "The AWK Programming Language".'
arch=('i686' 'x86_64')
-url="https://github.com/onetrueawk/awk"
+url='https://github.com/onetrueawk/awk'
license=('MIT')
-groups=()
depends=(glibc)
makedepends=(git)
-optdepends=()
-checkdepends=()
provides=("${pkgname%-*}")
conflicts=("${pkgname%-*}")
-replaces=()
-backup=()
options=('!makeflags')
-changelog=
-install=
-source=("$pkgname::git+$url" manpage-naming.patch)
-noextract=()
-md5sums=('SKIP' 'f79cfc163176b6b06891f4dbeadc218f')
-sha1sums=('SKIP' 'a729df9321d409402c023937260e5627fa72f811')
-sha256sums=('SKIP' '5f0e0e737626b5060559a1a97dfc191875d6b2f784aa4fe2256add03d38f968b')
+source=("$pkgname::git+$url"
+ "${pkgname}-bsd::git+$url#branch=bsd-features")
+md5sums=('SKIP' 'SKIP')
pkgver() {
- cd "$srcdir/$pkgname"
- printf "%s.r%s.%s" "$(grep '*version' main.c | sed 's/.*version //;s/";//')" \
- "$(git rev-list --count HEAD)" \
- "$(git rev-parse --short HEAD)"
+ cd "$srcdir/$pkgname"
+ printf "%s.r%s.%s" "$(grep '*version' main.c | sed 's/.*version //;s/";//')" \
+ "$(git rev-list --count HEAD)" \
+ "$(git rev-parse --short HEAD)"
}
prepare() {
- cd "$srcdir/$pkgname"
- patch -Np1 awk.1 ../manpage-naming.patch
+ cd "$srcdir/$pkgname"
+ sed -i 's/^\.TH AWK/.TH NAWK/;s/awk/nawk/g;s/Awk/Nawk/' awk.1
+ sed -i '/^\.CT .*/d;/^\.TF .*/d' awk.1
+ cd "$srcdir/$pkgname-bsd"
+ sed -i 's/^\.TH AWK/.TH NAWK-BSD/;s/awk/nawk-bsd/g;s/Awk/Nawk-BSD/' awk.1
+ sed -i '/^\.CT .*/d;/^\.TF .*/d' awk.1
}
build() {
- cd "$srcdir/$pkgname"
- make "CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS"
+ cd "$srcdir/$pkgname"
+ make "CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS"
+ cd "$srcdir/$pkgname-bsd"
+ make "CPPFLAGS=-DHAS_ISBLANK $CPPFLAGS" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS"
}
check() {
- cd "$srcdir/$pkgname"
- ./REGRESS
+ cd "$srcdir/$pkgname"
+ ./REGRESS
+ cd "$srcdir/$pkgname-bsd"
+ ./REGRESS
}
package() {
- cd "$srcdir/$pkgname"
- 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"
+ cd "$srcdir/$pkgname"
+ 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"
+ cd "$srcdir/$pkgname-bsd"
+ install -Dm755 a.out "$pkgdir/usr/bin/nawk-bsd"
+ install -Dm644 awk.1 "$pkgdir/usr/share/man/man1/nawk-bsd.1"
}
diff --git a/manpage-naming.patch b/manpage-naming.patch
deleted file mode 100644
index d6dfdefb85df..000000000000
--- a/manpage-naming.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- awk.1
-+++ awk.1
-@@ -7,12 +7,11 @@
- .fi
- .ft 1
- ..
--.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
-@@ -31,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
-@@ -197,7 +196,6 @@
- .BR atan2
- are built in.
- Other built-in functions:
--.TF length
- .TP
- .B length
- the length of its argument
-@@ -417,7 +415,6 @@
- do not combine with other patterns.
- .PP
- Variable names with special meanings:
--.TF FILENAME
- .TP
- .B ARGC
- argument count, assignable