system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 10:20:45 +00:00
Code Issues Projects Releases Wiki Activity

Ports/klong: Update klong to version 20220315

Browse Source 
Upgrade patch to git style, add ReadMe.md and remove from the list of
ports missing descriptions.
This commit is contained in:
EWouters 2022-04-01 03:15:54 +02:00 committed by Brian Gianforcaro
parent d59694b864
commit cf0798158a
6 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Meta/lint-ports.py
View File

@ -61,7 +61,6 @@ PORTS_MISSING_DESCRIPTIONS = {
'harfbuzz',
'indent',
'jq',
'klong',
'libassuan',
'libgcrypt',
'libgd',

2
Ports/AvailablePorts.md
View File

@ -83,7 +83,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`ja2`](ja2/) | Jagged Alliance 2 Stracciatella | 0.15.x | https://github.com/safarp/ja2-stracciatella/tree/0.15.x |
| [`jot`](jot/) | jot (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy |
| [`jq`](jq/) | jq | 1.6 | https://stedolan.github.io/jq/ |
| [`klong`](klong/) | Klong | 20190926 | https://t3x.org/klong/ |
| [`klong`](klong/) | Klong | 20220315 | https://t3x.org/klong/ |
| [`less`](less/) | less | 590 | https://www.greenwoodsoftware.com/less/ |
| [`libarchive`](libarchive/) | libarchive | 3.5.2 | https://libarchive.org/ |
| [`libassuan`](libassuan/) | libassuan | 2.5.5 | https://gnupg.org/software/libassuan/index.html |

4
Ports/klong/package.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=klong
version=20190926
files="http://t3x.org/klong/klong20190926.tgz klong20190926.tgz 98009744f2200fc34d94b129590bbe52de1d330acbdb7c28e36d34a5cb30dc48"
version=20220315
files="http://t3x.org/klong/klong${version}.tgz klong${version}.tgz 018b75ca2b2ee86eabc9ac3b6c14b0a2aa9200998d4d860e04432fdc80285191"
auth_type=sha256
useconfigure=false
workdir=klong

44
Ports/klong/patches/0001-Patch-Makefile.patch Normal file
View File

@ -0,0 +1,44 @@
From 63f3b49119e29d905a66c64895625c702b4827d5 Mon Sep 17 00:00:00 2001
From: EWouters <6179932+EWouters@users.noreply.github.com>
Date: Tue, 5 Apr 2022 14:33:34 +0200
Subject: [PATCH] Patch Makefile
- Make `CC` configurable from `env`
- Remove `klong.image` target from all
- Add install target
---
Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index f692ff7..470adcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
CFLAGS= -g -Wall -pedantic -O3
-CC= cc $(CFLAGS)
+CC:= $(CC) $(CFLAGS)
V= 20211014
R= 20220315
@@ -12,7 +12,7 @@ OPTIONS= -DEDIT
# Modules to load into image file
MODULES=-l nstat -l nplot -l time
-all: kg klong.image
+all: kg
klong.image: kg
./kg -n $(MODULES) -o klong.image
@@ -54,3 +54,8 @@ csums:
mksums: clean
find . -type f | grep -v _csums | grep -v klong2015 | csum >_csums
+
+install:
+ install kg ${DESTDIR}/usr/local/bin
+ mkdir -p ${DESTDIR}/usr/local/lib/klong
+ install -m 644 lib/* ${DESTDIR}/usr/local/lib/klong
--
2.32.0 (Apple Git-132)

10
Ports/klong/patches/ReadMe.md Normal file
View File

@ -0,0 +1,10 @@
# Patches for klong on SerenityOS
## `0001-Patch-Makefile.patch`
Patch Makefile
- Make `CC` configurable from `env`
- Remove `klong.image` target from all
- Add install target

26
Ports/klong/patches/klong.patch
View File

@ -1,26 +0,0 @@
--- klong/Makefile.orig 2019-10-01 13:06:39.000000000 +0200
+++ klong/Makefile 2020-02-01 21:08:13.020202542 +0100
@@ -1,12 +1,12 @@
CFLAGS= -g -Wall -pedantic -O3
-CC= cc $(CFLAGS)
+CC:= $(CC) $(CFLAGS)
V= 20190330
R= 20190926
# Modules to load into image file
OPTIONS=-l nstat -l nplot -l time
-all: kg klong.image
+all: kg
klong.image: kg
./kg -n $(OPTIONS) -o klong.image
@@ -48,3 +48,8 @@
mksums: clean
find . -type f | grep -v _csums | grep -v klong2015 | csum >_csums
+
+install:
+ install kg ${DESTDIR}/usr/local/bin
+ mkdir -p ${DESTDIR}/usr/local/lib/klong
+ install -m 644 lib/* ${DESTDIR}/usr/local/lib/klong