From nobody Tue Sep 12 19:34:49 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlYgs6MTrz4tQ0g; Tue, 12 Sep 2023 19:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlYgs5sfrz3DGk; Tue, 12 Sep 2023 19:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694547289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TOFB/da341YdRsfd1ijdQgsxcc00YjbWei40RxP98M=; b=dU52k9rA7T5OIM9NAnTXt8U43wYPSJGDXwo5W/Xg5+pgSQmRwlarDnMSF09uWB2kWfu6C/ YxOs1HYfmer61lrMbmmJwCYuIhcHi3Jaj816byJL9LQpx99jvrOgekZ8YDAsQSM96dMI/U AGkONeZSdOsLTmud6O5qMsQw3P2EmZJFkCJBSNnAWHcRd/xS8Edot12CRci53brlKUSKlK w7ngfUwZMsZkaT9r2F8LJCwzStgMA28F5CwgE2pCRIX8YESR0hk4WLyvTAJp6j/OWwpfM8 /rtESpRiMNk4xwyrokxy/R02SUPsQtXE2ZXTJxGIGXZzFLqkA2Pp8/jikDWUTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694547289; a=rsa-sha256; cv=none; b=DDBdBEDZ/nvdpEJQ6f0jMqR0s0PGCFpAp5YixWbilNkT6/ONHMdZckMwMEFazIp0nTULq9 o7hAJ91P0l6fCGm2FkixrS5CJ+Ywd4p7QDsNflUFKzLKuIHvEFsGu7FkIpUqaCHx4y5JTO VD5ZzWdg+xuZT5acVlu77+6BR7Db9NF+km79DB1zU1AezrzUSe4DYPjTIorgBv0+0Ydk5N vlEuuRzSksGF9Ft0sgQvM6iq50/ZWG+hRGtVEBjfuNkUEZyVc/hPlMEnKxxd2jnh9/w2Eb 0lGwdMbPEouQEwLKK6qegNPDURWSyeE0A3P76JxnSCCxUdFD1y5n0H9Syyr5tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694547289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TOFB/da341YdRsfd1ijdQgsxcc00YjbWei40RxP98M=; b=utpBKF/7f8kCpyf107OhRhhEhe0Bit3wHH47COJRb45zmdHbB6lbwn1zdCCsOAAWlo37WZ X7LyOAILYVXi1NjMryZQN8avfuUFzHKgURhhRPmtCMrX5bzWF/Zj/xe7o8EO3kgidJatNT BBbT3cFy83ufHPU2wFiUyW20qFX7f/G46+KCBYhL+zZOUduXySJmJ62uRIa4QnJPlknD29 lg5GKrgk4YICzERrABJ0/ZmQdEkDfEK8a8hASG3ldIiS4lcvF7WTG+Wdg6G4OS0+KJzh33 W6URXnXTM6gK1OgRV8v0ZRatlU8OcoHiD8E/7rfWC/vU6rpRUynqMMQD6lDyZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlYgs4wNyzl0L; Tue, 12 Sep 2023 19:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CJYnsA055993; Tue, 12 Sep 2023 19:34:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CJYnHl055990; Tue, 12 Sep 2023 19:34:49 GMT (envelope-from git) Date: Tue, 12 Sep 2023 19:34:49 GMT Message-Id: <202309121934.38CJYnHl055990@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 2ded8fa10c76 - main - devel/libzakalwe: Add new port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ded8fa10c76265b9d9a27cf75b817a977074848 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ded8fa10c76265b9d9a27cf75b817a977074848 commit 2ded8fa10c76265b9d9a27cf75b817a977074848 Author: Emanuel Haupt AuthorDate: 2023-09-12 19:24:06 +0000 Commit: Emanuel Haupt CommitDate: 2023-09-12 19:24:06 +0000 devel/libzakalwe: Add new port A Shared tools library required by the Unix Amiga Delitracker Emulator. --- devel/Makefile | 1 + devel/libzakalwe/Makefile | 26 +++++++++++++++ devel/libzakalwe/distinfo | 3 ++ devel/libzakalwe/files/patch-Makefile | 37 ++++++++++++++++++++++ .../libzakalwe/files/patch-include_zakalwe_array.h | 30 ++++++++++++++++++ devel/libzakalwe/pkg-descr | 1 + devel/libzakalwe/pkg-plist | 22 +++++++++++++ 7 files changed, 120 insertions(+) diff --git a/devel/Makefile b/devel/Makefile index 70aa3121432f..3e229e197e45 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1455,6 +1455,7 @@ SUBDIR += libxo SUBDIR += libxs SUBDIR += libxtend + SUBDIR += libzakalwe SUBDIR += libzim SUBDIR += libzookeeper SUBDIR += libzvbi diff --git a/devel/libzakalwe/Makefile b/devel/libzakalwe/Makefile new file mode 100644 index 000000000000..e4db9c5a569b --- /dev/null +++ b/devel/libzakalwe/Makefile @@ -0,0 +1,26 @@ +PORTNAME= libzakalwe +DISTVERSION= g20230909 +CATEGORIES= devel + +MAINTAINER= ehaupt@FreeBSD.org +COMMENT= Shared tools library required by UADE +WWW= https://gitlab.com/hors/libzakalwe + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= bash:shells/bash + +USES= gmake shebangfix +USE_GITLAB= yes +GL_ACCOUNT= hors +GL_TAGNAME= 521bc3ba81d78859fb3cabae88dae6ebe41f9c03 + +SHEBANG_FILES= configure + +HAS_CONFIGURE= yes + +post-patch: + @${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/configure + +.include diff --git a/devel/libzakalwe/distinfo b/devel/libzakalwe/distinfo new file mode 100644 index 000000000000..d80abfe5f73d --- /dev/null +++ b/devel/libzakalwe/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1694249586 +SHA256 (hors-libzakalwe-521bc3ba81d78859fb3cabae88dae6ebe41f9c03_GL0.tar.gz) = 2e43c83737c94d9b9b0ace39d85c2eb6b35d8f1f47a1fa9ba1eab1772d15a561 +SIZE (hors-libzakalwe-521bc3ba81d78859fb3cabae88dae6ebe41f9c03_GL0.tar.gz) = 333539 diff --git a/devel/libzakalwe/files/patch-Makefile b/devel/libzakalwe/files/patch-Makefile new file mode 100644 index 000000000000..c6fd77224b5e --- /dev/null +++ b/devel/libzakalwe/files/patch-Makefile @@ -0,0 +1,37 @@ +--- Makefile.orig 2022-10-06 20:04:46 UTC ++++ Makefile +@@ -1,10 +1,10 @@ +-AR = ar +-CC = cgcc +-GCC = gcc +-CFLAGS = -W -Wall -O2 -I include -g -pthread -D_DEFAULT_SOURCE +-LDFLAGS = -lm -lpthread ++AR ?= ar ++CC ?= cgcc ++GCC ?= gcc ++CFLAGS += -W -Wall -I include -pthread -D_DEFAULT_SOURCE ++LDFLAGS += -lm -lpthread + INSTALL = install +-PREFIX = /usr/local ++PREFIX ?= /usr/local + + TEST_LINK_FLAG = -Wl,-rpath,. + +@@ -177,10 +177,13 @@ unix-support.o: unix-support.c include/zakalwe/unix-su + unix-support.lo: unix-support.c include/zakalwe/unix-support.h $(GENERAL_DEPS) + unix-support.o: unix-support.c include/zakalwe/unix-support.h $(GENERAL_DEPS) + +-install: all +- $(INSTALL) -m 644 libzakalwe.so "$(PREFIX)/lib"/ +- mkdir -p -m 755 "$(PREFIX)/include/zakalwe" +- $(INSTALL) -m 644 include/zakalwe/*.h "$(PREFIX)/include/zakalwe"/ ++strip: ++ strip libzakalwe.so ++ ++install: strip all ++ $(INSTALL) -m 644 libzakalwe.so "$(DESTDIR)$(PREFIX)/lib"/ ++ mkdir -p -m 755 "$(DESTDIR)$(PREFIX)/include/zakalwe" ++ $(INSTALL) -m 644 include/zakalwe/*.h "$(DESTDIR)$(PREFIX)/include/zakalwe"/ + + clean: + rm -f $(Z_TEST_BIN) *.o *.lo *.so diff --git a/devel/libzakalwe/files/patch-include_zakalwe_array.h b/devel/libzakalwe/files/patch-include_zakalwe_array.h new file mode 100644 index 000000000000..5890ddecd796 --- /dev/null +++ b/devel/libzakalwe/files/patch-include_zakalwe_array.h @@ -0,0 +1,30 @@ +--- include/zakalwe/array.h.orig 2022-10-06 20:04:46 UTC ++++ include/zakalwe/array.h +@@ -13,7 +13,7 @@ extern "C" { + extern "C" { + #endif + +-static inline void *z_array_util_double_if_needed(void *ptr, ++static inline void *z_array_util_double_if_needed(void **ptr, + const size_t num_members, + size_t *num_allocated, + const size_t size) +@@ -24,10 +24,14 @@ static inline void *z_array_util_double_if_needed(void + if (!z_mul2_size_t(&new_num_allocated, *num_allocated, 2)) + return NULL; + new_num_allocated = Z_MAX(new_num_allocated, 1); +- ptr = reallocarray(ptr, new_num_allocated, size); +- if (ptr != NULL) +- *num_allocated = new_num_allocated; +- return ptr; ++ // ptr = reallocarray(ptr, new_num_allocated, size); ++ void *new_ptr = realloc(*ptr, new_num_allocated * size); ++ if (new_ptr == NULL) ++ return NULL; ++ ++ *ptr = new_ptr; ++ *num_allocated = new_num_allocated; ++ return new_ptr; + } + + int _z_array_allocate(const size_t new_num_items, diff --git a/devel/libzakalwe/pkg-descr b/devel/libzakalwe/pkg-descr new file mode 100644 index 000000000000..03c142095a51 --- /dev/null +++ b/devel/libzakalwe/pkg-descr @@ -0,0 +1 @@ +A Shared tools library required by the Unix Amiga Delitracker Emulator. diff --git a/devel/libzakalwe/pkg-plist b/devel/libzakalwe/pkg-plist new file mode 100644 index 000000000000..2abbefb1aa3e --- /dev/null +++ b/devel/libzakalwe/pkg-plist @@ -0,0 +1,22 @@ +include/zakalwe/array.h +include/zakalwe/base.h +include/zakalwe/bitfield.h +include/zakalwe/char_array.h +include/zakalwe/compiler.h +include/zakalwe/config.h +include/zakalwe/endianess.h +include/zakalwe/file.h +include/zakalwe/hash-utils.h +include/zakalwe/input.h +include/zakalwe/map.h +include/zakalwe/math.h +include/zakalwe/mem.h +include/zakalwe/random.h +include/zakalwe/size_t_array.h +include/zakalwe/str_array.h +include/zakalwe/string.h +include/zakalwe/time.h +include/zakalwe/tree.h +include/zakalwe/unix-support.h +include/zakalwe/ztree.h +lib/libzakalwe.so