Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2024 07:23:48 GMT
From:      Yasuhiro Kimura <yasu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dda0309f01ea - main - devel/hare: Move man pages to share/man
Message-ID:  <202403200723.42K7Nmd3009219@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dda0309f01ea087fe13daf151d8bcd42c2b593b4

commit dda0309f01ea087fe13daf151d8bcd42c2b593b4
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-03-20 06:26:45 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-03-20 07:23:22 +0000

    devel/hare: Move man pages to share/man
    
    While here, fix build with poudriere.
    
    HAREC   .cache/hare.ssa
    QBE     .cache/hare.s
    AS      .cache/hare.o
    LD      .bin/hare
    HARE    .bin/harec2
    Error creating /nonexistent/.cache/hare: Permission denied
    *** Error code 255
    
    Stop.
    make[1]: stopped in /wrkdirs/usr/ports/devel/hare/work/hare-0919412b
    *** Error code 1
    
    Stop.
    make: stopped in /usr/ports/devel/hare
    
    Approved by:    portmgr (blanket, just fix it)
---
 devel/hare/Makefile                      | 3 ++-
 devel/hare/files/patch-config.example.mk | 6 +++---
 devel/hare/pkg-plist                     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/devel/hare/Makefile b/devel/hare/Makefile
index f57de6730f28..d4f49b0f53eb 100644
--- a/devel/hare/Makefile
+++ b/devel/hare/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	hare
 PORTVERSION=	g20230719
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/
 PKGNAMESUFFIX=	-lang
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	harec:lang/harec \
 		scdoc:textproc/scdoc
 RUN_DEPENDS=	harec:lang/harec
 
-MAKE_ARGS=	ARCH=${ARCH:S/^amd64$/x86_64/} PREFIX=${PREFIX}
+MAKE_ARGS=	ARCH=${ARCH:S/^amd64$/x86_64/} HARECACHE=${WRKDIR}/.cache/hare PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 
diff --git a/devel/hare/files/patch-config.example.mk b/devel/hare/files/patch-config.example.mk
index acc39783a5d7..dba21952ec7e 100644
--- a/devel/hare/files/patch-config.example.mk
+++ b/devel/hare/files/patch-config.example.mk
@@ -1,5 +1,5 @@
---- config.example.mk.orig	2023-07-19 01:21:32.000000000 +0200
-+++ config.example.mk	2023-07-19 13:07:52.729248178 +0200
+--- config.example.mk.orig	2023-07-18 23:21:32 UTC
++++ config.example.mk
 @@ -1,21 +1,23 @@
  ## Install configuration
  
@@ -9,7 +9,7 @@
 -SRCDIR = $(PREFIX)/src
 +#PREFIX =	%%LOCALBASE%%
 +BINDIR = 	$(PREFIX)/bin
-+MANDIR =	$(PREFIX)/man
++MANDIR =	$(PREFIX)/share/man
 +DATADIR =	$(PREFIX)/share/hare
 +SRCDIR =	$(DATADIR)/src
  
diff --git a/devel/hare/pkg-plist b/devel/hare/pkg-plist
index 8f7edc8f82e2..4d8e99feb8e5 100644
--- a/devel/hare/pkg-plist
+++ b/devel/hare/pkg-plist
@@ -1,7 +1,7 @@
 bin/hare
 bin/haredoc
-man/man1/hare.1.gz
-man/man1/haredoc.1.gz
+share/man/man1/hare.1.gz
+share/man/man1/haredoc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/maintainers.md
 %%PORTDOCS%%%%DOCSDIR%%/modules.md



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403200723.42K7Nmd3009219>