Date: Mon, 6 Oct 2025 18:55:04 GMT From: Stefan =?utf-8?Q?E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8ccdf6692d68 - main - devel/hare: fix library path Message-ID: <202510061855.596It4xj041653@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ccdf6692d6803e683ee07af84540d7e89ba7675 commit 8ccdf6692d6803e683ee07af84540d7e89ba7675 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2025-10-06 18:52:58 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2025-10-06 18:52:58 +0000 devel/hare: fix library path PR: 290014 Reported by: l.lux@magenta.de --- devel/hare/Makefile | 2 + devel/hare/files/patch-configs_freebsd.mk | 78 ++++--------------------------- devel/hare/pkg-plist | 1 + 3 files changed, 11 insertions(+), 70 deletions(-) diff --git a/devel/hare/Makefile b/devel/hare/Makefile index 83efccc6129c..d97c1bd6af93 100644 --- a/devel/hare/Makefile +++ b/devel/hare/Makefile @@ -1,5 +1,6 @@ PORTNAME= hare DISTVERSION= 0.25.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ PKGNAMESUFFIX= -lang @@ -41,6 +42,7 @@ do-configure: post-install: ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/* + ${MKDIR} ${STAGEDIR}${DATADIR}/third-party ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR} diff --git a/devel/hare/files/patch-configs_freebsd.mk b/devel/hare/files/patch-configs_freebsd.mk index 97d62281f76d..5cacbe16b103 100644 --- a/devel/hare/files/patch-configs_freebsd.mk +++ b/devel/hare/files/patch-configs_freebsd.mk @@ -1,73 +1,11 @@ --- configs/freebsd.mk.orig 2025-06-21 07:52:26 UTC +++ configs/freebsd.mk -@@ -1,27 +1,28 @@ - # install locations --PREFIX = /usr/local --BINDIR = $(PREFIX)/bin --MANDIR = $(PREFIX)/share/man +@@ -2,7 +2,7 @@ MANDIR = $(PREFIX)/share/man + PREFIX = /usr/local + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/share/man -SRCDIR = $(PREFIX)/src --STDLIB = $(SRCDIR)/hare/stdlib --LIBEXECDIR = $(PREFIX)/libexec --TOOLDIR = $(LIBEXECDIR)/hare -+PREFIX ?= /usr/local -+BINDIR ?= $(PREFIX)/bin -+MANDIR ?= $(PREFIX)/share/man -+DATADIR ?= $(PREFIX)/share/hare -+SRCDIR ?= $(DATADIR)/src -+STDLIB ?= $(DATADIR)/stdlib -+LIBEXECDIR ?= $(PREFIX)/libexec -+TOOLDIR ?= $(LIBEXECDIR)/hare - - # variables used during build - PLATFORM = freebsd - ARCH = x86_64 - HAREFLAGS = --HARECFLAGS = -+HARECFLAGS = -a ${ARCH} - QBEFLAGS = - ASFLAGS = --LDLINKFLAGS = --gc-sections -z noexecstack -+LDLINKFLAGS ?= --gc-sections -z noexecstack - - # commands used by the build script --HAREC = harec --QBE = qbe --AS = as --LD = ld --SCDOC = scdoc -+HAREC ?= harec -+QBE ?= qbe -+AS ?= as -+LD ?= ld -+SCDOC ?= scdoc - - # build locations - HARECACHE = .cache -@@ -29,17 +30,17 @@ HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third- - - # variables that will be embedded in the binary with -D definitions - HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party --VERSION=$$(./scripts/version) -+VERSION ?= $$(./scripts/version) - - # For cross-compilation, modify the variables below --AARCH64_AS=as --AARCH64_CC=cc --AARCH64_LD=ld -+AARCH64_AS ?= as -+AARCH64_CC ?= cc -+AARCH64_LD ?= ld - --RISCV64_AS=as --RISCV64_CC=cc --RISCV64_LD=ld -+RISCV64_AS ?= as -+RISCV64_CC ?= cc -+RISCV64_LD ?= ld - --X86_64_AS=as --X86_64_CC=cc --X86_64_LD=ld -+X86_64_AS ?= as -+X86_64_CC ?= cc -+X86_64_LD ?= ld ++SRCDIR = $(PREFIX)/share + STDLIB = $(SRCDIR)/hare/stdlib + LIBEXECDIR = $(PREFIX)/libexec + TOOLDIR = $(LIBEXECDIR)/hare diff --git a/devel/hare/pkg-plist b/devel/hare/pkg-plist index 5e12c4d3bbda..ea06514df75c 100644 --- a/devel/hare/pkg-plist +++ b/devel/hare/pkg-plist @@ -915,3 +915,4 @@ share/man/man1/hare.1.gz share/man/man1/haredoc.1.gz share/man/man5/hare-module.5.gz share/man/man5/haredoc.5.gz +@dir %%DATADIR%%/third-partyhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510061855.596It4xj041653>