Skip to content

Commit

Permalink
devel/hare: update to latest development version
Browse files Browse the repository at this point in the history
PR 272578 has been addressed by passing ${PREFIX} as an argument to
the make command.

PR:		272578
Reported by:	nfisher.sr@gmail.com (Nathan Fischer)
  • Loading branch information
stesser committed Jul 19, 2023
1 parent 6f054c6 commit 77b5844
Show file tree
Hide file tree
Showing 5 changed files with 137 additions and 113 deletions.
8 changes: 4 additions & 4 deletions devel/hare/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PORTNAME= hare
PORTVERSION= g20230205
PORTVERSION= g20230719
CATEGORIES= devel
MASTER_SITES= https://git.sr.ht/~sircmpwn/${PORTNAME}/archive/
PKGNAMESUFFIX= -lang
DISTNAME= 274b8b72
DISTNAME= 0919412b
DIST_SUBDIR= hare

MAINTAINER= se@FreeBSD.org
Expand All @@ -21,7 +21,7 @@ BUILD_DEPENDS= harec:lang/harec \
scdoc:textproc/scdoc
RUN_DEPENDS= harec:lang/harec

MAKE_ARGS= ARCH=${ARCH:S/^amd64$/x86_64/}
MAKE_ARGS= ARCH=${ARCH:S/^amd64$/x86_64/} PREFIX=${PREFIX}

WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTNAME}

Expand All @@ -34,7 +34,7 @@ BROKEN= pre-FreeBSD-13 assembler is not compatible with generated files
.endif

do-build:
${CP} ${FILESDIR}/config.mk ${WRKSRC}
${CP} ${WRKSRC}/config.example.mk ${WRKSRC}/config.mk
cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS}

post-stage:
Expand Down
6 changes: 3 additions & 3 deletions devel/hare/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1675628590
SHA256 (hare/274b8b72.tar.gz) = 8fa5c8dd3d919b699b818481bc836ca5971446e561039ae8d5031698575460da
SIZE (hare/274b8b72.tar.gz) = 718566
TIMESTAMP = 1689760640
SHA256 (hare/0919412b.tar.gz) = 66e005b9fd3073d7eed2b5143425f5988649215ff6947f2218b99614f5429e91
SIZE (hare/0919412b.tar.gz) = 725891
49 changes: 0 additions & 49 deletions devel/hare/files/config.mk

This file was deleted.

33 changes: 33 additions & 0 deletions devel/hare/files/patch-config.example.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--- config.example.mk.orig 2023-07-19 01:21:32.000000000 +0200
+++ config.example.mk 2023-07-19 13:07:52.729248178 +0200
@@ -1,21 +1,23 @@
## Install configuration

-PREFIX = /usr/local
-BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/share/man
-SRCDIR = $(PREFIX)/src
+#PREFIX = %%LOCALBASE%%
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/man
+DATADIR = $(PREFIX)/share/hare
+SRCDIR = $(DATADIR)/src

# Where to install the stdlib tree
STDLIB = $(SRCDIR)/hare/stdlib

# Default HAREPATH
-HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
+LOCALSRCDIR = ${SRCDIR}/local-src
+HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(DATADIR)/stdlib:$(DATADIR)/third-party

## Build configuration

# Platform to build for
-PLATFORM = linux
-ARCH = x86_64
+PLATFORM = freebsd
+#ARCH = x86_64

# External tools and flags
HAREC = harec
Loading

0 comments on commit 77b5844

Please sign in to comment.